corl 0.4.14 → 0.4.15

data/VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

data/corl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.14"
+  s.version = "0.4.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-23"
+  s.date = "2014-03-24"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]

data/lib/CORL/action/spawn.rb

@@ -49,17 +49,21 @@ class Spawn < Plugin::CloudAction
       
       if network
         if keypair && keypair_clean
+          hostnames     = []
           results       = []
           node_provider = settings.delete(:node_provider)
           
           settings.delete(:hostnames).each do |hostname|
+            hostnames << extract_hostnames(hostname)
+          end
+          hostnames.flatten.each do |hostname|
             if settings[:parallel]
               results << network.future.add_node(node_provider, hostname, settings)
             else
               results << network.add_node(node_provider, hostname, settings)    
             end
           end
-          results     = results.map { |future| future.value } if settings[:parallel]                  
+          results       = results.map { |future| future.value } if settings[:parallel]                  
           myself.status = code.batch_error if results.include?(false)
         else
           myself.status = code.key_failure  
@@ -69,6 +73,30 @@ class Spawn < Plugin::CloudAction
       end
     end
   end
+  
+  #-----------------------------------------------------------------------------
+  # Utilities
+  
+  def extract_hostnames(hostname)
+    hostnames = []
+    
+    if hostname.match(/([^\[]+)\[([^\]]+)\](.*)/)
+      before = $1
+      range  = $2
+      after  = $3
+      
+      low, high = range.split(/\s*\-\s*/)
+      range     = Range.new(low, high)
+      
+      range.each do |item|
+        hostnames << "#{before}#{item}#{after}"  
+      end
+    else
+      hostnames = [ hostname ]
+    end
+    hostnames
+  end
+  protected :extract_hostnames
 end
 end
 end

data/lib/core/plugin/node.rb

@@ -594,9 +594,9 @@ class Node < CORL.plugin_class(:base)
           results = active_machine.exec(commands, config.export) do |type, command, data|
             unless local?
               if type == :error
-                alert(data.gsub(/^(\e\[\d\d?m)?\[[^\]]+\]\s*/, '\\1'))
+                alert(data)
               else
-                render(data.gsub(/^(\e\[\d\d?m)?\[[^\]]+\]\s*/, '\\1'))
+                render(data)
               end
             end
             yield(:progress, { :type => type, :command => command, :data => data }) if block_given?   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
-  requirement: &16027460 !ruby/object:Gem::Requirement
+  requirement: &10641600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *16027460
+  version_requirements: *10641600
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &16026380 !ruby/object:Gem::Requirement
+  requirement: &10641000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.20'
   type: :runtime
   prerelease: false
-  version_requirements: *16026380
+  version_requirements: *10641000
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &16025500 !ruby/object:Gem::Requirement
+  requirement: &10640080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *16025500
+  version_requirements: *10640080
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &16025000 !ruby/object:Gem::Requirement
+  requirement: &10638600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *16025000
+  version_requirements: *10638600
 - !ruby/object:Gem::Dependency
   name: hiera
-  requirement: &16024440 !ruby/object:Gem::Requirement
+  requirement: &10637320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *16024440
+  version_requirements: *10637320
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &16023660 !ruby/object:Gem::Requirement
+  requirement: &10635880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *16023660
+  version_requirements: *10635880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16022220 !ruby/object:Gem::Requirement
+  requirement: &10634420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *16022220
+  version_requirements: *10634420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16021180 !ruby/object:Gem::Requirement
+  requirement: &10726200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *16021180
+  version_requirements: *10726200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16086200 !ruby/object:Gem::Requirement
+  requirement: &10725420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *16086200
+  version_requirements: *10725420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16085200 !ruby/object:Gem::Requirement
+  requirement: &10724820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *16085200
+  version_requirements: *10724820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16084640 !ruby/object:Gem::Requirement
+  requirement: &10723720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *16084640
+  version_requirements: *10723720
 description: Framework that provides a simple foundation for growing organically in
   the cloud
 email: adrian.webb@coralnexus.com