knife-draw 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c630368dd7753fd1b0154f4c676c6f45d29732
-  data.tar.gz: fde0dfc7d2a46b2631c1de4e0aab6c02ef471040
+  metadata.gz: 44f2b0f02a6f729eba72b64658d0416a07597aed
+  data.tar.gz: f1aaca343239a4e07f346a40c1ea84c97cebd1ee
 SHA512:
-  metadata.gz: 1184dc42b610177b3f092126e38dabe616b771f753f7c0c6ed2af93e564a7b0d7b0905bb98333ffafdbcf3578e56117477dd80c125f4aab1f61eb276b3fd5238
-  data.tar.gz: de8d3d0c0e6077d95277d385df786d7981ebf6c52a0fb2e5fea008d2cc47db86db0c3aa44fdbac46b20778e741114c753c8ae801569390876f8e3c13fdfe4e4f
+  metadata.gz: 6a56f9c3af69377d1ffeff77366dc6ada5b4403e06b53b337ded72a887a9ed576e7dbc233b0e7c7254fa99a58fded6bc12af094eb053f8d331e0ab058c365eb0
+  data.tar.gz: dd8db3e1d96e796e2321637316051334dda70858018a5254ee0076a12ea823ac65966689451ef508c3c05548a313851231c938d803bf152435dd477629b3e623

data/knife-draw.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["joshuaflanagan@gmail.com"]
   spec.summary       = %q{Draws pictures using your Chef data}
   spec.description   = %q{Generates GraphViz diagrams based on your Chef environment}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/joshuaflanagan/knife-draw"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/knife/draw.rb

@@ -1,6 +1,7 @@
 require 'chef/knife'
 
 require "knife_draw/version"
+require 'knife_draw/verbose_output'
 require 'knife_draw/draw_roles'
 require 'knife_draw/draw_nodes'
 require 'knife_draw/chef_graph'

data/lib/knife_draw/chef_graph.rb

@@ -41,9 +41,9 @@ module KnifeDraw
       graph.add_edge(source, target, color: EDGE_COLOR)
     end
 
-    def draw!(outputfile="output.png")
+    def draw!(outputfile)
       filename=outputfile
-      format = File.extname(filename)[1..-1]
+      format = File.extname(filename)[1..-1] || :png
       graph.output format => filename
     end
   end

data/lib/knife_draw/draw_nodes.rb

@@ -1,36 +1,40 @@
 module KnifeDraw
   class DrawNodes < Chef::Knife
+    include VerboseOutput
+
     deps do
       require 'graphviz'
     end
 
-    banner "knife draw nodes [ENVIRONMENT]"
+    banner "knife draw nodes [FILENAME]"
 
     def run
-      environment = name_args.first if name_args.size > 0
+      filename = name_args.size > 0 ? name_args.first : "output.png"
+      environment = config[:environment]
 
       graph = ChefGraph.new cluster_environments: environment.nil?
       source = ChefServerSource.new
 
-      source.nodes.each do |name, node|
+      source.nodes(environment).each do |name, node|
         node_box = graph.draw_node(name, node.chef_environment)
-        ui.msg "name: #{name} env: #{node.chef_environment}"
+        verbose_out "name: #{name} env: #{node.chef_environment}"
         source.roles_for_node(node).each do |role_name|
+          verbose_out "\trole: #{role_name}"
           role_box = graph.draw_role(role_name)
           graph.connect(node_box, role_box)
 
           source.runlist_for_role(role_name).each do |run_list|
             runlist_box = graph.draw_runlist run_list.to_s
             graph.connect(role_box, runlist_box)
-            ui.msg "\t\trunlist: #{run_list}"
+            verbose_out "\t\trunlist: #{run_list}"
           end
         end
       end
-      graph.draw!
+      graph.draw! filename
     end
   end
 
   class NodeDraw < DrawNodes
-    banner "knife node draw [ENVIRONMENT]"
+    banner "knife node draw"
   end
 end

data/lib/knife_draw/draw_roles.rb

@@ -1,24 +1,27 @@
 module KnifeDraw
   class DrawRoles < Chef::Knife
+    include VerboseOutput
+
     deps do
       require 'graphviz'
     end
 
-    banner "knife draw roles"
+    banner "knife draw roles [FILENAME]"
 
     def run
+      filename = name_args.size > 0 ? name_args.first : "output.png"
       graph = ChefGraph.new
       source = ChefServerSource.new
       source.roles.each do |role_name, role|
-        ui.msg "name: #{role_name}"
+        verbose_out "name: #{role_name}"
         role_box = graph.draw_role(role_name)
         source.runlist_for_role(role_name).each do |run_list|
           runlist_box = graph.draw_runlist run_list.to_s
           graph.connect(role_box, runlist_box)
-          ui.msg "\t\trunlist: #{run_list}"
+          verbose_out "\t\trunlist: #{run_list}"
         end
       end
-      graph.draw!
+      graph.draw! filename
     end
   end
 

data/lib/knife_draw/verbose_output.rb

@@ -0,0 +1,7 @@
+module KnifeDraw
+  module VerboseOutput
+    def verbose_out(message)
+      ui.msg(message) if config[:verbosity] >= 1
+    end
+  end
+end

data/lib/knife_draw/version.rb

@@ -1,3 +1,3 @@
 module KnifeDraw
-  VERSION = "0.9.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-draw
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Joshua Flanagan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -84,8 +84,9 @@ files:
 - lib/knife_draw/chef_server_source.rb
 - lib/knife_draw/draw_nodes.rb
 - lib/knife_draw/draw_roles.rb
+- lib/knife_draw/verbose_output.rb
 - lib/knife_draw/version.rb
-homepage: ''
+homepage: https://github.com/joshuaflanagan/knife-draw
 licenses:
 - MIT
 metadata: {}