beaker-puppet 1.18.14 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b61d545a1c2daedf8db34d1022483acc0ccd04632bb0bee75dc31b944e7fd3e
-  data.tar.gz: 188fe64c83a71c7b7993990c66f6da3c9533925a69ba5c94254808f02709b8e5
+  metadata.gz: 737b37a67f54e2d13971fdf418e83dbd137a25a3c438d2686b0b8b6d53c30d32
+  data.tar.gz: ef74b57af652ae95c6dd51f5d4edb418cf18d4120ffe9d07156ca70de3bfd0d2
 SHA512:
-  metadata.gz: ec8bcf9a562252bf3ea35d721399e3b96d4811bfba3a060100af5300bef787af7ca0fce736c0aa8e4a3d9d67901ee7b4ace4957cfa9d321a8227fa9d84a39f83
-  data.tar.gz: 62fe04f6113bd92d51215a40cca5bc4433411ab421366c70e532e380983064d1d4b2666771e099893cb3e4dcc206acf64ad557fdd3e8f8f02c09c4e3ac10303c
+  metadata.gz: 8cf482925c059096d7065862cac1dc6915b4e12371cd03f6be7e896e287933358a412e038b879bf19cca9705a16e85d4c789a75de098f4bce7d8fb78a003ff04
+  data.tar.gz: af50c97c0c401b087362530da9b03b1d5dc686d5c3430beea1965cbbcbf864cfc1264abca9149562803d45959ecc6753127862e0cb0dcbc6e7e658e31eb4e205

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.travis.yml

@@ -0,0 +1,10 @@
+before_install:
+  - gem update
+  - gem --version
+language: ruby
+script: "bundle exec rake test:spec"
+notifications:
+  email: false
+rvm:
+  - 2.6
+  - 2.4

data/CODEOWNERS

@@ -1,3 +0,0 @@
-#This Repository is maintained by both the beaker and Night's Watch teams, depending on the location of the changes
-* @puppetlabs/beaker
-* @puppetlabs/night-s-watch

data/acceptance/pre_suite/pkg/install.rb

@@ -4,8 +4,8 @@ require 'beaker-puppet'
 # all versions are required for osx
 hosts.each do |host|
   install_puppet_on(host, {
-    :version        => ENV['BEAKER_PUPPET_VERSION'] || '5.5.13',
-    :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.13'
+    :version        => ENV['BEAKER_PUPPET_VERSION'] || '5.5.20',
+    :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.20'
   })
 
   on(host, puppet('resource user puppet ensure=present'))

data/beaker-puppet.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
-  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
 

data/lib/beaker-puppet/helpers/host_helpers.rb

@@ -7,7 +7,11 @@ module Beaker
       module HostHelpers
 
         def ruby_command(host)
-          "env PATH=\"#{host['privatebindir']}:${PATH}\" ruby"
+          if host['platform'] =~ /windows/ && !host.is_cygwin?
+            "cmd /V /C \"set PATH=#{host['privatebindir']};!PATH! && ruby\""
+          else
+            "env PATH=\"#{host['privatebindir']}:${PATH}\" ruby"
+          end
         end
 
         # Returns an array containing the owner, group and mode of

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -677,7 +677,8 @@ module Beaker
 
             if host.is_cygwin?
               # NOTE: it is critical that -o be before -O on Windows
-              on host, "curl -o \"#{msi_download_path}\" -O #{link}"
+              proxy = opts[:package_proxy] ? "-x #{opts[:package_proxy]} " : ''
+              on host, "curl #{proxy}-o \"#{msi_download_path}\" -O #{link}"
 
               #Because the msi installer doesn't add Puppet to the environment path
               #Add both potential paths for simplicity
@@ -685,7 +686,8 @@ module Beaker
               puppetbin_path = "\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\""
               on host, %Q{ echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc }
             else
-              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{link}','#{msi_download_path}')")
+              webclient_proxy = opts[:package_proxy] ? "$webclient.Proxy = New-Object System.Net.WebProxy('#{opts[:package_proxy]}',$true); " : ''
+              on host, powershell("$webclient = New-Object System.Net.WebClient; #{webclient_proxy}$webclient.DownloadFile('#{link}','#{msi_download_path}')")
             end
 
             opts = { :debug => host[:pe_debug] || opts[:pe_debug] }

data/lib/beaker-puppet/install_utils/windows_utils.rb

@@ -115,19 +115,21 @@ module Beaker
           block_on hosts do | host |
             msi_opts['PUPPET_AGENT_STARTUP_MODE'] ||= 'Manual'
             batch_path, log_file = create_install_msi_batch_on(host, msi_path, msi_opts)
-
+            # Powershell command looses an escaped slash resulting in cygwin relative path
+            # See https://github.com/puppetlabs/beaker/pull/1626#issuecomment-621341555
+            log_file_escaped = log_file.gsub('\\','\\\\\\')
             # begin / rescue here so that we can reuse existing error msg propagation
             begin
               # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
               on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
               raise
             end
 
             if opts[:debug]
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
             end
 
             unless host.is_cygwin?
@@ -175,8 +177,8 @@ module Beaker
             # emit the misc/versions.txt file which contains component versions for
             # puppet, facter, hiera, pxp-agent, packaging and vendored Ruby
             [
-              '%ProgramFiles%/Puppet Labs/puppet/misc/versions.txt',
-              '%ProgramFiles(x86)%/Puppet Labs/puppet/misc/versions.txt'
+              '"${env:ProgramFiles}/Puppet Labs/puppet/misc/versions.txt"',
+              '"${env:ProgramFiles(x86)}/Puppet Labs/puppet/misc/versions.txt"'
             ].each do |path|
               if file_exists_on(host, path)
                 logger.info(file_contents_on(host, path)) && break
@@ -201,20 +203,22 @@ module Beaker
         def generic_install_msi_on(hosts, msi_path, msi_opts = {}, opts = {})
           block_on hosts do | host |
             batch_path, log_file = create_install_msi_batch_on(host, msi_path, msi_opts)
-
+            # Powershell command looses an escaped slash resulting in cygwin relative path
+            # See https://github.com/puppetlabs/beaker/pull/1626#issuecomment-621341555
+            log_file_escaped = log_file.gsub('\\','\\\\\\')
             # begin / rescue here so that we can reuse existing error msg propagation
             begin
               # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
               on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
 
               raise
             end
 
             if opts[:debug]
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
             end
 
             host.close unless host.is_cygwin?

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.14'
+  VERSION = '1.20.0'
 end

data/spec/beaker-puppet/helpers/host_helpers_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+class ClassMixedWithDSLHelpers
+  include Beaker::DSL::Helpers::HostHelpers
+end
+
+describe ClassMixedWithDSLHelpers do
+  let(:privatebindir) { 'C:\\Program Files\\Puppet Labs\\Puppet\\bin' }
+
+  context 'when platform is windows and non cygwin' do
+    let(:winhost) { make_host('winhost_non_cygwin', { :platform => 'windows',
+                                                      :privatebindir => privatebindir,
+                                                      :is_cygwin => 'false' }) }
+
+    it 'run the correct ruby_command' do
+      expect(subject.ruby_command(winhost)).to eq("cmd /V /C \"set PATH=#{privatebindir};!PATH! && ruby\"")
+    end
+  end
+
+  context 'when platform is windows and cygwin' do
+    let(:winhost) { make_host('winhost', { :platform => Beaker::Platform.new('windows-2016-a64'),
+                                           :privatebindir => privatebindir,
+                                           :is_cygwin => true }) }
+
+    it 'run the correct ruby_command' do
+      expect(subject.ruby_command(winhost)).to eq("env PATH=\"#{privatebindir}:${PATH}\" ruby")
+    end
+  end
+end

data/spec/beaker-puppet/install_utils/foss_utils_spec.rb

@@ -38,6 +38,7 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :working_dir => '/tmp',
                                                 :type => 'foss',
                                                 :is_cygwin => 'false' } ) }
+
   let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
                                                 :pe_ver => '3.0',
                                                 :type => 'foss',
@@ -347,6 +348,15 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows'}  )
     end
 
+    it 'installs puppet on cygwin windows via proxy' do
+      allow(subject).to receive(:link_exists?).and_return( true )
+      expect(subject).to receive(:on).with(winhost, "curl -x https://proxy.com -o \"#{win_temp}\\puppet-3.7.1-x64.msi\" -O http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
+      expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
+      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
+
+      subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows', :package_proxy => 'https://proxy.com'}  )
+    end
+
     it 'installs puppet on non-cygwin windows' do
       allow(subject).to receive(:link_exists?).and_return( true )
 
@@ -354,13 +364,29 @@ describe ClassMixedWithDSLInstallUtils do
 
       expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of( Beaker::Command )) do |host, beaker_command|
         expect(beaker_command.command).to eq('powershell.exe')
-        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
+        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient; $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
       end.once
 
       expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {}, {:debug => nil})
 
       subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows'}   )
     end
+
+    it 'installs puppet on non-cygwin windows via proxy' do
+      allow(subject).to receive(:link_exists?).and_return( true )
+
+      expect(winhost_non_cygwin).to receive(:mkdir_p).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules')
+
+      expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of( Beaker::Command )) do |host, beaker_command|
+        expect(beaker_command.command).to eq('powershell.exe')
+        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient; $webclient.Proxy = New-Object System.Net.WebProxy('https://proxy.com',$true); $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
+      end.once
+
+      expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {}, {:debug => nil})
+
+      subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows', :package_proxy => 'https://proxy.com'})
+
+    end
   end
 
   context 'clone_git_repo_on' do

data/spec/beaker-puppet/install_utils/windows_utils_spec.rb

@@ -41,7 +41,7 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   def expect_version_log_called(times = hosts.length)
-    path = %{%ProgramFiles%/Puppet Labs/puppet/misc/versions.txt}
+    path = %{"${env:ProgramFiles}/Puppet Labs/puppet/misc/versions.txt"}
 
     expect( subject ).to receive( :file_exists_on )
       .with(anything, path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.14
+  version: 1.20.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,8 +206,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".simplecov"
+- ".travis.yml"
 - CODEOWNERS
 - Gemfile
 - HISTORY.md
@@ -275,6 +277,7 @@ files:
 - setup/git/060_InstallModules.rb
 - setup/git/070_InstallCACerts.rb
 - spec/beaker-puppet/helpers/facter_helpers_spec.rb
+- spec/beaker-puppet/helpers/host_helpers_spec.rb
 - spec/beaker-puppet/helpers/puppet_helpers_spec.rb
 - spec/beaker-puppet/helpers/tk_helpers_spec.rb
 - spec/beaker-puppet/install_utils/ezbake_utils_spec.rb
@@ -306,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Beaker's Puppet DSL Extension Helpers!