Change the option from the --no-databagitems form to --no-data_bag_items

Based on #31 by @kamaradclimber

Author: gregkare

knife-inspect.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'chef',      chef_version
   s.add_runtime_dependency 'yajl-ruby', '~> 1.2'
-  s.add_runtime_dependency 'parallel', '~> 1.3'
+  s.add_runtime_dependency 'parallel',  '~> 1.3'
+  s.add_runtime_dependency 'inflecto',  '~> 0.0.2'
 end

lib/chef/knife/inspect.rb

@@ -13,25 +13,33 @@ class Inspect < Knife
 
       banner 'knife inspect'
 
-      CHECKLISTS.map do |checklist|
-        opt_name = checklist.downcase.to_sym
-        option opt_name,
-          :long => "--[no-]#{opt_name}",
+      CHECKLISTS.each do |checklist|
+        checklist = HealthInspector::Checklists.const_get(checklist)
+
+        option checklist.option,
+          :long => "--[no-]#{checklist.option}",
           :boolean => true,
           :default => true,
-          :description => "Add or exclude #{opt_name} from inspection"
+          :description => "Add or exclude #{checklist.title} from inspection"
       end
 
       def run
-        results = CHECKLISTS.select do |checklist|
-          opt_name = checklist.downcase.to_sym
-          config[opt_name] or config[opt_name].nil?
-        end.map do |checklist|
+        results = checklists_to_run.map do |checklist|
           HealthInspector::Checklists.const_get(checklist).run(self)
         end
 
         exit !results.include?(false)
       end
+
+      private
+
+      def checklists_to_run
+        CHECKLISTS.select do |checklist|
+          checklist = HealthInspector::Checklists.const_get(checklist)
+
+          config[checklist.option]
+        end
+      end
     end
   end
 end

lib/health_inspector/checklists/base.rb

@@ -2,24 +2,31 @@
 require 'pathname'
 require 'yajl'
 require 'parallel'
+require 'inflecto'
 
 module HealthInspector
   module Checklists
     class Base
       include Color
 
       class << self
-        attr_reader :title
-
-        def title(val = nil)
-          val.nil? ? @title : @title = val
+        def title
+          Inflecto.humanize(underscored_class).downcase
         end
       end
 
       def self.run(knife)
         new(knife).run
       end
 
+      def self.option
+        Inflecto.dasherize(underscored_class).to_sym
+      end
+
+      def self.underscored_class
+        Inflecto.underscore(Inflecto.demodulize(self.to_s))
+      end
+
       def initialize(knife)
         @context = Context.new(knife)
       end

lib/health_inspector/checklists/cookbooks.rb

@@ -88,8 +88,6 @@ def checksum_cookbook_file(filepath)
     end
 
     class Cookbooks < Base
-      title 'cookbooks'
-
       def load_item(name)
         Cookbook.new(@context,
                      name: name,

lib/health_inspector/checklists/data_bag_items.rb

@@ -9,8 +9,6 @@ class DataBagItem < Pairing
     end
 
     class DataBagItems < Base
-      title 'data bag items'
-
       def load_item(name)
         DataBagItem.new(@context,
                         name: name,

lib/health_inspector/checklists/data_bags.rb

@@ -7,8 +7,6 @@ class DataBag < Pairing
     end
 
     class DataBags < Base
-      title 'data bags'
-
       def load_item(name)
         DataBag.new(@context,
                     name: name,

lib/health_inspector/checklists/environments.rb

@@ -15,8 +15,6 @@ def validate_local_copy_exists
     end
 
     class Environments < Base
-      title 'environments'
-
       def load_item(name)
         Environment.new(@context,
                         name: name,

lib/health_inspector/checklists/roles.rb

@@ -8,8 +8,6 @@ class Role < Pairing
     end
 
     class Roles < Base
-      title 'roles'
-
       def load_item(name)
         Role.new(@context,
                  name: name,

spec/chef/knife/inspect_spec.rb

@@ -15,6 +15,15 @@
       knife_inspect.run
     end
 
+    before do
+      # FIXME: Default config does not appear to be used by Chef 11
+      described_class::CHECKLISTS.each do |checklist|
+        checklist = HealthInspector::Checklists.const_get(checklist)
+
+        knife_inspect.config[checklist.option] = true
+      end
+    end
+
     context 'when all the checklists pass' do
       it 'runs all the check lists and exits with 0' do
         { HealthInspector::Checklists::Cookbooks => true,