knife-nodefu 0.0.9 → 0.0.11

data/lib/chef/knife/nodefu_create.rb

@@ -64,27 +64,23 @@ class NodefuCreate < Chef::Knife
     check_args(1)
     env = Chef::Config[:environment]  
     definitions_file = config[:definitions_file].nil? ? Chef::Config[:nodefu_definitions_file] : config[:definitions_file] 
-    @yml_config = YAML.load_file definitions_file
+    yml_config = YAML.load_file definitions_file
 
     base_name, start_range, end_range = parse_servers(name_args[0])  
 
-    #merge the current environment hash with the defaults
-    merged_configuration = Chef::Mixin::DeepMerge.merge(@yml_config['default'],@yml_config['env'][env])
+    # Merge the current environment hash with the defaults
+    merged_configuration = Chef::Mixin::DeepMerge.merge(yml_config['default'],yml_config['env'][env])
 
-    if (! config[:node_spec].nil?)
-      node_spec_name = config[:node_spec]
-    else 
-      node_spec_name = base_name 
-    end
+    node_spec_name = config[:node_spec] || base_name 
 
+    abort("I'm sorry I couldn't find any node_spec matches :(") unless (node_spec = merged_configuration['node_spec'][node_spec_name])
     domain       = merged_configuration['domain'] 
-    node_spec    = merged_configuration['node_spec'][node_spec_name]
     vm_spec_name = node_spec['vm_spec']
     vm_spec      = merged_configuration['vm_spec'][vm_spec_name]
     aux_groups   = node_spec['aux_groups'].nil? ? '' : ",#{node_spec['aux_groups'].join(',')}"
 
     #Present the user with some totally rad visuals!!!
-    ui.msg "#{ui.color('SHAZAM!',:red)} It looks like you want to launch #{ui.color((end_range - start_range + 1).to_s,:yellow)} of these:"
+    ui.msg("#{ui.color('SHAZAM!',:red)} It looks like you want to launch #{ui.color((end_range - start_range + 1).to_s,:yellow)} of these:")
     ui.msg("#{ui.color('Base Name',:cyan)}: #{base_name}")
     ui.msg("#{ui.color('Node Spec',:cyan)}: #{node_spec_name}")
     pretty_print_hash(node_spec)
@@ -127,23 +123,26 @@ class NodefuCreate < Chef::Knife
     @servers = threads.inject({}) {|hash,t| hash[t.value[0]] = t.value[1]; hash}
 
     query = Chef::Search::Query.new
-    query.search('node',"name:#{base_name}*#{env}*") do |n|
-      n.inspect
-      @servers[n.name]['chef_node'] = n unless @servers[n.name].nil?
-    end
-  
+    query.search('node',"name:#{base_name}*#{env}*") { |n| @servers[n.name]['chef_node'] = n unless @servers[n.name].nil? } 
+
     ui.msg('') 
-    ui.msg(ui.color('Failed Nodes:',:red))
-    failed = failed_nodes(@servers).each_pair do |k,v| 
-      if v['server'].nil?
-        ui.msg("#{k}: #{v['failure']}")
-      else
-        ui.msg("#{k}: #{v['failure']}, #{v['server'].dns_name}, #{v['server'].id}") 
+
+    failed = failed_nodes(@servers)
+    unless failed.nil?
+      failed.each_pair do |k,v| 
+        if v['server'].nil?
+          ui.msg("#{k}: #{v['failure']}")
+        else
+          ui.msg("#{k}: #{v['failure']}, #{v['server'].dns_name}, #{v['server'].id}") 
+        end
       end
     end
 
-    ui.msg(ui.color('Successful Nodes:',:green))
-    successful = successful_nodes(@servers).each_pair { |k,v| ui.msg("#{k}: #{v['id']}, #{v['server'].dns_name}, #{v['server'].id}") }
+    successful = successful_nodes(@servers)
+    unless successful.nil?
+      ui.msg(ui.color('Successful Nodes:',:green))
+      successful.each_pair { |k,v| ui.msg("#{k}: #{v['id']}, #{v['server'].dns_name}, #{v['server'].id}") }
+    end
 
     if config[:destroy_on_fail]
       ui.msg(ui.color("Destroying failed nodes:",:red))

data/lib/knife-nodefu/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Nodefu
-    VERSION = "0.0.9"
+    VERSION = "0.0.11"
     MAJOR, MINOR, TINY = VERSION.split(',')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-nodefu
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-ec2
-  requirement: &70243419907320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243419907320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70243419906820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *70243419906820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: A knife plugin for simple node creation automation
 email:
 - brian.bianco@gmail.com
@@ -69,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A knife plugin for simple node creation automation