kitchen-ansiblepush 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7b7a7c54d6db3032fafdec0df791c8c5218917b
-  data.tar.gz: 06cd24f0c08c3960d6b718ae92e2baa52b816efe
+  metadata.gz: e3cbe198c6b5c78f2bc9fc8539e3e5c37ebc3c6c
+  data.tar.gz: 633e2fd2ff220a952d7eaae9f4861a5269e3cd21
 SHA512:
-  metadata.gz: f27af40952e7f1a8e6a284972c92e211e3795de71167e94a6c68d0eb599cfac822b21cfb24cf2236e9ba6210516a3d8522279dd5dc08192d11bcb3ec1b446122
-  data.tar.gz: 7d1186dcd96c12611a20f91e62c7a96454c462d37d817cd4c849ff053db4ec3ee4b9c490d763a6843d15397f4d2b317bd14d68670da65be02175e061e9b83bf3
+  metadata.gz: 909021bd352a2ffdc6701c2dda863a8cc73f231aaec9383c493cf5e106ea962879c1b7f803a9d3bfcf448f5aa4a58315113e09f618adf691cd92c1660e9aa519
+  data.tar.gz: 8185394ce8433fc72d60a4581814946e708a08e12a1e7697accd3a63a830b25a5e76abb811a4feadd00afd37ed14c3bfa0e471fd66403a2db5a54854dc1ce7e3

data/lib/kitchen/provisioner/ansible_push.rb

@@ -41,7 +41,7 @@ module Kitchen
       default_config :idempotency_test, false
       default_config :fail_non_idempotent, true
       default_config :use_instance_name, false
-      default_config :ansible_connection, "smart"
+      default_config :ansible_connection, 'smart'
 
       # For tests disable if not needed
       default_config :chef_bootstrap_url, 'https://omnitruck.chef.io/install.sh'
@@ -61,8 +61,8 @@ module Kitchen
 
         # Validate that extra_vars is either a hash, or a path to an existing file
         if config[:extra_vars]
-          extra_vars_is_valid = config[:extra_vars].kind_of?(Hash) || config[:extra_vars].kind_of?(String)
-          if config[:extra_vars].kind_of?(String)
+          extra_vars_is_valid = config[:extra_vars].is_a?(Hash) || config[:extra_vars].is_a?(String)
+          if config[:extra_vars].is_a?(String)
             # Accept the usage of '@' (e.g. '@vars.yml' and 'vars.yml' are both supported)
             match_data = /^@?(.+)$/.match(config[:extra_vars])
             extra_vars_path = match_data[1].to_s
@@ -108,11 +108,11 @@ module Kitchen
         options << "--inventory-file=#{conf[:generate_inv_path]}" if conf[:generate_inv]
 
         # By default we limit by the current machine,
-        if conf[:limit]
-          options << "--limit=#{as_list_argument(conf[:limit])}"
-        else
-          options << "--limit=#{machine_name}"
-        end
+        options << if conf[:limit]
+                     "--limit=#{as_list_argument(conf[:limit])}"
+                   else
+                     "--limit=#{machine_name}"
+                   end
 
         # Add raw argument as final thing
         options << conf[:raw_arguments] if conf[:raw_arguments]
@@ -144,14 +144,14 @@ module Kitchen
         true_command
       end
 
-     def true_command
-       # Place holder so a string is returned. This will execute true on remote host
-       if conf[:ansible_connection] == "winrm"
+      def true_command
+        # Place holder so a string is returned. This will execute true on remote host
+        if conf[:ansible_connection] == 'winrm'
           '$TRUE'
-       else
+        else
           'true'
-       end
-     end
+        end
+      end
 
       def install_command
         # Must install chef for busser and serverspec to work :(
@@ -169,7 +169,6 @@ module Kitchen
       end
 
       def chef_installation(chef_url, omnibus_download_dir, transport)
-
         if chef_url && (chef_url != 'nil') # ignore string nil
           scripts = []
           scripts << Util.shell_helpers
@@ -225,7 +224,7 @@ module Kitchen
       def exec_ansible_command(env, command, desc)
         debug('env=%s command=%s' % [env, command])
         system(env, command.to_s)
-        exit_code = $?.exitstatus
+        exit_code = $CHILD_STATUS.exitstatus
         debug("ansible-playbook exit code = #{exit_code}")
         if exit_code.to_i != 0
           raise '%s returned a non zero \'%s\'. Please see the output above.' % [desc, exit_code.to_s]
@@ -241,12 +240,12 @@ module Kitchen
 
       def prepare_inventory
         if instance_connection_option.nil?
-          hostname =  machine_name
-        elsif not instance_connection_option()[:hostname].nil?
-            instance_connection_option()[:hostname]
-        elsif not instance_connection_option()[:endpoint].nil?
+          hostname = machine_name
+        elsif !instance_connection_option[:hostname].nil?
+          hostname = instance_connection_option[:hostname]
+        elsif !instance_connection_option[:endpoint].nil?
           require 'uri'
-          urlhost = URI.parse(instance_connection_option()[:endpoint])
+          urlhost = URI.parse(instance_connection_option[:endpoint])
           hostname = urlhost.host
         end
         debug("hostname='#{hostname}")
@@ -258,7 +257,7 @@ module Kitchen
       end
 
       def extra_vars_argument
-        if conf[:extra_vars].kind_of?(String) && conf[:extra_vars] =~ /^@.+$/
+        if conf[:extra_vars].is_a?(String) && conf[:extra_vars] =~ /^@.+$/
           # A JSON or YAML file is referenced (requires Ansible 1.3+)
           conf[:extra_vars]
         else
@@ -280,7 +279,7 @@ module Kitchen
       end
 
       def as_list_argument(v)
-        v.kind_of?(Array) ? v.join(',') : v
+        v.is_a?(Array) ? v.join(',') : v
       end
 
       def verbosity_argument

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.5.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Adham Helal