poise-archive 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd46ea17e4040f2682e412ffda579ad0401d4aec
-  data.tar.gz: dc92ac0690c79f6a37a252682cc6bce4e03299ab
+  metadata.gz: 4242f7231038390f4f5fe3cbbffc7fc396ac5192
+  data.tar.gz: 52c718b6e9bef94592ca87e0eca89b5dd9d42929
 SHA512:
-  metadata.gz: d69d2aabe6bf4eaf939b9e5816d52291225ffb3889aa19012a5b456b793a957de94fa82657e46925a2230fb71445d5fbee75463ad7abf78b86b0f63fc3627fff
-  data.tar.gz: 7066f0bdbbffefa0cd752a7a730b441eeada22949976316bc8ad50f3b6a160de12f9d4536a6c486b88c33aa0e12bb2a7c36adbd9461f42f84e571b9f498acbe6
+  metadata.gz: 986c52a2da5d576ecde9094a7362443a9ddb4bd2f50f05f7a58ef39d8a4e597c00c6e9a1f0dbd6805d27ce9c66fd9e82f1955f10e425edced02343d83009ef74
+  data.tar.gz: a35ad89c3af875f794553c898266a0a6e5f7676d486e1796b47ed0b240d43f379fe897e9cc9fd817c32de5693af245cd50e8818141bc485f0bc1c34d0193e515

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Archive Changelog
 
+## v1.3.0
+
+* Add support for unpacking directly from a URL.
+
 ## v1.2.1
 
 * [#1](https://github.com/poise/poise-archive/issues/1) Restore file permissions

data/README.md

@@ -16,15 +16,9 @@ It supports `.tar`, `.tar.gz`, `.tar.bz2`, and `.zip` archive files.
 To download an unpack and archive:
 
 ```ruby
-poise_archive 'myapp.tgz' do
-  action :nothing
+poise_archive 'https://example.com/myapp.tgz' do
   destination '/opt/myapp'
 end
-
-remote_file "#{Chef::Config[:file_cache_path]}/myapp.tgz" do
-  source 'https://example.com/myapp.tgz'
-  notifies :unpack, 'poise_archive[myapp.tgz]', :immediately
-end
 ```
 
 ## Platforms
@@ -45,6 +39,19 @@ poise_archive '/tmp/myapp-1.2.0.tar' do
 end
 ```
 
+A URL can also be passed as the source path, optionally with extra properties to
+be merged with `source_properties`.
+
+```ruby
+poise_archive 'http://example.com/myapp-1.2.0.zip' do
+  destination '/srv/myapp-1.2.0'
+end
+
+poise_archive ['http://example.com/myapp-1.2.0.zip', {headers: {'Authentication' => '...'}}] do
+  destination '/srv/myapp-1.2.0'
+end
+```
+
 #### Actions
 
 * `:unpack` – Unpack the archive. *(default)*
@@ -52,12 +59,16 @@ end
 #### Properties
 
 * `path` – Path to the archive. If relative, it is taken as a file inside
-  `Chef::Config[:file_cache_path]`. *(name attribute)*
+  `Chef::Config[:file_cache_path]`. If a URL, it is downloaded to a cache file
+  first. *(name attribute)*
 * `destination` – Path to unpack the archive to. If not specified, the path of
-  the archive without the file extension is used. *(default: auto)*
+  the archive without the file extension is used. Required when unpacking from
+  a URL. *(default: auto)*
 * `group` – Group to run the unpack as.
 * `keep_existing` – Keep existing files in the destination directory when
   unpacking. *(default: false)*
+* `source_properties` – Property key/value pairs to be applied to the
+  `remote_file` file resource when downloading a URL. *(default: {retries: 5})*
 * `strip_components` – Number of intermediary directories to skip when
   unpacking. Works like GNU tar's `--strip-components`. *(default: 1)*
 * `user` – User to run the unpack as.

data/lib/poise_archive/archive_providers/base.rb

@@ -55,7 +55,14 @@ module PoiseArchive
       #
       # @return [void]
       def action_unpack
-        converge_by("unpack archive #{new_resource.path} to #{new_resource.absolute_destination}") do
+        if new_resource.is_url?
+          download_resource = download_file
+          # Check if the download resource updated, if not don't run the rest
+          # of the unpack for idempotence. I could also check
+          # new_resource.updated? but this seems more future proof.
+          return if !download_resource.updated_by_last_action?
+        end
+        converge_by("unpack archive #{new_resource.path} to #{new_resource.destination}") do
           notifying_block do
             create_directory
           end
@@ -66,11 +73,31 @@ module PoiseArchive
 
       private
 
+      # Download the source file to a cache path.
+      #
+      # @return [Chef::Resource]
+      def download_file
+        # resource_state used for closure breaking on the notifying block.
+        resource_state = []
+        notifying_block do
+          # TODO handle cookbook:// for cookbook_file "downloads".
+          resource_state << remote_file(new_resource.absolute_path) do
+            source new_resource.path
+            retries 5 # As a default, could be overridden by source_properties.
+            new_resource.merged_source_properties.each do |key, value|
+              send(key, value)
+            end
+          end
+        end
+        # Return the download resource for state tracking.
+        resource_state.first
+      end
+
       # Make sure the destination directory exists.
       #
       # @return [void]
       def create_directory
-        directory new_resource.absolute_destination do
+        directory new_resource.destination do
           group new_resource.group if new_resource.group
           owner new_resource.user if new_resource.user
           # There is explicitly no mode being set here. If a non-default mode
@@ -85,7 +112,7 @@ module PoiseArchive
       def empty_directory
         # If you want to keep it, not my problem.
         return if new_resource.keep_existing
-        dest = new_resource.absolute_destination
+        dest = new_resource.destination
         Dir.entries(dest).each do |entry|
           next if entry == '.' || entry == '..'
           FileUtils.remove_entry_secure(::File.join(dest, entry))

data/lib/poise_archive/archive_providers/gnu_tar.rb

@@ -51,8 +51,8 @@ module PoiseArchive
       # @return [void]
       def install_prereqs
         utils = ['tar']
-        utils << 'bzip2' if new_resource.path =~ /\.t?bz/
-        utils << 'xz-utils' if new_resource.path =~ /\.t?xz/
+        utils << 'bzip2' if new_resource.absolute_path =~ /\.t?bz/
+        utils << 'xz-utils' if new_resource.absolute_path =~ /\.t?xz/
         # This is a resource.
         package utils
       end
@@ -64,17 +64,17 @@ module PoiseArchive
         # 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/
+        cmd << if new_resource.absolute_path =~ /\.t?gz/
           '-xzvf'
-        elsif new_resource.path =~ /\.t?bz/
+        elsif new_resource.absolute_path =~ /\.t?bz/
           '-xjvf'
-        elsif new_resource.path =~ /\.t?xz/
+        elsif new_resource.absolute_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)
+        cmd << new_resource.absolute_path
+        poise_shell_out!(cmd, cwd: new_resource.destination, group: new_resource.group, user: new_resource.user)
       end
 
     end

data/lib/poise_archive/archive_providers/tar.rb

@@ -108,8 +108,8 @@ module PoiseArchive
       #
       # @return [void]
       def open_file!
-        @raw_file = ::File.open(new_resource.path, 'rb')
-        @file = case new_resource.path
+        @raw_file = ::File.open(new_resource.absolute_path, 'rb')
+        @file = case new_resource.absolute_path
         when /\.tar$/
           nil # So it uses @raw_file instead.
         when /\.t?gz/

data/lib/poise_archive/archive_providers/zip.rb

@@ -49,7 +49,7 @@ module PoiseArchive
 
       def unpack_zip
         @zip_entry_paths = []
-        ::Zip::File.open(new_resource.path) do |zip_file|
+        ::Zip::File.open(new_resource.absolute_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.

data/lib/poise_archive/resources/poise_archive.rb

@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+require 'base64'
+require 'uri'
+
 require 'chef/resource'
 require 'poise'
 
@@ -29,6 +32,10 @@ module PoiseArchive
       # @action unpack
       # @example
       #   poise_archive '/opt/myapp.tgz'
+      # @example Downloading from a URL with options
+      #   poise_archive ['http://example.com/myapp.zip', {headers: {'Authentication' => '...'}}] do
+      #     destination '/opt/myapp'
+      #   end
       class Resource < Chef::Resource
         include Poise
         provides(:poise_archive)
@@ -36,14 +43,15 @@ module PoiseArchive
 
         # @!attribute path
         #   Path to the archive. If relative, it is taken as a file inside
-        #   `Chef::Config[:file_cache_path]`.
-        #   @return [String]
-        attribute(:path, kind_of: String, name_attribute: true)
+        #   `Chef::Config[:file_cache_path]`. Can also be a URL to download the
+        #   archive from.
+        #   @return [String, Array]
+        attribute(:path, kind_of: String, default: lazy { @raw_name.is_a?(Array) ? @raw_name[0] : name }, required: true)
         # @!attribute destination
         #   Path to unpack the archive to. If not specified, the path of the
         #   archive without the file extension is used.
         #   @return [String, nil, false]
-        attribute(:destination, kind_of: [String, NilClass, FalseClass])
+        attribute(:destination, kind_of: [String, NilClass, FalseClass], default: lazy { default_destination })
         # @!attribute group
         #   Group to run the unpack as.
         #   @return [String, Integer, nil, false]
@@ -52,6 +60,11 @@ module PoiseArchive
         #   Keep existing files in the destination directory when unpacking.
         #   @return [Boolean]
         attribute(:keep_existing, equal_to: [true, false], default: false)
+        # @!attribute source_properties
+        #   Properties to pass through to the underlying download resource if
+        #   using one. Merged with the array form of {#name}.
+        #   @return [Hash]
+        attribute(:source_properties, option_collector: true, forced_keys: %i{retries})
         # @!attribute strip_components
         #   Number of intermediary directories to skip when unpacking. Works
         #   like GNU tar's --strip-components.
@@ -66,16 +79,67 @@ module PoiseArchive
         # @api private
         alias_method :owner, :user
 
+        def initialize(name, run_context)
+          @raw_name = name # Capture this before it gets coerced to a string.
+          super
+        end
+
+        # Regexp for URL-like paths.
+        # @api private
+        URL_PATHS = %r{^(\w+:)?//}
+
+        # Check if the source path is a URL.
+        #
+        # @api private
+        # @return [Boolean]
+        def is_url?
+          path =~ URL_PATHS
+        end
+
+        # Expand a relative file path against `Chef::Config[:file_cache_path]`.
+        # For URLs it returns the cache file path.
+        #
+        # @api private
+        # @return [String]
         def absolute_path
-          ::File.expand_path(path, Chef::Config[:file_cache_path])
+          if is_url?
+            # Use the last path component without the query string plus the name
+            # of the resource in Base64. This should be both mildly readable and
+            # also unique per invocation.
+            url_part = URI(path).path.split(/\//).last
+            base64_name = Base64.strict_encode64(name).gsub(/\=/, '')
+            ::File.join(Chef::Config[:file_cache_path], "#{base64_name}_#{url_part}")
+          else
+            ::File.expand_path(path, Chef::Config[:file_cache_path])
+          end
+        end
+
+        # Merge the explicit source properties with the array form of the name.
+        #
+        # @api private
+        # @return [Hash]
+        def merged_source_properties
+          if @raw_name.is_a?(Array) && @raw_name[1]
+            source_properties.merge(@raw_name[1])
+          else
+            source_properties
+          end
         end
 
+        private
+
         # Filename components to ignore.
         # @api private
         BASENAME_IGNORE = /(\.(t?(ar|gz|bz2?|xz)|zip))+$/
 
-        def absolute_destination
-          destination || begin
+        # Default value for the {#destination} property
+        #
+        # @api private
+        # @return [String]
+        def default_destination
+          if is_url?
+            raise ValueError.new("Destination for URL-based archive #{self} must be specified explicitly")
+          else
             ::File.join(::File.dirname(absolute_path), ::File.basename(path).gsub(BASENAME_IGNORE, ''))
           end
         end

data/lib/poise_archive/version.rb

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

data/test/cookbook/recipes/default.rb

@@ -29,6 +29,23 @@ user 'poise' do
   system true
 end
 
+# Directory for HTTP serving.
+directory '/test_http' do
+  mode '777'
+end
+
+# Copy all fixture files for HTTP serving.
+%w{tar tar.gz tar.bz2 zip}.each do |ext|
+  cookbook_file "/test_http/myapp-1.0.0.#{ext}" do
+    source "myapp-1.0.0.#{ext}"
+  end
+end
+
+# Start up a background web server.
+require 'webrick'
+server = WEBrick::HTTPServer.new(Port: 8000, DocumentRoot: '/test_http')
+Thread.new { server.start }
+
 # Tests for each fixture file.
 [
   {ext: 'tar', provider: nil},
@@ -78,6 +95,12 @@ end
     provider test[:provider] if test[:provider]
     user 'poise'
   end
+
+  poise_archive "#{test_base}/myapp-1.0.0.#{test[:ext]}_http" do
+    path "http://localhost:8000/myapp-1.0.0.#{test[:ext]}"
+    destination "#{test_base}/#{test[:ext]}_http"
+    provider test[:provider] if test[:provider]
+  end
 end
 
 # Some general tests for core features.

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

@@ -60,6 +60,12 @@ RSpec.shared_examples 'a poise_archive test' do |ext|
     it { is_expected.to be_owned_by 'poise' }
     it { is_expected.to be_mode '755' } unless os[:family] == 'windows'
   end
+  describe file("#{base}_http/README") do
+    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 }
+  end
 end
 
 describe 'default provider' do

data/test/spec/resources/poise_archive_spec.rb

@@ -23,7 +23,7 @@ describe PoiseArchive::Resources::PoiseArchive 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', destination: '/tmp/myapp') }
     end # /context an implicit destination
 
     context 'an explicit destination' do
@@ -33,7 +33,7 @@ describe PoiseArchive::Resources::PoiseArchive do
         end
       end
 
-      it { is_expected.to unpack_poise_archive('/tmp/myapp.tar').with(absolute_path: '/tmp/myapp.tar', absolute_destination: '/opt/myapp') }
+      it { is_expected.to unpack_poise_archive('/tmp/myapp.tar').with(absolute_path: '/tmp/myapp.tar', destination: '/opt/myapp') }
     end # /context an explicit destination
   end # /context an absolute path
 
@@ -54,7 +54,7 @@ describe PoiseArchive::Resources::PoiseArchive do
         poise_archive 'myapp.tar'
       end
 
-      it { is_expected.to unpack_poise_archive('myapp.tar').with(absolute_path: '/var/chef/cache/myapp.tar', absolute_destination: '/var/chef/cache/myapp') }
+      it { is_expected.to unpack_poise_archive('myapp.tar').with(absolute_path: '/var/chef/cache/myapp.tar', destination: '/var/chef/cache/myapp') }
     end # /context an implicit destination
 
     context 'an explicit destination' do
@@ -65,7 +65,7 @@ describe PoiseArchive::Resources::PoiseArchive do
         end
       end
 
-      it { is_expected.to unpack_poise_archive('myapp.tar').with(absolute_path: '/var/chef/cache/myapp.tar', absolute_destination: '/opt/myapp') }
+      it { is_expected.to unpack_poise_archive('myapp.tar').with(absolute_path: '/var/chef/cache/myapp.tar', destination: '/opt/myapp') }
     end # /context an explicit destination
   end # /context a relative path
 
@@ -74,7 +74,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tar.gz').with(absolute_path: '/tmp/myapp.tar.gz', destination: '/tmp/myapp') }
   end # /context with .tar.gz
 
   context 'with .tgz' do
@@ -82,7 +82,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tgz').with(absolute_path: '/tmp/myapp.tgz', destination: '/tmp/myapp') }
   end # /context with .tgz
 
   context 'with .tar.bz2' do
@@ -90,7 +90,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tar.bz2').with(absolute_path: '/tmp/myapp.tar.bz2', destination: '/tmp/myapp') }
   end # /context with .tar.bz2
 
   context 'with .tbz2' do
@@ -98,7 +98,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tbz2').with(absolute_path: '/tmp/myapp.tbz2', destination: '/tmp/myapp') }
   end # /context with .tbz2
 
   context 'with .tar.xz' do
@@ -106,7 +106,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.tar.xz').with(absolute_path: '/tmp/myapp.tar.xz', destination: '/tmp/myapp') }
   end # /context with .tar.xz
 
   context 'with .txz' do
@@ -114,7 +114,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.txz').with(absolute_path: '/tmp/myapp.txz', destination: '/tmp/myapp') }
   end # /context with .txz
 
   context 'with .zip' do
@@ -122,7 +122,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp.zip').with(absolute_path: '/tmp/myapp.zip', destination: '/tmp/myapp') }
   end # /context with .zip
 
   context 'with a hidden file' do
@@ -130,7 +130,7 @@ describe PoiseArchive::Resources::PoiseArchive 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', destination: '/tmp/.myapp') }
   end # /context with a hidden file
 
   context 'with a version number' do
@@ -138,7 +138,7 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp-1.0.0.tar').with(absolute_path: '/tmp/myapp-1.0.0.tar', destination: '/tmp/myapp-1.0.0') }
   end # /context with a version number
 
   context 'with a version number and .tar.gz' do
@@ -146,6 +146,56 @@ describe PoiseArchive::Resources::PoiseArchive 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') }
+    it { is_expected.to unpack_poise_archive('/tmp/myapp-1.0.0.tar.gz').with(absolute_path: '/tmp/myapp-1.0.0.tar.gz', destination: '/tmp/myapp-1.0.0') }
   end # /context with a version number and .tar.gz
+
+  context 'with a URL' do
+    recipe do
+      Chef::Config[:file_cache_path] = '/var/chef/cache'
+      poise_archive 'http://example.com/myapp-1.0.0.zip' do
+        destination '/tmp/myapp'
+      end
+    end
+
+    it { is_expected.to unpack_poise_archive('http://example.com/myapp-1.0.0.zip').with(path: 'http://example.com/myapp-1.0.0.zip', absolute_path: '/var/chef/cache/aHR0cDovL2V4YW1wbGUuY29tL215YXBwLTEuMC4wLnppcA_myapp-1.0.0.zip', destination: '/tmp/myapp', merged_source_properties: {}) }
+  end # /context with a URL
+
+  context 'with a URL and name properties' do
+    recipe do
+      Chef::Config[:file_cache_path] = '/var/chef/cache'
+      poise_archive ['http://example.com/myapp-1.0.0.zip', {retries: 0}] do
+        destination '/tmp/myapp'
+      end
+    end
+
+    it { is_expected.to unpack_poise_archive('http://example.com/myapp-1.0.0.zip, {:retries=>0}').with(path: 'http://example.com/myapp-1.0.0.zip', absolute_path: '/var/chef/cache/aHR0cDovL2V4YW1wbGUuY29tL215YXBwLTEuMC4wLnppcCwgezpyZXRyaWVzPT4wfQ_myapp-1.0.0.zip', destination: '/tmp/myapp', merged_source_properties: {'retries' => 0}) }
+  end # /context with a URL and name properties
+
+  context 'with a URL and source properties' do
+    recipe do
+      Chef::Config[:file_cache_path] = '/var/chef/cache'
+      poise_archive 'http://example.com/myapp-1.0.0.zip' do
+        destination '/tmp/myapp'
+        source_properties do
+          retries 0
+        end
+      end
+    end
+
+    it { is_expected.to unpack_poise_archive('http://example.com/myapp-1.0.0.zip').with(path: 'http://example.com/myapp-1.0.0.zip', absolute_path: '/var/chef/cache/aHR0cDovL2V4YW1wbGUuY29tL215YXBwLTEuMC4wLnppcA_myapp-1.0.0.zip', destination: '/tmp/myapp', merged_source_properties: {'retries' => 0}) }
+  end # /context with a URL and source properties
+
+  context 'with a URL and both properties' do
+    recipe do
+      Chef::Config[:file_cache_path] = '/var/chef/cache'
+      poise_archive ['http://example.com/myapp-1.0.0.zip', {retries: 100}] do
+        destination '/tmp/myapp'
+        source_properties do
+          retries 0
+        end
+      end
+    end
+
+    it { is_expected.to unpack_poise_archive('http://example.com/myapp-1.0.0.zip, {:retries=>100}').with(path: 'http://example.com/myapp-1.0.0.zip', absolute_path: '/var/chef/cache/aHR0cDovL2V4YW1wbGUuY29tL215YXBwLTEuMC4wLnppcCwgezpyZXRyaWVzPT4xMDB9_myapp-1.0.0.zip', destination: '/tmp/myapp', merged_source_properties: {'retries' => 100}) }
+  end # /context with a URL and both properties
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poise-archive
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Noah Kantrowitz