beaker-task_helper 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c3360cb6036e4bb6a390526c344fd527e5c0015
-  data.tar.gz: d127f764245da1d547d64cf84b8faef8783e5633
+SHA256:
+  metadata.gz: dcd238c08332ba479255427138485576fb735ac28ad1a66d87f69dcc8418503b
+  data.tar.gz: e39d27c1db8dd362d4eac66f159547c3313e809787b2d1fd7d8ae18a0302efde
 SHA512:
-  metadata.gz: 9a0cc3efbc57cd08afbdaaa6ba940edcf3663665de2fbcc36e6699620a59d42e9ffe5592fc0191097057bfbff071f474fb6fee1107d833834dcad077a190dbb8
-  data.tar.gz: ed427a9a31239dbde4f62976ba938b93c10779cc808bfb6dab9a9f2ba442355e0fe0b0832be7fe51bbbfda080d2fab67ce84cb6047f729768d2f8b9524843d87
+  metadata.gz: 764f938eb06c80ed4a92b9622fecd7505679eab588b36e786b44053c03dc1d3afebd557128eebaabf37c1828e2f27f36cd0161862f55d40efaa18aa6a6bdb54d
+  data.tar.gz: 573e0bdc45da4f1929d88d8416d417a5e5eb1c404a338c48891b96a7d3ce892e3d9ac90b2308ceda5d8e61665371063a830f941566bf7eda31f398deb56d74a4

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Change Log
+## 1.6.0
+### Fixed
+- Updates host from `localhost` to `127.0.0.1`.
+
+### Added
+- `BOLT_VERSION` is now dependent on Puppet version.
+- `bolt_path` is now dependent on Puppet version.
 
 ## 1.5.2
 ### Added

data/lib/beaker-task_helper.rb

@@ -18,7 +18,12 @@ module Beaker::TaskHelper # rubocop:disable Style/ClassAndModuleChildren
                        'root'
                      end
 
-  BOLT_VERSION = '0.16.1'.freeze
+  BOLT_VERSION = if ENV['BEAKER_PUPPET_COLLECTION'].nil? || ENV['BEAKER_PUPPET_COLLECTION'] == 'pc1'
+                  # puppet4 uses an older version of ruby (2.1.9) that bolt has stopped supporting
+                    '0.16.1'.freeze
+                  else
+                    '0.22.0'.freeze
+                  end
 
   def install_bolt_on(hosts, version = BOLT_VERSION, source = nil)
     unless default[:docker_image_commands].nil?
@@ -73,7 +78,7 @@ INSTALL_BOLT_PP
                host = master.hostname if host.nil?
                run_puppet_task(task_name: task_name, params: params, host: host, format: format)
              else
-               host = 'localhost' if host.nil?
+               host = '127.0.0.1' if host.nil?
                run_bolt_task(task_name: task_name, params: params,
                              password: password, host: host, format: format)
              end
@@ -87,9 +92,13 @@ INSTALL_BOLT_PP
   end
 
   def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD,
-                    host: 'localhost', format: 'human', module_path: nil)
+                    host: '127.0.0.1', format: 'human', module_path: nil)
     if fact_on(default, 'osfamily') == 'windows'
-      bolt_path = '/cygdrive/c/Program\ Files/Puppet\ Labs/Puppet/sys/ruby/bin/bolt.bat'
+      bolt_path = if ENV['BEAKER_PUPPET_COLLECTION'].nil? || ENV['BEAKER_PUPPET_COLLECTION'] == 'pc1' || ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5'
+                    '/cygdrive/c/Program\ Files/Puppet\ Labs/Puppet/sys/ruby/bin/bolt.bat'
+                  else
+                    '/cygdrive/c/Program\ Files/Puppet\ Labs/Puppet/puppet/bin/bolt.bat'
+                  end
       module_path ||= 'C:/ProgramData/PuppetLabs/code/modules'
 
       if version_is_less('0.15.0', BOLT_VERSION)
@@ -124,7 +133,7 @@ INSTALL_BOLT_PP
     on(default, bolt_full_cli, acceptable_exit_codes: [0, 1, 2]).stdout
   end
 
-  def run_puppet_task(task_name:, params: nil, host: 'localhost', format: 'human')
+  def run_puppet_task(task_name:, params: nil, host: '127.0.0.1', format: 'human')
     args = ['task', 'run', task_name, '--nodes', host]
     if params.class == Hash
       args << '--params'

data/lib/beaker-task_helper/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module TaskHelper
-    VERSION = '1.5.2'.freeze
+    VERSION = '1.6.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-task_helper
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem to help testing tasks with Beaker