knife-inspect 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df44c7117866177d6763bb03b81eb95353af13fe
-  data.tar.gz: 540a14e765e9d18acb68050c1914c283b0a7fe8e
+  metadata.gz: f6bfd104cb7e5ac63c15140fb15470a9e5954a2a
+  data.tar.gz: 709c71f1dea8ed399459eb97f0304f32f527e5b1
 SHA512:
-  metadata.gz: 4d0f3b29557479ede0bed9e51bf3a800371ac235d1138a119743e34cd1c5602159a896d864998c3c2ef87f9be5fb232d2e9ded6dfa86ddea16001b94997da3d9
-  data.tar.gz: ba837b29eaf4bd6385d582a7e835939a4d89e413a41392d09dc085614abd4a7bff108f398ee6f20a1ff3a31425de80a53892c197d6c052f23c320b926844835d
+  metadata.gz: 1f051f4156e4458700f70bb3b1f761da1c25f254138826dd0276926a4456011a89d839bb72e15f442900a243536ac0dbc4151e9c94387587b9c03da46ad96482
+  data.tar.gz: 9ff4c5c8f1f6018963c40289c8409b2a89b5bc7c1c5127c28ee9fb582b9c1a4f428921982418d3b372eb7077ae552492245dad7e654a1c484f8e34643c6a43c5

data/.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
 env:
   - CHEF_VERSION=12.6.0
   - CHEF_VERSION=12.7.2
+  - CHEF_VERSION=11.18.12
 notifications:
   email: false
 sudo: false

data/HISTORY.md

@@ -1,3 +1,10 @@
+## 0.15.0 ( 2016-08-03 )
+
+* New (old) feature: Chef 11 is supported again! ([#46][#46]). Thanks @kdaniels!
+* Updated development dependencies and set the version of rack to < 2
+* Switch to ffi-yajl like Chef
+
+
 ## 0.14.1 ( 2016-07-22 )
 
 * Bug fix: explicitly call the `HealthInspector` module with a root prefix

data/README.md

@@ -68,9 +68,7 @@ when everything is in sync or 1 if it's not.
 
 ## Compatibility
 
-This gem is tested with Ruby 2.1 and 2.2 and as of version 0.14.0 is only
-compatible with Chef 12. For now use version 0.13.0 if you are still using Chef
-11.
+This gem is tested with Ruby 2.1 and 2.2 and has been tested with Chef 12 and Chef 11.
 
 ## Contributors
 

data/knife-inspect.gemspec

@@ -6,7 +6,7 @@ require "health_inspector/version"
 chef_version = if ENV.key?('CHEF_VERSION')
                  "= #{ENV['CHEF_VERSION']}"
                else
-                 '>= 12.0.0'
+                 '>= 11.0.0'
                end
 
 Gem::Specification.new do |s|
@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_development_dependency 'rake',      '~> 10.1'
-  s.add_development_dependency 'rspec',     '~> 3.4.0'
-  s.add_development_dependency 'simplecov', '~> 0.11'
-  s.add_development_dependency 'coveralls', '~> 0.7'
+  s.add_development_dependency 'rake',      '~> 11.2'
+  s.add_development_dependency 'rspec',     '~> 3.5.0'
+  s.add_development_dependency 'simplecov', '~> 0.12'
+  s.add_development_dependency 'coveralls', '~> 0.8'
 
   s.add_runtime_dependency 'chef',      chef_version
-  s.add_runtime_dependency 'yajl-ruby', '~> 1.2'
+  s.add_runtime_dependency 'rack',      '< 2'
   s.add_runtime_dependency 'parallel',  '~> 1.3'
   s.add_runtime_dependency 'inflecto',  '~> 0.0.2'
 end

data/lib/health_inspector/checklists/base.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 require 'pathname'
-require 'yajl'
+require 'ffi_yajl'
 require 'parallel'
 require 'inflecto'
 
@@ -141,9 +141,11 @@ module HealthInspector
           instance = chef_class.new
           instance.from_file(ruby_pathname.first.to_s)
         elsif !json_pathname.empty?
-          instance = chef_class.from_hash(Yajl::Parser.parse(json_pathname.first.read))
+          parsed_json = FFI_Yajl::Parser.parse(json_pathname.first.read)
+          instance = load_instance_from(parsed_json, chef_class)
         elsif !js_pathname.empty?
-          instance = chef_class.from_hash(Yajl::Parser.parse(js_pathname.first.read))
+          parsed_json = FFI_Yajl::Parser.parse(js_pathname.first.read)
+          instance = load_instance_from(parsed_json, chef_class)
         end
 
         instance ? instance.to_hash : nil
@@ -154,6 +156,18 @@ module HealthInspector
       def indent(string, depth)
         (' ' * 2 * depth) + string
       end
+
+      private
+
+      # This supports both Chef 11 and 12+ (assuming the public API still has
+      # #from_hash
+      def load_instance_from(parsed_json, chef_class)
+        if Gem::Version.new(Chef::VERSION) < Gem::Version.new('12.0.0')
+          chef_class.json_create(parsed_json)
+        else
+          chef_class.from_hash(parsed_json)
+        end
+      end
     end
   end
 end

data/lib/health_inspector/checklists/data_bag_items.rb

@@ -1,5 +1,5 @@
 require 'chef/data_bag'
-require 'yajl'
+require 'ffi_yajl'
 
 module HealthInspector
   module Checklists
@@ -48,8 +48,8 @@ module HealthInspector
         local_data_bag_item = Dir["#{@context.repo_path}/data_bags/**/#{name}.json"].first
         return nil if local_data_bag_item.nil?
 
-        Yajl::Parser.parse(File.read(local_data_bag_item))
-      rescue Yajl::ParseError
+        FFI_Yajl::Parser.parse(File.read(local_data_bag_item))
+      rescue FFI_Yajl::ParseError
         nil
       end
     end

data/lib/health_inspector/version.rb

@@ -1,3 +1,3 @@
 module HealthInspector
-  VERSION = '0.14.1'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-inspect
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Greg Karékinian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,84 +17,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement