poise-archive 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfaafe9923ce43911a655e20b02ab6dd00cb7048
-  data.tar.gz: 80cc2672a626c92f4448b5936d5d10a51420c73c
+  metadata.gz: 5ba8a642607edf70f9c1cc3c985d6cd70eed6515
+  data.tar.gz: e1e3fa40223be0e015e1dae1e5640c5a839d5077
 SHA512:
-  metadata.gz: 6f46fc0af69806f98c569071ffd083f377614eae6ef598be79691957b709506cda3e5f719523f27cc00b164c0b3d9cbf611e147ac76aaacf8fb633c07f1f9f3b
-  data.tar.gz: b482be77a33a595e75f4a9d6ce56126cee7c7e452132c0a3e127bf8ed8834439abe2e00970878a6cb7ed31e702b303f384e68089aade9f6b286370ae78c07100
+  metadata.gz: 0d64cb5a421994253e7b5d124250df5c0d020a481e55e7ac4e699ecb6296327f43efe73fa1024bb95c940402435d79f9a1ba333f27d7dfb0b4ec95ac2c35607a
+  data.tar.gz: c54e8439eeb5b38a451636fa728fe59f3da6a9834aa8ed3609654b2e8e88292b785e24d1aafad84c9cae6367dce953f7aaa4496ca37334c577a622991f7491ca

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Poise-Archive Changelog
 
+## v1.2.0
+
+* Add back a tar-binary provider called `GnuTar`, used by default on Linux.
+* Support for ZIP files via RubyZip.
+* Full Windows support, including with the `user` and `group` properties.
+
 ## v1.1.2
 
 * Fix compat with older Ruby that doesn't include `Entry#symlink?`.

data/README.md

@@ -7,9 +7,9 @@
 [![Gemnasium](https://img.shields.io/gemnasium/poise/poise-archive.svg)](https://gemnasium.com/poise/poise-archive)
 [![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
-A [Chef](https://www.chef.io/) cookbook to unpack file archives like TAR and ZIP files.
+A [Chef](https://www.chef.io/) cookbook to unpack file archives.
 
-**NOTE:** ZIP files are not supported yet, stay tuned.
+It supports `.tar`, `.tar.gz`, `.tar.bz2`, and `.zip` archive files.
 
 ## Quick Start
 
@@ -27,6 +27,12 @@ remote_file "#{Chef::Config[:file_cache_path]}/myapp.tgz" do
 end
 ```
 
+## 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
+implementation.
+
 ## Resources
 
 ### `poise_archive`

data/lib/poise_archive/archive_providers.rb

@@ -16,6 +16,7 @@
 
 require 'chef/platform/provider_priority_map'
 
+require 'poise_archive/archive_providers/gnu_tar'
 require 'poise_archive/archive_providers/tar'
 require 'poise_archive/archive_providers/zip'
 
@@ -27,6 +28,7 @@ module PoiseArchive
   module ArchiveProviders
     # Set up priority maps
     Chef::Platform::ProviderPriorityMap.instance.priority(:poise_archive, [
+      PoiseArchive::ArchiveProviders::GnuTar,
       PoiseArchive::ArchiveProviders::Tar,
       PoiseArchive::ArchiveProviders::Zip,
     ])

data/lib/poise_archive/archive_providers/base.rb

@@ -55,11 +55,13 @@ module PoiseArchive
       #
       # @return [void]
       def action_unpack
-        notifying_block do
-          create_directory
+        converge_by("unpack archive #{new_resource.path} to #{new_resource.absolute_destination}") do
+          notifying_block do
+            create_directory
+          end
+          empty_directory
+          unpack_archive
         end
-        empty_directory
-        unpack_archive
       end
 
       private

data/lib/poise_archive/archive_providers/gnu_tar.rb

@@ -0,0 +1,82 @@
+#
+# Copyright 2016, 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 `gnu_tar` provider class for `poise_archive` to install from TAR
+    # archives using GNU's tar executable.
+    #
+    # @see PoiseArchive::Resources::PoiseArchive::Resource
+    # @provides poise_archive
+    class GnuTar < Base
+      provides_extension(/\.t(ar|gz|bz|xz)/)
+
+      # Only use this if we are on Linux. Everyone else gets the slow Ruby code.
+      #
+      # @api private
+      def self.provides?(node, _resource)
+        super && node['os'] == 'linux'
+      end
+
+      private
+
+      def unpack_archive
+        notifying_block do
+          install_prereqs
+        end
+        unpack_tar
+      end
+
+      # Install any needed prereqs.
+      #
+      # @return [void]
+      def install_prereqs
+        utils = ['tar']
+        utils << 'bzip2' if new_resource.path =~ /\.t?bz/
+        utils << 'xz-utils' if new_resource.path =~ /\.t?xz/
+        # This is a resource.
+        package utils
+      end
+
+      # Unpack the archive and process `strip_components`.
+      #
+      # @return [void]
+      def unpack_tar
+        # Build the tar command.
+        cmd = %w{tar}
+        cmd << "--strip-components=#{new_resource.strip_components}" if new_resource.strip_components && new_resource.strip_components > 0
+        cmd << if new_resource.path =~ /\.t?gz/
+          '-xzvf'
+        elsif new_resource.path =~ /\.t?bz/
+          '-xjvf'
+        elsif new_resource.path =~ /\.t?xz/
+          '-xJvf'
+        else
+          '-xvf'
+        end
+        cmd << new_resource.path
+        poise_shell_out!(cmd, cwd: new_resource.absolute_destination, group: new_resource.group, user: new_resource.user)
+      end
+
+    end
+  end
+end

data/lib/poise_archive/archive_providers/tar.rb

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-require 'fileutils'
 require 'rubygems/package'
 require 'zlib'
 
@@ -41,12 +40,14 @@ module PoiseArchive
 
       def unpack_archive
         unpack_tar
+        chown_entries if new_resource.user || new_resource.group
       end
 
       # Unpack the archive.
       #
       # @return [void]
       def unpack_tar
+        @tar_entry_paths = []
         tar_each_with_longlink do |entry|
           entry_name = entry.full_name.split(/\//).drop(new_resource.strip_components).join('/')
           # If strip_components wiped out the name, don't process this entry.
@@ -54,18 +55,20 @@ module PoiseArchive
           dest = ::File.join(new_resource.destination, entry_name)
           if entry.directory?
             Dir.mkdir(dest, entry.header.mode)
+            @tar_entry_paths << [:directory, dest]
           elsif entry.file?
             ::File.open(dest, 'wb', entry.header.mode) do |dest_f|
               while buf = entry.read(4096)
                 dest_f.write(buf)
               end
             end
+            @tar_entry_paths << [:file, dest]
           elsif entry.header.typeflag == '2' # symlink? is new in Ruby 2.0, apparently.
             ::File.symlink(entry.header.linkname, dest)
+            @tar_entry_paths << [:link, dest]
           else
             raise RuntimeError.new("Unknown tar entry type #{entry.header.typeflag.inspect} in #{new_resource.path}")
           end
-          FileUtils.chown(new_resource.user, new_resource.group, dest)
         end
       end
 
@@ -138,6 +141,18 @@ module PoiseArchive
         end
       end
 
+      def chown_entries
+        paths = @tar_entry_paths
+        notifying_block do
+          paths.each do |type, path|
+            send(type, path) do
+              group new_resource.group
+              owner new_resource.user
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/poise_archive/archive_providers/zip.rb

@@ -25,6 +25,54 @@ module PoiseArchive
     # @provides poise_archive
     class Zip < Base
       provides_extension(/\.zip$/)
+
+      private
+
+      def unpack_archive
+        check_rubyzip
+        unpack_zip
+        chown_entries if new_resource.user || new_resource.group
+      end
+
+      def check_rubyzip
+        require 'zip'
+      rescue LoadError
+        notifying_block do
+          install_rubyzip
+        end
+        require 'zip'
+      end
+
+      def install_rubyzip
+        chef_gem 'rubyzip'
+      end
+
+      def unpack_zip
+        @zip_entry_paths = []
+        ::Zip::File.open(new_resource.path) do |zip_file|
+          zip_file.each do |entry|
+            entry_name = entry.name.split(/\//).drop(new_resource.strip_components).join('/')
+            # 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)
+            entry.extract(entry_path)
+            @zip_entry_paths << [entry.directory? ? :directory : entry.file? ? :file : :link, entry_path]
+          end
+        end
+      end
+
+      def chown_entries
+        paths = @zip_entry_paths
+        notifying_block do
+          paths.each do |type, path|
+            send(type, path) do
+              group new_resource.group
+              owner new_resource.user
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/poise_archive/resources/poise_archive.rb

@@ -57,19 +57,26 @@ module PoiseArchive
         #   like GNU tar's --strip-components.
         #   @return [Integer]
         attribute(:strip_components, kind_of: Integer, default: 1)
-        # @!attribute group
+        # @!attribute user
         #   User to run the unpack as.
         #   @return [String, Integer, nil, false]
         attribute(:user, kind_of: [String, Integer, NilClass, FalseClass])
 
+        # Alias for the forgetful.
+        # @api private
+        alias_method :owner, :user
+
         def absolute_path
           ::File.expand_path(path, Chef::Config[:file_cache_path])
         end
 
+        # Filename components to ignore.
+        # @api private
+        BASENAME_IGNORE = /(\.(t?(ar|gz|bz2?|xz)|zip))+$/
+
         def absolute_destination
           destination || begin
-            basename = ::File.basename(path)
-            ::File.join(::File.dirname(absolute_path), basename.split(/\./).find {|part| !part.empty? } || basename)
+            ::File.join(::File.dirname(absolute_path), ::File.basename(path).gsub(BASENAME_IGNORE, ''))
           end
         end
       end

data/lib/poise_archive/version.rb

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

data/test/cookbook/recipes/default.rb

@@ -19,49 +19,70 @@ directory '/test' do
   mode '777'
 end
 
+# Test user/group.
+group 'gpoise' do
+  system true
+end
+
+user 'poise' do
+  group 'gpoise'
+  system true
+end
+
 # Tests for each fixture file.
-%w{tar tar.gz tar.bz2}.each do |ext|
-  cookbook_file "/test/myapp-1.0.0.#{ext}" do
-    source "myapp-1.0.0.#{ext}"
+[
+  {ext: 'tar', provider: nil},
+  {ext: 'tar.gz', provider: nil},
+  {ext: 'tar.bz2', provider: nil},
+  {ext: 'zip', provider: nil},
+  {ext: 'tar', provider: PoiseArchive::ArchiveProviders::Tar},
+  {ext: 'tar.gz', provider: PoiseArchive::ArchiveProviders::Tar},
+  {ext: 'tar.bz2', provider: PoiseArchive::ArchiveProviders::Tar},
+  {ext: 'tar', provider: PoiseArchive::ArchiveProviders::GnuTar, only_if: proc { node['os'] == 'linux' }},
+  {ext: 'tar.gz', provider: PoiseArchive::ArchiveProviders::GnuTar, only_if: proc { node['os'] == 'linux' }},
+  {ext: 'tar.bz2', provider: PoiseArchive::ArchiveProviders::GnuTar, only_if: proc { node['os'] == 'linux' }},
+  {ext: 'zip', provider: PoiseArchive::ArchiveProviders::Zip},
+].each do |test|
+  next if test[:only_if] && !test[:only_if].call
+  test_base = "/test/#{test[:provider].to_s.split('::').last || 'default'}"
+  directory test_base do
+    mode '777'
+  end
+
+  cookbook_file "#{test_base}/myapp-1.0.0.#{test[:ext]}" do
+    source "myapp-1.0.0.#{test[:ext]}"
   end
 
-  poise_archive "/test/myapp-1.0.0.#{ext}" do
-    destination "/test/#{ext}"
+  poise_archive "#{test_base}/myapp-1.0.0.#{test[:ext]}" do
+    destination "#{test_base}/#{test[:ext]}"
+    provider test[:provider] if test[:provider]
   end
 
-  poise_archive "/test/myapp-1.0.0.#{ext}_0" do
-    path "/test/myapp-1.0.0.#{ext}"
-    destination "/test/#{ext}_0"
+  poise_archive "#{test_base}/myapp-1.0.0.#{test[:ext]}_0" do
+    path "#{test_base}/myapp-1.0.0.#{test[:ext]}"
+    destination "#{test_base}/#{test[:ext]}_0"
+    provider test[:provider] if test[:provider]
     strip_components 0
   end
 
-  poise_archive "/test/myapp-1.0.0.#{ext}_2" do
-    path "/test/myapp-1.0.0.#{ext}"
-    destination "/test/#{ext}_2"
+  poise_archive "#{test_base}/myapp-1.0.0.#{test[:ext]}_2" do
+    path "#{test_base}/myapp-1.0.0.#{test[:ext]}"
+    destination "#{test_base}/#{test[:ext]}_2"
+    provider test[:provider] if test[:provider]
     strip_components 2
   end
-end
 
-# Some general tests for core features.
-# Test user-specific unpacking.
-group 'poise' do
-  system true
-end
-
-user 'poise' do
-  group 'poise'
-  system true
-end
-
-directory '/test/user' do
-  group 'poise'
-  mode '700'
-  owner 'poise'
+  poise_archive "#{test_base}/myapp-1.0.0.#{test[:ext]}_user" do
+    path "#{test_base}/myapp-1.0.0.#{test[:ext]}"
+    destination "#{test_base}/#{test[:ext]}_user"
+    provider test[:provider] if test[:provider]
+    user 'poise'
+  end
 end
 
-poise_archive '/test/myapp-1.0.0.tar' do
-  destination '/test/user'
-  user 'poise'
+# Some general tests for core features.
+cookbook_file '/test/myapp-1.0.0.tar' do
+  source 'myapp-1.0.0.tar'
 end
 
 # Test keep_existing true.

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

@@ -14,8 +14,17 @@
 # limitations under the License.
 #
 
+require 'rbconfig'
+
 require 'serverspec'
-set :backend, :exec
+
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  set :backend, :cmd
+  set :os, :family => 'windows'
+else
+  set :backend, :exec
+end
+
 
 RSpec.shared_examples 'a poise_archive test' do |ext|
   base = "/test/#{ext}"
@@ -35,28 +44,69 @@ RSpec.shared_examples 'a poise_archive test' do |ext|
   describe file("#{base}_2/main.c") do
     it { is_expected.to be_a_file }
   end
+  describe file("#{base}_user") do
+    it { is_expected.to be_owned_by 'poise' }
+    it { is_expected.to be_mode '755' } unless os[:family] == 'windows'
+  end
+  describe file("#{base}_user/README") do
+    it { is_expected.to be_owned_by 'poise' }
+    it { is_expected.to be_mode '644' } unless os[:family] == 'windows'
+  end
 end
 
-describe 'tar' do
-  it_should_behave_like 'a poise_archive test', 'tar'
-end
+describe 'default provider' do
+  describe 'tar' do
+    it_should_behave_like 'a poise_archive test', 'default/tar'
+  end
+
+  describe 'tar.gz' do
+    it_should_behave_like 'a poise_archive test', 'default/tar.gz'
+  end
 
-describe 'tar.gz' do
-  it_should_behave_like 'a poise_archive test', 'tar.gz'
+  describe 'tar.bz2' do
+    it_should_behave_like 'a poise_archive test', 'default/tar.bz2'
+  end
+
+  describe 'zip' do
+    it_should_behave_like 'a poise_archive test', 'default/zip'
+  end
 end
 
-describe 'tar.bz2' do
-  it_should_behave_like 'a poise_archive test', 'tar.bz2'
+describe 'Tar provider' do
+  describe 'tar' do
+    it_should_behave_like 'a poise_archive test', 'Tar/tar'
+  end
+
+  describe 'tar.gz' do
+    it_should_behave_like 'a poise_archive test', 'Tar/tar.gz'
+  end
+
+  describe 'tar.bz2' do
+    it_should_behave_like 'a poise_archive test', 'Tar/tar.bz2'
+  end
 end
 
-describe 'core features' do
-  describe file('/test/user') do
-    it { is_expected.to be_owned_by 'poise' }
-    it { is_expected.to be_mode '700' }
+describe 'GnuTar provider', if: File.exist?('/test/GnuTar') do
+  describe 'tar' do
+    it_should_behave_like 'a poise_archive test', 'GnuTar/tar'
   end
-  describe file('/test/user/README') do
-    it { is_expected.to be_owned_by 'poise' }
+
+  describe 'tar.gz' do
+    it_should_behave_like 'a poise_archive test', 'GnuTar/tar.gz'
   end
+
+  describe 'tar.bz2' do
+    it_should_behave_like 'a poise_archive test', 'GnuTar/tar.bz2'
+  end
+end
+
+describe 'Zip provider' do
+  describe 'zip' do
+    it_should_behave_like 'a poise_archive test', 'Zip/zip'
+  end
+end
+
+describe 'core features' do
   describe file('/test/keep/EXISTING') do
     it { is_expected.to be_a_file }
   end

data/test/spec/archive_providers/gnu_tar_spec.rb

@@ -0,0 +1,166 @@
+#
+# Copyright 2016, 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 'spec_helper'
+
+FIXTURES_PATH = File.expand_path('../../../cookbook/files', __FILE__)
+
+describe PoiseArchive::ArchiveProviders::GnuTar do
+  step_into(:poise_archive)
+  let(:archive_provider) { chef_run.poise_archive('myapp').provider_for_action(:unpack) }
+  before do
+    chefspec_options.update(platform: 'ubuntu', version: '14.04')
+    # Stub out some stuff from the base class.
+    expect(Dir).to receive(:mkdir).and_call_original
+    allow(Dir).to receive(:entries).and_call_original
+    allow(Dir).to receive(:entries).with('/test/myapp').and_return(%w{. ..})
+  end
+
+  context 'with a .tar path' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar"
+        destination '/test/myapp'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xvf /test/myapp-1.0.0.tar}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with a .tar path
+
+  context 'with a .tar.gz path' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar.gz"
+        destination '/test/myapp'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xzvf /test/myapp-1.0.0.tar.gz}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with a .tar.gz path
+
+  context 'with a .tar.bz2 path' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar.bz2"
+        destination '/test/myapp'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xjvf /test/myapp-1.0.0.tar.bz2}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with a .tar.bz2 path
+
+  context 'with a .tgz path' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tgz"
+        destination '/test/myapp'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xzvf /test/myapp-1.0.0.tgz}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with a .tgz path
+
+  context 'with a .tbz2 path' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tbz2"
+        destination '/test/myapp'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xjvf /test/myapp-1.0.0.tbz2}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with a .tbz2 path
+
+  context 'with strip_components 0' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar"
+        destination '/test/myapp'
+        strip_components 0
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar -xvf /test/myapp-1.0.0.tar}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+    end
+  end # /context with strip_components 0
+
+  context 'with strip_components 2' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar"
+        destination '/test/myapp'
+        strip_components 2
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=2 -xvf /test/myapp-1.0.0.tar}, cwd: '/test/myapp', group: nil, user: nil)
+      run_chef
+    end
+  end # /context with strip_components 2
+
+  context 'with a user' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar"
+        destination '/test/myapp'
+        user 'myuser'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xvf /test/myapp-1.0.0.tar}, cwd: '/test/myapp', group: nil, user: 'myuser')
+      run_chef
+    end
+  end # /context with a user
+
+  context 'with a group' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar"
+        destination '/test/myapp'
+        group 'mygroup'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(%w{tar --strip-components=1 -xvf /test/myapp-1.0.0.tar}, cwd: '/test/myapp', group: 'mygroup', user: nil)
+      run_chef
+    end
+  end # /context with a group
+end

data/test/spec/archive_providers/tar_spec.rb

@@ -20,70 +20,66 @@ FIXTURES_PATH = File.expand_path('../../../cookbook/files', __FILE__)
 
 describe PoiseArchive::ArchiveProviders::Tar do
   step_into(:poise_archive)
+  let(:archive_provider) { chef_run.poise_archive('myapp').provider_for_action(:unpack) }
+  before do
+    expect(Dir).to receive(:mkdir).and_call_original
+    allow(Dir).to receive(:entries).and_call_original
+    allow(Dir).to receive(:entries).with('/test/myapp').and_return(%w{. ..})
+    allow(File).to receive(:open).and_call_original
+    allow(File).to receive(:open).with('/test/myapp-1.0.0.tar', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar')) }
+    allow(File).to receive(:open).with('/test/myapp-1.0.0.tar.gz', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.gz')) }
+    allow(File).to receive(:open).with('/test/myapp-1.0.0.tgz', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.gz')) }
+    allow(File).to receive(:open).with('/test/myapp-1.0.0.tar.bz2', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.bz2')) }
+    allow(File).to receive(:open).with('/test/myapp-1.0.0.tbz2', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.bz2')) }
+  end
 
-  describe '#action_unpack' do
-    let(:archive_provider) { chef_run.poise_archive('myapp').provider_for_action(:unpack) }
-    before do
-      # allow(described_class).to receive(:mktmpdir).and_yield('/test')
-      expect(Dir).to receive(:mkdir).and_call_original
-      allow(Dir).to receive(:entries).and_call_original
-      allow(Dir).to receive(:entries).with('/test/myapp').and_return(%w{. ..})
-      # expect_any_instance_of(described_class).to receive(:poise_shell_out!).with(tar_cmd, cwd: '/test', group: nil, user: nil)
-      # expect_any_instance_of(described_class).to receive(:entries_at_depth).with('/test', 1).and_return(%w{/test/myapp/bin /test/myapp/src})
-      # expect(File).to receive(:rename).with('/test/myapp/bin', '/root/myapp/bin')
-      # expect(File).to receive(:rename).with('/test/myapp/src', '/root/myapp/src')
-      allow(File).to receive(:open).and_call_original
-      allow(File).to receive(:open).with('/test/myapp-1.0.0.tar', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar')) }
-      allow(File).to receive(:open).with('/test/myapp-1.0.0.tar.gz', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.gz')) }
-      allow(File).to receive(:open).with('/test/myapp-1.0.0.tgz', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.gz')) }
-      allow(File).to receive(:open).with('/test/myapp-1.0.0.tar.bz2', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.bz2')) }
-      allow(File).to receive(:open).with('/test/myapp-1.0.0.tbz2', 'rb') { File.open(File.join(FIXTURES_PATH, 'myapp-1.0.0.tar.bz2')) }
-    end
-
-    RSpec.shared_examples 'a poise_archive test' do |ext|
-      recipe do
-        poise_archive 'myapp' do
-          path "/test/myapp-1.0.0.#{ext}"
-          destination '/test/myapp'
-        end
+  RSpec.shared_examples 'a poise_archive tar test' do |ext|
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.#{ext}"
+        destination '/test/myapp'
+        user 'myuser'
       end
+    end
 
-      def expect_file(path, content, mode)
-        fake_file = double("file for #{path}")
-        expect(fake_file).to receive(:write).with(content)
-        allow(File).to receive(:open).with(path, 'wb', mode).and_yield(fake_file)
-        expect(FileUtils).to receive(:chown).with(nil, nil, path)
-      end
+    def expect_file(path, content, mode)
+      fake_file = double("file for #{path}")
+      expect(fake_file).to receive(:write).with(content)
+      allow(File).to receive(:open).with(path, 'wb', mode).and_yield(fake_file)
+    end
 
-      it 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(FileUtils).to receive(:chown).with(nil, nil, '/test/myapp/src')
-        expect_file('/test/myapp/src/main.c', "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n", 0644)
-        run_chef
-        expect(archive_provider).to be_a described_class
-      end
+    it 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_file('/test/myapp/src/main.c', "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n", 0644)
+      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_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)
     end
+  end
 
-    context 'with a .tar path' do
-      it_should_behave_like 'a poise_archive test', 'tar'
-    end # /context with a .tar path
+  context 'with a .tar path' do
+    it_should_behave_like 'a poise_archive tar test', 'tar'
+  end # /context with a .tar path
 
-    context 'with a .tar.gz path' do
-      it_should_behave_like 'a poise_archive test', 'tar.gz'
-    end # /context with a .tar.gz path
+  context 'with a .tar.gz path' do
+    it_should_behave_like 'a poise_archive tar test', 'tar.gz'
+  end # /context with a .tar.gz path
 
-    context 'with a .tar.bz2 path' do
-      it_should_behave_like 'a poise_archive test', 'tar.bz2'
-    end # /context with a .tar.bz2 path
+  context 'with a .tar.bz2 path' do
+    it_should_behave_like 'a poise_archive tar test', 'tar.bz2'
+  end # /context with a .tar.bz2 path
 
-    context 'with a .tgz path' do
-      it_should_behave_like 'a poise_archive test', 'tgz'
-    end # /context with a .tgz path
+  context 'with a .tgz path' do
+    it_should_behave_like 'a poise_archive tar test', 'tgz'
+  end # /context with a .tgz path
 
-    context 'with a .tbz2 path' do
-      it_should_behave_like 'a poise_archive test', 'tbz2'
-    end # /context with a .tbz2 path
-  end # /describe #action_unpack
+  context 'with a .tbz2 path' do
+    it_should_behave_like 'a poise_archive tar test', 'tbz2'
+  end # /context with a .tbz2 path
 end

data/test/spec/resources/poise_archive_spec.rb

@@ -69,19 +69,83 @@ describe PoiseArchive::Resources::PoiseArchive do
     end # /context an explicit destination
   end # /context a relative path
 
-  context 'with a two-extension path' do
+  context 'with .tar.gz' do
     recipe do
       poise_archive '/tmp/myapp.tar.gz'
     end
 
     it { is_expected.to unpack_poise_archive('/tmp/myapp.tar.gz').with(absolute_path: '/tmp/myapp.tar.gz', absolute_destination: '/tmp/myapp') }
-  end # /context with a two-extension path
+  end # /context with .tar.gz
+
+  context 'with .tgz' do
+    recipe do
+      poise_archive '/tmp/myapp.tgz'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tgz').with(absolute_path: '/tmp/myapp.tgz', absolute_destination: '/tmp/myapp') }
+  end # /context with .tgz
+
+  context 'with .tar.bz2' do
+    recipe do
+      poise_archive '/tmp/myapp.tar.bz2'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tar.bz2').with(absolute_path: '/tmp/myapp.tar.bz2', absolute_destination: '/tmp/myapp') }
+  end # /context with .tar.bz2
+
+  context 'with .tbz2' do
+    recipe do
+      poise_archive '/tmp/myapp.tbz2'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tbz2').with(absolute_path: '/tmp/myapp.tbz2', absolute_destination: '/tmp/myapp') }
+  end # /context with .tbz2
+
+  context 'with .tar.xz' do
+    recipe do
+      poise_archive '/tmp/myapp.tar.xz'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tar.xz').with(absolute_path: '/tmp/myapp.tar.xz', absolute_destination: '/tmp/myapp') }
+  end # /context with .tar.xz
+
+  context 'with .txz' do
+    recipe do
+      poise_archive '/tmp/myapp.txz'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.txz').with(absolute_path: '/tmp/myapp.txz', absolute_destination: '/tmp/myapp') }
+  end # /context with .txz
+
+  context 'with .zip' do
+    recipe do
+      poise_archive '/tmp/myapp.zip'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.zip').with(absolute_path: '/tmp/myapp.zip', absolute_destination: '/tmp/myapp') }
+  end # /context with .zip
 
   context 'with a hidden file' do
     recipe do
       poise_archive '/tmp/.myapp.tar'
     end
 
-    it { is_expected.to unpack_poise_archive('/tmp/.myapp.tar').with(absolute_path: '/tmp/.myapp.tar', absolute_destination: '/tmp/myapp') }
+    it { is_expected.to unpack_poise_archive('/tmp/.myapp.tar').with(absolute_path: '/tmp/.myapp.tar', absolute_destination: '/tmp/.myapp') }
   end # /context with a hidden file
+
+  context 'with a version number' do
+    recipe do
+      poise_archive '/tmp/myapp-1.0.0.tar'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp-1.0.0.tar').with(absolute_path: '/tmp/myapp-1.0.0.tar', absolute_destination: '/tmp/myapp-1.0.0') }
+  end # /context with a version number
+
+  context 'with a version number and .tar.gz' do
+    recipe do
+      poise_archive '/tmp/myapp-1.0.0.tar.gz'
+    end
+
+    it { is_expected.to unpack_poise_archive('/tmp/myapp-1.0.0.tar.gz').with(absolute_path: '/tmp/myapp-1.0.0.tar.gz', absolute_destination: '/tmp/myapp-1.0.0') }
+  end # /context with a version number and .tar.gz
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-archive
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -71,6 +71,7 @@ files:
 - lib/poise_archive.rb
 - lib/poise_archive/archive_providers.rb
 - lib/poise_archive/archive_providers/base.rb
+- lib/poise_archive/archive_providers/gnu_tar.rb
 - lib/poise_archive/archive_providers/tar.rb
 - lib/poise_archive/archive_providers/zip.rb
 - lib/poise_archive/bzip2.rb
@@ -102,6 +103,7 @@ files:
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
+- test/spec/archive_providers/gnu_tar_spec.rb
 - test/spec/archive_providers/tar_spec.rb
 - test/spec/archive_providers/zip_spec.rb
 - test/spec/resources/poise_archive_spec.rb
@@ -148,6 +150,7 @@ test_files:
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
+- test/spec/archive_providers/gnu_tar_spec.rb
 - test/spec/archive_providers/tar_spec.rb
 - test/spec/archive_providers/zip_spec.rb
 - test/spec/resources/poise_archive_spec.rb