corl 0.5.1 → 0.5.2

data/lib/nucleon/action/node/keypair.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Keypair < CORL.plugin_class(:nucleon, :cloud_action)
+class Keypair < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   include Mixin::Action::Keypair
   
@@ -36,7 +36,7 @@ class Keypair < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
  
   def execute
-    super do |node, network|
+    super do |node|
       if keys = keypair
         ui.info("\n", { :prefix => false })
         ui_group(Util::Console.cyan("#{keys.type.upcase} SSH keypair")) do |ui|          

data/lib/nucleon/action/node/lookup.rb

@@ -2,9 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Lookup < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Lookup < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -43,7 +41,7 @@ class Lookup < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       ensure_node(node) do
         translator = CORL.translator({}, settings[:format])
         

data/lib/nucleon/action/node/provision.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Provision < CORL.plugin_class(:nucleon, :cloud_action)
+class Provision < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -33,7 +33,7 @@ class Provision < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
   
   def execute
-    super do |node, network|
+    super do |node|
       info('corl.actions.provision.start')
       
       ensure_node(node) do        

data/lib/nucleon/action/node/reboot.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Reboot < CORL.plugin_class(:nucleon, :cloud_action)
+class Reboot < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -52,8 +52,8 @@ class Reboot < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |local_node, network|
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         batch_success = network.batch(settings[:reboot_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.reboot.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.reload  

data/lib/nucleon/action/node/revoke.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Revoke < CORL.plugin_class(:nucleon, :cloud_action)
+class Revoke < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -32,7 +32,7 @@ class Revoke < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       info('corl.actions.revoke.start')
       
       ensure_node(node) do

data/lib/nucleon/action/node/seed.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Seed < CORL.plugin_class(:nucleon, :cloud_action)
+class Seed < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -10,7 +10,7 @@ class Seed < CORL.plugin_class(:nucleon, :cloud_action)
   def self.describe
     super(:node, :seed, 625)
   end
- 
+  
   #-----------------------------------------------------------------------------
   # Settings
   
@@ -18,31 +18,13 @@ class Seed < CORL.plugin_class(:nucleon, :cloud_action)
     super do
       codes :key_store_failure,
             :project_failure,
-            :network_init_failure,
             :network_load_failure,
             :node_load_failure,
             :node_save_failure
       #---
       
-      register :project_branch, :str, 'master'
-      register :project_reference, :str, nil do |value|
-        next true if value.nil?
-        
-        value           = value.to_sym
-        project_plugins = CORL.loaded_plugins(:nucleon, :project)
-        
-        if @project_info = CORL.plugin_class(:nucleon, :project).translate_reference(value, true)
-          provider = @project_info[:provider]
-        else
-          provider = value
-        end
-        
-        unless project_plugins.keys.include?(provider.to_sym)
-          warn('corl.actions.seed.errors.project_reference', { :value => value, :provider => provider, :choices => project_plugins.keys.join(', ') })
-          next false
-        end
-        true
-      end      
+      register_project :project_reference
+      register_str :project_branch, 'master'      
     end
   end
   
@@ -56,28 +38,32 @@ class Seed < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
-      info('corl.actions.seed.start')
+    super do |node|
+      info('start')
       
       ensure_node(node) do
         admin_exec do
           network_path = lookup(:corl_network)
           backup_path  = File.join(Dir.tmpdir(), 'corl')
           
-          info("Generating network SSH deploy keys", { :i18n => false })
+          info('deploy_keys')
+          
+          project_class = CORL.plugin_class(:nucleon, :project)
           
           if keys = Util::SSH.generate.store
-            if @project_info
+            if @project_info = project_class.translate_reference(settings[:project_reference], true)
               project_info = Config.new(@project_info)
             else
               project_info = Config.new({ :provider => :git })
             end
             
-            info("Backing up current network configuration", { :i18n => false })
+            project_class.clear_provider(network_path)
+            
+            info('backup')
             FileUtils.rm_rf(backup_path)
             FileUtils.mv(network_path, backup_path)
             
-            info("Seeding network configuration from #{settings[:project_reference]}", { :i18n => false })
+            info('seeding')
             project = CORL.project(extended_config(:project, {
               :directory   => network_path,
               :reference   => project_info.get(:reference, nil),
@@ -86,28 +72,27 @@ class Seed < CORL.plugin_class(:nucleon, :cloud_action)
               :create      => true,
               :pull        => true,
               :keys        => keys,
-              :internal_ip => CORL.public_ip # Needed for seeding Vagrant VMs
+              :internal_ip => CORL.public_ip, # Needed for seeding Vagrant VMs,
+              :new         => true
             }), project_info[:provider])
-        
+            
             if project
-              info("Finalizing network path and removing temporary backup", { :i18n => false })
+              info('finalizing')
               FileUtils.chmod_R(0600, network_path)
               FileUtils.rm_rf(backup_path)
               
-              info("Reinitializing network", { :i18n => false })
-              if network = init_network
-                if network.load
-                  if node = network.local_node(true)
-                    info("Updating node network configurations", { :i18n => false })
-                    myself.status = code.node_save_failure unless node.save  
-                  else
-                    myself.status = code.node_load_failure
-                  end                  
+              info('reinitializing')
+              init_network
+              
+              if network.load
+                if node = network.local_node(true)
+                  info('updating')
+                  myself.status = code.node_save_failure unless node.save  
                 else
-                  myself.status = code.network_load_failure    
-                end
+                  myself.status = code.node_load_failure
+                end                  
               else
-                myself.status = code.network_init_failure
+                myself.status = code.network_load_failure    
               end     
             else
               myself.status = code.project_failure  

data/lib/nucleon/action/node/spawn.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Spawn < CORL.plugin_class(:nucleon, :cloud_action)
+class Spawn < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   include Mixin::Action::Keypair
   
@@ -21,17 +21,17 @@ class Spawn < CORL.plugin_class(:nucleon, :cloud_action)
       codes :key_failure,
             :node_create_failure
       
-      register :bootstrap, :bool, true
-      register :seed, :bool, true
-      register :provision, :bool, true
+      register_bool :bootstrap, true
+      register_bool :provision, false
       
-      register :groups, :array, []      
-      register :region, :str, nil
-      register :machine_type, :str, nil
-      register :image, :str, nil
-      register :user, :str, nil     
-      register :hostnames, :array, nil
-        
+      register_array :hostnames, nil
+      register_array :groups
+           
+      register_str :region, nil
+      register_str :machine_type, nil
+      register_str :image, nil
+      register_str :user, nil     
+              
       keypair_config
       
       config.defaults(CORL.action_config(:node_bootstrap))
@@ -39,6 +39,11 @@ class Spawn < CORL.plugin_class(:nucleon, :cloud_action)
     end
   end
   
+  def node_config
+    super
+    config[:node_provider].default = nil
+  end
+  
   #---
   
   def ignore
@@ -53,8 +58,8 @@ class Spawn < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
  
   def execute
-    super do |node, network|
-      ensure_network(network) do
+    super do |node|
+      ensure_network do
         if keypair && keypair_clean
           hostnames     = []
           results       = []
@@ -70,7 +75,7 @@ class Spawn < CORL.plugin_class(:nucleon, :cloud_action)
             settings[:user] = :root  
           end
           
-          info('corl.actions.spawn.start', { :node_provider => node_provider }) 
+          info('start', { :node_provider => node_provider }) 
           
           settings.delete(:hostnames).each do |hostname|
             hostnames << extract_hostnames(hostname)

data/lib/nucleon/action/node/start.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Start < CORL.plugin_class(:nucleon, :cloud_action)
+class Start < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -52,8 +52,8 @@ class Start < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |local_node, network|
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         batch_success = network.batch(settings[:start_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.start.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.start 

data/lib/nucleon/action/node/status.rb

@@ -2,9 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Status < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Status < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -38,12 +36,13 @@ class Status < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |local_node, network|
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         settings[:status_nodes] = [ 'all' ] if settings[:status_nodes].empty?
         
         batch_success = network.batch(settings[:status_nodes], settings[:node_provider], settings[:parallel]) do |node|
-          state       = node.state(true).to_sym
+          state       = node.state(true)
+          state       = state.nil? ? :aborted : state.to_sym
           ssh_enabled = ''
           
           case state
@@ -63,10 +62,11 @@ class Status < CORL.plugin_class(:nucleon, :cloud_action)
           when :stopped, :aborted
             state = red(state.to_s)
           end
-          info(state + " #{ssh_enabled}".rstrip, { :i18n => false, :prefix_text => yellow(node.plugin_provider) + ' ' + purple(node.plugin_name) })
+          info(state.to_s + " #{ssh_enabled}".rstrip, { :i18n => false, :prefix_text => yellow(node.plugin_provider) + ' ' + purple(node.plugin_name) })
           true
         end
-        myself.status = code.batch_error unless batch_success
+        success = network.save({ :push => true, :remote => :edit, :message => "Updating node status information.", :allow_empty => true })
+        myself.status = code.batch_error unless batch_success && success
       end
     end
   end

data/lib/nucleon/action/node/stop.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Stop < CORL.plugin_class(:nucleon, :cloud_action)
+class Stop < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -52,8 +52,8 @@ class Stop < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |local_node, network|
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         batch_success = network.batch(settings[:stop_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.stop.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.stop  

data/lib/nucleon/action/plugin/create.rb

@@ -2,15 +2,12 @@
 module Nucleon
 module Action
 module Plugin
-class Create < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Create < Nucleon.plugin_class(:nucleon, :cloud_action)
    
   #-----------------------------------------------------------------------------
   # Info
   
   def self.describe
-    Nucleon.dump_enabled = true
     super(:plugin, :create, 10)
   end
   
@@ -51,7 +48,7 @@ class Create < CORL.plugin_class(:nucleon, :cloud_action)
       register_array :name, nil
       
       register_bool :save
-      register_bool :interpolate
+      register_bool :interpolate, true
       
       register_directory :template_path
     end
@@ -71,8 +68,8 @@ class Create < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
-      ensure_network(network) do
+    super do |node|
+      ensure_network do
         require 'erubis'
         
         type = settings[:type].to_sym
@@ -95,7 +92,7 @@ class Create < CORL.plugin_class(:nucleon, :cloud_action)
           template_contents = Util::Disk.read(template)
           
           unless template_contents
-            error("Template file #{template} for #{@plugin_namespace}.#{@plugin_type} could not be parsed", { :i18n => false })
+            error('parse_failed', { :file => template })
             myself.status = code.template_file_parse_failed
             next      
           end
@@ -103,7 +100,7 @@ class Create < CORL.plugin_class(:nucleon, :cloud_action)
         end
         
         unless template
-          error("No template file exists for #{template_path}#{File::SEPARATOR}#{@plugin_namespace}.#{@plugin_type}.erb", { :i18n => false })
+          error('no_template', { :file => "#{template_path}#{File::SEPARATOR}#{@plugin_namespace}.#{@plugin_type}.erb" })
           myself.status = code.no_template_file
           next    
         end
@@ -113,7 +110,7 @@ class Create < CORL.plugin_class(:nucleon, :cloud_action)
         plugin_file = nil
         
         if File.exists?(save_file)
-          error("Plugin already exists at #{save_file}", { :i18n => false })
+          error('provider_exists', { :file => save_file })
           myself.status = code.plugin_already_exists
           next  
         end
@@ -146,13 +143,13 @@ class Create < CORL.plugin_class(:nucleon, :cloud_action)
           FileUtils.mkdir_p(save_directory)
           
           if Util::Disk.write(save_file, plugin_file)
-            success("Plugin successfully saved to #{save_file}", { :i18n => false })  
+            success('saved', { :file => save_file })
           else
-            error("Plugin can not be saved to #{save_file}", { :i18n => false })
+            error('save_failed', { :file => save_file })
             myself.status = code.plugin_save_failed 
           end
         else
-          info("Plugin: #{blue(save_file)}", { :i18n => false })
+          info('plugin_file', { :file => blue(save_file) })
           # Render template ONLY (testing)
           if settings.delete(:interpolate)
             puts green(plugin_file)  

data/lib/nucleon/action/plugin/list.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Plugin
-class List < CORL.plugin_class(:nucleon, :cloud_action)
+class List < Nucleon.plugin_class(:nucleon, :cloud_action)
    
   #-----------------------------------------------------------------------------
   # Info
@@ -30,22 +30,22 @@ class List < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
-      ensure_network(network) do
+    super do |node|
+      ensure_network do
         last_namespace   = nil
         last_plugin_type = nil
         
         Nucleon.loaded_plugins.each do |namespace, plugins|
-          info("------------------------------------------------------", { :i18n => false, :prefix => false })
-          info(" Namespace: #{purple(namespace)}", { :i18n => false, :prefix => false })
+          info('------------------------------------------------------', { :i18n => false, :prefix => false })
+          prefixed_message(:info, ' ', 'namespace', { :namespace => purple(namespace), :prefix => false })
           info("\n", { :i18n => false, :prefix => false })
           
           provider_info = {}
           max_width     = 10
                     
           plugins.each do |type, providers|
-            info("    Plugin type: #{blue(type)}", { :i18n => false, :prefix => false })
-            info("      Providers:", { :i18n => false, :prefix => false }) 
+            prefixed_message(:info, '    ', 'plugin_type', { :type => blue(type), :prefix => false })
+            prefixed_message(:info, '      ', 'providers', { :prefix => false })
             
             providers.keys.each do |name|
               width     = name.to_s.size

data/lib/nucleon/action/plugin/template/nucleon.action.erb

@@ -36,13 +36,13 @@ class <%= Nucleon.class_name(plugin_class) -%> < CORL.plugin_class(:nucleon, :cl
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       <% if node_context -%>
       ensure_node(node) do
         
       end
       <% else -%>
-      ensure_network(network) do
+      ensure_network do
       
       end
       <% end -%>

data/lib/nucleon/action/plugins.rb

@@ -1,4 +1,8 @@
 
+nucleon_require(File.join(File.dirname(__FILE__), 'plugin'), :list)
+
+#---
+
 module Nucleon
 module Action
 class Plugins < Plugin::List
@@ -7,7 +11,14 @@ class Plugins < Plugin::List
   # Info
   
   def self.describe
-    describe_base(nil, :plugins, 1)
+    describe_base(nil, :plugins, 1, nil, nil, :plugin_list)
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Output
+  
+  def render_provider
+    :plugin_list
   end
 end
 end

data/lib/nucleon/event/puppet.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Event
-class Puppet < CORL.plugin_class(:nucleon, :event)
+class Puppet < Nucleon.plugin_class(:nucleon, :event)
   
   #-----------------------------------------------------------------------------
   # Puppet event interface

data/lib/nucleon/extension/corl_config.rb

@@ -0,0 +1,26 @@
+
+module Nucleon
+module Extension
+class CorlConfig < Nucleon.plugin_class(:nucleon, :extension)
+  
+  def configuration_file_base(config)
+    plugin      = config[:plugin]
+    file_bases  = [ :build, :vagrant] 
+    translators = Nucleon.loaded_plugins(:nucleon, :translator).keys
+    
+    Dir.glob(File.join(plugin.directory, '*.*')).each do |file|
+      file_ext = File.extname(file)
+      
+      if translators.include?(file_ext.sub('.', '').to_sym)
+        file_base = File.basename(file).gsub(/#{file_ext}$/, '').to_sym
+        
+        unless file_base == :corl || file_bases.include?(file_base)
+          file_bases << file_base
+        end
+      end
+    end
+    file_bases
+  end
+end
+end
+end

data/lib/nucleon/template/environment.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Template
-class Environment < CORL.plugin_class(:nucleon, :template)
+class Environment < Nucleon.plugin_class(:nucleon, :template)
   
   #-----------------------------------------------------------------------------
   # Renderers