poise-archive 1.3.0 → 1.4.0

data/test/gemfiles/chef-12.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-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.
@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.6'
+gem 'chef', '~> 12.18'

data/test/gemfiles/master.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-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/test/integration/default/serverspec/default_spec.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.
@@ -36,17 +36,17 @@ RSpec.shared_examples 'a poise_archive test' do |ext|
     its(:content) { is_expected.to eq "This is a project!\n\n" }
   end
   describe file("#{base}/src/main.c") do
-    it { is_expected.to be_a_file }
+    its(:content) { is_expected.to eq "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n" }
   end
   describe file("#{base}/bin/run.sh") do
-    it { is_expected.to be_a_file }
+    its(:content) { is_expected.to eq "#!/bin/sh\necho \"Started!\"\n" }
     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 }
+    its(:content) { is_expected.to eq "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n" }
   end
   describe file("#{base}_2/main.c") do
-    it { is_expected.to be_a_file }
+    its(:content) { is_expected.to eq "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n" }
   end
   describe file("#{base}_user") do
     it { is_expected.to be_owned_by 'poise' }
@@ -64,7 +64,7 @@ RSpec.shared_examples 'a poise_archive test' do |ext|
     its(:content) { is_expected.to eq "This is a project!\n\n" }
   end
   describe file("#{base}_http/src/main.c") do
-    it { is_expected.to be_a_file }
+    its(:content) { is_expected.to eq "int main(int argc, char **argv)\n{\n  return 0;\n}\n\n" }
   end
 end
 
@@ -81,6 +81,10 @@ describe 'default provider' do
     it_should_behave_like 'a poise_archive test', 'default/tar.bz2'
   end
 
+  describe 'tar.xz' do
+    it_should_behave_like 'a poise_archive test', 'default/tar.xz'
+  end
+
   describe 'zip' do
     it_should_behave_like 'a poise_archive test', 'default/zip'
   end
@@ -112,6 +116,10 @@ describe 'GnuTar provider', if: File.exist?('/test/GnuTar') do
   describe 'tar.bz2' do
     it_should_behave_like 'a poise_archive test', 'GnuTar/tar.bz2'
   end
+
+  describe 'tar.xz' do
+    it_should_behave_like 'a poise_archive test', 'GnuTar/tar.xz'
+  end
 end
 
 describe 'Zip provider' do
@@ -120,6 +128,28 @@ describe 'Zip provider' do
   end
 end
 
+describe 'SevenZip provider', if: File.exist?('/test/SevenZip') do
+  describe 'tar' do
+    it_should_behave_like 'a poise_archive test', 'SevenZip/tar'
+  end
+
+  describe 'tar.gz' do
+    it_should_behave_like 'a poise_archive test', 'SevenZip/tar.gz'
+  end
+
+  describe 'tar.bz2' do
+    it_should_behave_like 'a poise_archive test', 'SevenZip/tar.bz2'
+  end
+
+  describe 'tar.xz' do
+    it_should_behave_like 'a poise_archive test', 'SevenZip/tar.xz'
+  end
+
+  describe 'zip' do
+    it_should_behave_like 'a poise_archive test', 'SevenZip/zip'
+  end
+end
+
 describe 'core features' do
   describe file('/test/keep/EXISTING') do
     it { is_expected.to be_a_file }

data/test/spec/archive_providers/gnu_tar_spec.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.
@@ -16,8 +16,6 @@
 
 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) }

data/test/spec/archive_providers/seven_zip_spec.rb

@@ -0,0 +1,151 @@
+#
+# 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 'spec_helper'
+
+describe PoiseArchive::ArchiveProviders::SevenZip do
+  step_into(:poise_archive)
+  let(:chefspec_options) { {platform: 'windows', version: '2012R2', file_cache_path: '/cache'} }
+  let(:archive_provider) { chef_run.poise_archive('myapp').provider_for_action(:unpack) }
+  before do
+    # Stub out some stuff from the base class.
+    allow(Dir).to receive(:entries).and_call_original
+    allow(Dir).to receive(:entries).with('/test/myapp').and_return(%w{. ..})
+    # Don't make real temp folders.
+    allow(described_class).to receive(:mktmpdir).and_yield('/poisetmp')
+    # Stub out what would be in the temp folder if unpacking worked.
+    allow(File).to receive(:directory?).and_call_original
+    allow(File).to receive(:directory?).with(/^\/poisetmp/) {|p| %w{/poisetmp /poisetmp/myapp-1.0.0 /poisetmp/myapp-1.0.0/bin /poisetmp/myapp-1.0.0/src}.include?(p) }
+    allow(Dir).to receive(:entries).with(/^\/poisetmp/) {|p| %w{. ..} + ({
+      '/poisetmp' => %w{myapp-1.0.0},
+      '/poisetmp/myapp-1.0.0' => %w{bin src LICENSE README},
+      '/poisetmp/myapp-1.0.0/bin' => %w{run.sh},
+      '/poisetmp/myapp-1.0.0/src' => %w{main.c},
+    }[p] || []) }
+  end
+
+  # Because there isn't a built-in matcher for this.
+  RSpec::Matchers.define :nothing_execute do |name|
+    match do |chef_run|
+      chef_run.execute(name).performed_actions == []
+    end
+  end
+
+  context 'with defaults' 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(:shell_out!).with('\\cache\\seven_zip_16.04\\7z.exe x -o"\\poisetmp" "\\test\\myapp-1.0.0.tar"')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/bin', '/test/myapp/bin')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/src', '/test/myapp/src')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/LICENSE', '/test/myapp/LICENSE')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/README', '/test/myapp/README')
+      run_chef
+      expect(archive_provider).to be_a described_class
+      expect(chef_run).to create_remote_file('/cache/7z1604-x64.exe').with(source: 'http://www.7-zip.org/a/7z1604-x64.exe')
+      expect(chef_run).to nothing_execute('\\cache\\7z1604-x64.exe /S /D=\\cache\\seven_zip_16.04')
+    end
+  end # /context with defaults
+
+  context 'with tar.gz archive' 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(:shell_out!).with('\\cache\\seven_zip_16.04\\7z.exe x -so "\\test\\myapp-1.0.0.tar.gz" | \\cache\\seven_zip_16.04\\7z.exe x -si -ttar -o"\\poisetmp"')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/bin', '/test/myapp/bin')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/src', '/test/myapp/src')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/LICENSE', '/test/myapp/LICENSE')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/README', '/test/myapp/README')
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with tar.gz archive
+
+  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(:shell_out!).with('\\cache\\seven_zip_16.04\\7z.exe x -o"\\poisetmp" "\\test\\myapp-1.0.0.tar"')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0', '/test/myapp/myapp-1.0.0')
+      run_chef
+      expect(archive_provider).to be_a described_class
+    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(:shell_out!).with('\\cache\\seven_zip_16.04\\7z.exe x -o"\\poisetmp" "\\test\\myapp-1.0.0.tar"')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/bin/run.sh', '/test/myapp/run.sh')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/src/main.c', '/test/myapp/main.c')
+      run_chef
+      expect(archive_provider).to be_a described_class
+    end
+  end # /context with strip_components 2
+
+  context 'with user and group' do
+    recipe do
+      poise_archive 'myapp' do
+        path "/test/myapp-1.0.0.tar"
+        destination '/test/myapp'
+        user 'myuser'
+        group 'mygroup'
+      end
+    end
+
+    it do
+      expect_any_instance_of(described_class).to receive(:shell_out!).with('\\cache\\seven_zip_16.04\\7z.exe x -o"\\poisetmp" "\\test\\myapp-1.0.0.tar"')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/bin', '/test/myapp/bin')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/src', '/test/myapp/src')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/LICENSE', '/test/myapp/LICENSE')
+      expect(File).to receive(:rename).with('/poisetmp/myapp-1.0.0/README', '/test/myapp/README')
+      allow(Dir).to receive(:[]).and_call_original
+      expect(Dir).to receive(:[]).with('/poisetmp/**/*').and_return(%w{/poisetmp/myapp-1.0.0 /poisetmp/myapp-1.0.0/bin /poisetmp/myapp-1.0.0/src /poisetmp/myapp-1.0.0/bin/run.sh /poisetmp/myapp-1.0.0/src/main.c /poisetmp/myapp-1.0.0/LICENSE /poisetmp/myapp-1.0.0/README})
+      run_chef
+      expect(archive_provider).to be_a described_class
+      expect(chef_run).to create_directory('/poisetmp/myapp-1.0.0').with(user: 'myuser', group: 'mygroup')
+      expect(chef_run).to create_directory('/poisetmp/myapp-1.0.0/bin').with(user: 'myuser', group: 'mygroup')
+      expect(chef_run).to create_directory('/poisetmp/myapp-1.0.0/src').with(user: 'myuser', group: 'mygroup')
+      expect(chef_run).to create_file('/poisetmp/myapp-1.0.0/bin/run.sh').with(user: 'myuser', group: 'mygroup')
+      expect(chef_run).to create_file('/poisetmp/myapp-1.0.0/src/main.c').with(user: 'myuser', group: 'mygroup')
+      expect(chef_run).to create_file('/poisetmp/myapp-1.0.0/LICENSE').with(user: 'myuser', group: 'mygroup')
+      expect(chef_run).to create_file('/poisetmp/myapp-1.0.0/README').with(user: 'myuser', group: 'mygroup')
+    end
+  end # /context with user and group
+end

data/test/spec/archive_providers/tar_spec.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.
@@ -20,6 +20,7 @@ FIXTURES_PATH = File.expand_path('../../../cookbook/files', __FILE__)
 
 describe PoiseArchive::ArchiveProviders::Tar do
   step_into(:poise_archive)
+  let(:chefspec_options) { {platform: 'mac_os_x', version: '10.12'} }
   let(:archive_provider) { chef_run.poise_archive('myapp').provider_for_action(:unpack) }
   before do
     expect(Dir).to receive(:mkdir).and_call_original

data/test/spec/archive_providers/zip_spec.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/test/spec/resources/poise_archive_spec.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/test/spec/spec_helper.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.

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: poise-archive
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: halite
   requirement: !ruby/object:Gem::Requirement
@@ -68,10 +82,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- chef/attributes/default.rb
 - 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/seven_zip.rb
 - lib/poise_archive/archive_providers/tar.rb
 - lib/poise_archive/archive_providers/zip.rb
 - lib/poise_archive/bzip2.rb
@@ -89,21 +105,39 @@ files:
 - test/cookbook/files/myapp-1.0.0.tar
 - test/cookbook/files/myapp-1.0.0.tar.bz2
 - test/cookbook/files/myapp-1.0.0.tar.gz
+- test/cookbook/files/myapp-1.0.0.tar.xz
 - test/cookbook/files/myapp-1.0.0.zip
+- test/cookbook/files/myapp-1.0.0/LICENSE
+- test/cookbook/files/myapp-1.0.0/README
+- test/cookbook/files/myapp-1.0.0/bin/run.sh
+- test/cookbook/files/myapp-1.0.0/src/main.c
 - test/cookbook/metadata.rb
 - test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.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/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
+- test/gemfiles/chef-12.9.gemfile
 - 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/seven_zip_spec.rb
 - test/spec/archive_providers/tar_spec.rb
 - test/spec/archive_providers/zip_spec.rb
 - test/spec/resources/poise_archive_spec.rb
@@ -136,21 +170,39 @@ test_files:
 - test/cookbook/files/myapp-1.0.0.tar
 - test/cookbook/files/myapp-1.0.0.tar.bz2
 - test/cookbook/files/myapp-1.0.0.tar.gz
+- test/cookbook/files/myapp-1.0.0.tar.xz
 - test/cookbook/files/myapp-1.0.0.zip
+- test/cookbook/files/myapp-1.0.0/LICENSE
+- test/cookbook/files/myapp-1.0.0/README
+- test/cookbook/files/myapp-1.0.0/bin/run.sh
+- test/cookbook/files/myapp-1.0.0/src/main.c
 - test/cookbook/metadata.rb
 - test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.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/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
+- test/gemfiles/chef-12.9.gemfile
 - 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/seven_zip_spec.rb
 - test/spec/archive_providers/tar_spec.rb
 - test/spec/archive_providers/zip_spec.rb
 - test/spec/resources/poise_archive_spec.rb