svn commit: r1488748 - in /buildr/trunk: CHANGELOG buildr.gemspec lib/buildr.rb lib/buildr/packaging/archive.rb

[bo...@apache.org]

Author: boisvert
Date: Sun Jun  2 17:30:45 2013
New Revision: 1488748

URL: http://svn.apache.org/r1488748
Log:
Make Archive-related operations deterministic by using OrderedHash

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/buildr.gemspec
    buildr/trunk/lib/buildr.rb
    buildr/trunk/lib/buildr/packaging/archive.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1488748&r1=1488747&r2=1488748&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Jun  2 17:30:45 2013
@@ -1,4 +1,6 @@
 1.4.13 (Pending)
+* Fixed:  Make Archive-related operations (e.g. zip.merge) deterministic using
+          OrderedHash.
 * Change: Update to TestNG 6.8.5.
 
 1.4.12 (2013-05-04)

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1488748&r1=1488747&r2=1488748&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Sun Jun  2 17:30:45 2013
@@ -76,6 +76,7 @@ for those one-off tasks, with a language
   spec.add_dependency 'minitar',              '0.5.3'
   spec.add_dependency 'jruby-openssl',        '~> 0.8.2' if $platform.to_s == 'java'
   spec.add_dependency 'bundler'
+  spec.add_dependency 'orderedhash'
 
   # Unable to get this consistently working under jruby on windows
   unless $platform.to_s == 'java'

Modified: buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=1488748&r1=1488747&r2=1488748&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Sun Jun  2 17:30:45 2013
@@ -35,6 +35,7 @@ require 'find'
 require 'uri'
 require 'stringio'
 require 'fileutils'
+require 'orderedhash'
 
 require 'buildr/core/util'
 require 'buildr/core/common'

Modified: buildr/trunk/lib/buildr/packaging/archive.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/archive.rb?rev=1488748&r1=1488747&r2=1488748&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/archive.rb (original)
+++ buildr/trunk/lib/buildr/packaging/archive.rb Sun Jun  2 17:30:45 2013
@@ -312,7 +312,7 @@ module Buildr #:nodoc:
 
       # Make sure we're the last enhancements, so other enhancements can add content.
       enhance do
-        @file_map = {}
+        @file_map = OrderedHash.new
         enhance do
           send 'create' if respond_to?(:create)
           # We're here because the archive file does not exist, or one of the files is newer than the archive contents;
@@ -345,7 +345,8 @@ module Buildr #:nodoc:
     #
     #    package(:jar).clean.include path_to('desired/content')
     def clean
-      @paths = { '' => Path.new(self, '') }
+      @paths = OrderedHash.new
+      @paths[''] = Path.new(self, '')
       @prepares = []
       self
     end
@@ -469,7 +470,7 @@ module Buildr #:nodoc:
       @prepares.each { |prepare| prepare.call(self) }
       @prepares.clear
 
-      file_map = {}
+      file_map = OrderedHash.new
       @paths.each do |name, path|
         path.add_files(file_map)
       end