kitchen-inspector 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4146d1e7d37eab22555d357517ac7a44a43f1213
-  data.tar.gz: e9ac2ee18b946515038713a5261265280856e52d
+  metadata.gz: 68e23844d77116a23b08ba739b8ed04569aaa82f
+  data.tar.gz: a5e820d914562944de16eaf98053fa9dee7051e0
 SHA512:
-  metadata.gz: 20e92986432fb382af3db7928902cfca6c0337911ed395d3bcc6310ca51ef2169038255a8b7163162a1fb98c3c4eb1783728ffa78ec7dad3a60f7d91be2fec29
-  data.tar.gz: 0415842acfdb0e434d6e8c019de5a3bd45d24c3bcf2fbc860956c358a0ff474ef9f67e48e00c7307b7b430cffbe6478719e05e3689a8a89af1d53bfb7b03b0cd
+  metadata.gz: 154b8702208b8d647427e985a7c26674180663b82cfd6656b2fb2c71072b9e5d54eae281ac48617caa8c475d16c2a3d6f0f5d30394aa2a68272363d21e3e2d2d
+  data.tar.gz: 498cbbc3e0cfc33836211b7e7d16849ec6b42676ff1c995ddef4f27b7f85a109d357807051ba710146f857a750cf36bcda16592c016ed904f8042d6a40a8e98e

data/.travis.yml

@@ -6,4 +6,4 @@ rvm:
 script: bundle exec rspec spec
 env:
   global:
-    secure: ox+FSwU2Ue7t3Yq/XKiUvvY5kZ6H2BTAza3zQdHgKq3hhqF9xowp1QSB2BybVSreVgy+dMPivsk5ZPX67aZwfH0tYOJRkaZODVYTxbu/gygTAkcpf9qqGTsS9ISXn6EGqXfAWHXAPsuhjDbMgGBbuAxj0k/HagDSrd7mKvqsrgc=
+    secure: QquzUUCraIbBpzZbihr2LEdbnTVxUyBYNgHMvc5Z94HUh8R8ShITRz1zWUvTXQ41IA71/ML1loF8BFHFEE0+Zli6wi8ctoA+/CdH14lFHA6mBaT0o4JRGenAcnG2/1PFVj7CfCjlJe2EBJ/DHpR6bOaiDH4tL42O6fAWu6CDfyQ=

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 Changes
 ==
+
+12 Feb 2014 (1.2.0)
+--
+
+FEATURES:
+
+* Fallback to *knife.rb* for Chef Server configuration
+
+FIXES:
+
+* Detect when inspectors are not configured at all
+* Blacklist metadata.rb's fields instead of using a whitelist
+* Fix cache key for changelog
+
+CHANGES:
+
+* Show 'inspect' in help instead of 'investigate'
+
 17 Dec 2013 (1.1.0)
 --
 

data/README.md

@@ -130,6 +130,9 @@ In order to turn off recursive analysis, simply use _--recursive false_.
 
 By default *${HOME}/.chef/kitchen_inspector.rb* is picked, but _--config_ can be used to override that setting.
 
+Valid Repository Manager and Chef Server configurations must be provided.  
+When a Chef Server configuration is not specified in *kitchen_inspector.rb* it fallbacks to *${HOME}/.chef/knife.rb*, if present.
+
 ```
 $ kitchen-inspector --config config_example.rb
 ```
@@ -167,6 +170,9 @@ host the cookbooks you're interested in.
 So, even though a *token* is not strictly required, it's better to configure it as well.  
 From [GitHub's Applications page](https://github.com/settings/applications) go to "Personal Access Tokens" and generate a new token.
 
+Due to the huge search space, searches against GitHub are restricted to profiles owned by *allowed_users* (aka GitHub usernames).
+Cookbooks are thus searched only within those users' repositories, comparing cookbooks' names with repositories' names (Pattern "one repo per cookbook").
+
 Example:
 
 ```ruby

data/lib/kitchen-inspector/inspector.rb

@@ -34,7 +34,9 @@ require 'googl'
 require 'kitchen-inspector/inspector/common'
 require 'kitchen-inspector/inspector/mixin/utils'
 require 'kitchen-inspector/inspector/cli'
-require 'kitchen-inspector/inspector/dependency'
+
+require 'kitchen-inspector/inspector/models/dependency'
+require 'kitchen-inspector/inspector/models/repo_cookbook'
 
 require 'kitchen-inspector/inspector/chef_inspector'
 require 'kitchen-inspector/inspector/repository_inspector'

data/lib/kitchen-inspector/inspector/cli.rb

@@ -49,16 +49,15 @@ module KitchenInspector
                              default: false,
                              aliases: '--remarks'
 
-      desc 'investigate (COOKBOOK_PATH)', 'Check Repository Manager/Chef Server status of dependent cookbooks'
-
-      map 'inspect'   => :investigate
+      desc 'inspect (COOKBOOK_PATH)', 'Check Repository Manager/Chef Server status of dependent cookbooks'
+      map 'inspect' => :investigate
       def investigate(path=Dir.pwd)
         inspector = HealthBureau.new options[:config]
 
         dependencies = inspector.investigate(path, options[:recursive])
 
         if dependencies.empty?
-          puts 'No dependent cookbooks'.yellow
+          puts 'No dependent cookbooks.'.yellow
           status_code = :'warning-nodependencies'
         else
           output, status_code = Report.generate(dependencies, options[:format], options)
@@ -69,10 +68,10 @@ module KitchenInspector
         puts e.message.red
         exit STATUS_TO_RETURN_CODES[:'error-config']
       rescue NotACookbookError
-        puts 'The path is not a cookbook path'.red
+        puts 'The path is not a cookbook path.'.red
         exit STATUS_TO_RETURN_CODES[:'error-notacookbook']
       rescue UnsupportedReportFormatError
-        puts "The report format #{options[:format]} is not supported".red
+        puts "The report format #{options[:format]} is not supported.".red
         exit STATUS_TO_RETURN_CODES[:'error-reportformat']
       end
     end

data/lib/kitchen-inspector/inspector/health_bureau.rb

@@ -38,8 +38,14 @@ module KitchenInspector
         begin
           self.instance_eval configuration
         rescue NoMethodError => e
-          raise ConfigurationError, "Unsupported configuration: #{e.name}"
+          raise ConfigurationError, "Unsupported configuration: #{e.name}."
         end
+
+        raise ConfigurationError, "Chef Server is not configured properly, " \
+                                  "please check your 'chef_server' configuration." unless validate_chef_inspector
+
+        raise ConfigurationError, "Repository Manager is not configured properly, " \
+                                  "please check your 'repository_manager' configuration." unless @repo_inspector
       end
 
       # Inspect your kitchen!
@@ -54,7 +60,7 @@ module KitchenInspector
 
         metadata = Ridley::Chef::Cookbook::Metadata.from_file(File.join(path, 'metadata.rb'))
         metadata.dependencies.collect do |name, version|
-          analyze_dependency(Dependency.new(name, version), recursive)
+          analyze_dependency(Models::Dependency.new(name, version), recursive)
         end.flatten
       end
 
@@ -176,6 +182,24 @@ module KitchenInspector
       def repository_manager(config)
         @repo_inspector = RepositoryInspector.new config
       end
+
+      # Initialize a Chef Inspector using knife.rb settings if not already
+      # initialized
+      #
+      # @return [ChefInspector]
+      def validate_chef_inspector
+        @chef_inspector ||= begin
+          # Fallback to knife.rb if possible
+          knife_cfg = "#{Dir.home}/.chef/knife.rb"
+          if File.exists?(knife_cfg)
+            Chef::Config.from_file knife_cfg
+            chef_server({ :username => Chef::Config.node_name,
+                          :url => Chef::Config.chef_server_url,
+                          :client_pem => Chef::Config.client_key
+                        })
+          end
+        end
+      end
     end
   end
 end

data/lib/kitchen-inspector/inspector/mixin/utils.rb

@@ -71,7 +71,7 @@ module KitchenInspector
       def eval_metadata(raw_response)
         clean_response = raw_response.split("\n").select do |line|
           line.strip!
-          line =~ /^depends|^name|^version/
+          line !~ /^(long_)*description|^recipe|^maintainer.*|^license/
         end
 
         metadata = Ridley::Chef::Cookbook::Metadata.new

data/lib/kitchen-inspector/inspector/models/dependency.rb

@@ -0,0 +1,89 @@
+#
+# Copyright (c) 2013 Stefano Tortarolo <stefano.tortarolo@gmail.com>
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module KitchenInspector
+  module Inspector
+    module Models
+      # The class that contains information about a dependent cookbook
+      class Dependency
+        include Comparable
+
+        # The name of the dependency
+        attr_reader :name
+
+        # The requirement for the dependency
+        attr_reader :requirement
+
+        # Info from Chef Server
+        attr_accessor :chef
+
+        # Info from the Repository Manager
+        attr_accessor :repomanager
+
+        # The status of the dependency
+        attr_accessor :status
+
+        # The dependencies of a cookbook
+        attr_accessor :dependencies
+
+        # Remarks field
+        attr_accessor :remarks
+
+        # Dependency's parents (if transitive)
+        attr_accessor :parents
+
+        def initialize(name, requirement)
+          @name = name
+          @requirement = requirement
+          @chef = {}
+          @repomanager = {}
+          @status = nil
+          @remarks = []
+          @dependencies = []
+          @parents = []
+        end
+
+        def ==(anOther)
+          name == anOther.name && requirement == anOther.requirement
+        end
+
+        def to_hash
+          {}.tap do |hash|
+            hash[:name] = name
+            hash[:requirement] = requirement
+            hash[:status] = status
+            hash[:remarks] = remarks
+            hash[:dependencies] = dependencies
+            hash[:chef] = chef
+            hash[:chef][:latest_version] = hash[:chef][:latest_version].to_s if hash[:chef][:latest_version]
+            hash[:repomanager] = repomanager
+            hash[:repomanager][:latest_tag] = hash[:repomanager][:latest_tag].to_s if hash[:repomanager][:latest_tag]
+            hash[:repomanager][:latest_metadata] = hash[:repomanager][:latest_metadata].to_s if hash[:repomanager][:latest_metadata]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen-inspector/inspector/models/repo_cookbook.rb

@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2013 Stefano Tortarolo <stefano.tortarolo@gmail.com>
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module KitchenInspector
+  module Inspector
+    module Models
+      # The class that contains information about a cookbook on Repository Manager
+      class RepoCookbook
+        include Comparable
+
+        # The ID of the cookbook on Repository Manager
+        attr_reader :id
+
+        # The name of the cookbook
+        attr_reader :name
+
+        # Path to metadata.rb
+        attr_accessor :metadata_path
+
+        def initialize(id, name, metadata_path)
+          @id = id
+          @name = name
+          @metadata_path = metadata_path
+        end
+
+        def ==(anOther)
+          name == anOther.name && metadata_path == anOther.metadata_path
+        end
+      end
+    end
+  end
+end

data/lib/kitchen-inspector/inspector/repository_inspector.rb

@@ -35,7 +35,7 @@ module KitchenInspector
           require "kitchen-inspector/inspector/repository_managers/#{config[:type].downcase}"
           manager_cls = "KitchenInspector::Inspector::#{config[:type]}Manager".constantize
         rescue LoadError, NameError => e
-          raise RepositoryManagerError, "Repository Manager '#{config[:type]}' not supported"
+          raise RepositoryManagerError, "Repository Manager '#{config[:type]}' not supported."
         end
 
         @manager = manager_cls.new config
@@ -60,7 +60,7 @@ module KitchenInspector
             repo_info[:not_unique] = projects.size > 1
 
             # Inherit only shallow information from dependency
-            prj_dependency = Dependency.new(dependency.name, dependency.requirement)
+            prj_dependency = Models::Dependency.new(dependency.name, dependency.requirement)
             prj_dependency.parents = dependency.parents
 
             prj_dependency.parents.each do |parent|

data/lib/kitchen-inspector/inspector/repository_managers/base.rb

@@ -65,7 +65,7 @@ module KitchenInspector
         metadata = project_metadata(project, revId)
 
         if metadata
-          metadata.dependencies.collect{|dep, constraint| Dependency.new(dep, constraint)}
+          metadata.dependencies.collect{|dep, constraint| Models::Dependency.new(dep, constraint)}
         end
       end
 
@@ -98,7 +98,7 @@ module KitchenInspector
       # Return a shortened url to the commits between two revisions
       def changelog(project_url, revId, otherRevId)
         return unless project_url && revId && otherRevId
-        cache_key = "#{project_url}-#{revId}-otherRevId"
+        cache_key = "#{project_url}-#{revId}-#{otherRevId}"
 
         @changelogs_cache[cache_key] ||=
           begin

data/lib/kitchen-inspector/inspector/repository_managers/github.rb

@@ -52,8 +52,8 @@ module KitchenInspector
 
       # Given a project and a revision retrieve its metadata
       def retrieve_metadata(project, revId)
-        response = Octokit.contents(project.full_name,
-                            {:ref => revId, :path => "metadata.rb" })
+        response = Octokit.contents(project.name,
+                            {:ref => revId, :path => project.metadata_path })
 
         if response && response.respond_to?(:content)
           eval_metadata Base64.decode64(response.content)
@@ -64,7 +64,7 @@ module KitchenInspector
 
       # Return the full URL for a given project
       def source_url(project)
-        "github.com/#{project.full_name}"
+        "github.com/#{project.name}"
       end
 
       # Retrieve projects by name
@@ -76,14 +76,15 @@ module KitchenInspector
           repos = repos.items.select do |repo|
             repo.name == name
           end
-          repos
+
+          repos.collect{|repo| Models::RepoCookbook.new(repo.id, repo.full_name, "metadata.rb")}
         end
       end
 
       # Given a project return the tags on GitHub
       def retrieve_tags(project)
         tags = {}
-        Octokit.tags(project.full_name).collect do |tag|
+        Octokit.tags(project.name).collect do |tag|
           tags[fix_version_name(tag.name)] = tag.commit.sha
         end
         tags

data/lib/kitchen-inspector/inspector/repository_managers/gitlab.rb

@@ -58,17 +58,18 @@ module KitchenInspector
 
       # Return the full URL for a given project
       def source_url(project)
-        "#{@gitlab_base_url}/#{project.path_with_namespace}"
+        "#{@gitlab_base_url}/#{project.name}"
       end
 
       # Retrieve projects by name
       def projects_by_name(name)
-        projects.select{|prj| prj.path == name }
+        repos = projects.select{|prj| prj.path == name }
+        repos.collect{|repo| Models::RepoCookbook.new(repo.id, repo.path_with_namespace, "metadata.rb")}
       end
 
       # Given a project and a revision retrieve its metadata
       def retrieve_metadata(project, revId)
-        response = HTTParty.get("#{Gitlab.endpoint}/projects/#{project.id}/repository/blobs/#{revId}?filepath=metadata.rb",
+        response = HTTParty.get("#{Gitlab.endpoint}/projects/#{project.id}/repository/blobs/#{revId}?filepath=#{project.metadata_path}",
                                 headers: {"PRIVATE-TOKEN" => Gitlab.private_token})
 
         if response.code == 200

data/lib/kitchen-inspector/inspector/version.rb

@@ -24,6 +24,6 @@
 #
 module KitchenInspector
   module Inspector
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/spec/github_manager_spec.rb

@@ -2,7 +2,9 @@ require_relative 'support/spec_helper'
 
 describe GitHubManager do
   let(:manager) do
-    config = {:type => "GitHub", :allowed_users => ["astratto"]}
+    config = {:type => "GitHub",
+              :allowed_users => ["kitchen-inspector"],
+              :token => ENV['GITHUB_TOKEN']}
 
     manager = GitHubManager.new config
     manager
@@ -22,7 +24,7 @@ describe GitHubManager do
       it "creates a valid Manager" do
         config = {:type => "GitHub",
                   :token => ENV['GITHUB_TOKEN'],
-                  :allowed_users => ["astratto"]
+                  :allowed_users => ["kitchen-inspector"]
                 }
 
         manager = GitHubManager.new config
@@ -42,36 +44,35 @@ describe GitHubManager do
   end
 
   describe "#projects_by_name" do
-    it "returns the correct project for astratto/kitchen-inspector", :type => :external do
-      projects = manager.projects_by_name "kitchen-inspector"
+    it "returns the correct project for kitchen-inspector/cook-test", :type => :external do
+      projects = manager.projects_by_name "cook-test"
       expect(projects).not_to eq(nil)
     end
   end
 
   describe "#tags" do
-    let(:project) { manager.projects_by_name("kitchen-inspector").first }
-
-    it "returns the correct tags for astratto/kitchen-inspector", :type => :external do
+    let(:project) { manager.projects_by_name("cook-test").first }
 
-      expect(manager.tags(project)["1.0.1"]).to eq("b935719a532c8042b51de560db09881803fbb511")
+    it "returns the correct tags for kitchen-inspector/cook-test", :type => :external do
+      expect(manager.tags(project)["1.1.0"]).to eq("5c430684e34415df07f3178dff96f2cf23a59452")
     end
   end
 
   describe "#project_metadata" do
     let(:project) { manager.projects_by_name("cook-test").first }
-    it "returns the correct metadata for github.com/astratto/cook-test v.1.0.0", :type => :external do
+    it "returns the correct metadata for github.com/kitchen-inspector/cook-test v.1.1.0", :type => :external do
 
-      metadata = manager.project_metadata(project, "689dcf42e0cc0710fd337ebd1fee3d2ee8e7dca4")
+      metadata = manager.project_metadata(project, "5c430684e34415df07f3178dff96f2cf23a59452")
       expect(metadata.name).to eq("cook-test")
     end
 
-    it "returns the correct version for github.com/astratto/cook-test v.1.0.0", :type => :external do
-      version = manager.project_metadata_version(project, "689dcf42e0cc0710fd337ebd1fee3d2ee8e7dca4")
-      expect(version).to eq("1.0.0")
+    it "returns the correct version for github.com/kitchen-inspector/cook-test v.1.1.0", :type => :external do
+      version = manager.project_metadata_version(project, "5c430684e34415df07f3178dff96f2cf23a59452")
+      expect(version).to eq("1.1.0")
     end
 
-    it "returns the correct dependencies for github.com/astratto/cook-test v.1.0.0", :type => :external do
-      dependencies = manager.project_dependencies(project, "689dcf42e0cc0710fd337ebd1fee3d2ee8e7dca4")
+    it "returns the correct dependencies for github.com/kitchen-inspector/cook-test v.1.1.0", :type => :external do
+      dependencies = manager.project_dependencies(project, "5c430684e34415df07f3178dff96f2cf23a59452")
 
       expect(dependencies.collect(&:name)).to eq(["openssl", "build-essential"])
     end

data/spec/gitlab_manager_spec.rb

@@ -41,7 +41,8 @@ describe GitLabManager do
 
         expect do
           GitLabManager.new config
-        end.to raise_error(GitLabAccessNotConfiguredError)
+        end.to raise_error(GitLabAccessNotConfiguredError, "GitLab Private Token not configured. " \
+                                                           "Please set token in your config file.")
       end
 
       it "raises an error when GitLab Base Url is not configured" do
@@ -51,7 +52,8 @@ describe GitLabManager do
 
         expect do
           GitLabManager.new config
-        end.to raise_error(GitLabAccessNotConfiguredError)
+        end.to raise_error(GitLabAccessNotConfiguredError, "GitLab base url not configured. " \
+                                                           "Please set base_url in your config file.")
       end
     end
   end

data/spec/{dependency_inspector_spec.rb → health_bureau_spec.rb}

@@ -1,6 +1,13 @@
 require_relative 'support/spec_helper'
 
 describe HealthBureau do
+  before(:each) do
+    # Ignore existing knife.rb configuration
+    orig_file = File.method(:exists?)
+    File.stub(:exists?).with(anything()) { |*args| orig_file.call(*args) }
+    File.stub(:exists?).with("#{Dir.home}/.chef/knife.rb").and_return(false)
+  end
+
   let(:health_bureau) { generate_health_bureau }
 
   let(:repomanager_info) do
@@ -16,6 +23,28 @@ describe HealthBureau do
   end
 
   describe "#initialize" do
+    context "Incomplete configuration" do
+      it "raises an error if a Repository Manager is not configured" do
+          config = StringIO.new
+          config.puts "chef_server :url => 'http://localhost:4000', :client_pem => 'testclient.pem', :username => 'test_user'"
+
+          expect do
+            HealthBureau.new config
+          end.to raise_error(ConfigurationError, "Repository Manager is not configured properly, "\
+                                                 "please check your 'repository_manager' configuration.")
+      end
+
+      it "raises an error if a Chef Server is not configured" do
+          config = StringIO.new
+          config.puts "repository_manager :type => 'GitLab', :base_url => 'http://localhost:8080', :token =>'test_token'"
+
+          expect do
+            HealthBureau.new config
+          end.to raise_error(ConfigurationError, "Chef Server is not configured properly, "\
+                                                 "please check your 'chef_server' configuration.")
+      end
+    end
+
     context "Repository Manager" do
       it "raises an error if an unsupported Repository Manager is specified" do
           config = StringIO.new
@@ -24,7 +53,7 @@ describe HealthBureau do
 
           expect do
             HealthBureau.new config
-          end.to raise_error(RepositoryManagerError)
+          end.to raise_error(RepositoryManagerError, "Repository Manager 'Unknown' not supported.")
       end
 
       it "raises an error if an unsupported field is specified" do
@@ -35,7 +64,7 @@ describe HealthBureau do
 
           expect do
             HealthBureau.new config
-          end.to raise_error(ConfigurationError)
+          end.to raise_error(ConfigurationError, "Unsupported configuration: invalid_field.")
       end
 
       context "GitLab" do
@@ -58,7 +87,8 @@ describe HealthBureau do
 
             expect do
               HealthBureau.new config
-            end.to raise_error(GitLabAccessNotConfiguredError)
+            end.to raise_error(GitLabAccessNotConfiguredError, "GitLab Private Token not configured. " \
+                                                               "Please set token in your config file.")
           end
 
           it "raises an error when GitLab Base Url is not configured" do
@@ -68,7 +98,8 @@ describe HealthBureau do
 
             expect do
               HealthBureau.new config
-            end.to raise_error(GitLabAccessNotConfiguredError)
+            end.to raise_error(GitLabAccessNotConfiguredError, "GitLab base url not configured. " \
+                                                               "Please set base_url in your config file.")
           end
         end
       end
@@ -82,7 +113,8 @@ describe HealthBureau do
 
         expect do
           HealthBureau.new config
-        end.to raise_error(ChefAccessNotConfiguredError)
+        end.to raise_error(ChefAccessNotConfiguredError, "Chef Server url not configured. " \
+                                                         "Please set :url in your config file.")
       end
 
       it "raises an error when Client PEM is not configured" do
@@ -92,7 +124,8 @@ describe HealthBureau do
 
         expect do
           HealthBureau.new config
-        end.to raise_error(ChefAccessNotConfiguredError)
+        end.to raise_error(ChefAccessNotConfiguredError, "Chef client PEM not configured. " \
+                                                         "Please set :client_pem in your config file.")
       end
 
       it "raises an error when Username is not configured" do
@@ -102,14 +135,15 @@ describe HealthBureau do
 
         expect do
           HealthBureau.new config
-        end.to raise_error(ChefAccessNotConfiguredError)
+        end.to raise_error(ChefAccessNotConfiguredError, "Chef username not configured. " \
+                                                         "Please set :username in your config file.")
       end
     end
   end
 
   describe "#update_dependency" do
     before(:each) do
-      @dep = Dependency.new("test", ">= 0")
+      @dep = Models::Dependency.new("test", ">= 0")
     end
 
     it "returns a success for correct versions on both servers" do
@@ -265,7 +299,7 @@ describe HealthBureau do
         project = double()
 
         allow(project).to receive(:id).and_return(1)
-        allow(project).to receive(:path_with_namespace).and_return("group/project")
+        allow(project).to receive(:name).and_return("group/project")
 
         GitLabManager.any_instance.stub(:projects_by_name).and_return([
           project

data/spec/report_spec.rb

@@ -18,7 +18,7 @@ describe Report do
   describe ".generate" do
     context "global status" do
       before(:each) do
-        dep1 = Dependency.new("Test", "~> 1.0.0")
+        dep1 = Models::Dependency.new("Test", "~> 1.0.0")
         health_bureau.update_dependency(dep1, chef_info, repomanager_info)
 
         @dependencies = [dep1]
@@ -111,7 +111,7 @@ describe Report do
       end
 
       it "warn_req" do
-        dep1 = Dependency.new("Test", "= 1.0.0")
+        dep1 = Models::Dependency.new("Test", "= 1.0.0")
         chef = {:versions => ["1.0.0", "1.0.1"],
                      :latest_version => Solve::Version.new("1.0.1"),
                      :version_used => "1.0.0"}
@@ -214,7 +214,7 @@ describe Report do
 
       it "shows nested dependencies" do
         dep1 = @dependencies.first
-        dep2 = Dependency.new("Nested", "~> 1.0.0")
+        dep2 = Models::Dependency.new("Nested", "~> 1.0.0")
         dep2.parents << dep1
         dep1.dependencies << dep2
         health_bureau.update_dependency(dep2, chef_info, repomanager_info)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspector
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,9 +256,10 @@ files:
 - lib/kitchen-inspector/inspector/chef_inspector.rb
 - lib/kitchen-inspector/inspector/cli.rb
 - lib/kitchen-inspector/inspector/common.rb
-- lib/kitchen-inspector/inspector/dependency.rb
 - lib/kitchen-inspector/inspector/health_bureau.rb
 - lib/kitchen-inspector/inspector/mixin/utils.rb
+- lib/kitchen-inspector/inspector/models/dependency.rb
+- lib/kitchen-inspector/inspector/models/repo_cookbook.rb
 - lib/kitchen-inspector/inspector/report/report.rb
 - lib/kitchen-inspector/inspector/report/status_reporter.rb
 - lib/kitchen-inspector/inspector/repository_inspector.rb
@@ -272,9 +273,9 @@ files:
 - spec/data/test_client.pem
 - spec/data/test_config_invalid.rb
 - spec/data/test_config_valid.rb
-- spec/dependency_inspector_spec.rb
 - spec/github_manager_spec.rb
 - spec/gitlab_manager_spec.rb
+- spec/health_bureau_spec.rb
 - spec/report_spec.rb
 - spec/support/spec_helper.rb
 - spec/utils_spec.rb
@@ -309,9 +310,10 @@ test_files:
 - spec/data/test_client.pem
 - spec/data/test_config_invalid.rb
 - spec/data/test_config_valid.rb
-- spec/dependency_inspector_spec.rb
 - spec/github_manager_spec.rb
 - spec/gitlab_manager_spec.rb
+- spec/health_bureau_spec.rb
 - spec/report_spec.rb
 - spec/support/spec_helper.rb
 - spec/utils_spec.rb
+has_rdoc: 

data/lib/kitchen-inspector/inspector/dependency.rb

@@ -1,87 +0,0 @@
-#
-# Copyright (c) 2013 Stefano Tortarolo <stefano.tortarolo@gmail.com>
-#
-# MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-module KitchenInspector
-  module Inspector
-    # The class that contains information about a dependent cookbook
-    class Dependency
-      include Comparable
-
-      # The name of the dependency
-      attr_reader :name
-
-      # The requirement for the dependency
-      attr_reader :requirement
-
-      # Info from Chef Server
-      attr_accessor :chef
-
-      # Info from the Repository Manager
-      attr_accessor :repomanager
-
-      # The status of the dependency
-      attr_accessor :status
-
-      # The dependencies of a cookbook
-      attr_accessor :dependencies
-
-      # Remarks field
-      attr_accessor :remarks
-
-      # Dependency's parents (if transitive)
-      attr_accessor :parents
-
-      def initialize(name, requirement)
-        @name = name
-        @requirement = requirement
-        @chef = {}
-        @repomanager = {}
-        @status = nil
-        @remarks = []
-        @dependencies = []
-        @parents = []
-      end
-
-      def ==(anOther)
-        name == anOther.name && requirement == anOther.requirement
-      end
-
-      def to_hash
-        {}.tap do |hash|
-          hash[:name] = name
-          hash[:requirement] = requirement
-          hash[:status] = status
-          hash[:remarks] = remarks
-          hash[:dependencies] = dependencies
-          hash[:chef] = chef
-          hash[:chef][:latest_version] = hash[:chef][:latest_version].to_s if hash[:chef][:latest_version]
-          hash[:repomanager] = repomanager
-          hash[:repomanager][:latest_tag] = hash[:repomanager][:latest_tag].to_s if hash[:repomanager][:latest_tag]
-          hash[:repomanager][:latest_metadata] = hash[:repomanager][:latest_metadata].to_s if hash[:repomanager][:latest_metadata]
-        end
-      end
-    end
-  end
-end