knife-api 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e2058634a5ec5f5e48fbb926e2ce9a4d40bdee4
-  data.tar.gz: 8a2b599294f9ed0f1b1bed7edc6d6b0569a01869
+  metadata.gz: 133c78523dfdc03c78812813cfe4e3b8bc3afb46
+  data.tar.gz: b345e8e05f3589958a8527ac744cb99c04e220df
 SHA512:
-  metadata.gz: 0d092f430d8ce506b3306c00adf13e5257cce08b03b219488960b84ec2efaaeae8665ec18faf30ea7e6541a71a8b1c6184a91d22606dea183808d91947545541
-  data.tar.gz: 68343cbd5ec83ade5b4c70141ce6ac41543a8d855a31ee15736804954b999ac81f2775151dc95d24137a605e42692e9dac1e2a18c52a55217afba4d449826d4b
+  metadata.gz: d2a1c44ffe320c70f148c2a52d691a04616bbf0eaae07366ea97b53bf9315cd33138c10a45ca8528747439f15502bb0b8692b920ea97a41c7ad04931b62b91c9
+  data.tar.gz: 95bd4bf5c30a8f1657bcefa87fce41bba4c6b65639491bead4bcacc6e080f005ea90033a9b71f90615d897d70c76294aeedc115be12f42da119b7e9ee38b03bc

data/CHANGELOG.md

@@ -3,4 +3,10 @@ Change Log
 
 2015-02-26
   added a CodeShip badge to the README.md file
-  added a CHANGELOG.md file to better document project changes
+  added a CHANGELOG.md file to better document project changes
+  
+2016-01-15
+  found that both Ruby Mine and Atom tricked out with linter, linter-ruby, 
+  linter-rubocop, linter-foodcritic were unhappy with the Ruby code as it was
+  so I cleaned it up, primarily by refactoring the knife_capture method
+

data/Rakefile

@@ -1 +1,17 @@
 require 'bundler/gem_tasks'
+
+require 'knife/api'
+require 'pp'
+require 'json'
+
+task :list_nodes do
+  status = knife :node_list
+  puts "status is #{status}"
+  fail if status > 0
+end
+
+task :show_node, :node_name do |task_name, args|
+  stdout, stderr, status = knife_capture :node_show, [args[:node_name], '-F', 'j']
+  fail if status > 0
+  pp JSON.load(stdout)
+end

data/knife-api.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'chef', '>= 10.32', '< 13.0.0'
+  gem.add_dependency 'chef', '>= 10.32', '<= 12.6.0'
   gem.add_dependency 'chef-zero', '>= 2.2.1'
   gem.add_dependency 'ohai', '> 7.0.0', '< 9.0.0'
   gem.add_dependency 'json', '>= 1.8.2'
 
   gem.add_development_dependency 'rake', '>= 10.4.2'
+  gem.add_development_dependency 'codeclimate-test-reporter', '>= 0.4.8' # , group: :test, require: nil
 end

data/lib/knife/api.rb

@@ -2,6 +2,8 @@ require 'chef/application/knife'
 require 'knife/api/version'
 require 'stringio'
 
+# Chef::Knife classes are opened to expose the Knife entry points to code
+# via the injected API module
 class Chef
   class Knife
     # adding API module to existing Chef::Knife packaging
@@ -9,21 +11,17 @@ class Chef
       # adding Support module
       module Support
         def self.run_knife(command, args)
-          unless command.is_a?(Array)
-            command = command.to_s.split(/[\s_]+/)
-          end
-
+          command = command.to_s.split(/[\s_]+/) unless command.is_a?(Array)
           command += args
-
-          if ENV['CHEF_CONFIG']
-            command += ['-c', ENV['CHEF_CONFIG']]
-          end
+          command += ['-c', ENV['CHEF_CONFIG']] if ENV['CHEF_CONFIG']
 
           opts = Chef::Application::Knife.new.options
           Chef::Knife.run(command, opts)
-          return 0
+          # believe this to be a problem -- if knife command would otherwise
+          # indicate a chef error this creates a false positive
+          0
         rescue SystemExit => e
-          return e.status
+          abort("Chef run failed with status " + e.status.to_s)
         end
       end
 
@@ -32,33 +30,52 @@ class Chef
       end
 
       def knife_capture(command, args = [], input = nil)
-        null = Gem.win_platform? ? File.open('NUL:', 'r') : File.open('/dev/null', 'r')
-
-        warn = $VERBOSE
-        $VERBOSE = nil
-        stderr, stdout, stdin = STDERR, STDOUT, STDIN
+        @input = input
+        set_null
 
-        Object.const_set('STDERR', StringIO.new('', 'r+'))
-        Object.const_set('STDOUT', StringIO.new('', 'r+'))
-        Object.const_set('STDIN', input ? StringIO.new(input, 'r') : null)
-        $VERBOSE = warn
+        assign_io_channels
 
         status = Chef::Knife::API::Support.run_knife(command, args)
         return STDOUT.string, STDERR.string, status
       ensure
-        warn = $VERBOSE
-        $VERBOSE = nil
-        Object.const_set('STDERR', stderr)
-        Object.const_set('STDOUT', stdout)
-        Object.const_set('STDIN', stdin)
-        $VERBOSE = warn
-        null.close
+        revert_io_channels
       end
     end
   end
+
+  def set_null
+    if Gem.win_platform? == null
+      File.open('NUL:', 'r')
+    else
+      File.open('/dev/null', 'r')
+    end
+  end
+
+  def assign_io_channels
+    @warn = $VERBOSE
+    $VERBOSE = nil
+    @stderr = STDERR
+    @stdout = STDOUT
+    @stdin = STDIN
+
+    Object.const_set('STDERR', StringIO.new('', 'r+'))
+    Object.const_set('STDOUT', StringIO.new('', 'r+'))
+    Object.const_set('STDIN', @input ? StringIO.new(@input, 'r') : null)
+    $VERBOSE = @warn
+  end
+
+  def revert_io_channels
+    @warn = $VERBOSE
+    $VERBOSE = nil
+    Object.const_set('STDERR', @stderr)
+    Object.const_set('STDOUT', @stdout)
+    Object.const_set('STDIN', @stdin)
+    $VERBOSE = @warn
+    null.close
+  end
 end
 
-class << eval("self", TOPLEVEL_BINDING)
+class << eval('self', TOPLEVEL_BINDING)
   include Chef::Knife::API
 end
 

data/lib/knife/api/version.rb

@@ -2,7 +2,7 @@ class Chef
   class Knife
     # adding API module to existing Chef::Knife packaging
     module API
-      VERSION = '0.1.6'
+      VERSION = '0.1.7'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-api
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Erik Hollensbe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -19,9 +19,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.32'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 12.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +29,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.32'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 12.6.0
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.2
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.8
 description: A small library that lets you drive Chef's 'knife' programmatically
 email:
 - andyglick@gmailcom
@@ -130,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A small library that lets you drive Chef's 'knife' programmatically