You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2014/07/31 07:12:15 UTC
[01/50] git commit: Add EOF EOL
Repository: buildr
Updated Branches:
refs/heads/master 472da42f1 -> bfbb78764
Add EOF EOL
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1533855 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/5ff8f45a
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/5ff8f45a
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/5ff8f45a
Branch: refs/heads/master
Commit: 5ff8f45aed32282271ac1046dcf9c7ee265ac502
Parents: 188114b
Author: Peter Donald <do...@apache.org>
Authored: Sun Oct 20 07:41:14 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sun Oct 20 07:41:14 2013 +0000
----------------------------------------------------------------------
tests/JavaSystemProperty/src/test/java/FooTest.java | 2 +-
tests/compile_with_parent/child/src/main/java/Foo.java | 2 +-
tests/helloWorld/src/main/java/HelloWorld.java | 2 +-
tests/junit3/src/main/java/Foo.java | 2 +-
tests/junit3/src/test/java/FooTest.java | 2 +-
tests/package_war_as_jar/src/main/java/Foo.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/5ff8f45a/tests/JavaSystemProperty/src/test/java/FooTest.java
----------------------------------------------------------------------
diff --git a/tests/JavaSystemProperty/src/test/java/FooTest.java b/tests/JavaSystemProperty/src/test/java/FooTest.java
index 4b4324b..6901f83 100644
--- a/tests/JavaSystemProperty/src/test/java/FooTest.java
+++ b/tests/JavaSystemProperty/src/test/java/FooTest.java
@@ -21,4 +21,4 @@ public class FooTest {
@Test
public void testSomething() {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/buildr/blob/5ff8f45a/tests/compile_with_parent/child/src/main/java/Foo.java
----------------------------------------------------------------------
diff --git a/tests/compile_with_parent/child/src/main/java/Foo.java b/tests/compile_with_parent/child/src/main/java/Foo.java
index e85da18..77ce16c 100644
--- a/tests/compile_with_parent/child/src/main/java/Foo.java
+++ b/tests/compile_with_parent/child/src/main/java/Foo.java
@@ -20,4 +20,4 @@ import org.apache.log4j.Logger;
public class Foo {
private static final Logger _logger = Logger.getLogger(Foo.class);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/buildr/blob/5ff8f45a/tests/helloWorld/src/main/java/HelloWorld.java
----------------------------------------------------------------------
diff --git a/tests/helloWorld/src/main/java/HelloWorld.java b/tests/helloWorld/src/main/java/HelloWorld.java
index a819dd0..8f5a867 100644
--- a/tests/helloWorld/src/main/java/HelloWorld.java
+++ b/tests/helloWorld/src/main/java/HelloWorld.java
@@ -20,4 +20,4 @@ public class HelloWorld {
public void foo() {
System.err.println("bar");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/buildr/blob/5ff8f45a/tests/junit3/src/main/java/Foo.java
----------------------------------------------------------------------
diff --git a/tests/junit3/src/main/java/Foo.java b/tests/junit3/src/main/java/Foo.java
index 3044b2a..5ff35f8 100644
--- a/tests/junit3/src/main/java/Foo.java
+++ b/tests/junit3/src/main/java/Foo.java
@@ -20,4 +20,4 @@ public class Foo {
public String bar() {
return "bar";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/buildr/blob/5ff8f45a/tests/junit3/src/test/java/FooTest.java
----------------------------------------------------------------------
diff --git a/tests/junit3/src/test/java/FooTest.java b/tests/junit3/src/test/java/FooTest.java
index a3341be..bfed84e 100644
--- a/tests/junit3/src/test/java/FooTest.java
+++ b/tests/junit3/src/test/java/FooTest.java
@@ -25,4 +25,4 @@ public class FooTest extends TestCase {
assertEquals("bar", foo.bar());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/buildr/blob/5ff8f45a/tests/package_war_as_jar/src/main/java/Foo.java
----------------------------------------------------------------------
diff --git a/tests/package_war_as_jar/src/main/java/Foo.java b/tests/package_war_as_jar/src/main/java/Foo.java
index 325cc6b..8ad468e 100644
--- a/tests/package_war_as_jar/src/main/java/Foo.java
+++ b/tests/package_war_as_jar/src/main/java/Foo.java
@@ -16,4 +16,4 @@
*/
public class Foo {
-}
\ No newline at end of file
+}
[39/50] git commit: Upgrade to TestNG 6.8.7
Posted by do...@apache.org.
Upgrade to TestNG 6.8.7
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1539185 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/5b656506
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/5b656506
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/5b656506
Branch: refs/heads/master
Commit: 5b6565066ea2fc33808d2d2bb53a81c6be475eb9
Parents: 7135371
Author: Peter Donald <do...@apache.org>
Authored: Tue Nov 5 23:18:03 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Nov 5 23:18:03 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 1 +
lib/buildr/java/tests.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/5b656506/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index e1a4df4..b62179a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.4.15 (2013-11-02)
+* Change: Update to TestNG 6.8.7.
* Change: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven
conventions. Reported by Chris Bozic.
http://git-wip-us.apache.org/repos/asf/buildr/blob/5b656506/lib/buildr/java/tests.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/tests.rb b/lib/buildr/java/tests.rb
index 618795c..cdc7591 100644
--- a/lib/buildr/java/tests.rb
+++ b/lib/buildr/java/tests.rb
@@ -296,7 +296,7 @@ module Buildr #:nodoc:
# * :args -- Arguments passed to the TestNG command line runner.
class TestNG < TestFramework::Java
- VERSION = '6.8.5'
+ VERSION = '6.8.7'
class << self
def version
[37/50] git commit: Remove test for functionality that has not been
supported in any release before or after assets work was integrated
Posted by do...@apache.org.
Remove test for functionality that has not been supported in any release before or after assets work was integrated
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1539181 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/0ab1051c
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/0ab1051c
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/0ab1051c
Branch: refs/heads/master
Commit: 0ab1051ca3992fd9af4090494bd861554e840ddf
Parents: 8502308
Author: Peter Donald <do...@apache.org>
Authored: Tue Nov 5 23:08:06 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Nov 5 23:08:06 2013 +0000
----------------------------------------------------------------------
spec/java/packaging_spec.rb | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/0ab1051c/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 6bc50d2..d267189 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -550,23 +550,6 @@ describe Packaging, 'war' do
inspect_war { |files| files.should include('test.html') }
end
- it 'should allow filtering into target directory' do
- write 'src/main/webapp/test.html', '${version}'
- define('foo', :version => '1.0') do
- target_webapp = file("target/webapp") do |task|
- filter('src/main/webapp/').
- into(task.to_s).using('version' => '999').
- run
- end
- package(:war)
- end
- inspect_war { |files| files.should include('test.html') }
- Zip::ZipFile.open(project('foo').package(:war).to_s) do |war|
- war.get_input_stream('test.html').read.should eql('999')
- end
- rm_f project('foo').package(:war).to_s
- end
-
it 'should accept files from :classes option', :retry => (Buildr::Util.win_os? ? 4 : 1) do
write 'classes/test'
define('foo', :version=>'1.0') { package(:war).with(:classes=>'classes') }
[31/50] git commit: Add retry to a test that can fail intermittently
under windows
Posted by do...@apache.org.
Add retry to a test that can fail intermittently under windows
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537924 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/06b59574
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/06b59574
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/06b59574
Branch: refs/heads/master
Commit: 06b59574d63703480bb7a613c7d1009f0b379bf7
Parents: de317d0
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 12:59:02 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 12:59:02 2013 +0000
----------------------------------------------------------------------
spec/java/packaging_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/06b59574/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 489d5e1..2d2e9c8 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -566,7 +566,7 @@ describe Packaging, 'war' do
end
end
- it 'should accept files from :classes option' do
+ it 'should accept files from :classes option', :retry => (Buildr::Util.win_os? ? 4 : 1) do
write 'classes/test'
define('foo', :version=>'1.0') { package(:war).with(:classes=>'classes') }
rm_f project('foo').package(:war).to_s
[44/50] git commit: Replace buildr --> apache in github url
Posted by do...@apache.org.
Replace buildr --> apache in github url
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/3ba55cd7
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/3ba55cd7
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/3ba55cd7
Branch: refs/heads/master
Commit: 3ba55cd7f773b96349ab31d650aef8c8e40eab09
Parents: 6c419f3
Author: Marcos Sainz <ma...@glassdoor.com>
Authored: Tue Dec 3 14:07:02 2013 -0800
Committer: Marcos Sainz <ma...@glassdoor.com>
Committed: Tue Dec 3 14:07:02 2013 -0800
----------------------------------------------------------------------
README.rdoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/3ba55cd7/README.rdoc
----------------------------------------------------------------------
diff --git a/README.rdoc b/README.rdoc
index c25d3d4..4736711 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -101,9 +101,9 @@ You can check the latest sources from SVN:
Or browse the SVN repository online:
http://svn.apache.org/repos/asf/buildr
-If you prefer Git, a Git fork is available from http://github.com/buildr/buildr/tree/master:
+If you prefer Git, a Git fork is available from http://github.com/apache/buildr/tree/master:
- git clone git://github.com/buildr/buildr.git
+ git clone git://github.com/apache/buildr.git
To install Buildr locally from source:
[14/50] git commit: Remove accidentally committed disabling of step
Posted by do...@apache.org.
Remove accidentally committed disabling of step
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535926 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/735ad9d6
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/735ad9d6
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/735ad9d6
Branch: refs/heads/master
Commit: 735ad9d6f432d84495f45685307e70e2ae5d9e1c
Parents: a90fca0
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 06:11:27 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 06:11:27 2013 +0000
----------------------------------------------------------------------
rakelib/stage.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/735ad9d6/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index c8c5be3..25ca670 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -47,7 +47,7 @@ task 'prepare' do |task, args|
git = `git status -s`
fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^ M/] && ENV["IGNORE_GIT"].nil?
puts '[X] There are no local changes, everything is in source control'
- end.call if false
+ end.call
# Make sure we have a valid CHANGELOG entry for this release.
lambda do
[18/50] git commit: Add jruby-pageant dependency as it is required
for sftp to work under windows/jruby
Posted by do...@apache.org.
Add jruby-pageant dependency as it is required for sftp to work under windows/jruby
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1536186 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/47048bc3
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/47048bc3
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/47048bc3
Branch: refs/heads/master
Commit: 47048bc3947292fa23ece545fceb2c19ee2c34ab
Parents: 87afece
Author: Peter Donald <do...@apache.org>
Authored: Sun Oct 27 19:34:35 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sun Oct 27 19:34:35 2013 +0000
----------------------------------------------------------------------
buildr.gemspec | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/47048bc3/buildr.gemspec
----------------------------------------------------------------------
diff --git a/buildr.gemspec b/buildr.gemspec
index 4ee41a6..562fb5f 100644
--- a/buildr.gemspec
+++ b/buildr.gemspec
@@ -58,6 +58,8 @@ for those one-off tasks, with a language that's a joy to use.
spec.add_dependency 'builder', '3.2.2'
spec.add_dependency 'net-ssh', '2.7.0'
spec.add_dependency 'net-sftp', '2.1.2'
+ # Required for sftp support under windows
+ spec.add_dependency "jruby-pageant", '1.1.1' if $platform.to_s == 'java'
spec.add_dependency 'rubyzip', '0.9.9'
spec.add_dependency 'json_pure', '1.8.0'
spec.add_dependency 'rubyforge', '2.0.4'
[46/50] git commit: Merge remote-tracking branch 'origin/pr/2'
Posted by do...@apache.org.
Merge remote-tracking branch 'origin/pr/2'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/43eb91ef
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/43eb91ef
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/43eb91ef
Branch: refs/heads/master
Commit: 43eb91efb36cf5c966942f5b31f70afa99a04e72
Parents: 9ce6132 d640342
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 31 15:08:27 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 31 15:08:27 2014 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/50] git commit: Give credit to the correct person
Posted by do...@apache.org.
Give credit to the correct person
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1534556 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e9dd8f75
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e9dd8f75
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e9dd8f75
Branch: refs/heads/master
Commit: e9dd8f75bcde37078fa12f8b8b7abb4aa97d1231
Parents: 8f1faa4
Author: Peter Donald <do...@apache.org>
Authored: Tue Oct 22 09:26:57 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Oct 22 09:26:57 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e9dd8f75/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index aed397f..e170327 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
1.4.15 (Pending)
* Added: BUILDR-679 - Support uploading to a snapshot repository
defined by repositories.snapshot_to if the artifact is
- a snapshot. Submitted by Jean-Philippe Caruana.
+ a snapshot. Submitted by Tammo van Lessen.
* Change: Update the jaxb_xjc addon to add output directory to
generated IDEA project files.
* Change: Update the default output directory used in the jaxb_xjc
[16/50] git commit: Rollback jekyll upgrade as it is incompatible
with the version of liquid in use
Posted by do...@apache.org.
Rollback jekyll upgrade as it is incompatible with the version of liquid in use
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535943 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/34255218
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/34255218
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/34255218
Branch: refs/heads/master
Commit: 3425521873f558aed8eeff7c00d72d86d484fb63
Parents: e1eca5d
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 07:50:25 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 07:50:25 2013 +0000
----------------------------------------------------------------------
buildr.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/34255218/buildr.gemspec
----------------------------------------------------------------------
diff --git a/buildr.gemspec b/buildr.gemspec
index f34d26b..4ee41a6 100644
--- a/buildr.gemspec
+++ b/buildr.gemspec
@@ -78,7 +78,7 @@ for those one-off tasks, with a language that's a joy to use.
# Unable to get this consistently working under jruby on windows
unless $platform.to_s == 'java'
- spec.add_development_dependency 'jekyll', '1.2.1'
+ spec.add_development_dependency 'jekyll', '0.11.2'
spec.add_development_dependency 'RedCloth', '4.2.9'
spec.add_development_dependency 'jekylltask', '1.1.0'
spec.add_development_dependency 'rdoc', '4.0.1'
[35/50] git commit: Bump the staging date
Posted by do...@apache.org.
Bump the staging date
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537931 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/ff6e60fd
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/ff6e60fd
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/ff6e60fd
Branch: refs/heads/master
Commit: ff6e60fd087094702262c2b9d54e28e48615b84d
Parents: 808594a
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 13:28:02 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 13:28:02 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/ff6e60fd/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 0d35762..e1a4df4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.4.15 (2013-10-26)
+1.4.15 (2013-11-02)
* Change: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven
conventions. Reported by Chris Bozic.
[27/50] git commit: Correct spelling of sufficient
Posted by do...@apache.org.
Correct spelling of sufficient
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537875 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a4283e8d
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a4283e8d
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a4283e8d
Branch: refs/heads/master
Commit: a4283e8d31a6292b05602f675f75f4f84b61b73b
Parents: 7d18d5f
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 09:50:18 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 09:50:18 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/util.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a4283e8d/lib/buildr/core/util.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/util.rb b/lib/buildr/core/util.rb
index d84df7c..b8b83b7 100644
--- a/lib/buildr/core/util.rb
+++ b/lib/buildr/core/util.rb
@@ -27,7 +27,7 @@ module Buildr #:nodoc:
#
# Gem.win_platform? only checks these RUBY_PLATFORM global,
# that in some cases like when running on JRuby is not
- # succifient for our purpose:
+ # sufficient for our purpose:
#
# For JRuby, the value for RUBY_PLATFORM will always be 'java'
# That's why this function checks on Config::CONFIG['host_os']
[10/50] git commit: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven conventions.
Posted by do...@apache.org.
Updated the 'test_jar' package type to have a classifier of 'tests' and thus match maven conventions.
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535908 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a487a7cd
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a487a7cd
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a487a7cd
Branch: refs/heads/master
Commit: a487a7cd74bc20dd34ded840130cc373d7e56aaf
Parents: 3b21e4f
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 01:45:46 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 01:45:46 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 ++
lib/buildr/packaging/test_jar.rb | 2 +-
spec/java/packaging_spec.rb | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a487a7cd/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9fe26f5..2b600b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.15 (Pending)
+* Change: Updated the 'test_jar' package type to have a
+ classifier of 'tests' and thus match maven conventions.
* Fixed: BUILDR-689 - Ensure that war file includes generated
assets rather than the "source" assets that may have
been filtered.
http://git-wip-us.apache.org/repos/asf/buildr/blob/a487a7cd/lib/buildr/packaging/test_jar.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/packaging/test_jar.rb b/lib/buildr/packaging/test_jar.rb
index a03a92c..8aa5202 100644
--- a/lib/buildr/packaging/test_jar.rb
+++ b/lib/buildr/packaging/test_jar.rb
@@ -16,7 +16,7 @@
module Buildr #:nodoc:
module PackageAsTestJar
def package_as_test_jar_spec(spec) #:nodoc:
- spec.merge(:type => :jar, :classifier => 'test-jar')
+ spec.merge(:type => :jar, :classifier => 'tests')
end
def package_as_test_jar(file_name) #:nodoc:
http://git-wip-us.apache.org/repos/asf/buildr/blob/a487a7cd/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 328f05f..5eb6498 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -1244,10 +1244,10 @@ describe Packaging, 'test_jar' do
it_should_behave_like 'packaging'
before { @packaging, @package_type = :test_jar, :jar }
- it 'should create package of type :jar and classifier \'test-jar\'' do
+ it 'should create package of type :jar and classifier \'tests\'' do
define 'foo', :version=>'1.0' do
package(:test_jar).type.should eql(:jar)
- package(:test_jar).classifier.should eql('test-jar')
+ package(:test_jar).classifier.should eql('tests')
package(:test_jar).name.should match(/foo-1.0-test-jar.jar$/)
end
end
[45/50] git commit: Merge remote-tracking branch 'origin/pr/5'
Posted by do...@apache.org.
Merge remote-tracking branch 'origin/pr/5'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/9ce61328
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/9ce61328
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/9ce61328
Branch: refs/heads/master
Commit: 9ce6132864c7929d8527c61743ce5df715cc5960
Parents: 472da42 aeeb8a1
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 31 15:07:36 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 31 15:07:36 2014 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
[36/50] git commit: Bump the staging date
Posted by do...@apache.org.
Bump the staging date
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537932 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/85023085
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/85023085
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/85023085
Branch: refs/heads/master
Commit: 85023085b4999acb3f5de44618e834b8ef5ddae3
Parents: ff6e60f
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 13:28:40 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 13:28:40 2013 +0000
----------------------------------------------------------------------
doc/index.textile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/85023085/doc/index.textile
----------------------------------------------------------------------
diff --git a/doc/index.textile b/doc/index.textile
index f0b4b00..2cc4329 100644
--- a/doc/index.textile
+++ b/doc/index.textile
@@ -46,7 +46,7 @@ So let's get started. You can "read the documentation online":quick_start.html,
h2(#news). What's New
-Highlights from Buildr 1.4.15 (2013-10-26)
+Highlights from Buildr 1.4.15 (2013-11-02)
* Change: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven
conventions. Reported by Chris Bozic.
[32/50] git commit: Remove the package created via filter in the same
block that creates it. Thus it does not matter what order the blocks execute
in
Posted by do...@apache.org.
Remove the package created via filter in the same block that creates it. Thus it does not matter what order the blocks execute in
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537926 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/ec23c537
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/ec23c537
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/ec23c537
Branch: refs/heads/master
Commit: ec23c53771ce6015e55ba7433b5f96211e4b0972
Parents: 06b5957
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 13:11:58 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 13:11:58 2013 +0000
----------------------------------------------------------------------
spec/java/packaging_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/ec23c537/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 2d2e9c8..6bc50d2 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -564,12 +564,12 @@ describe Packaging, 'war' do
Zip::ZipFile.open(project('foo').package(:war).to_s) do |war|
war.get_input_stream('test.html').read.should eql('999')
end
+ rm_f project('foo').package(:war).to_s
end
it 'should accept files from :classes option', :retry => (Buildr::Util.win_os? ? 4 : 1) do
write 'classes/test'
define('foo', :version=>'1.0') { package(:war).with(:classes=>'classes') }
- rm_f project('foo').package(:war).to_s
inspect_war { |files| files.should include('WEB-INF/classes/test') }
end
[05/50] git commit: BUILDR-689 - Ensure that war file includes
generated assets rather than the "source" assets that may have been filtered.
Posted by do...@apache.org.
BUILDR-689 - Ensure that war file includes generated assets rather than the "source" assets that may have been filtered.
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1534859 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8c8483ee
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8c8483ee
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8c8483ee
Branch: refs/heads/master
Commit: 8c8483eed5d60ac2f02e5e9ea86894e6238c53fe
Parents: dbb367c
Author: Peter Donald <do...@apache.org>
Authored: Tue Oct 22 23:50:23 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Oct 22 23:50:23 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 3 +++
lib/buildr/java/packaging.rb | 9 +++------
spec/java/packaging_spec.rb | 17 +++++++++++++++++
3 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8c8483ee/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index baf854f..9fe26f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
1.4.15 (Pending)
+* Fixed: BUILDR-689 - Ensure that war file includes generated
+ assets rather than the "source" assets that may have
+ been filtered.
* Fixed: BUILDR-689 - Define assets task before the project is
defined to avoid "undefined method `project='" if the
project attempts to generate into the same directory.
http://git-wip-us.apache.org/repos/asf/buildr/blob/8c8483ee/lib/buildr/java/packaging.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/packaging.rb b/lib/buildr/java/packaging.rb
index 79b4606..8a2b292 100644
--- a/lib/buildr/java/packaging.rb
+++ b/lib/buildr/java/packaging.rb
@@ -684,12 +684,9 @@ module Buildr #:nodoc:
# Add libraries in WEB-INF lib, and classes in WEB-INF classes
war.with :classes=>[compile.target, resources.target].compact
war.with :libs=>compile.dependencies
- # Add included files, or the webapp directory.
- assets.paths.each do |asset|
- war.tap do |war|
- war.enhance([asset])
- end
- war.include asset, :as => '.'
+ war.enhance([assets])
+ if !assets.paths.empty? || File.exist?(_(:source, :main, :webapp))
+ war.include assets.to_s, :as => '.'
end
end
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/8c8483ee/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 4257566..18b9de9 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -550,6 +550,23 @@ describe Packaging, 'war' do
inspect_war { |files| files.should include('test.html') }
end
+ it 'should allow filtering into target directory' do
+ write 'src/main/webapp/test.html', '${version}'
+ define('foo', :version => '1.0') do
+ target_webapp = file("target/webapp") do |task|
+ filter('src/main/webapp/').
+ into(task.to_s).using('version' => '999').
+ run
+ end
+ package(:war)
+ end
+ inspect_war { |files| files.should include('test.html') }
+ cp project('foo').package(:war).to_s, '/tmp/x.zip'
+ Zip::ZipFile.open(project('foo').package(:war).to_s, false) do |war|
+ war.get_input_stream('test.html').read.should eql('999')
+ end
+ end
+
it 'should accept files from :classes option' do
write 'src/main/java/Test.java', 'class Test {}'
write 'classes/test'
[22/50] git commit: Ensure that the dependency checking will check
the time of the target file rather than the containing directory
Posted by do...@apache.org.
Ensure that the dependency checking will check the time of the target file rather than the containing directory
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537851 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6fcf5e28
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6fcf5e28
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6fcf5e28
Branch: refs/heads/master
Commit: 6fcf5e282fe4505f8acf4d321eec468fccba29a9
Parents: 7728d4e
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 08:46:19 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 08:46:19 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/assets.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/6fcf5e28/lib/buildr/core/assets.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/assets.rb b/lib/buildr/core/assets.rb
index 95229a4..d5ca2ff 100644
--- a/lib/buildr/core/assets.rb
+++ b/lib/buildr/core/assets.rb
@@ -59,7 +59,7 @@ module Buildr #:nodoc:
f = f[source_dir.length + 1, 10000]
source = "#{asset}/#{f}"
target = "#{name}/#{f}"
- if !File.exist?(target) || File.mtime(name.to_s) < File.mtime(source)
+ if !File.exist?(target) || File.mtime(target) < File.mtime(source)
mkdir_p File.dirname(target)
cp source, target
end
[47/50] git commit: Merge remote-tracking branch 'origin/pr/3'
Posted by do...@apache.org.
Merge remote-tracking branch 'origin/pr/3'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/b61b3d5a
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/b61b3d5a
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/b61b3d5a
Branch: refs/heads/master
Commit: b61b3d5a64a899f37e8eec26a9174e61aedcb0ec
Parents: 43eb91e bc546a9
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 31 15:10:25 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 31 15:10:25 2014 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
[40/50] git commit: Bump the staging date
Posted by do...@apache.org.
Bump the staging date
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1539204 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/9126425d
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/9126425d
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/9126425d
Branch: refs/heads/master
Commit: 9126425d33235dd78e052e4f2ad3cb2ab503425b
Parents: 5b65650
Author: Peter Donald <do...@apache.org>
Authored: Wed Nov 6 00:36:19 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Wed Nov 6 00:36:19 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 +-
doc/index.textile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/9126425d/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index b62179a..c1f4cb7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.4.15 (2013-11-02)
+1.4.15 (2013-11-06)
* Change: Update to TestNG 6.8.7.
* Change: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven
http://git-wip-us.apache.org/repos/asf/buildr/blob/9126425d/doc/index.textile
----------------------------------------------------------------------
diff --git a/doc/index.textile b/doc/index.textile
index 2cc4329..c461024 100644
--- a/doc/index.textile
+++ b/doc/index.textile
@@ -46,7 +46,7 @@ So let's get started. You can "read the documentation online":quick_start.html,
h2(#news). What's New
-Highlights from Buildr 1.4.15 (2013-11-02)
+Highlights from Buildr 1.4.15 (2013-11-06)
* Change: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven
conventions. Reported by Chris Bozic.
[04/50] git commit: BUILDR-689 - Define assets task before the
project is defined to avoid "undefined method `project='" if the project
attempts to generate into the same directory.
Posted by do...@apache.org.
BUILDR-689 - Define assets task before the project is defined to avoid "undefined method `project='" if the project attempts to generate into the same directory.
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1534852 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/dbb367cd
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/dbb367cd
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/dbb367cd
Branch: refs/heads/master
Commit: dbb367cd0f202292ddd2028a0a1ced2557bb5612
Parents: e9dd8f7
Author: Peter Donald <do...@apache.org>
Authored: Tue Oct 22 23:42:14 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Oct 22 23:42:14 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 3 +++
lib/buildr/core/assets.rb | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/dbb367cd/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index e170327..baf854f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
1.4.15 (Pending)
+* Fixed: BUILDR-689 - Define assets task before the project is
+ defined to avoid "undefined method `project='" if the
+ project attempts to generate into the same directory.
* Added: BUILDR-679 - Support uploading to a snapshot repository
defined by repositories.snapshot_to if the artifact is
a snapshot. Submitted by Tammo van Lessen.
http://git-wip-us.apache.org/repos/asf/buildr/blob/dbb367cd/lib/buildr/core/assets.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/assets.rb b/lib/buildr/core/assets.rb
index 3566d9c..bfd3b22 100644
--- a/lib/buildr/core/assets.rb
+++ b/lib/buildr/core/assets.rb
@@ -72,6 +72,11 @@ module Buildr #:nodoc:
Project.local_task("assets")
end
+ before_define do |project|
+ # Force the construction of the assets task
+ project.assets.paths
+ end
+
# Access the asset task
def assets
if @assets.nil?
@@ -82,11 +87,6 @@ module Buildr #:nodoc:
end
@assets
end
-
- after_define do |project|
- # Force construction
- project.assets
- end
end
end
end
[34/50] git commit: Make it possible to override the staging date
with an environment variable
Posted by do...@apache.org.
Make it possible to override the staging date with an environment variable
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537930 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/808594a7
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/808594a7
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/808594a7
Branch: refs/heads/master
Commit: 808594a74f3f7569587d1651fc596493240754b0
Parents: 8cbf73b
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 13:27:06 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 13:27:06 2013 +0000
----------------------------------------------------------------------
rakelib/stage.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/808594a7/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index 25ca670..3082158 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -19,7 +19,7 @@ require 'digest/sha1'
gpg_cmd = 'gpg2'
-STAGE_DATE = Time.now.strftime('%Y-%m-%d')
+STAGE_DATE = ENV['STAGE_DATE'] || Time.now.strftime('%Y-%m-%d')
task 'prepare' do |task, args|
gpg_arg = args.gpg || ENV['gpg']
[21/50] git commit: Add add_default_configuration utility method to
ipr project
Posted by do...@apache.org.
Add add_default_configuration utility method to ipr project
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537619 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7728d4ea
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7728d4ea
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7728d4ea
Branch: refs/heads/master
Commit: 7728d4ea8ba9117eac9c8c824c177fbc53b182da
Parents: dfede00
Author: Peter Donald <do...@apache.org>
Authored: Thu Oct 31 20:16:28 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Thu Oct 31 20:16:28 2013 +0000
----------------------------------------------------------------------
lib/buildr/ide/idea.rb | 9 ++++++++-
spec/ide/idea_spec.rb | 25 +++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7728d4ea/lib/buildr/ide/idea.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index cade709..e380dee 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -647,12 +647,19 @@ module Buildr #:nodoc:
def add_configuration(name, type, factory_name, default = false)
add_to_composite_component(self.configurations) do |xml|
- xml.configuration(:name => name, :type => type, :factoryName => factory_name, :default => default) do |xml|
+ options = {:type => type, :factoryName => factory_name}
+ options[:name] = name unless default
+ options[:default] = true if default
+ xml.configuration(options) do |xml|
yield xml if block_given?
end
end
end
+ def add_default_configuration(type, factory_name)
+ add_configuration(nil, type, factory_name)
+ end
+
def add_postgres_data_source(name, options = {})
if options[:url].nil? && options[:database]
default_url = "jdbc:postgresql://#{(options[:host] || "127.0.0.1")}:#{(options[:port] || "5432")}/#{options[:database]}"
http://git-wip-us.apache.org/repos/asf/buildr/blob/7728d4ea/spec/ide/idea_spec.rb
----------------------------------------------------------------------
diff --git a/spec/ide/idea_spec.rb b/spec/ide/idea_spec.rb
index b6ebd83..1e62fb8 100644
--- a/spec/ide/idea_spec.rb
+++ b/spec/ide/idea_spec.rb
@@ -1076,6 +1076,31 @@ describe Buildr::IntellijIdea do
end
end
+ describe "with default configuration added to root project" do
+ before do
+ @foo = define "foo" do
+ ipr.add_default_configuration("GWT.ConfigurationType", "GWT Configuration") do |xml|
+ xml.module(:name => project.iml.id)
+ xml.option(:name => "RUN_PAGE", :value => "Planner.html")
+ xml.option(:name => "compilerParameters", :value => "-draftCompile -localWorkers 2")
+ xml.option(:name => "compilerMaxHeapSize", :value => "512")
+
+ xml.RunnerSettings(:RunnerId => "Run")
+ xml.ConfigurationWrapper(:RunnerId => "Run")
+ xml.tag! :method
+ end
+ end
+ invoke_generate_task
+ end
+
+ it "generates an IPR with default configuration" do
+ doc = xml_document(@foo._("foo.ipr"))
+ facet_xpath = "/project/component[@name='ProjectRunConfigurationManager']/configuration"
+ doc.should have_nodes(facet_xpath, 1)
+ doc.should have_xpath("#{facet_xpath}[@type='GWT.ConfigurationType' AND @factoryName='GWT Configuration' AND @default='true']")
+ end
+ end
+
describe "with iml.group specified" do
before do
@foo = define "foo" do
[11/50] git commit: Rework the change description
Posted by do...@apache.org.
Rework the change description
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535909 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/86507400
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/86507400
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/86507400
Branch: refs/heads/master
Commit: 86507400ab3d0146134392540db60294b91bf1c2
Parents: a487a7c
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 01:46:43 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 01:46:43 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/86507400/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 2b600b5..283bccc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
1.4.15 (Pending)
* Change: Updated the 'test_jar' package type to have a
- classifier of 'tests' and thus match maven conventions.
+ classifier of 'tests' and thus match maven
+ conventions. Reported by Chris Bozic.
* Fixed: BUILDR-689 - Ensure that war file includes generated
assets rather than the "source" assets that may have
been filtered.
[42/50] git commit: Update the download links
Posted by do...@apache.org.
Update the download links
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1540248 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/9ae3f9a8
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/9ae3f9a8
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/9ae3f9a8
Branch: refs/heads/master
Commit: 9ae3f9a8466186123b5b687f0806904da99197ab
Parents: c654dab
Author: Peter Donald <do...@apache.org>
Authored: Sat Nov 9 02:54:13 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Nov 9 02:54:13 2013 +0000
----------------------------------------------------------------------
doc/download.textile | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/9ae3f9a8/doc/download.textile
----------------------------------------------------------------------
diff --git a/doc/download.textile b/doc/download.textile
index a858562..4d62ca4 100644
--- a/doc/download.textile
+++ b/doc/download.textile
@@ -20,16 +20,28 @@ The source code is included in both source and binary distribution, the Gem dist
h2(#dist). Binaries and Source Code
+h3. buildr 1.4.15 (2013-11-06)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.15-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.15/buildr-1.4.15-java.gem | "5ea7f855a2e57340d840fea3ef635a44":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15-java.gem.asc |
+| "buildr-1.4.15-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.15/buildr-1.4.15-x86-mswin32.gem | "e297b9a358ed2fe90afe0a67285c1236":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15-x86-mswin32.gem.asc |
+| "buildr-1.4.15.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.15/buildr-1.4.15.gem | "d4052ac4aa739c63ab7ad08d80719a1a":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15.gem.asc |
+| "buildr-1.4.15.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.15/buildr-1.4.15.tgz | "c80a6fee2d2cfe7de1a57821596444bd":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15.tgz.asc |
+| "buildr-1.4.15.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.15/buildr-1.4.15.zip | "0c63028d9965817b8d17ca49096974dc":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.15/buildr-1.4.15.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.15/KEYS)
+
+
h3. buildr 1.4.14 (2013-10-11)
|_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.14-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14-java.gem | "f90047a502b964943bda09b0a76b98f2":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem.asc |
-| "buildr-1.4.14-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem | "f98125eb8edae9ecb720d04d895b113b":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem.asc |
-| "buildr-1.4.14.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14.gem | "b797e2a07b7da07a317ea90ec1d7a36c":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem.asc |
-| "buildr-1.4.14.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14.tgz | "ddece5f90aef3ccd589eeff81af2a686":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz.asc |
-| "buildr-1.4.14.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14.zip | "40c0bffb0b2d3ca1ad43a5e0020e2afb":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip.asc |
+| "buildr-1.4.14-java.gem":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem | "f90047a502b964943bda09b0a76b98f2":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem.asc |
+| "buildr-1.4.14-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem | "f98125eb8edae9ecb720d04d895b113b":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem.asc |
+| "buildr-1.4.14.gem":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem | "b797e2a07b7da07a317ea90ec1d7a36c":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem.asc |
+| "buildr-1.4.14.tgz":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz | "ddece5f90aef3ccd589eeff81af2a686":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz.asc |
+| "buildr-1.4.14.zip":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip | "40c0bffb0b2d3ca1ad43a5e0020e2afb":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip.asc |
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.14/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.14/KEYS)
h3. buildr 1.4.13 (2013-10-02)
[26/50] git commit: Remove stray character
Posted by do...@apache.org.
Remove stray character
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537865 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7d18d5f1
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7d18d5f1
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7d18d5f1
Branch: refs/heads/master
Commit: 7d18d5f1580aa0780eea6c9dd6861b1ad79bfadd
Parents: 155a77c
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 09:33:02 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 09:33:02 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/application.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7d18d5f1/lib/buildr/core/application.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/application.rb b/lib/buildr/core/application.rb
index 35a60bf..5554084 100644
--- a/lib/buildr/core/application.rb
+++ b/lib/buildr/core/application.rb
@@ -677,7 +677,7 @@ module FileUtils
[arg].flatten.map { |path| Buildr::Util.normalize_path(path) }
end
- private_Fmodule_function :fu_list
+ private_module_function :fu_list
end
module FileUtils
[17/50] git commit: Remove use of deprecated mock method
Posted by do...@apache.org.
Remove use of deprecated mock method
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1536185 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/87afece5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/87afece5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/87afece5
Branch: refs/heads/master
Commit: 87afece5bf0279384bb7420ca56fc4d37c333bc1
Parents: 3425521
Author: Peter Donald <do...@apache.org>
Authored: Sun Oct 27 19:25:30 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sun Oct 27 19:25:30 2013 +0000
----------------------------------------------------------------------
spec/core/common_spec.rb | 4 ++--
spec/core/test_spec.rb | 4 ++--
spec/core/transport_spec.rb | 28 ++++++++++++++--------------
3 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/87afece5/spec/core/common_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/common_spec.rb b/spec/core/common_spec.rb
index 8240545..c741b34 100644
--- a/spec/core/common_spec.rb
+++ b/spec/core/common_spec.rb
@@ -97,7 +97,7 @@ end
describe Buildr.method(:download) do
before do
@content = 'we has download!'
- @http = mock('http')
+ @http = double('http')
@http.stub(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
end
@@ -601,7 +601,7 @@ describe Buildr::Options, 'proxy.exclude' do
@uri = URI("http://#{@host}")
@no_proxy_args = [@host, 80]
@proxy_args = @no_proxy_args + ['myproxy', 8080, nil, nil]
- @http = mock('http')
+ @http = double('http')
@http.stub(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/87afece5/spec/core/test_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/test_spec.rb b/spec/core/test_spec.rb
index 68f8db5..4c48cf2 100644
--- a/spec/core/test_spec.rb
+++ b/spec/core/test_spec.rb
@@ -183,7 +183,7 @@ describe Buildr::TestTask do
end
it 'should execute setup task before running tests' do
- mock = mock('actions')
+ mock = double('actions')
test_task.setup { mock.setup }
test_task.enhance { mock.tests }
mock.should_receive(:setup).ordered
@@ -192,7 +192,7 @@ describe Buildr::TestTask do
end
it 'should execute teardown task after running tests' do
- mock = mock('actions')
+ mock = double('actions')
test_task.teardown { mock.teardown }
test_task.enhance { mock.tests }
mock.should_receive(:tests).ordered
http://git-wip-us.apache.org/repos/asf/buildr/blob/87afece5/spec/core/transport_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/transport_spec.rb b/spec/core/transport_spec.rb
index f8c554b..f8bf079 100644
--- a/spec/core/transport_spec.rb
+++ b/spec/core/transport_spec.rb
@@ -237,7 +237,7 @@ describe URI::HTTP, '#read' do
@uri = URI("http://#{@host_domain}#{@path}#{@query}")
@no_proxy_args = [@host_domain, 80]
@proxy_args = @no_proxy_args + ['myproxy', 8080, 'john', 'smith']
- @http = mock('http')
+ @http = double('http')
@http.stub(:request).and_yield(Net::HTTPNotModified.new(nil, nil, nil))
end
@@ -318,7 +318,7 @@ describe URI::HTTP, '#read' do
it 'should use HTTP Basic authentication' do
Net::HTTP.should_receive(:new).and_return(@http)
- request = mock('request')
+ request = double('request')
Net::HTTP::Get.should_receive(:new).and_return(request)
request.should_receive(:basic_auth).with('john', 'secret')
URI("http://john:secret@#{@host_domain}").read
@@ -331,7 +331,7 @@ describe URI::HTTP, '#read' do
redirect = Net::HTTPRedirection.new(nil, nil, nil)
redirect['Location'] = "http://#{@host_domain}/asdf"
- request1 = mock('request1')
+ request1 = double('request1')
Net::HTTP::Get.should_receive(:new).once.with('/', default_http_headers).and_return(request1)
request1.should_receive(:basic_auth).with('john', 'secret')
@http.should_receive(:request).with(request1).and_yield(redirect)
@@ -340,7 +340,7 @@ describe URI::HTTP, '#read' do
ok = Net::HTTPOK.new(nil, nil, nil)
ok.stub(:read_body)
- request2 = mock('request2')
+ request2 = double('request2')
Net::HTTP::Get.should_receive(:new).once.with("/asdf", default_http_headers).and_return(request2)
request2.should_receive(:basic_auth).with('john', 'secret')
@http.should_receive(:request).with(request2).and_yield(ok)
@@ -362,7 +362,7 @@ describe URI::HTTP, '#write' do
before do
@content = 'Readme. Please!'
@uri = URI('http://john:secret@host.domain/foo/bar/baz.jar')
- @http = mock('Net::HTTP')
+ @http = double('Net::HTTP')
@http.stub(:request).and_return(Net::HTTPOK.new(nil, nil, nil))
Net::HTTP.stub(:new).and_return(@http)
end
@@ -438,9 +438,9 @@ describe URI::SFTP, '#read' do
@uri = URI('sftp://john:secret@localhost/root/path/readme')
@content = 'Readme. Please!'
- @ssh_session = mock('Net::SSH::Session')
- @sftp_session = mock('Net::SFTP::Session')
- @file_factory = mock('Net::SFTP::Operations::FileFactory')
+ @ssh_session = double('Net::SSH::Session')
+ @sftp_session = double('Net::SFTP::Session')
+ @file_factory = double('Net::SFTP::Operations::FileFactory')
Net::SSH.stub(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
@sftp_session.should_receive(:connect!).and_return(@sftp_session)
@@ -462,14 +462,14 @@ describe URI::SFTP, '#read' do
end
it 'should read contents of file and return it' do
- file = mock('Net::SFTP::Operations::File')
+ file = double('Net::SFTP::Operations::File')
file.should_receive(:read).with(URI::RW_CHUNK_SIZE).once.and_return(@content)
@file_factory.should_receive(:open).with('/root/path/readme', 'r').and_yield(file)
@uri.read.should eql(@content)
end
it 'should read contents of file and pass it to block' do
- file = mock('Net::SFTP::Operations::File')
+ file = double('Net::SFTP::Operations::File')
file.should_receive(:read).with(URI::RW_CHUNK_SIZE).once.and_return(@content)
@file_factory.should_receive(:open).with('/root/path/readme', 'r').and_yield(file)
content = ''
@@ -486,9 +486,9 @@ describe URI::SFTP, '#write' do
@uri = URI('sftp://john:secret@localhost/root/path/readme')
@content = 'Readme. Please!'
- @ssh_session = mock('Net::SSH::Session')
- @sftp_session = mock('Net::SFTP::Session')
- @file_factory = mock('Net::SFTP::Operations::FileFactory')
+ @ssh_session = double('Net::SSH::Session')
+ @sftp_session = double('Net::SFTP::Session')
+ @file_factory = double('Net::SFTP::Operations::FileFactory')
Net::SSH.stub(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
@sftp_session.should_receive(:connect!).and_return(@sftp_session)
@@ -539,7 +539,7 @@ describe URI::SFTP, '#write' do
end
it 'should write contents to file' do
- file = mock('Net::SFTP::Operations::File')
+ file = double('Net::SFTP::Operations::File')
file.should_receive(:write).with(@content)
@file_factory.should_receive(:open).with('/root/path/readme', 'w').and_yield(file)
@uri.write @content
[43/50] git commit: Register last release
Posted by do...@apache.org.
Register last release
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1540249 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6c419f33
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6c419f33
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6c419f33
Branch: refs/heads/master
Commit: 6c419f330c2fa88b6b740b41f2f9d1b6ce39548a
Parents: 9ae3f9a
Author: Peter Donald <do...@apache.org>
Authored: Sat Nov 9 02:54:39 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Nov 9 02:54:39 2013 +0000
----------------------------------------------------------------------
doap.rdf | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/6c419f33/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index d84e5e3..1828e6f 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -37,6 +37,39 @@
<category rdf:resource="http://projects.apache.org/category/build-management" />
<release>
<Version>
+ <name>1.4.15</name>
+ <created>2013-11-06</created>
+ <revision>1.4.15</revision>
+ <dc:description>
+* Change: Update to TestNG 6.8.7.
+* Change: Updated the 'test_jar' package type to have a
+ classifier of 'tests' and thus match maven
+ conventions. Reported by Chris Bozic.
+* Fixed: BUILDR-689 - Ensure that war file includes generated
+ assets rather than the "source" assets that may have
+ been filtered.
+* Fixed: BUILDR-689 - Define assets task before the project is
+ defined to avoid "undefined method `project='" if the
+ project attempts to generate into the same directory.
+* Added: BUILDR-679 - Support uploading to a snapshot repository
+ defined by repositories.snapshot_to if the artifact is
+ a snapshot. Submitted by Tammo van Lessen.
+* Change: Update the jaxb_xjc addon to add output directory to
+ generated IDEA project files.
+* Change: Update the default output directory used in the jaxb_xjc
+ addon to use Maven conventions.
+* Fixed: Bug in IdeaProject.partition_dependencies resulted in
+ projects being rebuilt if artifacts were added to the
+ project with dependencies on the current project.
+* Fixed: BUILDR-605 - Ensure package task invokes included paths.
+* Fixed: BUILDR-609 - compile.from should accept Task argument.
+
+ </dc:description>
+ </Version>
+ </release>
+
+ <release>
+ <Version>
<name>1.4.14</name>
<created>2013-10-11</created>
<revision>1.4.14</revision>
[09/50] git commit: Remove usage of the Java constant so that native
windows ruby will no raise an exception
Posted by do...@apache.org.
Remove usage of the Java constant so that native windows ruby will no raise an exception
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535907 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/3b21e4f1
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/3b21e4f1
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/3b21e4f1
Branch: refs/heads/master
Commit: 3b21e4f1af3ab373268bb404d01e913062257e2f
Parents: e1f4441
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 01:44:24 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 01:44:24 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/console.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/3b21e4f1/lib/buildr/core/console.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/console.rb b/lib/buildr/core/console.rb
index 2769e59..a704ec7 100644
--- a/lib/buildr/core/console.rb
+++ b/lib/buildr/core/console.rb
@@ -194,7 +194,7 @@ module Buildr #nodoc
require 'Win32/Console/ANSI'
end
end
- rescue Java::JavaLang::IncompatibleClassChangeError
+ rescue
# Unfortunately we have multiple incompatible jline libraries
# in the classpath. This is probably because we are using jruby
# 1.7.5 with a library like scala and both use incompatible jline
[15/50] git commit: Start to prepare for another release
Posted by do...@apache.org.
Start to prepare for another release
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535927 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e1eca5d4
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e1eca5d4
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e1eca5d4
Branch: refs/heads/master
Commit: e1eca5d484c819cb7a1067a73aef4ae469ad1996
Parents: 735ad9d
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 06:11:55 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 06:11:55 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 +-
doc/index.textile | 21 +++++++++++++++++++++
lib/buildr/version.rb | 2 +-
3 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e1eca5d4/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 283bccc..0d35762 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.4.15 (Pending)
+1.4.15 (2013-10-26)
* Change: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven
conventions. Reported by Chris Bozic.
http://git-wip-us.apache.org/repos/asf/buildr/blob/e1eca5d4/doc/index.textile
----------------------------------------------------------------------
diff --git a/doc/index.textile b/doc/index.textile
index a287360..f0b4b00 100644
--- a/doc/index.textile
+++ b/doc/index.textile
@@ -46,6 +46,27 @@ So let's get started. You can "read the documentation online":quick_start.html,
h2(#news). What's New
+Highlights from Buildr 1.4.15 (2013-10-26)
+* Change: Updated the 'test_jar' package type to have a
+ classifier of 'tests' and thus match maven
+ conventions. Reported by Chris Bozic.
+* Fixed: BUILDR-689 - Ensure that war file includes generated
+ assets rather than the "source" assets that may have
+ been filtered.
+* Fixed: BUILDR-689 - Define assets task before the project is
+ defined to avoid "undefined method `project='" if the
+ project attempts to generate into the same directory.
+* Added: BUILDR-679 - Support uploading to a snapshot repository
+ defined by repositories.snapshot_to if the artifact is
+ a snapshot. Submitted by Tammo van Lessen.
+* Change: Update the default output directory used in the jaxb_xjc
+ addon to use Maven conventions.
+* Fixed: Bug in IdeaProject.partition_dependencies resulted in
+ projects being rebuilt if artifacts were added to the
+ project with dependencies on the current project.
+* Fixed: BUILDR-605 - Ensure package task invokes included paths.
+* Fixed: BUILDR-609 - compile.from should accept Task argument.
+
Highlights from Buildr 1.4.14 (2013-10-11)
* Fixed: Fixed regression in gwt addon.
* Fixed: Fixed regression using transitive dependencies due to
http://git-wip-us.apache.org/repos/asf/buildr/blob/e1eca5d4/lib/buildr/version.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/version.rb b/lib/buildr/version.rb
index 63b8574..23837af 100644
--- a/lib/buildr/version.rb
+++ b/lib/buildr/version.rb
@@ -14,5 +14,5 @@
# the License.
module Buildr #:nodoc:
- VERSION = '1.4.15.dev'.freeze
+ VERSION = '1.4.15'.freeze
end
[20/50] git commit: Restrict the tests further on certain platforms
Posted by do...@apache.org.
Restrict the tests further on certain platforms
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1536447 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/dfede00a
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/dfede00a
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/dfede00a
Branch: refs/heads/master
Commit: dfede00adf18006025f72b09963730c62aa26894
Parents: 6fb423f
Author: Peter Donald <do...@apache.org>
Authored: Mon Oct 28 17:53:53 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Mon Oct 28 17:53:53 2013 +0000
----------------------------------------------------------------------
spec/core/console_spec.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/dfede00a/spec/core/console_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/console_spec.rb b/spec/core/console_spec.rb
index 760e50e..3763cda 100644
--- a/spec/core/console_spec.rb
+++ b/spec/core/console_spec.rb
@@ -21,7 +21,7 @@ describe Buildr::Console do
it 'should return a value' do
Buildr::Console.console_dimensions.should_not be_nil
- end if $stdout.isatty && !ENV["TRAVIS"] && (!Buildr::Util.win_os? || Buildr::Util.java_platform?)
+ end if $stdout.isatty && !ENV["TRAVIS"] && !Buildr::Util.win_os?
end
describe 'color' do
@@ -42,7 +42,7 @@ describe Buildr::Console do
it 'should emit blue code when asked' do
Buildr::Console.color('message', :blue).should eql("\e[34mmessage\e[0m")
end
- end if $stdout.isatty && (!Buildr::Util.win_os? || Buildr::Util.java_platform?)
+ end if $stdout.isatty && !Buildr::Util.win_os?
describe ' use_color is false' do
before do
[33/50] git commit: Ensure that the target file to download to does
not exist
Posted by do...@apache.org.
Ensure that the target file to download to does not exist
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537929 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8cbf73b5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8cbf73b5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8cbf73b5
Branch: refs/heads/master
Commit: 8cbf73b57e69367bf94f28962b231d4aafa211d7
Parents: ec23c53
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 13:25:18 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 13:25:18 2013 +0000
----------------------------------------------------------------------
spec/core/transport_spec.rb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8cbf73b5/spec/core/transport_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/transport_spec.rb b/spec/core/transport_spec.rb
index fd11517..31e8b03 100644
--- a/spec/core/transport_spec.rb
+++ b/spec/core/transport_spec.rb
@@ -19,9 +19,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
describe URI, '#download' do
before do
- write @source = 'source', @content = 'Just a file'
- @uri = URI(URI.escape("file://#{File.expand_path(@source)}"))
- @target = 'target'
+ write @source = File.expand_path('source'), @content = 'A file to download'
+ @uri = URI(URI.escape("file://#{@source}"))
+ @target = File.expand_path('target')
+ rm_f @target
end
it 'should download file if found' do
[25/50] git commit: Rollback accidental change
Posted by do...@apache.org.
Rollback accidental change
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537863 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/155a77c2
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/155a77c2
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/155a77c2
Branch: refs/heads/master
Commit: 155a77c2c6fcfd0fe4f54805c548ad74d0a54432
Parents: 3766d17
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 09:32:38 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 09:32:38 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/application.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/155a77c2/lib/buildr/core/application.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/application.rb b/lib/buildr/core/application.rb
index ab4cfdb..35a60bf 100644
--- a/lib/buildr/core/application.rb
+++ b/lib/buildr/core/application.rb
@@ -117,7 +117,7 @@ module Buildr
@rakefiles = DEFAULT_BUILDFILES.dup
@top_level_tasks = []
@home_dir = File.expand_path('.buildr', ENV['HOME'])
- mkpath Buildr::Util.normalize_path(@home_dir) if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
+ mkpath @home_dir if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
@settings = Settings.new(self)
@on_completion = []
@on_failure = []
[49/50] git commit: Merge remote-tracking branch 'origin/pr/8'
Posted by do...@apache.org.
Merge remote-tracking branch 'origin/pr/8'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/dcc0b6c7
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/dcc0b6c7
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/dcc0b6c7
Branch: refs/heads/master
Commit: dcc0b6c74c227df488b44127ba468e3e54e4a38b
Parents: 4ce550c b6e1939
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 31 15:11:05 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 31 15:11:05 2014 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
[38/50] git commit: Remove direct integration of assets pipeline and
webapp dir and return to behaviour as 1.4.12
Posted by do...@apache.org.
Remove direct integration of assets pipeline and webapp dir and return to behaviour as 1.4.12
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1539183 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/71353719
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/71353719
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/71353719
Branch: refs/heads/master
Commit: 71353719e14c2373171d2fcd3d1a5868da8288fd
Parents: 0ab1051
Author: Peter Donald <do...@apache.org>
Authored: Tue Nov 5 23:11:16 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Nov 5 23:11:16 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/assets.rb | 29 +++++------------------------
lib/buildr/ide/idea.rb | 1 +
lib/buildr/java/packaging.rb | 6 +++---
3 files changed, 9 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/71353719/lib/buildr/core/assets.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/assets.rb b/lib/buildr/core/assets.rb
index d5ca2ff..600512f 100644
--- a/lib/buildr/core/assets.rb
+++ b/lib/buildr/core/assets.rb
@@ -31,7 +31,7 @@ module Buildr #:nodoc:
def paths
unless @paths
@paths = []
- @paths << project._(:source, :main, :webapp) if File.exist?(project._(:source, :main, :webapp))
+ @paths << project._(:source, :main, :assets) if File.exist?(project._(:source, :main, :assets))
end
@paths
end
@@ -40,11 +40,6 @@ module Buildr #:nodoc:
def initialize(*args) #:nodoc:
super
- end
-
- private
-
- def add_enhance_actions
enhance do
paths = self.paths.flatten.compact
if paths.size > 0
@@ -54,21 +49,14 @@ module Buildr #:nodoc:
end.each do |a|
a.invoke if a.respond_to?(:invoke)
end.each do |asset|
- source_dir = asset.to_s
- Dir["#{source_dir}/*"].each do |f|
- f = f[source_dir.length + 1, 10000]
- source = "#{asset}/#{f}"
- target = "#{name}/#{f}"
- if !File.exist?(target) || File.mtime(target) < File.mtime(source)
- mkdir_p File.dirname(target)
- cp source, target
- end
- end
+ cp_r Dir["#{asset}/*"], "#{name}/"
end
end
end
end
+ private
+
def out_of_date?(stamp)
super ||
self.paths.any? { |n| n.respond_to?(:needed?) && n.needed? }
@@ -89,17 +77,10 @@ module Buildr #:nodoc:
project.assets.paths
end
- after_define do |project|
- # This is used to add actions after project is defined so that files are copied
- # as the last action and don't block tasks that try and filter into target dir
- # from the source dir
- project.assets.send(:add_enhance_actions)
- end
-
# Access the asset task
def assets
if @assets.nil?
- @assets = AssetsTask.define_task(project._(:target, :main, :webapp) => [])
+ @assets = AssetsTask.define_task(project._(:target, :main, :assets) => [])
@assets.project = self
project.task('assets').enhance([@assets])
project.build.enhance([@assets])
http://git-wip-us.apache.org/repos/asf/buildr/blob/71353719/lib/buildr/ide/idea.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index e380dee..40d2cbf 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -299,6 +299,7 @@ module Buildr #:nodoc:
def add_web_facet(options = {})
name = options[:name] || "Web"
default_webroots = {}
+ default_webroots[buildr_project._(:source, :main, :webapp)] = "/" if File.exist?(buildr_project._(:source, :main, :webapp))
buildr_project.assets.paths.each {|p| default_webroots[p] = "/" }
webroots = options[:webroots] || default_webroots
default_deployment_descriptors = []
http://git-wip-us.apache.org/repos/asf/buildr/blob/71353719/lib/buildr/java/packaging.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/packaging.rb b/lib/buildr/java/packaging.rb
index 8a2b292..0e2da91 100644
--- a/lib/buildr/java/packaging.rb
+++ b/lib/buildr/java/packaging.rb
@@ -684,10 +684,10 @@ module Buildr #:nodoc:
# Add libraries in WEB-INF lib, and classes in WEB-INF classes
war.with :classes=>[compile.target, resources.target].compact
war.with :libs=>compile.dependencies
+ webapp = path_to(:source, :main, :webapp)
+ war.with webapp if File.exist?(webapp)
war.enhance([assets])
- if !assets.paths.empty? || File.exist?(_(:source, :main, :webapp))
- war.include assets.to_s, :as => '.'
- end
+ war.include assets.to_s, :as => '.' unless assets.paths.empty?
end
end
[19/50] git commit: Replace deprecated_be_close(x,
y) with be_within(y).of(x)
Posted by do...@apache.org.
Replace deprecated_be_close(x,y) with be_within(y).of(x)
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1536192 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6fb423f7
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6fb423f7
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6fb423f7
Branch: refs/heads/master
Commit: 6fb423f7055a0e767feaff77d44f517b2b3e9dfa
Parents: 47048bc
Author: Peter Donald <do...@apache.org>
Authored: Sun Oct 27 20:26:19 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sun Oct 27 20:26:19 2013 +0000
----------------------------------------------------------------------
spec/core/common_spec.rb | 4 ++--
spec/core/compile_spec.rb | 10 +++++-----
spec/java/test_coverage_helper.rb | 4 ++--
spec/packaging/archive_spec.rb | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/6fb423f7/spec/core/common_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/common_spec.rb b/spec/core/common_spec.rb
index c741b34..a72d1bb 100644
--- a/spec/core/common_spec.rb
+++ b/spec/core/common_spec.rb
@@ -495,13 +495,13 @@ describe Buildr::Filter do
it 'should touch target directory' do
mkpath 'target' ; File.utime @early, @early, 'target'
@filter.from('src').into('target').run
- File.stat('target').mtime.should be_close(Time.now, 10)
+ File.stat('target').mtime.should be_within(10).of(Time.now)
end
it 'should not touch target directory unless running' do
mkpath 'target' ; File.utime @early, @early, 'target'
@filter.from('src').into('target').exclude('*').run
- File.mtime('target').should be_close(@early, 10)
+ File.mtime('target').should be_within(10).of(@early)
end
it 'should run only on new files' do
http://git-wip-us.apache.org/repos/asf/buildr/blob/6fb423f7/spec/core/compile_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/compile_spec.rb b/spec/core/compile_spec.rb
index d4d6383..08fba32 100644
--- a/spec/core/compile_spec.rb
+++ b/spec/core/compile_spec.rb
@@ -389,21 +389,21 @@ describe Buildr::CompileTask, '#invoke' do
time = now_at_fs_resolution - 10
mkpath compile_task.target.to_s
File.utime(time, time, compile_task.target.to_s)
- compile_task.timestamp.should be_close(time, 1)
+ compile_task.timestamp.should be_within(1).of(time)
end
it 'should touch target if anything compiled' do
mkpath compile_task.target.to_s
File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
compile_task.from(sources).invoke
- File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution, 2)
+ File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution)
end
it 'should not touch target if nothing compiled' do
mkpath compile_task.target.to_s
File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
compile_task.invoke
- File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
+ File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution - 10)
end
it 'should not touch target if failed to compile' do
@@ -411,7 +411,7 @@ describe Buildr::CompileTask, '#invoke' do
File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
write 'failed.java', 'not a class'
suppress_stdout { compile_task.from('failed.java').invoke rescue nil }
- File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
+ File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution - 10)
end
it 'should complain if source directories and no compiler selected' do
@@ -429,7 +429,7 @@ describe Buildr::CompileTask, '#invoke' do
touch 'target/classes/foo/Foo.class'
File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
compile_task.invoke
- File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
+ File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution - 10)
end
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/6fb423f7/spec/java/test_coverage_helper.rb
----------------------------------------------------------------------
diff --git a/spec/java/test_coverage_helper.rb b/spec/java/test_coverage_helper.rb
index 3b555d1..1651c97 100644
--- a/spec/java/test_coverage_helper.rb
+++ b/spec/java/test_coverage_helper.rb
@@ -128,7 +128,7 @@ shared_examples_for 'test coverage tool' do
mkpath instrumented_dir.to_s
File.utime(a_long_time_ago, a_long_time_ago, instrumented_dir.to_s)
task("foo:#{toolname}:instrument").invoke
- instrumented_dir.timestamp.should be_close(Time.now, 2)
+ instrumented_dir.timestamp.should be_within(2).of(Time.now)
end
it 'should not touch instrumented directory if nothing instrumented' do
@@ -137,7 +137,7 @@ shared_examples_for 'test coverage tool' do
mkpath instrumented_dir.to_s
[project('foo').compile.target, instrumented_dir].map(&:to_s).each { |dir| File.utime(a_long_time_ago, a_long_time_ago, dir) }
task("foo:#{toolname}:instrument").invoke
- instrumented_dir.timestamp.should be_close(a_long_time_ago, 2)
+ instrumented_dir.timestamp.should be_within(2).of(a_long_time_ago)
end
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/6fb423f7/spec/packaging/archive_spec.rb
----------------------------------------------------------------------
diff --git a/spec/packaging/archive_spec.rb b/spec/packaging/archive_spec.rb
index 1b82c1f..42d7e47 100644
--- a/spec/packaging/archive_spec.rb
+++ b/spec/packaging/archive_spec.rb
@@ -345,7 +345,7 @@ shared_examples_for 'ArchiveTask' do
# all included files newer.
File.utime Time.now - 100, Time.now - 100, @archive
archive(@archive).include(@files).invoke
- File.stat(@archive).mtime.should be_close(Time.now, 10)
+ File.stat(@archive).mtime.should be_within(10).of(Time.now)
end
it 'should update if a file in a subdir is more recent' do
@@ -369,7 +369,7 @@ shared_examples_for 'ArchiveTask' do
# By touching all files in the past, there's nothing new to update.
(@files + [@archive]).each { |f| File.utime Time.now - 100, Time.now - 100, f }
archive(@archive).include(@files).invoke
- File.stat(@archive).mtime.should be_close(Time.now - 100, 10)
+ File.stat(@archive).mtime.should be_within(10).of(Time.now - 100)
end
it 'should update if one of the files is recent' do
@@ -609,7 +609,7 @@ describe Unzip do
File.utime(Time.now - 10, Time.now - 10, @target)
unzip(@target=>@zip).target.invoke
end
- File.stat(@target).mtime.should be_close(Time.now, 2)
+ File.stat(@target).mtime.should be_within(2).of(Time.now)
end
it 'should expand files' do
[02/50] git commit: BUILDR-679 - Support uploading to a snapshot
repository defined by repositories.snapshot_to if the artifact is a snapshot.
Posted by do...@apache.org.
BUILDR-679 - Support uploading to a snapshot repository defined by repositories.snapshot_to if the artifact is a snapshot.
Submitted by Jean-Philippe Caruana.
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1534553 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8f1faa44
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8f1faa44
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8f1faa44
Branch: refs/heads/master
Commit: 8f1faa443accfc48d323047bed0e13516001cf58
Parents: 5ff8f45
Author: Peter Donald <do...@apache.org>
Authored: Tue Oct 22 09:23:50 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Tue Oct 22 09:23:50 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 3 ++
doc/packaging.textile | 8 ++++
doc/settings_profiles.textile | 1 +
lib/buildr/packaging/artifact.rb | 52 ++++++++++++++++++++-
spec/packaging/artifact_spec.rb | 86 ++++++++++++++++++++++++++++++++++-
spec/sandbox.rb | 2 +-
6 files changed, 149 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1faa44/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 6f8574b..aed397f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
1.4.15 (Pending)
+* Added: BUILDR-679 - Support uploading to a snapshot repository
+ defined by repositories.snapshot_to if the artifact is
+ a snapshot. Submitted by Jean-Philippe Caruana.
* Change: Update the jaxb_xjc addon to add output directory to
generated IDEA project files.
* Change: Update the default output directory used in the jaxb_xjc
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1faa44/doc/packaging.textile
----------------------------------------------------------------------
diff --git a/doc/packaging.textile b/doc/packaging.textile
index dd13012..9c0f4bb 100644
--- a/doc/packaging.textile
+++ b/doc/packaging.textile
@@ -585,6 +585,14 @@ Of course, you'll need to tell Buildr about the release server:
repositories.release_to = 'sftp://john:secret@release/usr/share/repo'
{% endhighlight %}
+If you have separate repositories for releases and snapshots, you can specify them accordingly. Buildr takes care of picking the correct one.
+
+{% highlight ruby %}
+repositories.release_to = 'sftp://john:secret@release/usr/share/repo/releases'
+repositories.snapshot_to = 'sftp://john:secret@release/usr/share/repo/snapshots'
+{% endhighlight %}
+
+
This example uses the SFTP protocol. In addition, you can use the HTTP protocol -- Buildr supports HTTP and HTTPS, Basic Authentication and uploads using PUT -- or point to a directory on your file system.
The URL in this example contains the release server ("release"), path to repository ("user/share/repo") and username/password for access. The way SFTP works, you specify the path on the release server, and give the user permissions to create directories and files inside the repository. The file system path is different from the path you use to download these artifacts through an HTTP server, and starts at the root, not the user's home directory.
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1faa44/doc/settings_profiles.textile
----------------------------------------------------------------------
diff --git a/doc/settings_profiles.textile b/doc/settings_profiles.textile
index 675e9c3..52bd8ab 100644
--- a/doc/settings_profiles.textile
+++ b/doc/settings_profiles.textile
@@ -58,6 +58,7 @@ repositories.release_to[:username] = ENV['USERNAME']
repositories.release_to[:password] = ENV['PASSWORD']
{% endhighlight %}
+The same works for the @repositories.snapshot_to@ hash.
h2(#personal). Personal Settings
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1faa44/lib/buildr/packaging/artifact.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/packaging/artifact.rb b/lib/buildr/packaging/artifact.rb
index d49df57..2189969 100644
--- a/lib/buildr/packaging/artifact.rb
+++ b/lib/buildr/packaging/artifact.rb
@@ -179,7 +179,8 @@ module Buildr #:nodoc:
#
# Uploads the artifact, its POM and digital signatures to remote server.
#
- # In the first form, uses the upload options specified by repositories.release_to.
+ # In the first form, uses the upload options specified by repositories.release_to
+ # or repositories.snapshot_to if the subject is a snapshot artifact.
# In the second form, uses a URL that includes all the relevant information.
# In the third form, uses a hash with the options :url, :username, :password,
# and :permissions. All but :url are optional.
@@ -188,6 +189,7 @@ module Buildr #:nodoc:
end
def upload_task(upload_to = nil)
+ upload_to ||= Buildr.repositories.snapshot_to if snapshot? && Buildr.repositories.snapshot_to != nil && Buildr.repositories.snapshot_to[:url] != nil
upload_to ||= Buildr.repositories.release_to
upload_to = { :url=>upload_to } unless Hash === upload_to
raise ArgumentError, 'Don\'t know where to upload, perhaps you forgot to set repositories.release_to' unless upload_to[:url]
@@ -715,6 +717,54 @@ module Buildr #:nodoc:
@release_to
end
+ # :call-seq:
+ # snapshot_to = url
+ # snapshot_to = hash
+ #
+ # Specifies the release server. Accepts a Hash with different repository settings
+ # (e.g. url, username, password), or a String to only set the repository URL.
+ #
+ # Besides the URL, all other settings depend on the transport protocol in use.
+ #
+ # For example:
+ # repositories.snapshot_to = 'sftp://john:secret@example.com/var/www/repo/'
+ #
+ # repositories.snapshot_to = { :url=>'sftp://example.com/var/www/repo/',
+ # :username='john', :password=>'secret' }
+ # Or in the settings.yaml file:
+ # repositories:
+ # snapshot_to: sftp://john:secret@example.com/var/www/repo/
+ #
+ # repositories:
+ # snapshot_to:
+ # url: sftp://example.com/var/www/repo/
+ # username: john
+ # password: secret
+ def snapshot_to=(options)
+ options = { :url=>options } unless Hash === options
+ @snapshot_to = options
+ end
+
+ # :call-seq:
+ # snapshot_to => hash
+ #
+ # Returns the current snapshot release server setting as a Hash. This is a more convenient way to
+ # configure the settings, as it allows you to specify the settings progressively.
+ #
+ # For example, the Buildfile will contain the repository URL used by all developers:
+ # repositories.snapshot_to[:url] ||= 'sftp://example.com/var/www/repo'
+ # Your private buildr.rb will contain your credentials:
+ # repositories.snapshot_to[:username] = 'john'
+ # repositories.snapshot_to[:password] = 'secret'
+ def snapshot_to
+ unless @snapshot_to
+ value = (Buildr.settings.user['repositories'] && Buildr.settings.user['repositories']['snapshot_to']) \
+ || (Buildr.settings.build['repositories'] && Buildr.settings.build['repositories']['snapshot_to'])
+ @snapshot_to = Hash === value ? value.inject({}) { |hash, (key, value)| hash.update(key.to_sym=>value) } : { :url=>Array(value).first }
+ end
+ @snapshot_to
+ end
+
end
# :call-seq:
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1faa44/spec/packaging/artifact_spec.rb
----------------------------------------------------------------------
diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb
index 7685399..b97622b 100644
--- a/spec/packaging/artifact_spec.rb
+++ b/spec/packaging/artifact_spec.rb
@@ -510,6 +510,51 @@ describe Repositories, 'release_to' do
end
end
+describe Repositories, 'snapshot_to' do
+ it 'should accept URL as first argument' do
+ repositories.snapshot_to = 'http://buildr.apache.org/repository/noexist'
+ repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist' }
+ end
+
+ it 'should accept hash with options' do
+ repositories.snapshot_to = { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john' }
+ repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john' }
+ end
+
+ it 'should allow the hash to be manipulated' do
+ repositories.snapshot_to = 'http://buildr.apache.org/repository/noexist'
+ repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist' }
+ repositories.snapshot_to[:username] = 'john'
+ repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john' }
+ end
+
+ it 'should load URL from settings file' do
+ write 'home/.buildr/settings.yaml', <<-YAML
+ repositories:
+ snapshot_to: http://john:secret@buildr.apache.org/repository/noexist
+ YAML
+ repositories.snapshot_to.should == { :url=>'http://john:secret@buildr.apache.org/repository/noexist' }
+ end
+
+ it 'should load URL from build settings file' do
+ write 'build.yaml', <<-YAML
+ repositories:
+ snapshot_to: http://john:secret@buildr.apache.org/repository/noexist
+ YAML
+ repositories.snapshot_to.should == { :url=>'http://john:secret@buildr.apache.org/repository/noexist' }
+ end
+
+ it 'should load URL, username and password from settings file' do
+ write 'home/.buildr/settings.yaml', <<-YAML
+ repositories:
+ snapshot_to:
+ url: http://buildr.apache.org/repository/noexist
+ username: john
+ password: secret
+ YAML
+ repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john', :password=>'secret' }
+ end
+end
describe Buildr, '#artifact' do
before do
@@ -885,7 +930,7 @@ describe ActsAsArtifact, '#upload' do
lambda { artifact.upload }.should raise_error(Exception, /where to upload/)
end
- it 'should accept repositories.upload setting' do
+ it 'should accept repositories.release_to setting' do
artifact = artifact('com.example:library:jar:2.0')
# Prevent artifact from downloading anything.
write repositories.locate(artifact)
@@ -896,6 +941,45 @@ describe ActsAsArtifact, '#upload' do
lambda { artifact.upload }.should_not raise_error
end
+ it 'should use repositories.release_to setting even for snapshots when snapshot_to is not set' do
+ artifact = artifact('com.example:library:jar:2.0-SNAPSHOT')
+ # Prevent artifact from downloading anything.
+ write repositories.locate(artifact)
+ write repositories.locate(artifact.pom)
+ URI.should_receive(:upload).once.
+ with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.pom'), artifact.pom.to_s, anything)
+ URI.should_receive(:upload).once.
+ with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.jar'), artifact.to_s, anything)
+ repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base'
+ artifact.upload
+ lambda { artifact.upload }.should_not raise_error
+ end
+
+ it 'should use repositories.snapshot_to setting when snapshot_to is set' do
+ artifact = artifact('com.example:library:jar:2.0-SNAPSHOT')
+ # Prevent artifact from downloading anything.
+ write repositories.locate(artifact)
+ write repositories.locate(artifact.pom)
+ URI.should_receive(:upload).once.
+ with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.pom'), artifact.pom.to_s, anything)
+ URI.should_receive(:upload).once.
+ with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.jar'), artifact.to_s, anything)
+ repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base'
+ repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot'
+ artifact.upload
+ lambda { artifact.upload }.should_not raise_error
+ end
+
+ it 'should complain when only a snapshot repo is set but the artifact is not a snapshot' do
+ artifact = artifact('com.example:library:jar:2.0')
+ # Prevent artifact from downloading anything.
+ write repositories.locate(artifact)
+ write repositories.locate(artifact.pom)
+ repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot'
+ lambda { artifact.upload }.should raise_error(Exception, /where to upload/)
+ end
+
+
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1faa44/spec/sandbox.rb
----------------------------------------------------------------------
diff --git a/spec/sandbox.rb b/spec/sandbox.rb
index 594228d..599784d 100644
--- a/spec/sandbox.rb
+++ b/spec/sandbox.rb
@@ -162,7 +162,7 @@ module Sandbox
# since we don't want to remotely download artifacts into the sandbox over and over
Buildr.repositories.instance_eval do
@remote = ["file://" + @local]
- @local = @release_to = nil
+ @local = @release_to = @snapshot_to = nil
end
Buildr.options.proxy.http = nil
[29/50] git commit: It seems under windows with the low resolution of
times on the filesystems that we need to explicitly delete the war from the
previous task
Posted by do...@apache.org.
It seems under windows with the low resolution of times on the filesystems that we need to explicitly delete the war from the previous task
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537910 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/f46168e9
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/f46168e9
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/f46168e9
Branch: refs/heads/master
Commit: f46168e9cfe8c1ac29d2a7353e5a85e665c236e0
Parents: 5cfc9a3
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 12:26:01 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 12:26:01 2013 +0000
----------------------------------------------------------------------
spec/java/packaging_spec.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/f46168e9/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 0b0c093..489d5e1 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -561,15 +561,15 @@ describe Packaging, 'war' do
package(:war)
end
inspect_war { |files| files.should include('test.html') }
- Zip::ZipFile.open(project('foo').package(:war).to_s, false) do |war|
+ Zip::ZipFile.open(project('foo').package(:war).to_s) do |war|
war.get_input_stream('test.html').read.should eql('999')
end
end
it 'should accept files from :classes option' do
- write 'src/main/java/Test.java', 'class Test {}'
write 'classes/test'
define('foo', :version=>'1.0') { package(:war).with(:classes=>'classes') }
+ rm_f project('foo').package(:war).to_s
inspect_war { |files| files.should include('WEB-INF/classes/test') }
end
[41/50] git commit: Bump the version for next development sprint
Posted by do...@apache.org.
Bump the version for next development sprint
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1540247 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/c654dab8
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/c654dab8
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/c654dab8
Branch: refs/heads/master
Commit: c654dab8340e694217dd8b546ed7d1794b6757ea
Parents: 9126425
Author: Peter Donald <do...@apache.org>
Authored: Sat Nov 9 02:53:51 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Nov 9 02:53:51 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 ++
lib/buildr/version.rb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/c654dab8/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index c1f4cb7..22475b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+1.4.16 (Pending)
+
1.4.15 (2013-11-06)
* Change: Update to TestNG 6.8.7.
* Change: Updated the 'test_jar' package type to have a
http://git-wip-us.apache.org/repos/asf/buildr/blob/c654dab8/lib/buildr/version.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/version.rb b/lib/buildr/version.rb
index 23837af..953ff5e 100644
--- a/lib/buildr/version.rb
+++ b/lib/buildr/version.rb
@@ -14,5 +14,5 @@
# the License.
module Buildr #:nodoc:
- VERSION = '1.4.15'.freeze
+ VERSION = '1.4.16.dev'.freeze
end
[50/50] git commit: Merge remote-tracking branch 'origin/pr/9'
Posted by do...@apache.org.
Merge remote-tracking branch 'origin/pr/9'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/bfbb7876
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/bfbb7876
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/bfbb7876
Branch: refs/heads/master
Commit: bfbb78764b067c5b38828c48f27c8ac0f5c96801
Parents: dcc0b6c 3ba55cd
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 31 15:11:18 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 31 15:11:18 2014 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
[24/50] git commit: Under windows, paths passed to mkpath,
mkdir_p and mkdirs need to be normalized. Otherwise ruby may decide
to treat the drive component as a directory (i.e. create a directory named
"C:"). This patch hooks in at a low level to work ar
Posted by do...@apache.org.
Under windows, paths passed to mkpath, mkdir_p and mkdirs need to be normalized. Otherwise ruby may decide to treat the drive component as a directory (i.e. create a directory named "C:"). This patch hooks in at a low level to work around this issue.
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537858 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/3766d17b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/3766d17b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/3766d17b
Branch: refs/heads/master
Commit: 3766d17bbdcb17a010c088f6db643d7e484b22b9
Parents: a4b12ac
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 09:22:54 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 09:22:54 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/application.rb | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/3766d17b/lib/buildr/core/application.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/application.rb b/lib/buildr/core/application.rb
index e2f103a..ab4cfdb 100644
--- a/lib/buildr/core/application.rb
+++ b/lib/buildr/core/application.rb
@@ -117,7 +117,7 @@ module Buildr
@rakefiles = DEFAULT_BUILDFILES.dup
@top_level_tasks = []
@home_dir = File.expand_path('.buildr', ENV['HOME'])
- mkpath @home_dir if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
+ mkpath Buildr::Util.normalize_path(@home_dir) if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
@settings = Settings.new(self)
@on_completion = []
@on_failure = []
@@ -668,6 +668,18 @@ module Rake #:nodoc
end
end
+# Under windows, paths passed to mkpath, mkdir_p and mkdirs need to be normalized.
+# Otherwise ruby may decide to treat the drive component as a directory (i.e.
+# create a directory named "C:"). This patch hooks in at a low level to work around
+# this issue.
+module FileUtils
+ def fu_list(arg) #:nodoc:
+ [arg].flatten.map { |path| Buildr::Util.normalize_path(path) }
+ end
+
+ private_Fmodule_function :fu_list
+end
+
module FileUtils
def fu_output_message(msg) #:nodoc:
if Rake::FileUtilsExt::DEFAULT == RakeFileUtils.verbose_flag
[13/50] git commit: Fix the test to reflect test_jar's correct
classifier
Posted by do...@apache.org.
Fix the test to reflect test_jar's correct classifier
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535917 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a90fca08
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a90fca08
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a90fca08
Branch: refs/heads/master
Commit: a90fca0893eb78b5c397859997a3e87a22cffb25
Parents: 0faefa7
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 04:22:21 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 04:22:21 2013 +0000
----------------------------------------------------------------------
spec/java/packaging_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a90fca08/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 5eb6498..0b0c093 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -1248,7 +1248,7 @@ describe Packaging, 'test_jar' do
define 'foo', :version=>'1.0' do
package(:test_jar).type.should eql(:jar)
package(:test_jar).classifier.should eql('tests')
- package(:test_jar).name.should match(/foo-1.0-test-jar.jar$/)
+ package(:test_jar).name.should match(/foo-1.0-tests.jar$/)
end
end
[28/50] git commit: Fix test to account for the scenario where
RbConfig::CONFIG is now invoked when creating the directories for the test
Posted by do...@apache.org.
Fix test to account for the scenario where RbConfig::CONFIG is now invoked when creating the directories for the test
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537877 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/5cfc9a36
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/5cfc9a36
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/5cfc9a36
Branch: refs/heads/master
Commit: 5cfc9a3601479f53823abdbb9a84ae06d7d9a099
Parents: a4283e8
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 09:52:59 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 09:52:59 2013 +0000
----------------------------------------------------------------------
spec/java/java_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/5cfc9a36/spec/java/java_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/java_spec.rb b/spec/java/java_spec.rb
index 14885f7..3756e49 100644
--- a/spec/java/java_spec.rb
+++ b/spec/java/java_spec.rb
@@ -22,7 +22,7 @@ unless RUBY_PLATFORM =~ /java/
before do
@old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
@old_env_java = Object.module_eval { remove_const :ENV_JAVA }
- RbConfig::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+ RbConfig::CONFIG.should_receive(:[]).at_least(:once).with('host_os').and_return('darwin0.9')
end
it 'should point to default JVM' do
[30/50] git commit: Attempt to avoi intermittent failures on windows
by force deleting content from previous runs
Posted by do...@apache.org.
Attempt to avoi intermittent failures on windows by force deleting content from previous runs
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537914 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/de317d04
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/de317d04
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/de317d04
Branch: refs/heads/master
Commit: de317d04a6ed9e95a55eded7d50afba50f2dce06
Parents: f46168e
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 12:31:51 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 12:31:51 2013 +0000
----------------------------------------------------------------------
spec/core/transport_spec.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/de317d04/spec/core/transport_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/transport_spec.rb b/spec/core/transport_spec.rb
index f8bf079..fd11517 100644
--- a/spec/core/transport_spec.rb
+++ b/spec/core/transport_spec.rb
@@ -59,8 +59,9 @@ end
describe URI, '#upload' do
before do
write @source = 'source', @content = 'Just a file'
- @target = 'target'
- @uri = URI(URI.escape("file://#{File.expand_path(@target)}"))
+ @target = File.expand_path('target')
+ rm_rf @target
+ @uri = URI(URI.escape("file://#{@target}"))
end
it 'should preserve file permissions if uploading to a file' do
[07/50] git commit: Attempt to work around sequencing issues relating
to the order in which resources are copied. If a user defines a task that
generates assets then these assets should be copied first and all the
non-filtered resources should come after
Posted by do...@apache.org.
Attempt to work around sequencing issues relating to the order in which resources are copied. If a user defines a task that generates assets then these assets should be copied first and all the non-filtered resources should come after
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535340 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8f1d8d38
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8f1d8d38
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8f1d8d38
Branch: refs/heads/master
Commit: 8f1d8d38bad031d8cf301de69ec2530f48efc2d2
Parents: 445505d
Author: Peter Donald <do...@apache.org>
Authored: Thu Oct 24 11:04:16 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Thu Oct 24 11:04:16 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/assets.rb | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8f1d8d38/lib/buildr/core/assets.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/assets.rb b/lib/buildr/core/assets.rb
index bfd3b22..4a9466d 100644
--- a/lib/buildr/core/assets.rb
+++ b/lib/buildr/core/assets.rb
@@ -40,6 +40,11 @@ module Buildr #:nodoc:
def initialize(*args) #:nodoc:
super
+ end
+
+ private
+
+ def add_enhance_actions
enhance do
paths = self.paths.flatten.compact
if paths.size > 0
@@ -49,14 +54,21 @@ module Buildr #:nodoc:
end.each do |a|
a.invoke if a.respond_to?(:invoke)
end.each do |asset|
- cp_r Dir["#{asset}/*"], "#{name}/"
+ source_dir = asset.to_s
+ Dir["#{source_dir}/*"].each do |f|
+ f = f[source_dir.length + 1, 10000]
+ source = "#{asset}/#{f}"
+ target = "#{name}/#{f}"
+ if !File.exist?(target) || File.mtime(name.to_s) < File.mtime(source)
+ mkdir_p File.dirname(target)
+ cp source, target
+ end
+ end
end
end
end
end
- private
-
def out_of_date?(stamp)
super ||
self.paths.any? { |n| n.respond_to?(:needed?) && n.needed? }
@@ -77,6 +89,10 @@ module Buildr #:nodoc:
project.assets.paths
end
+ after_define do |project|
+ project.assets.send(:add_enhance_actions)
+ end
+
# Access the asset task
def assets
if @assets.nil?
[06/50] git commit: Remove debug output
Posted by do...@apache.org.
Remove debug output
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1534979 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/445505d0
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/445505d0
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/445505d0
Branch: refs/heads/master
Commit: 445505d037c6fce79fabc4bc23632549799a1ff3
Parents: 8c8483e
Author: Peter Donald <do...@apache.org>
Authored: Wed Oct 23 10:41:29 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Wed Oct 23 10:41:29 2013 +0000
----------------------------------------------------------------------
spec/java/packaging_spec.rb | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/445505d0/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 18b9de9..328f05f 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -561,7 +561,6 @@ describe Packaging, 'war' do
package(:war)
end
inspect_war { |files| files.should include('test.html') }
- cp project('foo').package(:war).to_s, '/tmp/x.zip'
Zip::ZipFile.open(project('foo').package(:war).to_s, false) do |war|
war.get_input_stream('test.html').read.should eql('999')
end
[08/50] git commit: Note down reasoning for odd construct
Posted by do...@apache.org.
Note down reasoning for odd construct
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535652 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e1f4441b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e1f4441b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e1f4441b
Branch: refs/heads/master
Commit: e1f4441ba2f94d8025d40cb15ca007e8412e8c0f
Parents: 8f1d8d3
Author: Peter Donald <do...@apache.org>
Authored: Fri Oct 25 08:10:36 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Oct 25 08:10:36 2013 +0000
----------------------------------------------------------------------
lib/buildr/core/assets.rb | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e1f4441b/lib/buildr/core/assets.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/assets.rb b/lib/buildr/core/assets.rb
index 4a9466d..95229a4 100644
--- a/lib/buildr/core/assets.rb
+++ b/lib/buildr/core/assets.rb
@@ -90,6 +90,9 @@ module Buildr #:nodoc:
end
after_define do |project|
+ # This is used to add actions after project is defined so that files are copied
+ # as the last action and don't block tasks that try and filter into target dir
+ # from the source dir
project.assets.send(:add_enhance_actions)
end
[48/50] git commit: Merge remote-tracking branch 'origin/pr/7'
Posted by do...@apache.org.
Merge remote-tracking branch 'origin/pr/7'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4ce550cf
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4ce550cf
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4ce550cf
Branch: refs/heads/master
Commit: 4ce550cf7cdb4e92ae9d7e1ff6aff951a23601da
Parents: b61b3d5 c55b41a
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 31 15:10:52 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 31 15:10:52 2014 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/50] git commit: Add guard so that tests do not run under windows
MRI
Posted by do...@apache.org.
Add guard so that tests do not run under windows MRI
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535912 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/0faefa70
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/0faefa70
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/0faefa70
Branch: refs/heads/master
Commit: 0faefa70c983040535e4ce15d7ec7f4cabc9b817
Parents: 8650740
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 02:19:09 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 02:19:09 2013 +0000
----------------------------------------------------------------------
spec/core/console_spec.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/0faefa70/spec/core/console_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/console_spec.rb b/spec/core/console_spec.rb
index 30a3a22..760e50e 100644
--- a/spec/core/console_spec.rb
+++ b/spec/core/console_spec.rb
@@ -21,7 +21,7 @@ describe Buildr::Console do
it 'should return a value' do
Buildr::Console.console_dimensions.should_not be_nil
- end if $stdout.isatty && !ENV["TRAVIS"]
+ end if $stdout.isatty && !ENV["TRAVIS"] && (!Buildr::Util.win_os? || Buildr::Util.java_platform?)
end
describe 'color' do
@@ -42,7 +42,7 @@ describe Buildr::Console do
it 'should emit blue code when asked' do
Buildr::Console.color('message', :blue).should eql("\e[34mmessage\e[0m")
end
- end if $stdout.isatty
+ end if $stdout.isatty && (!Buildr::Util.win_os? || Buildr::Util.java_platform?)
describe ' use_color is false' do
before do
[23/50] git commit: Move the clobber task outside the catch block and
add a few directories to the list removed
Posted by do...@apache.org.
Move the clobber task outside the catch block and add a few directories to the list removed
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1537852 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a4b12acc
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a4b12acc
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a4b12acc
Branch: refs/heads/master
Commit: a4b12acc87d218fe1fe0b8bb040eb9aab77ec646
Parents: 6fcf5e2
Author: Peter Donald <do...@apache.org>
Authored: Fri Nov 1 08:47:10 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Fri Nov 1 08:47:10 2013 +0000
----------------------------------------------------------------------
rakelib/doc.rake | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a4b12acc/rakelib/doc.rake
----------------------------------------------------------------------
diff --git a/rakelib/doc.rake b/rakelib/doc.rake
index 73fc46a..e090c30 100644
--- a/rakelib/doc.rake
+++ b/rakelib/doc.rake
@@ -125,15 +125,17 @@ task 'setup-local-site-svn' do
end
end
+rescue Exception => e
+# The doc tasks do not work on our CI infrastructure with jruby as the native libraries
+# are not compatible with version of the C++ library we are running there
+end
+
task 'clobber' do
+ rm_f 'rake/lib'
rm_rf 'rake'
+ rm_rf 'rdoc'
rm_rf 'site'
rm_rf '_site'
rm_f 'buildr.pdf'
rm_f 'prince_errors.log'
end
-
-rescue Exception => e
-# The doc tasks do not work on our CI infrastructure with jruby as the native libraries
-# are not compatible with version of the C++ library we are running there
-end
\ No newline at end of file