knife-inspect 0.6.2 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 93d11b775e0d0a9c62affe93ccf80f97e76ba075
+  data.tar.gz: 0840a56e0c61e3e8aeae5964fd861f55719124cc
+SHA512:
+  metadata.gz: 5437694f23d11c9c5eb948e32f8532c29f77d52fc30acf275552fdd16572d293563deaa36af45483c1040f2860f3fc0e017abbb4d3331b552cebbfb9a4051833
+  data.tar.gz: b9e3d09b260fc0762c20215eece40f710a511e94c34dc5793192e17239b9dc266468b3067d0960874e35779838d1016c681248ccc3a6d70b22a789475c049bb5

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 !.gitkeep
+/coverage/

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+env:
+  - CHEF_VERSION=10.24.0
+  - CHEF_VERSION=10.26.0
+  - CHEF_VERSION=11.4.0
+  - CHEF_VERSION=11.4.4
+  - CHEF_VERSION=11.6.0
+before_script:
+  - chef-client --version

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-# Specify your gem's dependencies in health_inspector.gemspec
 gemspec

data/HISTORY.md

@@ -1,3 +1,17 @@
+## 0.7.0 ( 2014-01-03 )
+
+> It's alive! Thanks a lot to Ben Marini for starting this project!
+> I'm happy to be the new maintainer of knife-inspect, this is an essential
+> tool for all users Chef Server users.
+>
+> -- [Greg Karékinian](https://github.com/gregkare)
+
+* The plugin is now compatible with Chef 11 ([#6][#6])
+* Fix inspect for something non-existent ([#2][#2])
+* Exit with the proper status (0 for success, 1 for failure) ([#14][#14])
+* Remove dependency on thor ([#15][#15])
+* Specify version of the yajl-ruby gem (same as Chef)
+
 ## 0.6.2 ( 2013-02-27 )
 
 * Be indifferent about symbols and strings for hash keys when diff'ing
@@ -89,4 +103,10 @@
 
 ## 0.0.1 ( 2012-03-27 )
 
-* Initial release.
+* Initial release.
+
+
+[#15]: https://github.com/bmarini/knife-inspect/issues/15
+[#14]: https://github.com/bmarini/knife-inspect/issues/14
+[#6]: https://github.com/bmarini/knife-inspect/issues/6
+[#2]: https://github.com/bmarini/knife-inspect/issues/2

data/knife-inspect.gemspec

@@ -2,26 +2,31 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "health_inspector/version"
 
+# Allow to pass an arbitrary chef version. Useful for testing for example.
+chef_version = if ENV.key?('CHEF_VERSION')
+                 "= #{ENV['CHEF_VERSION']}"
+               else
+                 ['>= 10', '<= 12']
+               end
+
 Gem::Specification.new do |s|
-  s.name        = "knife-inspect"
+  s.name        = 'knife-inspect'
   s.version     = HealthInspector::VERSION
-  s.authors     = ["Ben Marini"]
-  s.email       = ["bmarini@gmail.com"]
-  s.homepage    = "https://github.com/bmarini/knife-inspect"
-  s.summary     = %q{Inspect your chef repo as is compares to what is on your chef server}
-  s.description = %q{Inspect your chef repo as is compares to what is on your chef server}
-
-  s.rubyforge_project = "knife-inspect"
+  s.authors     = ['Greg Karékinian', 'Ben Marini']
+  s.email       = ['greg@karekinian.com']
+  s.license     = 'MIT'
+  s.homepage    = 'https://github.com/bmarini/knife-inspect'
+  s.summary     = 'Inspect your chef repo as it is compared to what is on your chef server'
+  s.description = 'knife-inspect is a knife plugin to compare the content of your Chef repository and Chef server'
 
   s.files         = `git ls-files`.split("\n")
   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.require_paths = ["lib"]
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency 'rake',      '~> 10.1'
+  s.add_development_dependency 'rspec',     '~> 2.14'
+  s.add_development_dependency 'simplecov', '~> 0.8'
 
-  s.add_runtime_dependency "thor"
-  s.add_runtime_dependency "chef", "~> 10.14"
-  s.add_runtime_dependency "yajl-ruby"
+  s.add_runtime_dependency 'chef',      chef_version
+  s.add_runtime_dependency 'yajl-ruby', '~> 1.1'
 end

data/lib/chef/knife/cookbook_inspect.rb

@@ -13,7 +13,7 @@ class Chef
 
       banner "knife cookbook inspect [COOKBOOK] (options)"
 
-      def run 
+      def run
         case @name_args.length
         when 1 # We are inspecting a cookbook
           cookbook_name = @name_args[0]
@@ -22,9 +22,9 @@ class Chef
           # api_endpoint  = env ? "environments/#{env}/cookbooks/#{cookbook_name}" : "cookbooks/#{cookbook_name}"
 
           validator = HealthInspector::Checklists::Cookbooks.new(self)
-          validator.validate_item( validator.load_item(cookbook_name) )
+          exit validator.validate_item( validator.load_item(cookbook_name) )
         when 0 # We are inspecting all the cookbooks
-          HealthInspector::Checklists::Cookbooks.run(self)
+          exit HealthInspector::Checklists::Cookbooks.run(self)
         end
       end
     end

data/lib/chef/knife/data_bag_inspect.rb

@@ -17,17 +17,17 @@ class Chef
           item_name = @name_args[1]
 
           validator = HealthInspector::Checklists::DataBagItems.new(self)
-          validator.validate_item( validator.load_item("#{bag_name}/#{item_name}") )
+          exit validator.validate_item( validator.load_item("#{bag_name}/#{item_name}") )
 
         when 1 # We are inspecting a data bag
           bag_name = @name_args[0]
 
           validator = HealthInspector::Checklists::DataBags.new(self)
-          validator.validate_item( validator.load_item(bag_name) )
+          exit validator.validate_item( validator.load_item(bag_name) )
 
         when 0 # We are inspecting all the data bags
           HealthInspector::Checklists::DataBags.run(self)
-          HealthInspector::Checklists::DataBagItems.run(self)
+          exit HealthInspector::Checklists::DataBagItems.run(self)
         end
       end
     end

data/lib/chef/knife/environment_inspect.rb

@@ -10,14 +10,14 @@ class Chef
 
       banner "knife environment inspect [ENVIRONMENT] (options)"
 
-      def run 
+      def run
         case @name_args.length
         when 1 # We are inspecting a environment
           environment_name = @name_args[0]
           validator = HealthInspector::Checklists::Environments.new(self)
-          validator.validate_item( validator.load_item(environment_name) )
+          exit validator.validate_item( validator.load_item(environment_name) )
         when 0 # We are inspecting all the environments
-          HealthInspector::Checklists::Environments.run(self)
+          exit HealthInspector::Checklists::Environments.run(self)
         end
       end
     end

data/lib/chef/knife/inspect.rb

@@ -4,6 +4,8 @@ class Chef
   class Knife
     class Inspect < Knife
 
+      CHECKLISTS = %w[Cookbooks DataBags DataBagItems Environments Roles]
+
       deps do
         require "health_inspector"
       end
@@ -11,9 +13,11 @@ class Chef
       banner "knife inspect"
 
       def run
-        %w[ Cookbooks DataBags DataBagItems Environments Roles ].each do |checklist|
+        results = CHECKLISTS.map do |checklist|
           HealthInspector::Checklists.const_get(checklist).run(self)
         end
+
+        exit ! results.include?(false)
       end
     end
   end

data/lib/chef/knife/role_inspect.rb

@@ -10,14 +10,14 @@ class Chef
 
       banner "knife role inspect [ROLE] (options)"
 
-      def run 
+      def run
         case @name_args.length
         when 1 # We are inspecting a role
           role_name = @name_args[0]
           validator = HealthInspector::Checklists::Roles.new(self)
-          validator.validate_item( validator.load_item(role_name) )
+          exit validator.validate_item( validator.load_item(role_name) )
         when 0 # We are inspecting all the roles
-          HealthInspector::Checklists::Roles.run(self)
+          exit HealthInspector::Checklists::Roles.run(self)
         end
       end
     end

data/lib/health_inspector.rb

@@ -11,7 +11,6 @@ require "health_inspector/checklists/data_bag_items"
 require "health_inspector/checklists/environments"
 require "health_inspector/checklists/roles"
 require 'chef/rest'
-require 'chef/checksum_cache'
 require 'chef/version'
 
 module HealthInspector

data/lib/health_inspector/checklists/base.rb

@@ -41,9 +41,13 @@ module HealthInspector
       def run
         banner "Inspecting #{self.class.title}"
 
+        results = []
+
         each_item do |item|
-          validate_item(item)
+          results << validate_item(item)
         end
+
+        return ! results.include?(false)
       end
 
       def validate_item(item)
@@ -52,8 +56,12 @@ module HealthInspector
 
         if failures.empty?
           print_success(item.name) # unless @context.quiet_success
+
+          true
         else
           print_failures(item.name, failures)
+
+          false
         end
       end
 
@@ -103,7 +111,7 @@ module HealthInspector
         print value["server"]
         print "\n"
         print indent( color('bright fail',"local value  = "), depth + 1 )
-        print value["local"] 
+        print value["local"]
         print "\n\n"
       end
 

data/lib/health_inspector/checklists/environments.rb

@@ -6,6 +6,7 @@ module HealthInspector
       include ExistenceValidations
       include JsonValidations
 
+      private
       # Override to ignore _default environment if it is missing locally
       def validate_local_copy_exists
         super unless name == '_default'

data/lib/health_inspector/pairing.rb

@@ -41,14 +41,14 @@ module HealthInspector
     def hash_diff(original, other)
       recursive_diff(stringify_hash_keys(original), stringify_hash_keys(other))
     end
-    
+
     def stringify_hash_keys(original)
       original.keys.inject({}) do |original_strkey, key|
         original_strkey[key.to_s] = stringify_item(original[key])
         original_strkey
       end
     end
-    
+
     def stringify_item(item)
       if item.kind_of?(Hash)
         stringify_hash_keys(item)
@@ -58,7 +58,7 @@ module HealthInspector
         item
       end
     end
-    
+
     def recursive_diff(original, other)
       (original.keys + other.keys).uniq.inject({}) do |memo, key|
         unless original[key] == other[key]
@@ -76,6 +76,17 @@ module HealthInspector
 
   # Mixins for common validations across pairings
   module ExistenceValidations
+    def validate_existence
+      if local.nil? && server.nil?
+        errors.add "does not exist locally or on server"
+        return
+      end
+
+      validate_local_copy_exists
+      validate_server_copy_exists
+    end
+
+    private
     def validate_local_copy_exists
       errors.add "exists on server but not locally" if local.nil?
     end
@@ -93,4 +104,4 @@ module HealthInspector
       end
     end
   end
-end
+end

data/lib/health_inspector/version.rb

@@ -1,3 +1,3 @@
 module HealthInspector
-  VERSION = "0.6.2"
+  VERSION = '0.7.0'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+if RUBY_VERSION > '1.9'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
+
 require 'rubygems'
 require 'bundler/setup'
 require 'health_inspector'
@@ -32,6 +39,14 @@ shared_examples "a chef model" do
     pairing.errors.should_not be_empty
     pairing.errors.first.should == "exists locally but not on server"
   end
+
+  it "should detect if an item does not exist locally or on server" do
+    pairing.server = nil
+    pairing.local  = nil
+    pairing.validate
+
+    pairing.errors.to_a.should == ["does not exist locally or on server"]
+  end
 end
 
 shared_examples "a chef model that can be respresented in json" do
@@ -41,64 +56,64 @@ shared_examples "a chef model that can be respresented in json" do
     pairing.server = {"foo" => "bar"}
     pairing.local  = {"foo" => "baz"}
     pairing.validate
-  
+
     pairing.errors.should_not be_empty
     pairing.errors.first.should == {"foo"=>{"server"=>"bar", "local"=>"baz"}}
   end
-  
+
   it "should detect if an item is the same" do
     pairing.server = {"foo" => "bar"}
     pairing.local  = {"foo" => "bar"}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-  
+
   it "should detect if an string and symbol keys convert to the same values" do
     pairing.server = {"foo" => "bar"}
     pairing.local  = {:foo => "bar"}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-  
+
   it "should detect if matching hashes are the same" do
     pairing.server = {"foo" => {"bar" => "fizz"}}
     pairing.local  = {"foo" => {"bar" => "fizz"}}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-  
+
   it "should detect if matching hashes with mismatched symbols and keys are the same" do
     pairing.server = {"foo" => {"bar" => "fizz"}}
     pairing.local  = {:foo => {:bar => "fizz"}}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-  
+
   it "should detect if matching arrays are the same" do
     pairing.server = {"foo" => ["bar", "fizz"]}
     pairing.local  = {"foo" => ["bar", "fizz"]}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-  
+
   it "should detect if matching arrays with hashes are the same" do
     pairing.server = {"foo" => ["bar", {"fizz" => "buzz"}]}
     pairing.local  = {"foo" => ["bar", {"fizz" => "buzz"}]}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-  
+
   it "should detect if matching arrays with hashes containing symbols/strings are the same" do
     pairing.server = {"foo" => ["bar", {"fizz" => "buzz"}]}
     pairing.local  = {"foo" => ["bar", {:fizz => "buzz"}]}
     pairing.validate
-  
+
     pairing.errors.should be_empty
   end
-end
+end

metadata

@@ -1,104 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: knife-inspect
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
+- Greg Karékinian
 - Ben Marini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '0.8'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.14'
+        version: '10'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '10.14'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Inspect your chef repo as is compares to what is on your chef server
+        version: '1.1'
+description: knife-inspect is a knife plugin to compare the content of your Chef repository
+  and Chef server
 email:
-- bmarini@gmail.com
+- greg@karekinian.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - MIT-LICENSE
@@ -131,29 +129,29 @@ files:
 - spec/role_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bmarini/knife-inspect
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: knife-inspect
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
-summary: Inspect your chef repo as is compares to what is on your chef server
+specification_version: 4
+summary: Inspect your chef repo as it is compared to what is on your chef server
 test_files:
 - spec/chef-repo/.chef/client.pem
 - spec/chef-repo/.chef/knife.rb
@@ -163,4 +161,3 @@ test_files:
 - spec/environment_spec.rb
 - spec/role_spec.rb
 - spec/spec_helper.rb
-has_rdoc: