knife-role-spaghetti 0.0.1 → 0.0.2

data/README.md

@@ -69,10 +69,14 @@ Running through the neato renderer (with the `-N` switch) produces this image:
 
 ## Changelog
 
+### v0.0.2
+* Updated CLI banner to reflect that filename is not required, renamed for clarity
+* Improved handling cases where a role contains recipes named the same as the role
+* Added handling for roles in JSON format
+
 ### v0.0.1
 * Initial commit
 
-
 ## License
 
 Author:: Mike Fiedler (<miketheman@gmail.com>)

data/features/cli.feature

@@ -23,7 +23,7 @@ Scenario Outline: Running with Help flags produces the correct result
   When I run `knife role spaghetti <HelpFlag>`
   Then the output should contain:
   """
-  knife role spaghetti FILENAME [-G FORMAT [-N] ]
+  knife role spaghetti [ OUTFILE.PNG -G FORMAT [-N] ]
   """
   And the exit status should be 1
   Examples:

data/features/graphing.feature

@@ -39,6 +39,18 @@ Scenario: Running against a directory with multiple roles succeeds
     "recipe[mysql]"
   )
   """
+  And a file named "roles/base.json" with:
+  """
+  {
+    "name" : "base",
+    "description" : "Sample base json role",
+    "run_list" : [
+      "recipe[yum]",
+      "recipe[apt]",
+      "recipe[ntp]"
+    ]
+  }
+  """
   When I successfully run `knife role spaghetti multirole.png`
   Then the exit status should be 0
 

data/lib/chef/knife/spaghetti.rb

@@ -8,7 +8,7 @@ module KnifeRoleSpaghetti
       require 'graphviz'
     end
 
-    banner "knife role spaghetti FILENAME [-G FORMAT [-N] ]"
+    banner "knife role spaghetti [ OUTFILE.PNG -G FORMAT [-N] ]"
 
     option :graphformat,
       :short => "-G FORMAT",
@@ -23,6 +23,8 @@ module KnifeRoleSpaghetti
       :boolean => true,
       :description => "Specify to render the graph in the neato engine"
 
+    # OPTIMIZE: Add an option to display cookbooks instead of recipes?
+
     def run
 
       self.config = Chef::Config.merge!(config)
@@ -58,16 +60,25 @@ module KnifeRoleSpaghetti
         :compound => "true"
       )
 
-      # OPTIMIZE: Handle json files too
-      Dir.glob(File.join(Chef::Config.role_path, '*.rb')) do |rb_file|
+      Dir.glob(File.join(Chef::Config.role_path, '*.{rb,json}')) do |role_file|
+
         role = Chef::Role.new
-        role.from_file(rb_file)
+
+        if File.extname(role_file) == '.rb'
+          role.from_file(role_file)
+        elsif File.extname(role_file) == '.json'
+          js_file = Chef::JSONCompat.from_json(IO.read(role_file))
+          role = Chef::Role.json_create(js_file)
+        else
+          ui.error("This shouldn't happen, the file must be either rb or json")
+        end
+
         # OPTIMIZE: Handle environment run_lists
 
         g.node[:shape] = "box"
         g.node[:style] = "rounded"
         g.node[:color] = "red"
-        role_node = g.add_nodes(role.name)
+        role_node = g.add_nodes("#{role.name}_role", :label => role.name)
 
         # This logic is to ensure that an embedded role doesn't change color
         role.run_list.each do |rli|

data/lib/knife-role-spaghetti.rb

@@ -1,3 +1,3 @@
 module KnifeRoleSpaghetti
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-role-spaghetti
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef