knife-verschart 2.7.3 → 2.7.4

data/lib/chef/knife/Verschart.rb

@@ -11,19 +11,24 @@ end
 
 module Verschart
   class Verschart < Chef::Knife
-    banner 'knife verschart [-e env[,env,...]] [[-o| --env_order] env[,env,...]]'
+    banner 'knife verschart [--primary env[,env,...]] [[-o| --env_order] env[,env,...]] [[--cbselect] cookbook[,cookbook,...]]'
 
     option :primary,
-      :short => "-e env[,env,...]",
+      :long => "--primary env[,env,...]",
       :description => "A comma-separated list of environments to be considered primary. Versions which are NOT frozen willl be highlighted red.",
       :proc => Proc.new { |primary| Chef::Config[:knife][:primary] = primary.split(',') }
 
     option :envorder,
       :short => "-o env[,env,....]",
       :long => "--env_order env[,env,....]", 
-      :description => "A comma-separated list of environments to establish an display order. Any existing environments not included in this list will be added at the end",
+      :description => "A comma-separated list of environments to establish a display order. Any existing environments not included in this list will be added at the end",
       :proc => Proc.new { |envorder| Chef::Config[:knife][:envorder] = envorder.split(',') }
 
+    option :cbselect,
+      :long => "--cbselect cookbook[,cookbook,....]",
+      :description => "A comma-separated list of cookbooks to include in the chart",
+      :proc => Proc.new { |cbselect|  Chef::Config[:knife][:cbselect] = cbselect.split(',') }
+
     def run
 	# Load Options
 	primary = config[:primary] || []
@@ -31,6 +36,7 @@ module Verschart
 	envorder = []
 	envorder = order.split(',') unless order.empty?
 	srv = server_url.sub(%r{https://}, '').sub(/:[0-9]*$/, '')
+        cbselect = config[:cbselect] || []
 
 	# Opening output
 	ui.info('')
@@ -77,21 +83,28 @@ module Verschart
 	charthash['Latest'] = Hash.new
 	charthash['Cookbooks'] = Hash.new
 	charthash['Latest']['col'] = 12
+	r = Regexp.union(cbselect)
 	server_side_cookbooks = Chef::CookbookVersion.list
 	server_side_cookbooks.each do |svcb|
-	  fm = Chef::CookbookVersion.load(svcb[0])
-	  cblen = fm.metadata.name.length if fm.metadata.name.length > cblen
-	  charthash['Latest'][fm.metadata.name] = Hash.new(0)
-	  charthash['Cookbooks'][fm.metadata.name] = Hash.new(0)
-	  charthash['Latest'][fm.metadata.name]['vs'] = fm.metadata.version.to_s
-	  charthash['Cookbooks'][fm.metadata.name]['vs'] = fm.metadata.name
-	  if fm.frozen_version?
-	    charthash['Latest'][fm.metadata.name]['teal'] = true
-	  else
-	    charthash['Latest'][fm.metadata.name]['teal'] = false
+          select_match = false
+	  if !cbselect.empty? && r =~ svcb[0] 
+	    select_match = true
 	  end
-	  charthash['Latest'][fm.metadata.name]['bold'] = false
-	  charthash['Latest'][fm.metadata.name]['red'] = false
+   	  if cbselect.empty? || select_match
+	    fm = Chef::CookbookVersion.load(svcb[0])
+	    cblen = fm.metadata.name.length if fm.metadata.name.length > cblen
+  	    charthash['Latest'][fm.metadata.name] = Hash.new(0)
+	    charthash['Cookbooks'][fm.metadata.name] = Hash.new(0)
+	    charthash['Latest'][fm.metadata.name]['vs'] = fm.metadata.version.to_s
+	    charthash['Cookbooks'][fm.metadata.name]['vs'] = fm.metadata.name
+	    if fm.frozen_version?
+	      charthash['Latest'][fm.metadata.name]['teal'] = true
+	    else
+	      charthash['Latest'][fm.metadata.name]['teal'] = false
+	    end
+	    charthash['Latest'][fm.metadata.name]['bold'] = false
+	    charthash['Latest'][fm.metadata.name]['red'] = false
+          end
 	end
 
 	# Set first column width
@@ -172,23 +185,25 @@ module Verschart
 	  end
 	end
 
-	# Look for obsolete constraints
-	hd = 0 # Flag for section header
-	ev = 0 # Flag for Environent header
-
-	envs.each  do |env|
-	  charthash[env].keys.each do |ckbk|
-	    unless charthash['Cookbooks'].has_key?(ckbk)
-	      unless hd == 1
-	        ui.info('')
-	        ui.info('Obsolete Version constraints are listed below')
-	        hd = 1
-	      end
-	      unless ev == 1
-	        ui.info('')
-	        ui.info(env)
+	if cbselect.empty?
+	  # Look for obsolete constraints
+	  hd = 0 # Flag for section header
+	  ev = 0 # Flag for Environent header
+
+	  envs.each  do |env|
+	    charthash[env].keys.each do |ckbk|
+	      unless charthash['Cookbooks'].has_key?(ckbk)
+	        unless hd == 1
+	          ui.info('')
+	          ui.info('Obsolete Version constraints are listed below')
+	          hd = 1
+	        end
+	        unless ev == 1
+	          ui.info('')
+	          ui.info(env)
+	        end
+	        ui.info("-- #{ckbk}   #{charthash[env][ckbk]['vs']}")
 	      end
-	      ui.info("-- #{ckbk}   #{charthash[env][ckbk]['vs']}")
 	    end
 	  end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-verschart
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: chazzly@gmail.com