svn commit: r1531452 - in /buildr/trunk: CHANGELOG lib/buildr/packaging/archive.rb spec/packaging/archive_spec.rb

[do...@apache.org]

Author: donaldp
Date: Fri Oct 11 22:38:48 2013
New Revision: 1531452

URL: http://svn.apache.org/r1531452
Log:
BUILDR-605 - Ensure package task invokes included paths.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/packaging/archive.rb
    buildr/trunk/spec/packaging/archive_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1531452&r1=1531451&r2=1531452&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri Oct 11 22:38:48 2013
@@ -1,4 +1,5 @@
 1.4.15 (Pending)
+* Fixed:  BUILDR-605 - Ensure package task invokes included paths.
 * Fixed:  BUILDR-609 - compile.from should accept Task argument.
 
 1.4.14 (2013-10-11)

Modified: buildr/trunk/lib/buildr/packaging/archive.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/archive.rb?rev=1531452&r1=1531451&r2=1531452&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/archive.rb (original)
+++ buildr/trunk/lib/buildr/packaging/archive.rb Fri Oct 11 22:38:48 2013
@@ -207,6 +207,7 @@ module Buildr #:nodoc:
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
+          file(file).invoke
           unless excluded?(file)
             if File.directory?(file)
               in_directory file do |file, rel_path|

Modified: buildr/trunk/spec/packaging/archive_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/archive_spec.rb?rev=1531452&r1=1531451&r2=1531452&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/archive_spec.rb (original)
+++ buildr/trunk/spec/packaging/archive_spec.rb Fri Oct 11 22:38:48 2013
@@ -392,6 +392,25 @@ shared_examples_for 'ArchiveTask' do
     archive(@archive).include(@files)
     lambda { archive(@archive).with :option=>true }.should raise_error
   end
+
+  it 'should invoke paths supplied in from parameters' do
+    included_file = File.expand_path("somefile.myext")
+    write included_file, content_for(included_file)
+    archive2_filename = File.expand_path("somebug.zip")
+    a2 = zip(archive2_filename).
+      include(included_file, :as => 'folder1/somefile1.ext').
+      include(included_file, :as => 'folder2/somefile2.ext').
+      invoke
+    a = archive(@archive)
+    f1 = unzip('target/folder1' => archive2_filename).from_path("folder1/*").root
+    f2 = unzip('target/folder2' => archive2_filename).from_path("folder2/*").root
+    a.include(:from => f1)
+    a.include(:from => f2)
+    a.invoke
+    contents = inspect_archive
+    contents["folder1/somefile1.ext"].should_not be_nil
+    contents["folder2/somefile2.ext"].should_not be_nil
+  end
 end
 
 describe TarTask do