poise-archive 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba8a642607edf70f9c1cc3c985d6cd70eed6515
-  data.tar.gz: e1e3fa40223be0e015e1dae1e5640c5a839d5077
+  metadata.gz: dd46ea17e4040f2682e412ffda579ad0401d4aec
+  data.tar.gz: dc92ac0690c79f6a37a252682cc6bce4e03299ab
 SHA512:
-  metadata.gz: 0d64cb5a421994253e7b5d124250df5c0d020a481e55e7ac4e699ecb6296327f43efe73fa1024bb95c940402435d79f9a1ba333f27d7dfb0b4ec95ac2c35607a
-  data.tar.gz: c54e8439eeb5b38a451636fa728fe59f3da6a9834aa8ed3609654b2e8e88292b785e24d1aafad84c9cae6367dce953f7aaa4496ca37334c577a622991f7491ca
+  metadata.gz: d69d2aabe6bf4eaf939b9e5816d52291225ffb3889aa19012a5b456b793a957de94fa82657e46925a2230fb71445d5fbee75463ad7abf78b86b0f63fc3627fff
+  data.tar.gz: 7066f0bdbbffefa0cd752a7a730b441eeada22949976316bc8ad50f3b6a160de12f9d4536a6c486b88c33aa0e12bb2a7c36adbd9461f42f84e571b9f498acbe6

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-- '2.2'
+- 2.3.1
 env:
   global:
   - secure: OIVa/hlztLT/hICbouLmXu9F6x0ntFzUnfJbhG3LNVQk3s3YmeI8QPLh1bIxGULry+a3pLykDESYya6gpC+f+Si3FSI7VLpFds5EVIbptMVPRVHjDSNSHFjoAgjzX36HCxvWGJdb0jKZ5EUNBGBqDtnBPFAp3FcwknhkRpOAzKemzXnSZVMyxLiuNBMynLycFPjSSDZt0uSq/yvXnBAb0FXov84Zh0K+OoTEQ1J2AWSS9jXkBZncZD4rdSBqJSZwMxN9+3w6IONyWO3BMCg1QBcA0fCdcqk5ZlbGOfpt0n/FkYfUvB3Ypei+4+QT3wg9f63R14HtM1ZK/VHOrjx/h0rAC0haq2OEWmEAyrZF+pSm5l46ngWlHnifVURjOOabXg6TLNqN0JN8zjXyGYB6rb3RDeG8U0dJrdoVUQW02A4v8Fpo2wACHcz+h0cipWxh2RPOfl7/5PtDZ/ZKFaR73Ci2SXOG9Q9gTCdFDbXmEgEB8PtyoDS5gkm4QiY3Ffi1YXD46yU0YHxTVnw7S63g7gmHf4G30NAKdoSl1Zke6IvZYA5fl7vcx6Dl1ZQWJMxJgsTx7KVRENeCzpJDkty04bs1MCAy6vEWcAxYApket7TXvnAIEAQzxnp/r82zWVwanLdVcbBVvFDWNlsMquRXRwOVkcs12esLY6Wj6WBZCyQ=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Poise-Archive Changelog
 
+## v1.2.1
+
+* [#1](https://github.com/poise/poise-archive/issues/1) Restore file permissions
+  for ZIP files.
+
 ## v1.2.0
 
 * Add back a tar-binary provider called `GnuTar`, used by default on Linux.

data/lib/poise_archive/archive_providers/zip.rb

@@ -55,12 +55,31 @@ module PoiseArchive
             # If strip_components wiped out the name, don't process this entry.
             next if entry_name.empty?
             entry_path = ::File.join(new_resource.destination, entry_name)
+            # Ensure parent directories exist because some ZIP files don't
+            # include those for some reason.
+            ensure_directory(entry_path)
             entry.extract(entry_path)
+            # Make sure we restore file permissions. RubyZip won't do this
+            # unless we also turn on UID/GID restoration, which we don't want.
+            # Mask filters out setuid and setgid bits because no.
+            ::File.chmod(entry.unix_perms & 01777, entry_path) if !node.platform_family?('windows') && entry.unix_perms
             @zip_entry_paths << [entry.directory? ? :directory : entry.file? ? :file : :link, entry_path]
           end
         end
       end
 
+      # Make sure all enclosing directories exist before writing a path.
+      #
+      # @param oath [String] Path to check.
+      def ensure_directory(path)
+        base = ::File.dirname(path)
+        unless ::File.exist?(base)
+          ensure_directory(base)
+          Dir.mkdir(base)
+          @zip_entry_paths << [:directory, base]
+        end
+      end
+
       def chown_entries
         paths = @zip_entry_paths
         notifying_block do

data/lib/poise_archive/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseArchive
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/integration/default/serverspec/default_spec.rb

@@ -38,6 +38,10 @@ RSpec.shared_examples 'a poise_archive test' do |ext|
   describe file("#{base}/src/main.c") do
     it { is_expected.to be_a_file }
   end
+  describe file("#{base}/bin/run.sh") do
+    it { is_expected.to be_a_file }
+    it { is_expected.to be_mode '755' } unless os[:family] == 'windows'
+  end
   describe file("#{base}_0/myapp-1.0.0/src/main.c") do
     it { is_expected.to be_a_file }
   end
@@ -52,6 +56,10 @@ RSpec.shared_examples 'a poise_archive test' do |ext|
     it { is_expected.to be_owned_by 'poise' }
     it { is_expected.to be_mode '644' } unless os[:family] == 'windows'
   end
+  describe file("#{base}_user/bin/run.sh") do
+    it { is_expected.to be_owned_by 'poise' }
+    it { is_expected.to be_mode '755' } unless os[:family] == 'windows'
+  end
 end
 
 describe 'default provider' do

data/test/spec/archive_providers/tar_spec.rb

@@ -52,14 +52,18 @@ describe PoiseArchive::ArchiveProviders::Tar do
       expect_file('/test/myapp/LICENSE', "This is in the public domain.\n", 0644)
       expect_file('/test/myapp/README', "This is a project!\n\n", 0644)
       expect(Dir).to receive(:mkdir).with('/test/myapp/src', 0755)
+      expect(Dir).to receive(:mkdir).with('/test/myapp/bin', 0755)
       expect_file('/test/myapp/src/main.c', "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n", 0644)
+      expect_file('/test/myapp/bin/run.sh', "#!/bin/sh\necho \"Started!\"\n", 0755)
       run_chef
       expect(archive_provider).to be_a described_class
       expect(chef_run).to create_directory('/test/myapp').with(user: 'myuser', group: nil)
       expect(chef_run).to create_directory('/test/myapp/src').with(user: 'myuser', group: nil)
+      expect(chef_run).to create_directory('/test/myapp/bin').with(user: 'myuser', group: nil)
       expect(chef_run).to create_file('/test/myapp/LICENSE').with(user: 'myuser', group: nil)
       expect(chef_run).to create_file('/test/myapp/README').with(user: 'myuser', group: nil)
       expect(chef_run).to create_file('/test/myapp/src/main.c').with(user: 'myuser', group: nil)
+      expect(chef_run).to create_file('/test/myapp/bin/run.sh').with(user: 'myuser', group: nil)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-archive
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook for unpacking file archives like tar and zip.
@@ -155,4 +155,3 @@ test_files:
 - test/spec/archive_providers/zip_spec.rb
 - test/spec/resources/poise_archive_spec.rb
 - test/spec/spec_helper.rb
-has_rdoc: