knife-role-spaghetti 0.0.2 → 0.0.3

data/.travis.yml

@@ -3,5 +3,4 @@ rvm:
   - 1.9.2
   - 1.9.3
 env:
-  - CHEF_VERSION=0.10.8
   - CHEF_VERSION=10.12.0

data/README.md

@@ -69,6 +69,13 @@ Running through the neato renderer (with the `-N` switch) produces this image:
 
 ## Changelog
 
+### v0.0.3
+* Fixed JSON roles loading #7 - Thanks @miah & @tezz!
+* Re-implemented the DRY proposed by @jtimberman in #1, with a different method
+* Prevent a role and recipe sharing the same name from colliding
+* Figured out correct testing requirements matrix for Travis
+* Added some more verbose logging options
+
 ### 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

data/features/cli.feature

@@ -6,7 +6,7 @@ Feature: Ensure that the Command Line Interface works as designed
 Background:
   Given a file named ".chef/knife.rb" with:
   """
-  role_path ["#{File.dirname(__FILE__)}/../roles"]
+  role_path "#{File.dirname(__FILE__)}/../roles"
   """
   And a file named "roles/webserver.rb" with:
   """
@@ -64,3 +64,13 @@ Scenario: Running with no filename, the format flag and no format, should fail
 Scenario: Running with no filename, the format flag and no format, should fail
   When I run `knife role spaghetti failfile.png -G`
   Then the exit status should be 1
+
+Scenario: Running with verbose flags provides better output
+  When I successfully run `knife role spaghetti verbose.png -VV`
+  Then the output should contain:
+  """
+  DEBUG: Output format is: png
+  DEBUG: Output filename is: verbose.png
+  DEBUG: Loaded role is: role[webserver]
+  A Role dependency graph has been written to verbose.png
+  """

data/features/graphing.feature

@@ -21,7 +21,7 @@ Scenario: Running against a knife.rb with undefined roles directory should fail
 Scenario: Running against a directory with multiple roles succeeds
   Given a file named ".chef/knife.rb" with:
   """
-  role_path ["#{File.dirname(__FILE__)}/../roles"]
+  role_path "#{File.dirname(__FILE__)}/../roles"
   """
   And a file named "roles/webserver.rb" with:
   """
@@ -57,7 +57,7 @@ Scenario: Running against a directory with multiple roles succeeds
 Scenario: Running against embedded roles succeeds
   Given a file named ".chef/knife.rb" with:
   """
-  role_path ["#{File.dirname(__FILE__)}/../roles"]
+  role_path "#{File.dirname(__FILE__)}/../roles"
   """
   And a file named "roles/webserver.rb" with:
   """
@@ -86,3 +86,40 @@ Scenario: Running against embedded roles succeeds
   """
   When I successfully run `knife role spaghetti embedded.png`
   Then the exit status should be 0
+
+Scenario: Running against only json role files succeeds.
+  Given a file named ".chef/knife.rb" with:
+  """
+  role_path "#{File.dirname(__FILE__)}/../roles"
+  """
+  And a file named "roles/webserver.json" with:
+  """
+  {
+    "name": "webserver",
+    "chef_type": "role",
+    "json_class": "Chef::Role",
+    "default_attributes": {
+      "apache2": {
+        "listen_ports": [
+          "80",
+          "443"
+        ]
+      }
+    },
+    "description": "The base role for systems that serve HTTP traffic",
+    "run_list": [
+      "recipe[apache2]",
+      "recipe[apache2::mod_ssl]",
+      "role[monitor]"
+    ],
+    "env_run_lists" : {
+     },
+    "override_attributes": {
+      "apache2": {
+        "max_children": "50"
+      }
+    }
+  }
+  """
+  When I successfully run `knife role spaghetti webserver.png`
+  Then the exit status should be 0

data/lib/chef/knife/spaghetti.rb

@@ -5,6 +5,7 @@ module KnifeRoleSpaghetti
 
     deps do
       require 'chef/role'
+      require 'chef/knife/core/object_loader'
       require 'graphviz'
     end
 
@@ -25,18 +26,23 @@ module KnifeRoleSpaghetti
 
     # OPTIMIZE: Add an option to display cookbooks instead of recipes?
 
+    def loader
+      @loader ||= Chef::Knife::Core::ObjectLoader.new(Chef::Role, ui)
+    end
+
     def run
 
       self.config = Chef::Config.merge!(config)
 
       # OPTIMIZE: Maybe instead of a flag, infer the graph format from fileext?
 
-      # Parse the configuration options, provide defaults where needed      
+      # Parse the configuration options, provide defaults where needed
       if config[:graphformat]
         output_format = config[:graphformat].to_sym
       else
         output_format = :png
       end
+      Chef::Log.debug("Output format is: #{output_format}")
 
       # Determine of a filename has been passed
       if @name_args.size >= 1
@@ -44,9 +50,12 @@ module KnifeRoleSpaghetti
       else
         filename = "role-spaghetti.#{output_format}"
       end
+      Chef::Log.debug("Output filename is: #{filename}")
+
+      loaded_roles = loader.find_all_objects(config[:role_path])
 
       # If we can't find any roles, it's pointless to continue.
-      if Dir.glob(File.join(Chef::Config.role_path, '*.rb')).size == 0
+      if loaded_roles.size == 0
         ui.fatal("No roles were found in role_path: #{config[:role_path]}")
         ui.fatal("Ensure that your knife.rb has the correct path.")
         exit 1
@@ -60,18 +69,14 @@ module KnifeRoleSpaghetti
         :compound => "true"
       )
 
-      Dir.glob(File.join(Chef::Config.role_path, '*.{rb,json}')) do |role_file|
+      loaded_roles.each do |role_file|
+        # Create an absolute path, since some file references include relative paths
+        abspath = File.absolute_path(File.join(config[:role_path], role_file))
 
-        role = Chef::Role.new
+        # The object_from_file method figures out the ruby/json logic
+        role = loader.object_from_file(abspath)
 
-        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
+        Chef::Log.debug("Loaded role is: #{role}")
 
         # OPTIMIZE: Handle environment run_lists
 
@@ -87,12 +92,13 @@ module KnifeRoleSpaghetti
             g.node[:shape] = "box"
             g.node[:style] = "rounded"
             g.node[:color] = "red"
+            rli_node = g.add_nodes("#{rli.name}_role", :label => rli.name)
           else
             g.node[:shape] = "component"
             g.node[:color] = "blue"
+            rli_node = g.add_nodes(rli.name)
           end
 
-          rli_node = g.add_nodes(rli.name)
           g.add_edges(role_node, rli_node)
         end
 

data/lib/knife-role-spaghetti.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-role-spaghetti
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cut through the Role spaghetti with a Knife, Chef.