facter_helpers.rb in beaker-puppet-2.0.0

- old
+ new

@@ -3,19 +3,18 @@
     module Helpers
       # Methods that help you interact with your facter installation, facter must be installed
       # for these methods to execute correctly
       #
       module FacterHelpers
-
         # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
         #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
         #     (or range) of integer exit codes that should be considered
         #     acceptable.  An error will be thrown if the exit code does not
         #     match one of the values in this list.
-        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
+        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all
         #     exit codes as passing.
         #   @option opts [Boolean] :dry_run (false) Do not actually execute any
         #     commands on the SUT
         #   @option opts [String] :stdin (nil) Input to be provided during command
         #     execution on the SUT.
@@ -35,19 +34,23 @@
         # @!macro common_opts
         #
         # @return String The value of the fact 'name' on the provided host
         # @raise  [FailTest] Raises an exception if call to facter fails
         def fact_on(host, name, opts = {})
-          raise(ArgumentError, "fact_on's `name` option must be a String. You provided a #{name.class}: '#{name}'") unless name.is_a?(String)
-          if opts.kind_of?(Hash)
-            opts.merge!({json: nil})
+          unless name.is_a?(String)
+            raise(ArgumentError,
+                  "fact_on's `name` option must be a String. You provided a #{name.class}: '#{name}'")
+          end
+
+          if opts.is_a?(Hash)
+            opts.merge!({ json: nil })
           else
             opts << ' --json'
           end
 
           result = on host, facter("\"#{name}\"", opts)
-          if result.kind_of?(Array)
+          if result.is_a?(Array)
             result.map { |res| JSON.parse(res.stdout)[name] }
           else
             JSON.parse(result.stdout)[name]
           end
         end
@@ -55,10 +58,9 @@
         # Get a facter fact from the default host
         # @see #fact_on
         def fact(name, opts = {})
           fact_on(default, name, opts)
         end
-
       end
     end
   end
 end