knife-nodefu 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18ea080f20cf396c1ca2028c251c2d03e11739d
-  data.tar.gz: 763a2918bb038fb17a6af7a400c506aee7a20cb5
+  metadata.gz: a3ad8e8392d71ebeb845d8e9b51f4af596afb1e1
+  data.tar.gz: 9a278214eb9500715e6076b9c58b24ee755229df
 SHA512:
-  metadata.gz: 88715399c2240c35d89d03b4372e114f8eab9e274714b18d5f02cb34ee8779212b2b4d0ec92f69ddb8c8fcb8d180dec7c59933cd24fdbf733d329369442713fa
-  data.tar.gz: 9bd9e97e0030b96b0031659c0021035800912814303b1a9f38d3cb05a27afb6ce313a3183069c91ecb6c6793cd26b1f9c37a0f2c0f4364e3956fe5a818df109d
+  metadata.gz: '0459c7fb7576d7def3d3a4b5c83e6b0064268274c1afede64e69e922313f8ecbdce11661b305b5ebc3aed7103565def7a373e9a70416a844badab5a39bbf6087'
+  data.tar.gz: 53d748a9b6f26f6e1339f7acac1925536ed8e4f4bfe82a5d42d45620417903f2cd4f3fc1afb81842dd9942cf4c689668c84aff63650051d92b4777e21b8053b6

data/README.rdoc

@@ -25,7 +25,7 @@ nodefu_definitions "Path to directory"
 
 Example definitions yml file:
 
-default: 
+default:
   domain: 'gf-svc.com'
 
   vm_spec:
@@ -51,11 +51,11 @@ default:
       elastic_ip_address: ###.###.###.###
       group_ids:
         - 'sg-00000000'
-        - 'sg-00000000' 
+        - 'sg-00000000'
       server_connect_attribute: public_ip_address
 env:
   production:
-  staging: 
+  staging:
     vm_spec:
       m1.large:
         ssh_key: 'other_key'
@@ -70,7 +70,7 @@ This plugin provides the following Knife subcommands.  Specific command options
 
 == knife nodefu create
 
-This command expects an argument in the format of <hostname><id> or <hostname>[<start_range>-<end_range>] where id is an integer.  It will automatically use the hostname as the node_spec unless you specify one with the -n option
+This command expects an argument in the format of <hostname>, <hostname><id> or <hostname>[<start_range>-<end_range>] where id is an integer.  It will automatically use the hostname as the node_spec unless you specify one with the -n option
 
 options:
 

data/lib/chef/knife/nodefu_base.rb

@@ -1,5 +1,5 @@
 module NodefuBase
-  class ServerRangeError < StandardError; end 
+  class ServerRangeError < StandardError; end
   class NameFormatError < StandardError; end
 
   def pretty_print_hash(hash,color=:magenta)
@@ -24,18 +24,18 @@ module NodefuBase
   end
 
   def parse_servers(servers_string)
-    raise ArgumentError if servers_string.nil? 
-    results = /([a-zA-z\-\.^\s]*)\[(\d+)-(\d+)\]/.match(servers_string) || results = /([a-zA-z\-\.^\s]*)(\d+)/.match(servers_string) 
-    raise NameFormatError if results.nil? 
+    raise ArgumentError if servers_string.nil?
+    results = /([a-zA-z\-\.^\s]*)\[(\d+)-(\d+)\]/.match(servers_string) || results = /([a-zA-z\-\.^\s]*)(\d*)/.match(servers_string)
+    raise NameFormatError if results.nil?
     base_name = results[1]
-    start_range = results[2].to_i
-    end_range = results[3].nil? ? start_range.to_i : results[3].to_i 
+    start_range = results[2].empty? ? nil : results[2].to_i
+    end_range = results[3].nil? ? start_range : results[3].to_i
     raise ServerRangeError if end_range.to_i < start_range.to_i
     return [base_name,start_range,end_range]
   end
 
   def failed_nodes(servers)
-    servers.select {|k,v| v['chef_node'].nil? || !v['failure'].nil? }    
+    servers.select {|k,v| v['chef_node'].nil? || !v['failure'].nil? }
   end
 
   def successful_nodes(servers)

data/lib/chef/knife/nodefu_create.rb

@@ -13,7 +13,7 @@ class NodefuCreate < Chef::Knife
 
   include NodefuBase
 
-  banner "knife nodefu create <server><range> (OPTIONS)"
+  banner "knife nodefu create <server>[<range>] (OPTIONS)"
 
   attr_reader :servers
 
@@ -102,7 +102,15 @@ class NodefuCreate < Chef::Knife
     end
 
     # 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:")
+    number_of_instances =
+      case start_range
+      when end_range
+        1
+      else
+        end_range - start_range + 1
+      end
+
+    ui.msg("#{ui.color('SHAZAM!',:red)} It looks like you want to launch #{ui.color((number_of_instances).to_s,:yellow)} of these:")
     ui.msg("#{ui.color('Base Name',:cyan)}: #{base_name}")
     ui.msg("#{ui.color('Node Spec',:cyan)}: #{node_spec_name}")
     ui.msg("#{ui.color('VPC Mode',:cyan)}: #{is_vpc?(node_spec)}")
@@ -110,7 +118,16 @@ class NodefuCreate < Chef::Knife
     pretty_print_hash(vm_spec)
 
     unless config[:disable_default_groups] || is_vpc?(node_spec)
-      ui.msg("#{ui.color('Auto generated security groups',:cyan)}: #{generate_security_groups("#{base_name}#{start_range}-#{end_range}",env,domain)}")
+      range_formatted =
+        case start_range
+        when nil
+          ''
+        when end_range
+          "#{start_range}"
+        else
+          "#{start_range}-#{end_range}"
+        end
+      ui.msg("#{ui.color('Auto generated security groups',:cyan)}: #{generate_security_groups("#{base_name}#{range_formatted}",env,domain)}")
     end
 
     config[:yes] ? user_response = 'yes' : user_response = ui.ask_question("Does this seem right to you? [y/n] ").downcase
@@ -118,9 +135,10 @@ class NodefuCreate < Chef::Knife
 
     threads = []
     sema = Mutex.new
-    for i in (start_range..end_range)
+    for i in (start_range.to_i..end_range.to_i)
       ec2_server_request = Ec2ServerCreate.new
-      node_name = "#{base_name}#{i}"
+      node_name = start_range.nil? ? "#{base_name}" : "#{base_name}#{i}"
+
       full_node_name  = "#{node_name}.#{env}.#{domain}"
       security_groups = if config[:disable_default_groups]
                           aux_groups

data/lib/knife-nodefu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-nodefu
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Brian Bianco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-ec2
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A knife plugin for simple node creation automation