beaker 3.27.0 → 3.28.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjliYzUxMDQyMjEzOWZlMzcxN2NmMTZiYTBhNzkwM2Q5OGJmODdmOQ==
+    YzI3NzY5NGEwYTU3NGI4ODQ1MWM4ODIxNGM5YWFkOTY0MjEyZjZiZg==
   data.tar.gz: !binary |-
-    ZDg0NDJhZTI2YTQyMjAwYWRmZjEyODUyZTIzZjk2YWUwYWVmZjhkOA==
+    ODM3ZTkyZTU1M2ZhZjRjZWMxYWNiZTUzMmM4NmY1NGRmZGY4NjRhNQ==
 SHA512:
   metadata.gz: !binary |-
-    YWQ2NGIxZTgzYjRiMzYxYjFjYzQ1YTk2ZjA2NmNiMmM2NmM3NTk1MmY5MTQy
-    MzI4ZWY4NzllOWQxZTBlYjNiZTIzNmI4MDUxYmU1ZDc0MjhlZWU0YzEyODMy
-    MjA2ZmU1MDFhY2JiYTk1NTVkZDZiYjkyZWM1MDYyMTRmMmY0N2E=
+    YjQ0NDliNGQzZjFhOTY2ZGM1OWE2M2MwYzkyNTU3ZDg1OTc4OGQwNjI0N2U0
+    M2ZlZjc4Mzk2MjU3YTMyYjc4ZDBlYzg2Y2VlMTExOWMyMDQ1NGE5N2EwZmQ5
+    MDNlNWM3OTllZmY1MjQyMzExZTczMjQyZjRmMTA1NGI5MzM2MWI=
   data.tar.gz: !binary |-
-    MjdmNDQxNTYxNWNmMjJlNGMwYTYzYWIzODdmMGIzMzUyNWY2ZTBjZGNlODY5
-    ZTNjNTFjMjUyNzczOWM1YzgyOTc3NjUyODllYTk4NmZiOWVhZmRhYWY0OTFm
-    YTY0YmFkNThhMWRhMTFlMTcxMmFkZGZkMjE3YWY3ODllNTk2ZmQ=
+    OTIzNmViMTY2NGRiMGNkMjlmYmNlYWE2NzM3ZDY1YTA3OWMyZDE5Y2M4NjQ1
+    YjQ1ZmFlOGE4MmUzZTg2NGEyZTM5YmU0NDY2MGI2N2JmZWM3YjY0NWJmNmUx
+    OGNmODM5MWE5ZTYwYzM4NWMxZTc1ZWYxMzE5M2UwMTQxYjA3OTU=

data/CHANGELOG.md

@@ -11,7 +11,13 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/3.27.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/3.28.0...master)
+
+# [3.28.0](https://github.com/puppetlabs/beaker/compare/3.27.0...3.28.0) - 2017-11-01
+
+### Fixed
+
+- corruption of `opts[:ignore]` when using `rsync`
 
 # [3.27.0](https://github.com/puppetlabs/beaker/compare/3.26.0...3.27.0) - 2017-10-19
 

data/lib/beaker/host.rb

@@ -559,10 +559,7 @@ module Beaker
       end
 
       if opts.has_key?(:ignore) and not opts[:ignore].empty?
-        opts[:ignore].map! do |value|
-          "--exclude '#{value}'"
-        end
-        rsync_args << opts[:ignore].join(' ')
+        rsync_args << opts[:ignore].map { |value| "--exclude '#{value}'" }.join(' ')
       end
 
       # We assume that the *contents* of the directory 'from_path' needs to be

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.27.0'
+    STRING = '3.28.0'
   end
 end

data/spec/beaker/host/mac_spec.rb

@@ -7,7 +7,7 @@ module Mac
       if @platform
         { :platform => Beaker::Platform.new( @platform) }
       else
-        { :platform => Beaker::Platform.new( 'osx-10.9-x86_64' ) }
+        { :platform => Beaker::Platform.new( 'osx-10.12-x86_64' ) }
       end
     }
     let(:host)    { make_host( 'name', options.merge(platform) ) }
@@ -39,11 +39,11 @@ module Mac
       end
 
       it 'adds the version dot correctly if not supplied' do
-        @platform = 'osx-109-x86_64'
+        @platform = 'osx-10.12-x86_64'
         allow( host ).to receive( :link_exists? ) { true }
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC3', 'pav3', :download_url => '' )
-        expect( release_path_end ).to match( /10\.9/ )
-        expect( release_file ).to match( /10\.9/ )
+        expect( release_path_end ).to match( /10\.12/ )
+        expect( release_file ).to match( /10\.12/ )
       end
 
       it 'runs the correct install for osx platforms (newest link format)' do
@@ -53,9 +53,9 @@ module Mac
         # verify the mac package name starts the name correctly
         expect( release_file ).to match( /^puppet-agent-pav4-/ )
         # verify the "newest hotness" is set correctly for the end of the mac package name
-        expect( release_file ).to match( /#{Regexp.escape("-1.osx10.9.dmg")}$/ )
+        expect( release_file ).to match( /#{Regexp.escape("-1.osx10.12.dmg")}$/ )
         # verify the release path end is set correctly
-        expect( release_path_end ).to be === "apple/10.9/PC4/x86_64"
+        expect( release_path_end ).to be === "apple/10.12/PC4/x86_64"
       end
 
       it 'runs the correct install for osx platforms (new link format)' do
@@ -65,9 +65,9 @@ module Mac
         # verify the mac package name starts the name correctly
         expect( release_file ).to match( /^puppet-agent-pav7-/ )
         # verify the "new hotness" is set correctly for the end of the mac package name
-        expect( release_file ).to match( /#{Regexp.escape("-1.mavericks.dmg")}$/ )
+        expect( release_file ).to match( /#{Regexp.escape("-1.sierra.dmg")}$/ )
         # verify the release path end isn't changed in the "new hotness" case
-        expect( release_path_end ).to be === "apple/10.9/PC7/x86_64"
+        expect( release_path_end ).to be === "apple/10.12/PC7/x86_64"
       end
 
       it 'runs the correct install for osx platforms (old link format)' do
@@ -77,7 +77,7 @@ module Mac
         # verify the mac package name starts the name correctly
         expect( release_file ).to match( /^puppet-agent-pav8-/ )
         # verify the old way is set correctly for the end of the mac package name
-        expect( release_file ).to match( /#{Regexp.escape("-osx-10.9-x86_64.dmg")}$/ )
+        expect( release_file ).to match( /#{Regexp.escape("-osx-10.12-x86_64.dmg")}$/ )
         # verify the release path end is set correctly to the older method
         expect( release_path_end ).to be === "apple/PC8"
       end

data/spec/beaker/host_spec.rb

@@ -651,6 +651,24 @@ module Beaker
         expect(Rsync).to receive(:run).with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
         expect(host.do_rsync_to(*args).cmd).to eq('output!')
       end
+
+      it "doesn't corrupt :ignore option" do
+        create_files(['source'])
+
+        ignore_list = ['.bundle']
+        args = ['source', 'target', {:ignore => ignore_list}]
+
+        key = host['ssh']['keys']
+        if key.is_a? Array
+          key = key.first
+        end
+
+        rsync_args = ['source', 'target', ['-az', "-e \"ssh -i #{key} -p 22 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"]]
+        expect(Rsync).to receive(:run).twice.with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
+
+        host.do_rsync_to *args
+        host.do_rsync_to *args
+      end
     end
 
     it 'interpolates to its "name"' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.27.0
+  version: 3.28.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -792,7 +792,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!