beaker-task_helper 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b67d20327e15bba80fc705279d00a66a5238326
-  data.tar.gz: 886bb5ec8d0c12b921f7957aedd285222c814b47
+  metadata.gz: 4aa5e71c49d4a2414c546b7253e9ad625b03cb4b
+  data.tar.gz: 24db4ac16d07dd157b07832c48c5e3f274b2977c
 SHA512:
-  metadata.gz: 00d3d517e0805475cbb87f734d523856281a740f588c6ef58b96ffd14c4b4b6068cc882e91ef820901ca134082ffb279e5081a3430438f11c8d5ffbb96baabff
-  data.tar.gz: 163cae5d0dc532e61af406560867ae805e32cb0950739655851c3d32a6c6d1a768c5becb6d072682276c1784abbdab682eae9e733a900f18aafbf47825d0226a
+  metadata.gz: e2e75f30b9defb8407b9dfde6fd5a5c20c57a9d36086adc97754924713aaa61c2995b31f5e4ddec40ea1145121828d3972ffd6b545bfeb42b621146a681d06b3
+  data.tar.gz: cb41ff126ae70ae7b7c9b3c60dab8367ed5ad8ed37f5c5aaa25fb1e7e54470d1e0e63a1de1eb93a2337f9bbc3c93c1aeb8f3824494e3f12ee2c33e62a02683c6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+### 1.4.0
+
+  * Added `BEAKER_password` variable for remote tasks.
+  * Fix windows on bolt >=0.16.0
+  * Fix json output format.
+
 ### 1.3.0
 
   * Cleaning up the README

data/README.md

@@ -1 +1,3 @@
 beaker-task_helper
+
+Accepts Bolt password via the `BEAKER_password` environment variable.

data/lib/beaker/task_helper/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module TaskHelper
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/lib/beaker/task_helper.rb

@@ -8,10 +8,10 @@ module Beaker::TaskHelper # rubocop:disable Style/ClassAndModuleChildren
     (on default, puppet('--version')).output.chomp
   end
 
-  DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
+  DEFAULT_PASSWORD = if ENV.has_key?('BEAKER_password')
+                       ENV['BEAKER_password']
+                     elsif default[:hypervisor] == 'vagrant'
                        'puppet'
-                     elsif default[:hypervisor] == 'vcloud' || default[:hypervisor] == 'vmpooler'
-                       'Qu@lity!'
                      else
                        'root'
                      end
@@ -25,7 +25,6 @@ module Beaker::TaskHelper # rubocop:disable Style/ClassAndModuleChildren
       elsif default[:docker_image_commands].to_s.include? 'apt-get'
         on(hosts, 'apt-get install -y make gcc ruby-dev', acceptable_exit_codes: [0, 1]).stdout
       end
-
     end
 
     Array(hosts).each do |host|
@@ -51,10 +50,11 @@ INSTALL_BOLT_PP
   def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD, host: nil, format: 'human')
     output = if pe_install?
                host = master.hostname if host.nil?
-               run_puppet_task(task_name: task_name, params: params, host: host)
+               run_puppet_task(task_name: task_name, params: params, host: host, format: format)
              else
                host = 'localhost' if host.nil?
-               run_bolt_task(task_name: task_name, params: params, password: password, host: host)
+               run_bolt_task(task_name: task_name, params: params,
+                             password: password, host: host, format: format)
              end
 
     if format == 'json'
@@ -65,22 +65,31 @@ INSTALL_BOLT_PP
     end
   end
 
-  def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD, host: 'localhost', format: 'human') # rubocop:disable Metrics/LineLength, Lint/UnusedMethodArgument
+  def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD,
+                    host: 'localhost', format: 'human')
     if fact_on(default, 'osfamily') == 'windows'
       bolt_path = '/cygdrive/c/Program\ Files/Puppet\ Labs/Puppet/sys/ruby/bin/bolt.bat'
       module_path = 'C:/ProgramData/PuppetLabs/code/modules'
+
+      if Puppet::Util::Package.versioncmp(BOLT_VERSION, '0.15.0') > 0
+        check = '--no-ssl'
+      else
+        check = '--insecure'
+      end
     else
       bolt_path = '/opt/puppetlabs/puppet/bin/bolt'
       module_path = '/etc/puppetlabs/code/modules'
-    end
 
-    if Puppet::Util::Package.versioncmp(BOLT_VERSION, '0.15.0') > 0
-      check = '--no-host-key-check'
-    else
-      check = '--insecure'
+      if Puppet::Util::Package.versioncmp(BOLT_VERSION, '0.15.0') > 0
+        check = '--no-host-key-check'
+      else
+        check = '--insecure'
+      end
     end
 
-    bolt_full_cli = "#{bolt_path} task run #{task_name} #{check} -m #{module_path} --nodes #{host} --password #{password}" # rubocop:disable Metrics/LineLength
+    bolt_full_cli = "#{bolt_path} task run #{task_name} #{check} -m #{module_path} " \
+                    "--nodes #{host} --password #{password}"
+    bolt_full_cli << " --format #{format}" if format != 'human'
     bolt_full_cli << if params.class == Hash
                        " --params '#{params.to_json}'"
                      else
@@ -91,7 +100,7 @@ INSTALL_BOLT_PP
       bolt_full_cli << ' --transport winrm --user Administrator'
     end
     puts "BOLT_CLI: #{bolt_full_cli}" if ENV['BEAKER_debug']
-    on(default, bolt_full_cli, acceptable_exit_codes: [0, 1]).stdout
+    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')
@@ -102,9 +111,9 @@ INSTALL_BOLT_PP
     else
       args << params
     end
-    if format == 'json'
+    if format != 'human'
       args << '--format'
-      args << 'json'
+      args << format
     end
     on(master, puppet(*args), acceptable_exit_codes: [0, 1]).stdout
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-task_helper
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby gem to help testing tasks with Beaker