Author: toulmean
Date: Thu Jul 8 01:54:49 2010
New Revision: 961555
URL: http://svn.apache.org/viewvc?rev=961555&view=rev
Log:
fix for BUILDR-225 ArchiveTask#merge, not according to doc
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/spec/packaging/archive_spec.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=961555&r1=961554&r2=961555&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Jul 8 01:54:49 2010
@@ -1,7 +1,8 @@
1.4.2 (pending)
-* Fixed: BUILDR-464 Improve the versioning of Buildr (Rhett Sutphin)
+* Fixed: BUILDR-225 ArchiveTask#merge, not according to doc
* Fixed: BUILDR-256 Automatically installing gems aborts rspec test runner
(Rhett Sutphin)
* Fixed: BUILDR-342 The jruby gem installer invokes the removed
Gem.manage_gems function (Rhett Sutphin)
+* Fixed: BUILDR-464 Improve the versioning of Buildr (Rhett Sutphin)
1.4.1 (2010-07-07)
* Added: BUILDR-420 Support external compiler
Modified: buildr/trunk/spec/packaging/archive_spec.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/archive_spec.rb?rev=961555&r1=961554&r2=961555&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/archive_spec.rb (original)
+++ buildr/trunk/spec/packaging/archive_spec.rb Thu Jul 8 01:54:49 2010
@@ -578,6 +578,10 @@ describe Unzip do
Rake::Task.clear ; rm_rf @target
unzip(@target=>@zip).include('test/**/*').target.invoke
FileList[File.join(@target, 'test/path/*')].size.should be(2)
+
+ Rake::Task.clear ; rm_rf @target
+ unzip(@target=>@zip).include('test/*').target.invoke
+ FileList[File.join(@target, 'test/path/*')].size.should be(2)
end
end
