knife-nodefu 0.0.11 → 0.1.1

data/README.rdoc

@@ -10,11 +10,11 @@ A basic utility to help automate the creation and destruction of ec2 servers man
 
 gem install knife-nodefu
 
-= Definitions File
+= Definitions File Directory
 
-This file provides all the proper definitions for nodefu to be able to easily build out servers.  You can either pass in the definitions file with the -d option, or set the following option in your knife.rb file.
+This file provides all the proper definitions for nodefu to be able to easily build out servers.  You can either pass in the definitions file directory with the -d option, or set the following option in your knife.rb file.
  
-nodefu_definitions_file    "Path to file"
+nodefu_definitions "Path to directory"
 
 Example definitions yml file:
 

data/knife-nodefu.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.has_rdoc    = true
   s.authors     = ['Brian Bianco']
   s.email       = ['brian.bianco@gmail.com']
-  s.homepage    = 'https://github.com/brianbianco/nodefu'
+  s.homepage    = 'https://github.com/brianbianco/knife-nodefu'
   s.summary     = 'A knife plugin for simple node creation automation'
   s.description = s.summary
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE' ]

data/lib/chef/knife/nodefu_create.rb

@@ -30,9 +30,9 @@ class NodefuCreate < Chef::Knife
          :default => nil
   
   option :definitions_file,
-         :short => "-d <definitions_file_path>",
-         :long => "--definitions_file <definitions_file_path>",
-         :description => "yml definitions file",
+         :short => "-d <definitions_directory>",
+         :long => "--definitions_dir <definitions_directory>",
+         :description => "yml definitions directory",
          :default => nil 
 
   option :exit_on_fail,
@@ -60,26 +60,36 @@ class NodefuCreate < Chef::Knife
     ec2_delete.run 
   end
 
+  def definitions_from_directory(dir)
+    definitions = Hash.new
+    Dir.entries(dir).each do |f|
+      if File.extname(f) == ".yml"
+        puts "loading #{f}"
+        loaded_defs = YAML.load_file(::File.join(dir,f))
+        definitions = Chef::Mixin::DeepMerge.merge(definitions,loaded_defs)
+      end
+    end
+    definitions
+  end
+
   def run
     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
-
-    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])
 
+    env            = Chef::Config[:environment]  
+    defs_dir       = Chef::Config[:nodefu_definitions] || config[:definitionss] 
+    yml_config     = definitions_from_directory defs_dir
+    merged_config  = Chef::Mixin::DeepMerge.merge(yml_config['default'],yml_config['env'][env])
     node_spec_name = config[:node_spec] || base_name 
+    abort("I'm sorry I couldn't find any node_spec matches :(") unless (node_spec = merged_config['node_spec'][node_spec_name])
+
+    base_name, start_range, end_range = parse_servers(name_args[0])  
 
-    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'] 
+    domain       = merged_config['domain'] 
     vm_spec_name = node_spec['vm_spec']
-    vm_spec      = merged_configuration['vm_spec'][vm_spec_name]
+    vm_spec      = merged_config['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!!!
+    # 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('Base Name',:cyan)}: #{base_name}")
     ui.msg("#{ui.color('Node Spec',:cyan)}: #{node_spec_name}")
@@ -95,8 +105,8 @@ class NodefuCreate < Chef::Knife
       ec2_server_request = Ec2ServerCreate.new
       node_name = "#{base_name}#{i}"
       full_node_name = "#{base_name}#{i}.#{env}.#{domain}"  
-      #A handfull of the Ec2ServerCreate command line options use a :proc field so I have to
-      #populate those by hand instead of simply passing a value to its config entry 
+      # A handfull of the Ec2ServerCreate command line options use a :proc field so I have to
+      # populate those by hand instead of simply passing a value to its config entry 
       Chef::Config[:knife][:aws_ssh_key_id] = vm_spec['ssh_key']
       Chef::Config[:knife][:image]          = vm_spec['ami']
       Chef::Config[:knife][:region]         = vm_spec['region']
@@ -119,7 +129,7 @@ class NodefuCreate < Chef::Knife
     end
     threads.each(&:join)
 
-    #Build a servers hash with the node names as they key from the object returned by the threads
+    # Build a servers hash with the node names as the key from the object returned by the threads
     @servers = threads.inject({}) {|hash,t| hash[t.value[0]] = t.value[1]; hash}
 
     query = Chef::Search::Query.new

data/lib/knife-nodefu/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Nodefu
-    VERSION = "0.0.11"
+    VERSION = "0.1.1"
     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.11
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-ec2
@@ -59,7 +59,7 @@ files:
 - lib/chef/knife/nodefu_create.rb
 - lib/chef/knife/nodefu_destroy.rb
 - lib/knife-nodefu/version.rb
-homepage: https://github.com/brianbianco/nodefu
+homepage: https://github.com/brianbianco/knife-nodefu
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A knife plugin for simple node creation automation