buildr 1.4.12 → 1.4.13

data/spec/java/packaging_spec.rb

@@ -530,6 +530,26 @@ describe Packaging, 'war' do
     inspect_war { |files| files.should include('test.html') }
   end
 
+  it 'should use files from added assets directory if nothing included' do
+    write 'generated/main/webapp/test.html'
+    define('foo', :version => '1.0') { assets.paths << 'generated/main/webapp/'; package(:war) }
+    inspect_war { |files| files.should include('test.html') }
+  end
+
+  it 'should use files from generated assets directory if nothing included' do
+    write 'generated/main/webapp/test.html'
+    define('foo', :version => '1.0') do
+      target_dir = _('generated/main/webapp')
+      assets.paths << project.file(target_dir) do
+        mkdir_p target_dir
+        touch "#{target_dir}/test.html"
+        touch target_dir
+      end
+      package(:war)
+    end
+    inspect_war { |files| files.should include('test.html') }
+  end
+
   it 'should accept files from :classes option' do
     write 'src/main/java/Test.java', 'class Test {}'
     write 'classes/test'

data/spec/java/tests_spec.rb

@@ -667,7 +667,7 @@ describe Buildr::MultiTest do
         }
       }
     JAVA
-    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :groups=>['included'] }
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :options => {:testng => {:groups=>['included']}} }
     lambda { project('foo').test.invoke }.should_not raise_error
   end
 
@@ -688,7 +688,7 @@ describe Buildr::MultiTest do
         public void annotated() {}
       }
     JAVA
-    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :excludegroups=>['excluded'] }
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :options => {:testng => {:excludegroups=>['excluded']}} }
     lambda { project('foo').test.invoke }.should_not raise_error
   end
 end

data/spec/packaging/packaging_spec.rb

@@ -13,11 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'packaging_helper'))
 
-
 describe Project, '#group' do
   it 'should default to project name' do
     desc 'My Project'
@@ -34,7 +32,6 @@ describe Project, '#group' do
   end
 end
 
-
 describe Project, '#version' do
   it 'should default to nil' do
     define('foo').version.should be_nil
@@ -48,10 +45,8 @@ describe Project, '#version' do
     define('foo', :version=>'2.1') { define 'bar' }
     project('foo:bar').version.should eql('2.1')
   end
-
 end
 
-
 describe Project, '#id' do
   it 'should be same as project name' do
     define('foo').id.should eql('foo')
@@ -410,13 +405,8 @@ POM
       project('foo').packages.size.should == 2
     end
   end
-
 end
 
-
-
-
-
 describe Project, '#package file' do
   it 'should be a file task' do
     define 'foo' do
@@ -527,12 +517,6 @@ describe Project, '#package file' do
 
 end
 
-
-
-
-
-
-
 describe Rake::Task, ' package' do
   it 'should be local task' do
     define 'foo', :version=>'1.0' do
@@ -566,7 +550,6 @@ describe Rake::Task, ' package' do
   end
 end
 
-
 describe Rake::Task, ' install' do
   it 'should be local task' do
     define 'foo', :version=>'1.0' do
@@ -603,7 +586,6 @@ describe Rake::Task, ' install' do
   end
 end
 
-
 describe Rake::Task, ' uninstall' do
   it 'should be local task' do
     define 'foo', :version=>'1.0' do
@@ -630,7 +612,6 @@ describe Rake::Task, ' uninstall' do
   end
 end
 
-
 describe Rake::Task, ' upload' do
   before do
     repositories.release_to = URI.escape("file://#{File.expand_path('remote')}")
@@ -692,7 +673,6 @@ describe Rake::Task, ' upload' do
   end
 end
 
-
 describe Packaging, 'zip' do
   it_should_behave_like 'packaging'
   before { @packaging = :zip }
@@ -706,13 +686,11 @@ describe Packaging, 'zip' do
   end
 end
 
-
 describe Packaging, ' tar' do
   before { @packaging = :tar }
   it_should_behave_like 'packaging'
 end
 
-
 describe Packaging, ' tgz' do
   before { @packaging = :tgz }
   it_should_behave_like 'packaging'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.12
-  prerelease: 
+  version: 1.4.13
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,55 +27,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,39 +83,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.19
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rubyforge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,39 +125,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: rjb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: atoulme-Antwrap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,119 +167,104 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.14.3
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.14.3
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.14.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.14.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -310,111 +272,97 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: orderedhash
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: jekylltask
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 4.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: jekylltask
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: pygmentize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -422,7 +370,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -430,7 +377,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: saikuro_treemap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -438,7 +384,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -446,7 +391,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: atoulme-Saikuro
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -454,7 +398,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -561,6 +504,7 @@ files:
 - lib/buildr/clojure/shell.rb
 - lib/buildr/clojure.rb
 - lib/buildr/core/application.rb
+- lib/buildr/core/assets.rb
 - lib/buildr/core/build.rb
 - lib/buildr/core/cc.rb
 - lib/buildr/core/checks.rb
@@ -708,6 +652,7 @@ files:
 - _jbuildr
 homepage: http://buildr.apache.org/
 licenses: []
+metadata: {}
 post_install_message: To get started run buildr --help
 rdoc_options:
 - --title
@@ -720,24 +665,19 @@ require_paths:
 - lib
 - addon
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -750290413766610913
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 requirements: []
 rubyforge_project: buildr
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Build like you code
 test_files: []