health_inspector 0.3.0 → 0.3.1

data/HISTORY.md

@@ -1,6 +1,10 @@
+## 0.3.1 ( 2012-09-27 )
+
+* Stop shelling out for knife commands, use Chef API directly for everything.
+
 ## 0.3.0 ( 2012-09-26 )
 
-* Add new check for cookbooks: checksum comparison for each file
+* Add new check for cookbooks: checksum comparison for each file.
 
 ## 0.2.1 ( 2012-09-26 )
 
@@ -15,8 +19,8 @@
 ## 0.1.0 ( 2012-09-24 )
 
 * Bump Chef dependency version up to 10.14
-* Add support for JSON environments
-* Add support for JSON roles
+* Add support for JSON environments.
+* Add support for JSON roles.
 * Display the diff between JSONs when JSON data doesn't match.
 
 ## 0.0.6 ( 2012-05-23 )
@@ -26,20 +30,20 @@
 
 ## 0.0.5 ( 2012-04-13 )
 
-* Fix #2, exception when a data bag item json file doesn't exist locally
+* Fix #2, exception when a data bag item json file doesn't exist locally.
 
 ## 0.0.4 ( 2012-04-09 )
 
-* Add checks for data bags, data bag items, environments, and roles
+* Add checks for data bags, data bag items, environments, and roles.
 
 ## 0.0.3 ( 2012-03-27 )
 
-* Read cookbook paths from knife config file instead of hardcoding /cookbooks
+* Read cookbook paths from knife config file instead of hardcoding /cookbooks.
 
 ## 0.0.2 ( 2012-03-27 )
 
-* Make sure we iterate over actual cookbooks in cookbooks folder
+* Make sure we iterate over actual cookbooks in cookbooks folder.
 
 ## 0.0.1 ( 2012-03-27 )
 
-* Initial release
+* Initial release.

data/README.md

@@ -23,7 +23,3 @@ So far it checks if...
 * your data bag items are in sync
 * your environments are in sync
 * your roles are in sync
-
-## Assumptions
-
-* Your roles and environments are written using the ruby DSL.

data/lib/health_inspector/checklists/base.rb

@@ -77,9 +77,8 @@ module HealthInspector
         end
       end
 
-      def chef_rest 
-        @rest ||= Chef::REST.new(@context.configure[:chef_server_url], @context.configure[:node_name],
-                                 @context.configure[:client_key])
+      def chef_rest
+        @context.chef_rest
       end
 
       def run_check(check, item)

data/lib/health_inspector/checklists/cookbooks.rb

@@ -73,9 +73,8 @@ module HealthInspector
       end
 
       def cookbooks_on_server
-        Yajl::Parser.parse( @context.knife_command("cookbook list -Fj") ).inject({}) do |hsh, c|
-          name, version = c.split
-          hsh[name] = version
+        chef_rest.get_rest("/cookbooks").inject({}) do |hsh, (name,version)|
+          hsh[name] = version["versions"].first["version"]
           hsh
         end
       end
@@ -100,30 +99,35 @@ module HealthInspector
         path ? File.join(path, name) : nil
       end
 
-      def checksum_compare(name,version)
+      # TODO: Check files that exist locally but not in manifest on server
+      def checksum_compare(name, version)
         begin
           cookbook = chef_rest.get_rest("/cookbooks/#{name}/#{version}")
         rescue Net::HTTPServerException => e
           return ["Could not find cookbook #{name} on the server"]
         end
 
-        cookbook.manifest.inject([]) do |memo, (key,value)|
-          if value.kind_of? Array
-            value.each do |file|
-              path = cookbook_path("#{name}/#{file["path"]}")
-
-              if path
-                checksum = Chef::ChecksumCache.generate_md5_checksum_for_file(path)
-                memo << "#{file['path']}" if checksum != file['checksum']
-              else
-                memo << "#{file['path']} does not exist in the repo"
-              end
+        bad_files = []
+
+        Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segment|
+          cookbook.manifest[segment].each do |manifest_record|
+            path = cookbook_path("#{name}/#{manifest_record["path"]}")
+
+            if path
+              checksum = checksum_cookbook_file(path)
+              bad_files << "#{manifest_record['path']}" if checksum != manifest_record['checksum']
+            else
+              bad_files << "#{manifest_record['path']} does not exist in the repo"
             end
           end
-          memo
         end
+
+        bad_files
       end
 
+      def checksum_cookbook_file(filepath)
+        Chef::CookbookVersion.checksum_cookbook_file(filepath)
+      end
     end
   end
 end

data/lib/health_inspector/context.rb

@@ -2,10 +2,6 @@ require "chef/config"
 
 module HealthInspector
   class Context < Struct.new(:repo_path, :config_path)
-    def knife_command(subcommnad)
-      `cd #{repo_path} && knife #{subcommnad} -c #{config_path}`
-    end
-
     def cookbook_path
       Array( config.cookbook_path )
     end
@@ -18,5 +14,9 @@ module HealthInspector
       Chef::Config.from_file(config_path)
       Chef::Config
     end
+
+    def chef_rest
+      @chef_rest ||= Chef::REST.new( config[:chef_server_url], config[:node_name], config[:client_key] )
+    end
   end
-end
+end

data/lib/health_inspector/version.rb

@@ -1,3 +1,3 @@
 module HealthInspector
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/data_bag_item_spec.rb

@@ -6,9 +6,11 @@ describe "HealthInspector::Checklists::DataBagItems" do
   end
 
   it "should detect if a data bag item does not exist locally" do
-    subject.expects(:data_bag_items_on_server).returns( ["apps/app1"] )
-    subject.expects(:load_item_from_server).with("apps/app1").returns({})
-    failures = subject.run_checks(subject.items.first)
+    item = HealthInspector::Checklists::DataBagItems::DataBagItem.new(
+      :name => "apps", :server => ["apps/app1"], :local => nil
+    )
+
+    failures = subject.run_checks(item)
     failures.first.include?("exists on server but not locally").must_equal true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_inspector
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70140548345560 !ruby/object:Gem::Requirement
+  requirement: &70329253887600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140548345560
+  version_requirements: *70329253887600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70140548344640 !ruby/object:Gem::Requirement
+  requirement: &70329253886680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140548344640
+  version_requirements: *70329253886680
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70140548344100 !ruby/object:Gem::Requirement
+  requirement: &70329253886140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140548344100
+  version_requirements: *70329253886140
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70140548343560 !ruby/object:Gem::Requirement
+  requirement: &70329253885600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '10.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70140548343560
+  version_requirements: *70329253885600
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70140548343140 !ruby/object:Gem::Requirement
+  requirement: &70329253885180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140548343140
+  version_requirements: *70329253885180
 description: A tool to inspect your chef repo as is compares to what is on your chef
   server
 email: