beaker 4.39.0 → 4.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 034ae21eb707ca77a36a13ded6183b148c17565a49949567a79af42e1f11af0d
-  data.tar.gz: 91d4c0c6e3162c6a92927b40079f266b9e548b96c22bd98ff4585ce9aa73b576
+  metadata.gz: 772b30c85d3406390ceba9e0df29f7911dc990a579da87e3d520b8fd6a5deff5
+  data.tar.gz: bb5721411884d7876ade5bc04c6304308faf0e4090d3153126367943ccf6d4f2
 SHA512:
-  metadata.gz: d3ebe45b647af548f4464db48dd0b1cbfdbf25eb37946a190f573b23d7e45bf8a216f1b55c84b3c65582ea2163b3848357ca16c61e319068cb851333e736cb45
-  data.tar.gz: a4d11a73a5ef9a2bad6920085c2c32abd8117c3085b9d1b9f8c2bda18b2fecd719c7d38175fd861d2472af568a0312972f01f17d0bfbc3bfe1f4ddcbb5f6f148
+  metadata.gz: 48814c53dada3769d467a63f15817f07b4c94139b7127aa5befe42b1cce4e3d186baa620a88a9156ccc1ac35170530a1bf6036b4951b3e1adf66d69e628788ed
+  data.tar.gz: ca25c8a16952c3af5f9415ded1b30fe76ff9ea37bf7892a264b41b6c86432a1fcc787ce3d9e1be05407cfa7a502828a059b6d97d00cbe886024a249e301bf8ff

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
-## [4.39.0](https://github.com/voxpupuli/beaker/tree/4.39.0) (2023-02-09)
+## [4.40.1](https://github.com/voxpupuli/beaker/tree/4.40.1) (2023-05-05)
+
+**Merged Changes:**
+
+- in-parallel: Allow 1.x [\#1813](https://github.com/voxpupuli/beaker/pull/1813) ([bastelfreak](https://github.com/bastelfreak))
+
+## [4.40.0](https://github.com/voxpupuli/beaker/tree/4.40.0) (2023-04-04)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.39.0...4.40.0)
+
+**Implemented enhancements:**
+
+- \(maint\) Backport 'Removes open\_uri\_redirections' [\#1798](https://github.com/voxpupuli/beaker/pull/1798) ([joshcooper](https://github.com/joshcooper))
+
+## [4.39.0](https://github.com/voxpupuli/beaker/tree/4.39.0) (2023-02-18)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/4.38.1...4.39.0)
 
@@ -10,9 +24,9 @@
 
 **Implemented enhancements:**
 
-- Add RuboCop [\#1761](https://github.com/voxpupuli/beaker/pull/1761) ([ekohl](https://github.com/ekohl))
+- Add Rubocop [\#1761](https://github.com/voxpupuli/beaker/pull/1761) ([ekohl](https://github.com/ekohl))
 - Update net-scp requirement from >= 1.2, < 4.0 to >= 1.2, < 5.0 [\#1757](https://github.com/voxpupuli/beaker/pull/1757)
-- (maint) StringInclude Rubocop corrections [\1765](https://github.com/voxpupuli/beaker/pull/1765) ([mhashizume](https://github.com/mhashizume))
+- \(maint\) StringInclude Rubocop corrections [\#1765](https://github.com/voxpupuli/beaker/pull/1765) ([mhashizume](https://github.com/mhashizume))
 
 **Closed issues:**
 

data/beaker.gemspec

@@ -40,8 +40,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'net-scp', '>= 1.2', '< 5.0'
   s.add_runtime_dependency 'net-ssh', '>= 5.0'
 
-  s.add_runtime_dependency 'in-parallel', '~> 0.1'
-  s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
+  s.add_runtime_dependency 'in-parallel', '>= 0.1', '< 2'
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0']
 

data/lib/beaker/dsl/helpers/web_helpers.rb

@@ -52,7 +52,6 @@ module Beaker
         # @!visibility private
         def fetch_http_file(base_url, file_name, dst_dir)
           require 'open-uri'
-          require 'open_uri_redirections'
           FileUtils.makedirs(dst_dir)
           base_url.chomp!('/')
           src = "#{base_url}/#{file_name}"
@@ -63,7 +62,7 @@ module Beaker
             logger.notify "Fetching: #{src}"
             logger.notify "  and saving to #{dst}"
             begin
-              open(src, :allow_redirections => :all) do |remote|
+              uri_open(src) do |remote|
                 File.open(dst, "w") do |file|
                   FileUtils.copy_stream(remote, file)
                 end
@@ -79,6 +78,19 @@ module Beaker
           return dst
         end
 
+        def uri_open(src)
+          if RUBY_VERSION.to_f < 2.5
+            URI.send(:open, src) do |remote|
+              yield remote
+            end
+          else
+            URI.open(src) do |remote|
+              yield remote
+            end
+          end
+        end
+        private :uri_open
+
         # Recursively fetch the contents of the given http url, ignoring
         # `index.html` and `*.gif` files.
         #

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.39.0'
+    STRING = '4.40.1'
   end
 end

data/spec/beaker/dsl/helpers/web_helpers_spec.rb

@@ -14,7 +14,7 @@ end
 
 describe ClassMixedWithDSLHelpers do
   let( :logger  ) { double("Beaker::Logger", :notify => nil , :debug => nil ) }
-  let( :url     ) { "http://beaker.tool" }
+  let( :url     ) { "http://example.com" }
   let( :name    ) { "name" }
   let( :destdir ) { "destdir" }
 
@@ -37,7 +37,7 @@ describe ClassMixedWithDSLHelpers do
         concat_path = "#{destdir}/#{name}"
         create_files([concat_path])
         allow(logger).to receive(:notify)
-        allow(subject).to receive(:open)
+        allow(URI).to receive(:open).with("#{url}/#{name}").and_return(status: 200)
         result = subject.fetch_http_file url, name, destdir
         expect(result).to eq(concat_path)
       end
@@ -45,7 +45,8 @@ describe ClassMixedWithDSLHelpers do
       it 'doesn\'t cache by default' do
         expect( logger ).to receive( :notify ).with( /^Fetching/ ).ordered
         expect( logger ).to receive( :notify ).with( /^\ \ and\ saving\ to\ / ).ordered
-        expect( subject ).to receive( :open )
+        allow(URI).to receive(:open).with("#{url}/#{name}").and_return(status: 200)
+        expect(URI).to receive(:open)
 
         subject.fetch_http_file( url, name, destdir )
       end
@@ -67,7 +68,8 @@ describe ClassMixedWithDSLHelpers do
 
           expect( logger ).to receive( :notify ).with( /^Fetching/ ).ordered
           expect( logger ).to receive( :notify ).with( /^\ \ and\ saving\ to\ / ).ordered
-          expect( subject ).to receive( :open )
+          allow(URI).to receive(:open).with("#{url}/#{name}").and_return(status: 200)
+          expect(URI).to receive(:open)
 
           subject.fetch_http_file( url, name, destdir )
         end
@@ -78,8 +80,9 @@ describe ClassMixedWithDSLHelpers do
     describe 'given invalid arguments' do
 
       it 'chomps correctly when given a URL ending with a / character' do
-        expect( subject ).to receive( :open ).with( "#{url}/#{name}", anything )
-        subject.fetch_http_file( url, name, destdir )
+        allow(URI).to receive(:open).with("#{url}/#{name}").and_return(status: 200)
+        expect( URI ).to receive( :open ).with( "#{url}/#{name}" )
+        subject.fetch_http_file( "#{url}/", name, destdir )
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.39.0
+  version: 4.40.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -202,30 +202,22 @@ dependencies:
   name: in-parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: open_uri_redirections
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement