corl 0.4.20 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a56639289fcbd5aa19501f8a112396ff3175027b
-  data.tar.gz: 8d2305381ca5393fe3be2ff59dd29b3427cb2d9f
+  metadata.gz: e3bb80a650eb209623ead506dd69a51306c1fcf0
+  data.tar.gz: e41e127547eb7677cf335aa661301b11ffcb690e
 SHA512:
-  metadata.gz: 344dac8b66397b59cc18de211635a4f3460b68286b192d57a14cdff8fd92642d2ac8fba3f96b32b77512e2058d293d5251156204da50410f4240711661f25133
-  data.tar.gz: e2aec0396e8867739f808a52155598ce599204bf65001b6e749e4b21d09ef81d170faf487a199e41f9cdf165170825d4471e98d1e0ea1be0f73ef041c60d0423
+  metadata.gz: 2c37715b7116f293ab7d8d2f96610f0e17d7a8d136cce335d06a2b1f540047b7ed2b340643ed998ec02fca54122d8925ffe8af665933e7f177ddd363d554ccc6
+  data.tar.gz: a07956638bdcb9915e2152158417ef1b073b7eae676f57a2b87dc97a2fe0864b79f88c7337589dfbbdc219740ed570cbbc8baef51e13fbdf65ad31ad7790b840

data/Gemfile.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    corl (0.4.19)
+    corl (0.4.20)
       facter (~> 1.7)
       fog (~> 1.20)
       hiera (~> 1.3)

data/VERSION

@@ -1 +1 @@
-0.4.20
+0.4.21

data/corl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.4.20 ruby lib
+# stub: corl 0.4.21 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.20"
+  s.version = "0.4.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-04-25"
+  s.date = "2014-04-28"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
     "lib/core/facade.rb",
     "lib/core/mixin/action/keypair.rb",
     "lib/core/mixin/lookup.rb",
+    "lib/core/mixin/machine/ssh.rb",
     "lib/core/mixin/macro/network_settings.rb",
     "lib/core/mod/facter_loader.rb",
     "lib/core/mod/fog_aws_server.rb",

data/lib/CORL/machine/vagrant.rb

@@ -3,6 +3,10 @@ module CORL
 module Machine
 class Vagrant < CORL.plugin_class(:machine)
   
+  include Mixin::Machine::SSH
+  
+  #---
+  
   @@lock = Mutex.new
     
   #-----------------------------------------------------------------------------
@@ -101,56 +105,25 @@ class Vagrant < CORL.plugin_class(:machine)
   
   #---
   
-  def download(remote_path, local_path, options = {})
+  def download(remote_path, local_path, options = {}, &code)
     super do |config, success|
-      begin
-        if init_ssh_session
-          Util::SSH.download(node.public_ip, node.user, remote_path, local_path, config.export) do |name, received, total|
-            yield(name, received, total) if block_given?
-          end
-          true
-        else
-          false
-        end
-      rescue Exception => error
-        ui.error(error.message)
-        false
-      end
+      ssh_download(remote_path, local_path, config, &code)
     end  
   end
   
   #---
   
-  def upload(local_path, remote_path, options = {})
+  def upload(local_path, remote_path, options = {}, &code)
     super do |config, success|
-      begin
-        if init_ssh_session
-          Util::SSH.upload(node.public_ip, node.user, local_path, remote_path, config.export) do |name, sent, total|
-            yield(name, sent, total) if block_given?
-          end
-          true
-        else
-          false
-        end
-      rescue Exception => error
-        ui.error(error.message)
-        false
-      end
+      ssh_upload(local_path, remote_path, config, &code)
     end  
   end
   
   #---
   
-  def exec(commands, options = {})
-    super do |config, results|
-      if init_ssh_session
-        results = Util::SSH.exec(node.public_ip, node.user, commands) do |type, command, data|
-          yield(type, command, data) if block_given?  
-        end
-      else
-        results = nil
-      end
-      results
+  def exec(commands, options = {}, &code)
+    super do |config|
+      ssh_exec(commands, config, &code)
     end
   end
   
@@ -158,7 +131,7 @@ class Vagrant < CORL.plugin_class(:machine)
   
   def terminal(user, options = {})
     super do |config|
-      Util::SSH.terminal(node.public_ip, user, config.export)
+      ssh_terminal(user, config)
     end
   end
   
@@ -203,7 +176,7 @@ class Vagrant < CORL.plugin_class(:machine)
           load
         end
         
-      rescue Exception => error
+      rescue => error
         ui.error(error.message)
         success = false
       end
@@ -332,7 +305,7 @@ class Vagrant < CORL.plugin_class(:machine)
         
         server.send(:action, action.to_sym, params)
         
-      rescue Exception => error
+      rescue => error
         ui.error(error)
         ui.error(Util::Data.to_yaml(error.backtrace))
         success = false
@@ -341,34 +314,6 @@ class Vagrant < CORL.plugin_class(:machine)
     success
   end
   protected :run
-  
-  #---
-    
-  def init_ssh_session(reset = false, tries = 5, sleep_secs = 5)
-    success = true
-        
-    begin
-      Util::SSH.session(node.public_ip, node.user, node.ssh_port, node.private_key, reset)
-            
-    rescue Exception => error
-      if tries > 1
-        sleep(sleep_secs)
-        
-        tries -= 1
-        reset  = true
-        retry
-      else
-        success = false
-      end
-    end
-    success
-  end
-  
-  #---
-  
-  def close_ssh_session
-    Util::SSH.close_session(node.public_ip, node.user)
-  end
 end
 end
 end

data/lib/core/facade.rb

@@ -22,9 +22,16 @@ module Facade
   
   #---
   
+  @@vagrant_config_loaded = false
+  
+  def vagrant_config_loaded?
+    @@vagrant_config_loaded
+  end
+  
   def vagrant_config(directory, config, &code)
     require File.join(File.dirname(__FILE__), 'vagrant', 'config.rb')
     Vagrant::Config.register(directory, config, &code)
+    @@vagrant_config_loaded = true
   end
     
   #-----------------------------------------------------------------------------

data/lib/core/mixin/machine/ssh.rb

@@ -0,0 +1,118 @@
+module CORL
+module Mixin
+module Machine
+module SSH
+
+  #-----------------------------------------------------------------------------
+  # SSH Operations
+       
+  def init_ssh_session(reset = false, tries = 5, sleep_secs = 5)
+    ssh_wait_for_ready
+    
+    success = true
+        
+    begin
+      Util::SSH.session(node.public_ip, node.user, node.ssh_port, node.private_key, reset)
+            
+    rescue Net::SSH::HostKeyMismatch => error
+      error.remember_host!
+      sleep 0.2
+      reset = true
+      retry
+
+    rescue Net::SSH::ConnectionTimeout, Net::SSH::Disconnect => error     
+      if tries > 1
+        sleep(sleep_secs)
+        
+        tries -= 1
+        reset  = true
+        retry
+      else
+        success = false
+      end
+      
+    rescue => error
+      ui.warn(error)
+      success = false
+    end
+    success
+  end
+  
+  #---
+  
+  def ssh_download(remote_path, local_path, options = {}, &code)
+    config  = Config.ensure(options)
+    success = false
+    
+    begin
+      if init_ssh_session
+        Util::SSH.download(node.public_ip, node.user, remote_path, local_path, config.export) do |name, received, total|
+          code.call(name, received, total) if code
+        end
+        success = true
+      end  
+    rescue => error
+      ui.error(error.message)
+    end
+    
+    success
+  end
+  
+  #---
+  
+  def ssh_upload(local_path, remote_path, options = {}, &code)
+    config  = Config.ensure(options)
+    success = false
+    
+    begin
+      if init_ssh_session
+        Util::SSH.upload(node.public_ip, node.user, local_path, remote_path, config.export) do |name, sent, total|
+          code.call(name, sent, total) if code
+        end
+        success = true
+      end  
+    rescue => error
+      ui.error(error.message)
+    end
+    
+    success  
+  end
+  
+  #---
+  
+  def ssh_exec(commands, options = {}, &code)
+    config  = Config.ensure(options)
+    results = nil
+    
+    if commands
+      if init_ssh_session
+        results = Util::SSH.exec(node.public_ip, node.user, commands) do |type, command, data|
+          code.call(type, command, data) if code  
+        end
+      end
+    end
+    results
+  end
+  
+  #---
+  
+  def close_ssh_session
+    Util::SSH.close_session(node.public_ip, node.user)
+  end
+  
+  #---
+  
+  def ssh_terminal(user, options = {})
+    Util::SSH.terminal(node.public_ip, user, Config.ensure(options).export)
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Utilities
+  
+  def ssh_wait_for_ready
+    # Override in class if needed (see Fog Machine provider)
+  end
+end
+end
+end
+end

data/lib/core/mod/fog_aws_server.rb

@@ -22,13 +22,19 @@ class Server
       Nucleon::Util::SSH.session(ssh_ip_address, username, ssh_port, private_key_path, true)
       results = Nucleon::Util::SSH.exec(ssh_ip_address, username, commands)
             
-    rescue Exception => error
+    rescue Net::SSH::HostKeyMismatch => error
+      error.remember_host!
+      sleep 0.2
+      reset = true
+      retry
+      
+    rescue Net::SSH::ConnectionTimeout, Net::SSH::Disconnect => error     
       if tries > 1
-        sleep(sleep_secs)        
+        sleep(sleep_secs)
+        
         tries -= 1
+        reset  = true
         retry
-      else
-        raise error
       end
     end
   end

data/lib/core/mod/fog_rackspace_server.rb

@@ -18,6 +18,7 @@ class Server
     @password = nil if password_lock
     
     Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)
+    
   rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
     sleep(1)
     retry

data/lib/core/plugin/fog_machine.rb

@@ -6,6 +6,8 @@ nucleon_require(File.dirname(__FILE__), :machine)
 module CORL
 module Machine
 class Fog < CORL.plugin_class(:machine)
+  
+  include Mixin::Machine::SSH
  
   #-----------------------------------------------------------------------------
   # Checks
@@ -135,10 +137,10 @@ class Fog < CORL.plugin_class(:machine)
   
   #---
   
-  def create(options = {})
+  def create(options = {}, &code)
     super do |config|
       if compute
-        yield(config) if block_given?
+        code.call(config) if code
         myself.server = compute.servers.bootstrap(config.export)
       end
       myself.server ? true : false
@@ -147,64 +149,25 @@ class Fog < CORL.plugin_class(:machine)
   
   #---
   
-  def download(remote_path, local_path, options = {})
+  def download(remote_path, local_path, options = {}, &code)
     super do |config, success|
-      logger.debug("Executing SCP download to #{local_path} from #{remote_path} on machine #{plugin_name}") 
-      
-      begin
-        if init_ssh_session(server)
-          Util::SSH.download(node.public_ip, node.user, remote_path, local_path, config.export) do |name, received, total|
-            yield(name, received, total) if block_given?
-          end
-          true
-        else
-          false
-        end
-      rescue Exception => error
-        ui.error(error.message)
-        false
-      end
+      ssh_download(remote_path, local_path, config, &code)
     end  
   end
   
   #---
   
-  def upload(local_path, remote_path, options = {})
+  def upload(local_path, remote_path, options = {}, &code)
     super do |config, success|
-      logger.debug("Executing SCP upload from #{local_path} to #{remote_path} on machine #{plugin_name}") 
-      
-      begin
-        if init_ssh_session(server)
-          Util::SSH.upload(node.public_ip, node.user, local_path, remote_path, config.export) do |name, sent, total|
-            yield(name, sent, total) if block_given?
-          end
-          true
-        else
-          false
-        end
-      rescue Exception => error
-        ui.error(error.message)
-        false
-      end
+      ssh_upload(local_path, remote_path, config, &code)
     end  
   end
   
   #---
   
-  def exec(commands, options = {})
-    super do |config, results|
-      if commands
-        logger.debug("Executing SSH commands ( #{commands.inspect} ) on machine #{plugin_name}")
-        
-        if init_ssh_session(server)
-          results = Util::SSH.exec(node.public_ip, node.user, commands) do |type, command, data|
-            yield(type, command, data) if block_given?  
-          end
-        else
-          results = nil
-        end
-      end
-      results
+  def exec(commands, options = {}, &code)
+    super do |config|
+      ssh_exec(commands, config, &code)
     end
   end
   
@@ -212,36 +175,27 @@ class Fog < CORL.plugin_class(:machine)
   
   def terminal(user, options = {})
     super do |config|
-      Util::SSH.terminal(node.public_ip, user, config.export)
+      ssh_terminal(user, config)
     end
   end
   
   #---
   
-  def reload(options = {})
+  def reload(options = {}, &code)
     super do |config|
-      success = false
-      if server
-        success = block_given? ? yield(config) : true            
-        success = init_ssh_session(server, true, config.get(:tries, 5), config.get(:sleep_time, 5)) if success
-      end
-      success
+      success = code ? code.call(config) : true            
+      success = init_ssh_session(true, config.get(:tries, 5), config.get(:sleep_time, 5)) if success
     end
   end
 
   #---
  
-  def create_image(options = {})
+  def create_image(options = {}, &code)
     super do |config|
-      success = false
-      if server
-        logger.debug("Imaging machine #{plugin_name}")
-        
-        image_name = sprintf("%s (%s)", node.plugin_name, Time.now.to_s)
-        success    = yield(image_name, config, success) if block_given? # Implement in sub classes
-        success    = init_ssh_session(server, true, config.get(:tries, 5), config.get(:sleep_time, 5)) if success
-      end
-      success
+      image_name = sprintf("%s (%s)", node.plugin_name, Time.now.to_s)
+      
+      success = code ? code.call(image_name, config, success) : true 
+      success = init_ssh_session(true, config.get(:tries, 5), config.get(:sleep_time, 5)) if success
     end
   end
   
@@ -249,27 +203,18 @@ class Fog < CORL.plugin_class(:machine)
   
   def stop(options = {})
     super do |config|
-      success = true
-      if server && create_image(config)      
-        logger.debug("Stopping machine #{plugin_name}")
-        success = destroy(config.import({ :stop => true }))
-      else
-        success = false            
-      end
-      success
+      success = false            
+      success = destroy(config.import({ :stop => true })) if create_image(config)
     end
   end
   
   #---
 
-  def destroy(options = {})
+  def destroy(options = {}, &code)
     super do |config|
-      success = false
-      if server
-        logger.debug("Destroying machine #{plugin_name}")
-        success = server.destroy
-        success = yield(config) if success && block_given?
-      end
+      success = server.destroy
+      success = code.call(config) if success && code
+      
       close_ssh_session if success
       success
     end
@@ -278,32 +223,8 @@ class Fog < CORL.plugin_class(:machine)
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def init_ssh_session(server, reset = false, tries = 5, sleep_secs = 5)
+  def ssh_wait_for_ready
     server.wait_for { ready? }
-    
-    success = true
-        
-    begin
-      Util::SSH.session(node.public_ip, node.user, node.ssh_port, node.private_key, reset)
-            
-    rescue Exception => error
-      if tries > 1
-        sleep(sleep_secs)
-        
-        tries -= 1
-        reset  = true
-        retry
-      else
-        success = false
-      end
-    end
-    success
-  end
-  
-  #---
-  
-  def close_ssh_session
-    Util::SSH.close_session(node.public_ip, node.user)
   end
 end
 end

data/lib/core/plugin/machine.rb

@@ -151,7 +151,7 @@ class Machine < CORL.plugin_class(:base)
     results = []
     
     if running?
-      logger.debug("Executing commands on #{plugin_provider} machine with: #{options.inspect}")
+      logger.info("Executing commands ( #{commands.inspect} ) on machine #{plugin_name}")
       config  = Config.ensure(options)      
       results = yield(config, results) if block_given?
     else

data/lib/core/plugin/node.rb

@@ -363,10 +363,10 @@ class Node < CORL.plugin_class(:base)
       end
     end
     
+    myself.build_time = Time.now.to_s if success
+    
     if success && config.delete(:save, true)
-      ui.success("Saving successful build")
-      
-      myself.build_time = Time.now.to_s
+      ui.success("Saving successful build")    
     
       success = save(extended_config(:build, {
         :message => config.get(:message, "Built #{plugin_provider} node: #{plugin_name}"),
@@ -611,15 +611,21 @@ class Node < CORL.plugin_class(:base)
         end
         
         if commands = config.get(:commands, nil)
-          results = active_machine.exec(commands, config.export) do |type, command, data|
-            unless local?
-              if type == :error
-                alert(filter_output(type, data))
-              else
-                render(filter_output(type, data))
+          begin
+            test = active_machine.exec(commands, config.export) do |type, command, data|
+              unless local?
+                if type == :error
+                  alert(filter_output(type, data))
+                else
+                  render(filter_output(type, data))
+                end
               end
+              yield(:progress, { :type => type, :command => command, :data => data }) if block_given?   
             end
-            yield(:progress, { :type => type, :command => command, :data => data }) if block_given?   
+            results = test if test
+            
+          rescue Exception => error
+            default_error.append_errors(error.message)   
           end
         else
           default_error.append_errors("No execution command")    
@@ -884,7 +890,7 @@ class Node < CORL.plugin_class(:base)
         success = save(config) if success
         
         if success
-          if bootstrap_script = myself[:bootstrap]
+          if config.get(:bootstrap, true) && bootstrap_script
             result = command("HOSTNAME='#{hostname}' #{bootstrap_script}", { :as_admin => true }) do |op, data|
               yield("bootstrap_#{op}".to_sym, data) if block_given?
               data

data/lib/core/plugin/provisioner.rb

@@ -107,7 +107,7 @@ class Provisioner < CORL.plugin_class(:base)
   def build_locations(reset = false)
     locations = cache_setting(:build_locations, {}, :hash)
     build if reset || locations.empty?
-    cache_setting(:build_locations, {}, :hash)
+    symbol_map(cache_setting(:build_locations, {}, :hash))
   end
   
   #---
@@ -115,7 +115,7 @@ class Provisioner < CORL.plugin_class(:base)
   def build_info(reset = false)
     info = cache_setting(:build_info, {}, :hash)
     build if reset || info.empty?
-    cache_setting(:build_info, {}, :hash)
+    symbol_map(cache_setting(:build_info, {}, :hash))
   end
   
   #---

data/lib/core/vagrant/action.rb

@@ -13,6 +13,17 @@ class BaseAction
     @network = nil
     @node    = nil
     @vm      = nil
+    
+    if @corl_config_loaded = ::CORL.vagrant_config_loaded?
+      # Hackish solution to ensure our code has access to Vagrant machines.
+      # This serves as a Vagrant VM manager.
+      ::CORL::Vagrant.command = Command::Launcher.new([], @env)
+      
+      if @network = ::CORL::Vagrant::Config.load_network(env[:root_path])
+        @vm   = env[:machine]
+        @node = network.node(:vagrant, @vm.name) if @vm
+      end
+    end
   end
   
   #-----------------------------------------------------------------------------
@@ -24,15 +35,7 @@ class BaseAction
   # Action execution
   
   def call(env)
-    # Hackish solution to ensure our code has access to Vagrant machines.
-    # This serves as a Vagrant VM manager.
-    ::CORL::Vagrant.command = Command::Launcher.new([], @env)
-    
-    if @network = ::CORL::Vagrant::Config.load_network(env[:root_path])
-      @vm   = env[:machine]
-      @node = network.node(:vagrant, @vm.name) if @vm
-      yield if block_given? && @node 
-    end
+    yield if block_given? && @corl_config_loaded && @network && @node
   end
 end    
 end

data/lib/core/vagrant/provisioner/config.rb

@@ -19,17 +19,17 @@ class CORL < ::Vagrant.plugin("2", :config)
     @root_user         = UNSET_VALUE
     @root_home         = UNSET_VALUE
     
-    @bootstrap         = false
+    @bootstrap         = UNSET_VALUE
     @bootstrap_path    = UNSET_VALUE
     @bootstrap_glob    = UNSET_VALUE
     @bootstrap_init    = UNSET_VALUE
     @auth_files        = UNSET_VALUE
     
-    @seed              = false
+    @seed              = UNSET_VALUE
     @project_reference = UNSET_VALUE
     @project_branch    = UNSET_VALUE
     
-    @provision         = true
+    @provision         = UNSET_VALUE
     @dry_run           = false
   end
   
@@ -43,13 +43,17 @@ class CORL < ::Vagrant.plugin("2", :config)
     @root_user         = nil if @root_user == UNSET_VALUE
     @root_home         = nil if @root_home == UNSET_VALUE
     
+    @bootstrap         = nil if @bootstrap == UNSET_VALUE
     @bootstrap_path    = nil if @bootstrap_path == UNSET_VALUE
     @bootstrap_glob    = nil if @bootstrap_glob == UNSET_VALUE
     @bootstrap_init    = nil if @bootstrap_init == UNSET_VALUE
     @auth_files        = nil if @auth_files == UNSET_VALUE
     
+    @seed              = nil if @seed == UNSET_VALUE
     @project_reference = nil if @project_reference == UNSET_VALUE
     @project_branch    = nil if @project_branch == UNSET_VALUE
+    
+    @provision         = nil if @provision == UNSET_VALUE
   end
   
   #-----------------------------------------------------------------------------

data/lib/core/vagrant/provisioner/provisioner.rb

@@ -32,7 +32,7 @@ class CORL < ::Vagrant.plugin("2", :provisioner)
       
       if network && node
         # Provision the server
-        network.init_node(node, clean(::CORL.config(:vagrant_node_init, {
+        success = network.init_node(node, clean(::CORL.config(:vagrant_node_init, {
           :force             => config.force_updates,
           :home              => config.user_home,
           :home_env_var      => config.user_home_env_var,
@@ -49,6 +49,8 @@ class CORL < ::Vagrant.plugin("2", :provisioner)
           :provision         => config.provision,
           :dry_run           => config.dry_run
         }).export))
+        
+        node.ui.warn("CORL provisioner failed") unless success
       end
     end
   end

data/lib/corl.rb

@@ -13,15 +13,16 @@
 #-------------------------------------------------------------------------------
 # Top level properties 
 
-lib_dir          = File.dirname(__FILE__)
-core_dir         = File.join(lib_dir, 'core')
-mod_dir          = File.join(core_dir, 'mod')
-mixin_dir        = File.join(core_dir, 'mixin')
-mixin_action_dir = File.join(mixin_dir, 'action')
-macro_dir        = File.join(mixin_dir, 'macro')
-util_dir         = File.join(core_dir, 'util')
-mod_dir          = File.join(core_dir, 'mod')
-vagrant_dir      = File.join(core_dir, 'vagrant')
+lib_dir           = File.dirname(__FILE__)
+core_dir          = File.join(lib_dir, 'core')
+mod_dir           = File.join(core_dir, 'mod')
+mixin_dir         = File.join(core_dir, 'mixin')
+mixin_action_dir  = File.join(mixin_dir, 'action')
+mixin_machine_dir = File.join(mixin_dir, 'machine')
+macro_dir         = File.join(mixin_dir, 'macro')
+util_dir          = File.join(core_dir, 'util')
+mod_dir           = File.join(core_dir, 'mod')
+vagrant_dir       = File.join(core_dir, 'vagrant')
  
 #-------------------------------------------------------------------------------
 # CORL requirements
@@ -59,6 +60,9 @@ end
 Dir.glob(File.join(mixin_action_dir, '*.rb')).each do |file|
   require file
 end
+Dir.glob(File.join(mixin_machine_dir, '*.rb')).each do |file|
+  require file
+end
 Dir.glob(File.join(macro_dir, '*.rb')).each do |file|
   require file
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.21
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
@@ -263,6 +263,7 @@ files:
 - lib/core/facade.rb
 - lib/core/mixin/action/keypair.rb
 - lib/core/mixin/lookup.rb
+- lib/core/mixin/machine/ssh.rb
 - lib/core/mixin/macro/network_settings.rb
 - lib/core/mod/facter_loader.rb
 - lib/core/mod/fog_aws_server.rb