buildr 1.5.3-x86-mswin32 → 1.5.4-x86-mswin32

data/spec/packaging/archive_spec.rb

@@ -306,6 +306,36 @@ shared_examples_for 'ArchiveTask' do
       inspect_archive.should be_empty
     end
   end
+  
+  it 'should merge archives, concatenate file contents' do
+    @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
+      map do |dir|
+        txt_file = File.join(dir, 'test1.txt')
+        write txt_file, content_for('test1.txt')
+        zip(File.join(dir, 'test1.zip')).include(txt_file)
+      end
+    archive(@archive).merge(@files).concatenate("test1.txt")
+    archive(@archive).invoke
+    inspect_archive do |archive|
+      archive['test1.txt'].should eql(content_for('test1.txt') * @files.size)
+    end
+  end
+  
+  it 'should merge archives, transforming file contents' do
+    @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
+      map do |dir|
+        txt_file = File.join(dir, 'test1.txt')
+        write txt_file, content_for('test1.txt')
+        zip(File.join(dir, 'test1.zip')).include(txt_file)
+      end
+    archive(@archive).merge(@files).transform("test1.txt") do |matches|
+      matches.join("\n=====\n")
+    end
+    archive(@archive).invoke
+    inspect_archive do |archive|
+      archive['test1.txt'].should eql("#{content_for('test1.txt')}\n=====\n#{content_for('test1.txt')}")
+    end
+  end
 
   it 'should expand another archive file into path' do
     create_for_merge do |src|

data/spec/sandbox.rb

@@ -39,6 +39,7 @@ require 'buildr/groovy'
 require 'buildr/scala'
 require 'buildr/bnd'
 require 'buildr/jaxb_xjc'
+require 'buildr/kotlin'
 
 Java.load # Anything added to the classpath.
 artifacts(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: x86-mswin32
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -474,12 +474,17 @@ files:
 - addon/buildr/jdepend-report.xsl
 - addon/buildr/jdepend.rb
 - addon/buildr/jetty.rb
+- addon/buildr/jetty6.rb
 - addon/buildr/jibx.rb
 - addon/buildr/nailgun.rb
 - addon/buildr/openjpa.rb
 - addon/buildr/org/apache/buildr/BuildrNail$Main.class
 - addon/buildr/org/apache/buildr/BuildrNail.class
 - addon/buildr/org/apache/buildr/BuildrNail.java
+- addon/buildr/org/apache/buildr/Jetty6Wrapper$1.class
+- addon/buildr/org/apache/buildr/Jetty6Wrapper$BuildrHandler.class
+- addon/buildr/org/apache/buildr/Jetty6Wrapper.class
+- addon/buildr/org/apache/buildr/Jetty6Wrapper.java
 - addon/buildr/org/apache/buildr/JettyWrapper$1.class
 - addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class
 - addon/buildr/org/apache/buildr/JettyWrapper.class
@@ -588,6 +593,11 @@ files:
 - lib/buildr/java/test_result.rb
 - lib/buildr/java/tests.rb
 - lib/buildr/java/version_requirement.rb
+- lib/buildr/kotlin.rb
+- lib/buildr/kotlin/compiler.rb
+- lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector$1.class
+- lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.class
+- lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java
 - lib/buildr/packaging/archive.rb
 - lib/buildr/packaging/artifact.rb
 - lib/buildr/packaging/artifact_namespace.rb
@@ -609,7 +619,6 @@ files:
 - lib/buildr/scala/bdd.rb
 - lib/buildr/scala/compiler.rb
 - lib/buildr/scala/doc.rb
-- lib/buildr/scala/org/apache/buildr/Specs2Runner.class
 - lib/buildr/scala/shell.rb
 - lib/buildr/scala/tests.rb
 - lib/buildr/shell.rb
@@ -664,6 +673,7 @@ files:
 - spec/java/run_spec.rb
 - spec/java/test_coverage_helper.rb
 - spec/java/tests_spec.rb
+- spec/kotlin/compiler_spec.rb
 - spec/packaging/archive_spec.rb
 - spec/packaging/artifact_namespace_spec.rb
 - spec/packaging/artifact_spec.rb