knife-role-convert 0.0.1 → 0.0.2

data/Rakefile

@@ -21,4 +21,3 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/lib/chef/knife/role_convert.rb

@@ -41,11 +41,8 @@ class Chef
           ui.error("You must supply the name of the role you wish to convert")
           exit 1
         end
-
         role = @name_args[0]
-
         converter = Chef::RoleConverter.new(role, config)
-        converter.convert
         puts converter.generate_recipe
       end
     end

data/lib/chef/role_converter.rb

@@ -26,7 +26,7 @@ class Chef
     attr_reader :role, :cookbook, :recipe
     attr_accessor :attributes, :dependencies, :run_list
 
-    def initialize(role, config={})
+    def initialize(role, config = {})
       @role = Chef::Role.from_disk(role)
       @config = config
       @recipe = config[:recipe] || @role.name
@@ -39,7 +39,7 @@ class Chef
       @dependencies = []
     end
 
-    def convert
+    def convert_role
       convert_attributes(role.default_attributes, "default")
       convert_attributes(role.override_attributes, "override")
       convert_runlist
@@ -48,16 +48,15 @@ class Chef
     def convert_attributes(attrs, type, parents=[])
       # XXX this whole bit stinks, redo it later
       attrs.each do |attribute, value|
+        # detect hashes and recursively descend to the bottommost level of nesting
         if value.is_a? Hash
-          parents << attribute
-          convert_attributes(value, type, parents)
+          # make a copy of the parent path and add our current location before recurring
+          new_parents = parents.dup
+          new_parents << attribute
+          convert_attributes(value, type, new_parents)
         else
-          if parents.empty?
-            attr_path = "['#{attribute}']"
-          else
-            attr_path = parents.map {|a| "['#{a}']" }.join() + "['#{attribute}']"
-          end
-          attributes[type] << "#{attr_path} = #{value.pretty_inspect}"
+          attr_path = parents.map { |a| "['#{a}']" }.join() + "['#{attribute}']"
+          attributes[type].push("node.#{type}#{attr_path} = #{value.pretty_inspect}")
         end
       end
     end
@@ -69,16 +68,17 @@ class Chef
           unless dependencies.member? cookbook
             dependencies << cookbook
           end
-          run_list << "include_recipe '#{entry.name}'\n"
+          run_list.push("include_recipe '#{entry.name}'\n")
         elsif entry.role?
           # XXX process recursively ?
-          run_list << "# XXX detected role in run_list: #{entry.name}\n"
-          run_list << "# include_recipe 'role_cookbook::#{entry.name}\n'"
+          run_list.push("# XXX detected role in run_list: #{entry.name}\n")
+          run_list.push("# include_recipe 'role_cookbook::#{entry.name}'\n")
         end
       end
     end
 
     def generate_recipe
+      convert_role
       template = IO.read(Chef::RoleConverter::RECIPE_TEMPLATE).chomp
       eruby = Erubis::Eruby.new(template)
       context = {

data/lib/chef/role_converter/templates/recipe.erb

@@ -10,14 +10,14 @@
 <% unless @default_attributes.empty? -%>
 # default attributes
 <% @default_attributes.each do |line| -%>
-node.default<%= line -%>
+<%= line -%>
 <% end -%>
 
 <% end -%>
 <% unless @override_attributes.empty? -%>
 # override attributes
 <% @override_attributes.each do |line| -%>
-node.override<%= line -%>
+<%= line -%>
 <% end -%>
 
 <% end -%>

data/lib/chef/role_converter/version.rb

@@ -1,5 +1,5 @@
 class Chef
   class RoleConverter
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/spec/data/roles/simple_role.rb

@@ -1,5 +1,5 @@
 name 'simple_role'
-description 'simple test role for knife-role-coonvert'
+description 'simple test role for knife-role-convert'
 
 run_list(
   "recipe[foo]"
@@ -8,9 +8,16 @@ run_list(
 override_attributes(
   "foo" => {
     "unicorn" => {
-      "collect_tears" => true
+      "collect_tears" => true,
+      "nested" => {
+        "should_not_inspect_the_contents" => [
+          { :lambda => 'lambda' },
+          { :lambda => 'mu' }
+        ]
+      }
     }
   },
   "bar" => 1,
+  "baz" => 2.2,
   "quux" => %w{unos dos tres}
 )

data/spec/unit/role_convert_spec.rb

@@ -32,9 +32,13 @@ class Chef
 
       it "process nested attributes" do
         simple_role.convert_attributes(simple_role.role.override_attributes, "override")
-        require 'pry'
-        binding.pry
-        # simple_role.attributes['override']
+        simple_role.attributes['override'].should eq [
+          "node.override['foo']['unicorn']['collect_tears'] = true\n",
+          "node.override['foo']['unicorn']['nested']['should_not_inspect_the_contents'] = [{:lambda=>\"lambda\"}, {:lambda=>\"mu\"}]\n",
+          "node.override['bar'] = 1\n",
+          "node.override['baz'] = 2.2\n",
+          "node.override['quux'] = [\"unos\", \"dos\", \"tres\"]\n"
+        ]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-role-convert
 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: 2013-07-14 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -91,7 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Knife plugin for converting roles to role cookbooks
+description: knife plugin for converting roles to recipes
 email: msf@kisoku.net
 executables: []
 extensions: []
@@ -109,7 +109,7 @@ files:
 - spec/unit/role_convert_spec.rb
 - spec/support/spec_helper.rb
 - spec/data/roles/simple_role.rb
-homepage: http://www.opscode.com
+homepage: http://github.com/kisoku/knife-role-convert
 licenses:
 - Apache 2.0
 post_install_message: 
@@ -133,6 +133,6 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Knife plugin for converting roles to role cookbooks
+summary: knife plugin for converting roles to recipes
 test_files: []
 has_rdoc: true