buildr 1.4.20-x86-mswin32 → 1.4.21-x86-mswin32

data/lib/buildr/packaging/archive.rb

@@ -298,7 +298,7 @@ module Buildr #:nodoc:
                !@excludes.any? { |pattern| File.fnmatch(pattern, entry.name) }
               dest = path =~ /^\/?$/ ? entry.name : Util.relative_path(path + "/" + entry.name)
               trace "Adding #{dest}"
-              file_map[dest] = lambda { |output| output.write source.read(entry) }
+              file_map[dest] = ZipEntryData.new(source, entry)
             end
           end
         end
@@ -306,6 +306,20 @@ module Buildr #:nodoc:
 
     end
 
+    class ZipEntryData
+      def initialize(zipfile, entry)
+        @zipfile = zipfile
+        @entry = entry
+      end
+
+      def call(output)
+        output.write @zipfile.read(@entry)
+      end
+
+      def mode
+        @entry.unix_perms
+      end
+    end
 
     def initialize(*args) #:nodoc:
       super

data/lib/buildr/packaging/tar.rb

@@ -92,7 +92,7 @@ module Buildr #:nodoc:
 
         file_map.each do |path, content|
           if content.respond_to?(:call)
-            tar.add_file(path, options) { |os, opts| content.call os }
+            tar.add_file(path, content.respond_to?(:mode) ? options.merge(:mode => content.mode) : options) { |os, _| content.call os }
           elsif content.nil?
           elsif File.directory?(content.to_s)
             stat = File.stat(content.to_s)

data/lib/buildr/packaging/ziptask.rb

@@ -67,7 +67,8 @@ module Buildr #:nodoc:
           warn "Warning:  Path in zipfile #{name} contains backslash: #{path}" if path =~ /\\/
           mkpath.call File.dirname(path)
           if content.respond_to?(:call)
-            zip.put_next_entry(path, compression_level)
+            entry = zip.put_next_entry(path, compression_level)
+            entry.unix_perms = content.mode & 07777 if content.respond_to?(:mode)
             content.call zip
           elsif content.nil? || File.directory?(content.to_s)
             mkpath.call path

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.20'.freeze
+  VERSION = '1.4.21'.freeze
 end

data/rakelib/stage.rake

@@ -97,7 +97,7 @@ task 'stage' => %w(clobber prepare) do |task, args|
     puts 'Ensuring all files have appropriate group and other permissions...'
     sh 'find . -type f | xargs chmod go+r'
     sh 'find . -type d | xargs chmod go+rx'
-    puts '[X] File permissions updated/validted.'
+    puts '[X] File permissions updated/validated.'
   end.call
 
   # Start by figuring out what has changed.

data/spec/packaging/archive_spec.rb

@@ -445,6 +445,23 @@ describe TarTask do
       unzip('target' => 'foo.tgz').extract
       (File.stat('target/hello').mode & 0777).should == 0777
     end
+
+    it 'should preserve file permissions when merging zip files' do
+      # with JRuby it's important to use absolute paths with File.chmod()
+      # http://jira.codehaus.org/browse/JRUBY-3300
+      hello = File.expand_path('src/main/bin/hello')
+      write hello, 'echo hi'
+      File.chmod(0777,  hello)
+      fail("Failed to set permission on #{hello}") unless (File.stat(hello).mode & 0777) == 0777
+
+      foo = zip('foo.zip')
+      foo.include('src/main/bin/*').invoke
+      bar = tar('bar.tgz')
+      bar.merge(foo)
+      bar.invoke
+      unzip('target' => 'bar.tgz').extract
+      (File.stat('target/hello').mode & 0777).should == 0777
+    end
   end
 
 end
@@ -567,6 +584,23 @@ describe "ZipTask" do
       unzip('target' => 'foo.zip').extract
       (File.stat('target/hello').mode & 0777).should == 0777
     end
+
+    it 'should preserve file permissions when merging zip files' do
+      # with JRuby it's important to use absolute paths with File.chmod()
+      # http://jira.codehaus.org/browse/JRUBY-3300
+      hello = File.expand_path('src/main/bin/hello')
+      write hello, 'echo hi'
+      File.chmod(0777,  hello)
+      fail("Failed to set permission on #{hello}") unless (File.stat(hello).mode & 0777) == 0777
+
+      foo = zip('foo.zip')
+      foo.include('src/main/bin/*').invoke
+      bar = zip('bar.zip')
+      bar.merge(foo)
+      bar.invoke
+      unzip('target' => 'bar.zip').extract
+      (File.stat('target/hello').mode & 0777).should == 0777
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.20
+  version: 1.4.21
 platform: x86-mswin32
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: atoulme-Antwrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -238,42 +238,42 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: orderedhash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: win32console1.3.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -402,18 +402,12 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
-description: ! 'Apache Buildr is a build system for Java-based applications, including
-  support
-
+description: |
+  Apache Buildr is a build system for Java-based applications, including support
   for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
-
-  something that''s simple and intuitive to use, so we only need to tell it what
-
+  something that's simple and intuitive to use, so we only need to tell it what
   to do, and it takes care of the rest.  But also something we can easily extend
-
-  for those one-off tasks, with a language that''s a joy to use.
-
-'
+  for those one-off tasks, with a language that's a joy to use.
 email: users@buildr.apache.org
 executables:
 - buildr
@@ -424,6 +418,13 @@ extra_rdoc_files:
 - LICENSE
 - NOTICE
 files:
+- CHANGELOG
+- LICENSE
+- NOTICE
+- README.rdoc
+- Rakefile
+- _buildr
+- _jbuildr
 - addon/buildr/antlr.rb
 - addon/buildr/bnd.rb
 - addon/buildr/checkstyle-report.xsl
@@ -467,6 +468,8 @@ files:
 - addon/buildr/wsgen.rb
 - addon/buildr/xmlbeans.rb
 - bin/buildr
+- buildr.buildfile
+- buildr.gemspec
 - doc/_config.yml
 - doc/_layouts/default.html
 - doc/_layouts/preface.html
@@ -506,8 +509,9 @@ files:
 - doc/settings_profiles.textile
 - doc/testing.textile
 - etc/KEYS
-- lib/buildr/clojure/shell.rb
+- lib/buildr.rb
 - lib/buildr/clojure.rb
+- lib/buildr/clojure/shell.rb
 - lib/buildr/core/application.rb
 - lib/buildr/core/assets.rb
 - lib/buildr/core/build.rb
@@ -531,11 +535,11 @@ files:
 - lib/buildr/core/test.rb
 - lib/buildr/core/transports.rb
 - lib/buildr/core/util.rb
+- lib/buildr/groovy.rb
 - lib/buildr/groovy/bdd.rb
 - lib/buildr/groovy/compiler.rb
 - lib/buildr/groovy/doc.rb
 - lib/buildr/groovy/shell.rb
-- lib/buildr/groovy.rb
 - lib/buildr/ide/eclipse.rb
 - lib/buildr/ide/idea.rb
 - lib/buildr/java/ant.rb
@@ -573,6 +577,7 @@ files:
 - lib/buildr/resources/failed.png
 - lib/buildr/resources/icons-license.txt
 - lib/buildr/run.rb
+- lib/buildr/scala.rb
 - lib/buildr/scala/bdd.rb
 - lib/buildr/scala/compiler.rb
 - lib/buildr/scala/doc.rb
@@ -582,10 +587,8 @@ files:
 - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
 - lib/buildr/scala/shell.rb
 - lib/buildr/scala/tests.rb
-- lib/buildr/scala.rb
 - lib/buildr/shell.rb
 - lib/buildr/version.rb
-- lib/buildr.rb
 - rakelib/all-in-one.rake
 - rakelib/checks.rake
 - rakelib/doc.rake
@@ -649,42 +652,34 @@ files:
 - spec/spec_helpers.rb
 - spec/version_requirement_spec.rb
 - spec/xpath_matchers.rb
-- buildr.gemspec
-- buildr.buildfile
-- LICENSE
-- NOTICE
-- CHANGELOG
-- README.rdoc
-- Rakefile
-- _buildr
-- _jbuildr
 homepage: http://buildr.apache.org/
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: To get started run buildr --help
 rdoc_options:
-- --title
+- "--title"
 - Buildr
-- --main
+- "--main"
 - README.rdoc
-- --webcvs
+- "--webcvs"
 - https://github.com/apache/buildr
 require_paths:
 - lib
 - addon
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 requirements: []
 rubyforge_project: buildr
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Build like you code