beaker-task_helper 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef435a23400c79c3f83e6a8b80c07ecb6bf7cfc2
-  data.tar.gz: 8522c85a07a568ee2a588a6be1b6a4bc3e46f265
+  metadata.gz: 260b636cab7f87c21df1ecf2cdcf861010d26846
+  data.tar.gz: cd13935358710badae2c8eaf27b2bd590e9cf658
 SHA512:
-  metadata.gz: 5ac493e3f3bbcb21d1a0551f85e3a6a79ca9b03bb102c642d4ce5ce877d86104ffaf78f6ff425abd7ae01c38e808667f533e6bcd0e6db4d885cb21afdfc96633
-  data.tar.gz: cc95dba9146fcf288e3821b666fb095cf0d87834cd6cf1fd309c6e7c71a45c2e8c92172602ac5fda8f736bcaa124fa6cadea5987a2b2fffda61ece511763f451
+  metadata.gz: 779ce2f9bde38892dfecdf8868e6e920c231bf5dde2411959db6ada5a12138103c5b499a7d9ed80fb8d616e04bd3e59908ef77291be78cbb3a2d8639f55f2ba0
+  data.tar.gz: f431c134a371d38e7442d501fefaa8d3358f5601645d2586f8ba059abf5bcca2de6edf27bf61abbf458303fee76c4c1a5059f8581b237a9e68b6b3b81dd5a31d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 1.1.0
+
+ * Better windows support.
+ * Make source for gem an argument.
+
 ### 1.0.1
 
  * Fix license and point to the correct github URL.

data/lib/beaker/task_helper.rb

@@ -9,25 +9,35 @@ module Beaker::TaskHelper # rubocop:disable Style/ClassAndModuleChildren
   end
 
   DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
-                      'puppet'
-                     elsif default[:hypervisor] == 'vcloud'
+                       'puppet'
+                     elsif default[:hypervisor] == 'vcloud' || default[:hypervisor] == 'vmpooler'
                        'Qu@lity!'
                      else
                        'root'
                      end
 
-  BOLT_VERSION = '>= 0.7.0'
+  BOLT_VERSION = '0.7.0'.freeze
 
-  def install_bolt_on(hosts, version = BOLT_VERSION)
+  def install_bolt_on(hosts, version = BOLT_VERSION, source = nil)
     unless default[:docker_image_commands].nil?
-      if default[:docker_image_commands].to_s.include? "yum"
-        on(hosts, "yum install -y make gcc ruby-devel", acceptable_exit_codes: [0, 1]).stdout
-      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
+      if default[:docker_image_commands].to_s.include? 'yum'
+        on(hosts, 'yum install -y make gcc ruby-devel', acceptable_exit_codes: [0, 1]).stdout
+      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
-    on(hosts, "/opt/puppetlabs/puppet/bin/gem install --source http://rubygems.delivery.puppetlabs.net bolt -v '#{BOLT_VERSION}'", acceptable_exit_codes: [0, 1]).stdout
+
+    Array(hosts).each do |host|
+      pp = <<-INSTALL_BOLT_PP
+  package { 'bolt' :
+    provider => 'puppet_gem',
+    ensure   => '#{version}',
+INSTALL_BOLT_PP
+      pp << "source   => '#{source}'" if source
+      pp << '}'
+      apply_manifest_on(host, pp)
+    end
   end
 
   def pe_install?
@@ -39,11 +49,11 @@ module Beaker::TaskHelper # rubocop:disable Style/ClassAndModuleChildren
   end
 
   def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD, format: 'human')
-    if pe_install?
-      output = run_puppet_task(task_name: task_name, params: params)
-    else
-      output = run_bolt_task(task_name: task_name, params: params, password: password)
-    end
+    output = if pe_install?
+               run_puppet_task(task_name: task_name, params: params)
+             else
+               run_bolt_task(task_name: task_name, params: params, password: password)
+             end
 
     if format == 'json'
       output = JSON.parse(output)
@@ -53,16 +63,30 @@ module Beaker::TaskHelper # rubocop:disable Style/ClassAndModuleChildren
     end
   end
 
-  def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD, host: "localhost", format: 'human')
-    if params.class == Hash
-      on(default, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --insecure -m /etc/puppetlabs/code/modules --nodes #{host} --password #{password} --params '#{params.to_json}'", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength
+  def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD, host: 'localhost', format: 'human') # rubocop:disable Metrics/LineLength, Lint/UnusedMethodArgument
+    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'
     else
-      on(default, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --insecure -m /etc/puppetlabs/code/modules --nodes #{host} --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength
+      bolt_path = '/opt/puppetlabs/puppet/bin/bolt'
+      module_path = '/etc/puppetlabs/code/modules'
+    end
+    bolt_full_cli = "#{bolt_path} task run #{task_name} --insecure -m #{module_path} --nodes #{host} --password #{password}" # rubocop:disable Metrics/LineLength
+    bolt_full_cli << if params.class == Hash
+                       " --params '#{params.to_json}'"
+                     else
+                       " #{params}"
+                     end
+    # windows is special
+    if fact_on(default, 'osfamily') == 'windows'
+      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
   end
 
   def run_puppet_task(task_name:, params: nil, host: 'localhost', format: 'human')
-    args = ['task', 'run', task_name, '--nodes', host, ]
+    args = ['task', 'run', task_name, '--nodes', host]
     if params.class == Hash
       args << '--params'
       args << params.to_json

data/lib/beaker/task_helper/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module TaskHelper
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-task_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop