poise-archive 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4242f7231038390f4f5fe3cbbffc7fc396ac5192
-  data.tar.gz: 52c718b6e9bef94592ca87e0eca89b5dd9d42929
+  metadata.gz: 01c2f0093ff82b490d384f28383e9001be1f3d86
+  data.tar.gz: f03d4873224d55c6d543ca6584fc03fbf95a514d
 SHA512:
-  metadata.gz: 986c52a2da5d576ecde9094a7362443a9ddb4bd2f50f05f7a58ef39d8a4e597c00c6e9a1f0dbd6805d27ce9c66fd9e82f1955f10e425edced02343d83009ef74
-  data.tar.gz: a35ad89c3af875f794553c898266a0a6e5f7676d486e1796b47ed0b240d43f379fe897e9cc9fd817c32de5693af245cd50e8818141bc485f0bc1c34d0193e515
+  metadata.gz: e2362ecf6f347995dd967b7a07294a40fd6e455a9fc122a22618314fcc3418a3a05e31f32810cbf3b383a4a51e58d58450d1b0ca32c3d98038253961838df288
+  data.tar.gz: 104cc37a957cc08eeebe6db7e982b59ae6ab6e12fd8adea6ca33f0b7b9a60710862766bfa1aecbb2bd923e7f84f4cf5c2362523ed12fd3bf154026f3cb537606

data/.travis.yml

@@ -1,22 +1,52 @@
----
 sudo: false
 cache: bundler
 language: ruby
-rvm:
-- 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=
-before_install: "gem install bundler"
-bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
+    - secure: OIVa/hlztLT/hICbouLmXu9F6x0ntFzUnfJbhG3LNVQk3s3YmeI8QPLh1bIxGULry+a3pLykDESYya6gpC+f+Si3FSI7VLpFds5EVIbptMVPRVHjDSNSHFjoAgjzX36HCxvWGJdb0jKZ5EUNBGBqDtnBPFAp3FcwknhkRpOAzKemzXnSZVMyxLiuNBMynLycFPjSSDZt0uSq/yvXnBAb0FXov84Zh0K+OoTEQ1J2AWSS9jXkBZncZD4rdSBqJSZwMxN9+3w6IONyWO3BMCg1QBcA0fCdcqk5ZlbGOfpt0n/FkYfUvB3Ypei+4+QT3wg9f63R14HtM1ZK/VHOrjx/h0rAC0haq2OEWmEAyrZF+pSm5l46ngWlHnifVURjOOabXg6TLNqN0JN8zjXyGYB6rb3RDeG8U0dJrdoVUQW02A4v8Fpo2wACHcz+h0cipWxh2RPOfl7/5PtDZ/ZKFaR73Ci2SXOG9Q9gTCdFDbXmEgEB8PtyoDS5gkm4QiY3Ffi1YXD46yU0YHxTVnw7S63g7gmHf4G30NAKdoSl1Zke6IvZYA5fl7vcx6Dl1ZQWJMxJgsTx7KVRENeCzpJDkty04bs1MCAy6vEWcAxYApket7TXvnAIEAQzxnp/r82zWVwanLdVcbBVvFDWNlsMquRXRwOVkcs12esLY6Wj6WBZCyQ=
+before_install: gem install bundler
+bundler_args: '--binstubs=$PWD/bin --jobs 3 --retry 3'
 script:
-- "./bin/rake travis"
-gemfile:
-- test/gemfiles/chef-12.gemfile
-- test/gemfiles/chef-12.1.gemfile
-- test/gemfiles/chef-12.2.gemfile
-- test/gemfiles/chef-12.3.gemfile
-- test/gemfiles/chef-12.4.gemfile
-- test/gemfiles/chef-12.5.gemfile
-- test/gemfiles/chef-12.6.gemfile
-- test/gemfiles/master.gemfile
+  - ./bin/rake travis
+matrix:
+  include:
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.1.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.2.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.3.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.4.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.5.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.6.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.7.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.8.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.9.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.10.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.11.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.12.gemfile
+    - rvm: 2.1.9
+      gemfile: test/gemfiles/chef-12.13.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.14.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.15.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.16.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.17.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.18.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Poise-Archive Changelog
 
+## v1.4.0
+
+* Added support for using 7-Zip on Windows.
+* Fixed handling of `.tar.xz` archives on RHEL and CentOS.
+
 ## v1.3.0
 
 * Add support for unpacking directly from a URL.

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/README.md

@@ -21,10 +21,14 @@ poise_archive 'https://example.com/myapp.tgz' do
 end
 ```
 
+## Requirements
+
+Chef 12.1 or newer is required.
+
 ## Platforms
 
-This cookbook supports all platforms (including Windows) but non-Linux platforms
-may see very slow tar file unpacking when using the pure-Ruby fallback
+This cookbook supports all platforms (including Windows) but some Unix platforms
+(Solaris, AIX) may see very slow tar file unpacking when using the pure-Ruby fallback
 implementation.
 
 ## Resources
@@ -81,7 +85,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa
 
 ## License
 
-Copyright 2016, Noah Kantrowitz
+Copyright 2016-2017, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/attributes/default.rb

@@ -0,0 +1,18 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['poise-archive']['seven_zip']['version'] = '16.04'
+default['poise-archive']['seven_zip']['url'] = 'http://www.7-zip.org/a/7z%{version_tag}%{arch_tag}.exe'

data/lib/poise_archive.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_archive/archive_providers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 require 'chef/platform/provider_priority_map'
 
 require 'poise_archive/archive_providers/gnu_tar'
+require 'poise_archive/archive_providers/seven_zip'
 require 'poise_archive/archive_providers/tar'
 require 'poise_archive/archive_providers/zip'
 
@@ -28,9 +29,10 @@ module PoiseArchive
   module ArchiveProviders
     # Set up priority maps
     Chef::Platform::ProviderPriorityMap.instance.priority(:poise_archive, [
+      PoiseArchive::ArchiveProviders::Zip,
       PoiseArchive::ArchiveProviders::GnuTar,
+      PoiseArchive::ArchiveProviders::SevenZip,
       PoiseArchive::ArchiveProviders::Tar,
-      PoiseArchive::ArchiveProviders::Zip,
     ])
   end
 end

data/lib/poise_archive/archive_providers/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_archive/archive_providers/gnu_tar.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,7 +52,13 @@ module PoiseArchive
       def install_prereqs
         utils = ['tar']
         utils << 'bzip2' if new_resource.absolute_path =~ /\.t?bz/
-        utils << 'xz-utils' if new_resource.absolute_path =~ /\.t?xz/
+        if new_resource.absolute_path =~ /\.t?xz/
+          xz_package = node.value_for_platform_family(
+            debian: 'xz-utils',
+            rhel: 'xz',
+          )
+          utils << xz_package if xz_package
+        end
         # This is a resource.
         package utils
       end

data/lib/poise_archive/archive_providers/seven_zip.rb

@@ -0,0 +1,188 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'fileutils'
+require 'tmpdir'
+
+
+require 'poise_archive/archive_providers/base'
+
+
+module PoiseArchive
+  module ArchiveProviders
+    # The `seven_zip` provider class for `poise_archive` to upack archives
+    # using 7-Zip.
+    #
+    # @since 1.4.0
+    # @see PoiseArchive::Resources::PoiseArchive::Resource
+    # @provides poise_archive
+    class SevenZip < Base
+      provides_extension(/\.(t(ar|gz|bz|xz)|zip|7z)/)
+
+      # Only works on Windows, because use less silly things elsewhere.
+      #
+      # @api private
+      def self.provides?(node, _resource)
+        super && node['platform_family'] == 'windows'
+      end
+
+      private
+
+      def unpack_archive
+        notifying_block do
+          install_seven_zip
+        end
+        # Create a temp directory to unpack in to. Do I want to try and force
+        # this to be on the same filesystem as the target?
+        self.class.mktmpdir do |tmpdir|
+          unpack_using_seven_zip(tmpdir)
+          chown_files(tmpdir) if new_resource.user || new_resource.group
+          move_files(tmpdir)
+        end
+      end
+
+      # Install 7-Zip to a cache folder.
+      #
+      # @api private
+      # @return [void]
+      def install_seven_zip
+        url = seven_zip_url
+        path = "#{Chef::Config[:file_cache_path]}/#{url.split(/\//).last}"
+
+        install = execute "#{windows_path(path)} /S /D=#{seven_zip_home}" do
+          action :nothing
+        end
+
+        remote_file path do
+          source url
+          notifies :run, install, :immediately
+        end
+      end
+
+      # Unpack the whole archive to a temp directory.
+      #
+      # @api private
+      # @param tmpdir [String] Temp directory to unpack to.
+      # @return [void]
+      def unpack_using_seven_zip(tmpdir)
+        if new_resource.absolute_path =~ /\.t(ar\.)?(gz|bz(2)?|xz)$/
+          # 7-Zip doesn't know to unpack both levels of the archive on its own
+          # so we need to handle this more explicitly.
+          shell_out!("#{seven_zip_home}\\7z.exe x -so \"#{windows_path(new_resource.absolute_path)}\" | #{seven_zip_home}\\7z.exe x -si -ttar -o\"#{windows_path(tmpdir)}\"")
+        else
+          shell_out!("#{seven_zip_home}\\7z.exe x -o\"#{windows_path(tmpdir)}\" \"#{windows_path(new_resource.absolute_path)}\"")
+        end
+      end
+
+      # Fix file ownership if requested.
+      #
+      # @api private
+      # @param tmpdir [String] Temp directory to change ownership in.
+      # @return [void]
+      def chown_files(tmpdir)
+        notifying_block do
+          Dir["#{tmpdir}/**/*"].each do |path|
+            declare_resource(::File.directory?(path) ? :directory : :file, path) do
+              owner new_resource.user if new_resource.user
+              group new_resource.group if new_resource.group
+            end
+          end
+        end
+      end
+
+      # Manual implementation of --strip-components since 7-Zip doesn't support
+      # it internally.
+      #
+      # @api private
+      # @param tmpdir [String] Temp directory to move from.
+      # @return [void]
+      def move_files(tmpdir)
+        entries_at_depth(tmpdir, new_resource.strip_components).each do |source|
+          target = ::File.join(new_resource.destination, ::File.basename(source))
+          # If we are in keep_existing mode, the target might exist already.
+          # This is not a great solution and won't have exactly the same behavior
+          # as the other providers, but it's something at least.
+          FileUtils.rm_rf(target) if ::File.exist?(target)
+          # At some point this might need to fall back to a real copy.
+          ::File.rename(source, target)
+        end
+      end
+
+      # Compute the URL to download the 7-Zip installer from.
+      #
+      # @api private
+      # @return [String]
+      def seven_zip_url
+        node['poise-archive']['seven_zip']['url'] % {
+          version: node['poise-archive']['seven_zip']['version'],
+          version_tag: node['poise-archive']['seven_zip']['version'].gsub(/\./, ''),
+          arch: node['kernel']['machine'],
+          arch_tag: node['kernel']['machine'] == 'x86_64' ? '-x64' : '',
+        }
+      end
+
+      # Path to install 7-Zip in to.
+      #
+      # @api private
+      # @return [String]
+      def seven_zip_home
+        "#{windows_path(Chef::Config[:file_cache_path])}\\seven_zip_#{node['poise-archive']['seven_zip']['version']}"
+      end
+
+      # Flip the slashes in a path because 7z wants "normal" paths.
+      #
+      # @api private
+      # @param path [String] Path to convert.
+      # @return [String]
+      def windows_path(path)
+        path.gsub(/\//, '\\')
+      end
+
+      # Find the absolute paths for entries under a path at a depth.
+      #
+      # @api private
+      # @param path [String] Base path to search under.
+      # @param depth [Integer] Number of intermediary directories to skip.
+      # @return [Array<String>]
+      def entries_at_depth(path, depth)
+        entries = [path]
+        current_depth = 0
+        while current_depth <= depth
+          entries.map! do |ent|
+            if ::File.directory?(ent)
+              Dir.entries(ent).select {|e| e != '.' && e != '..' }.map {|e| ::File.join(ent, e) }
+            else
+              []
+            end
+          end
+          entries.flatten!
+          current_depth += 1
+        end
+        entries
+      end
+
+      # Indirection so I can stub this for testing without breaking RSpec.
+      #
+      # @api private
+      def self.mktmpdir(*args, &block)
+        # :nocov:
+        Dir.mktmpdir(*args, &block)
+        # :nocov:
+      end
+
+    end
+  end
+end

data/lib/poise_archive/archive_providers/tar.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_archive/archive_providers/zip.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_archive/cheftie.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_archive/resources.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_archive/resources/poise_archive.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.