corl 0.5.1 → 0.5.2

data/lib/nucleon/action/cloud/settings.rb

@@ -2,15 +2,13 @@
 module Nucleon
 module Action
 module Cloud
-class Settings < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Settings < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
   
   def self.describe
-    super(:cloud, :settings, 951)
+    super(:cloud, :settings, 950)
   end
  
   #-----------------------------------------------------------------------------
@@ -25,6 +23,7 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
       register_str :name
       register_array :value
       
+      register_bool :array
       register_bool :delete
       register_bool :append
       register_bool :groups
@@ -37,7 +36,7 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
   #---
   
   def ignore
-    [ :nodes ]
+    node_ignore
   end
    
   def arguments
@@ -48,28 +47,28 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
-      ensure_network(network) do
+    super do |node|
+      ensure_network do
         if settings[:groups]
-          render_groups(network)
+          render_groups
           
         elsif settings[:group].empty?
-          render_settings(network)
+          render_settings
           
         elsif settings[:name].empty?
-          render_settings(network, settings[:group])
+          render_settings(settings[:group])
           
         else
           name = settings[:name].gsub(/\]$/, '').split(/\]?\[/)
           
           if settings.get(:delete, false)
-            delete_settings(network, name, sanitize_remote(network, settings[:net_remote]))
+            delete_settings(name)
                  
           elsif ! settings[:value].empty?
-            set_settings(network, name, settings[:value], sanitize_remote(network, settings[:net_remote]))
+            set_settings(name, settings[:value])
                 
           else
-            render_settings(network, [ settings[:group], name ])  
+            render_settings([ settings[:group], name ])  
           end          
         end
       end
@@ -77,12 +76,12 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
   end
   
   #-----------------------------------------------------------------------------
-  # Sub operations
+  # Settings operations
   
-  def render_groups(network)
+  def render_groups
     groups = network.config.get(:settings).keys
     
-    info("Currently defined groups:", { :i18n => false })
+    info('groups')
     groups.each do |group|
       info("-> #{green(group)}", { :i18n => false })
     end
@@ -90,7 +89,7 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
   
   #---
   
-  def render_settings(network, elements = [])
+  def render_settings(elements = [])
     format = settings[:format]
     
     if elements.size > 0
@@ -103,27 +102,31 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
    
   #---
   
-  def delete_settings(network, property, remote = nil)
+  def delete_settings(property)
     group       = settings[:group]
     name        = parse_property_name(property)    
-    remote_text = remote_message(remote)
+    remote_text = remote_message(settings[:net_remote])
+    
+    render_options = { :group => blue(group), :name => blue(name), :remote_text => yellow(remote_text) }
     
     network.config.delete([ :settings, group, property ])
     
-    if network.save({ :remote => remote, :message => "Deleting #{group} setting #{name}", :allow_empty => true })
-      success("Group #{blue(group)} setting `#{blue(name)}` deleted (#{yellow(remote_text)})", { :i18n => false })
+    if network.save({ :remote => settings[:net_remote], :message => "Deleting #{group} setting #{name}", :allow_empty => true })
+      success('delete', render_options)
     else
-      error("Group #{blue(group)} setting `#{blue(name)}` deletion could not be saved", { :i18n => false })
+      error('delete', render_options)
       myself.status = code.settings_delete_failed    
     end
   end
   
   #---
   
-  def set_settings(network, property, values, remote = nil)
+  def set_settings(property, values)
     group        = settings[:group]
     name         = parse_property_name(property)    
-    remote_text  = remote_message(remote)
+    remote_text  = remote_message(settings[:net_remote])
+    
+    render_options = { :group => blue(group), :name => blue(name), :remote_text => yellow(remote_text) }
     
     input_format = settings[:input_format]
     
@@ -145,7 +148,9 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
         values = prev_value
       end
     else
-      if values.size == 1
+      if settings[:array]
+        values = array(values)
+      elsif values.size == 1
         values = values[0]
       end    
     end
@@ -153,32 +158,13 @@ class Settings < CORL.plugin_class(:nucleon, :cloud_action)
     myself.result = values    
     network.config.set([ :settings, group, property ], result)
     
-    if network.save({ :remote => remote, :message => "Updating #{group} setting #{name}", :allow_empty => true })
-      success("Group #{blue(group)} setting `#{blue(name)}` updated (#{yellow(remote_text)})", { :i18n => false })
+    if network.save({ :remote => settings[:net_remote], :message => "Updating #{group} setting #{name}", :allow_empty => true })
+      success('update', render_options)
     else
-      error("Group #{blue(group)} setting `#{blue(name)}` update could not be saved", { :i18n => false })
+      error('update', render_options)
       myself.status = code.settings_save_failed    
     end
   end
-  
-  #-----------------------------------------------------------------------------
-  # Utilities
-
-  def parse_property_name(property)
-    property = property.clone
-    
-    if property.size > 1
-      property.shift.to_s + '[' + property.join('][') + ']'
-    else
-      property.shift.to_s
-    end
-  end
-  
-  #---
-  
-  def remote_message(remote)
-    remote ? "#{remote}" : "LOCAL ONLY"
-  end
 end
 end
 end

data/lib/nucleon/action/cloud/vagrantfile.rb

@@ -19,41 +19,58 @@ class Vagrantfile < CORL.plugin_class(:nucleon, :cloud_action)
       codes :vagrant_backup_failure,
             :vagrant_save_failure,
             :network_save_failure
+            
+      register_bool :save
     end
   end
   
+  #---
+  
+  def ignore
+    node_ignore
+  end
+  
   #-----------------------------------------------------------------------------
   # Action operations
    
   def execute
-    super do |node, network|
-      info('corl.actions.vagrantfile.start')
-      
-      ensure_network(network) do
+    super do |node|
+      ensure_network do
         generated_vagrantfile_name = File.join(CORL.lib_path, 'core', 'vagrant', 'Vagrantfile')        
         project_vagrantfile_name   = File.join(network.directory, 'Vagrantfile')
         success                    = true
                 
         corl_vagrantfile = Util::Disk.read(generated_vagrantfile_name)
         
-        if File.exists?(project_vagrantfile_name)
-          unless FileUtils.mv(project_vagrantfile_name, "#{project_vagrantfile_name}.backup", :force => true)
-            myself.status = code.vagrant_backup_failure
-            success       = false
+        if settings[:save]
+          if File.exists?(project_vagrantfile_name)
+            backup_file = "#{project_vagrantfile_name}.backup"
+            
+            unless FileUtils.mv(project_vagrantfile_name, backup_file, :force => true)
+              error('file_save', { :file => blue(backup_file) })
+              myself.status = code.vagrant_backup_failure
+              success       = false
+            end
           end
-        end
         
-        if success
-          unless Util::Disk.write(project_vagrantfile_name, corl_vagrantfile)
-            myself.status = code.vagrant_save_failure
-            success       = false
-          end
-          
           if success
-            unless network.save({ :files => 'Vagrantfile' })
-              myself.status = code.network_save_failure
+            unless Util::Disk.write(project_vagrantfile_name, corl_vagrantfile)
+              error('file_save', { :file => blue(project_vagrantfile_name) })
+              myself.status = code.vagrant_save_failure
+              success       = false
+            end
+          
+            if success
+              if network.save({ :files => 'Vagrantfile', :remote => settings[:net_remote], :message => "Saving new Vagrantfile.", :allow_empty => true })
+                success('update', { :file => blue('Vagrantfile'), :remote_text => yellow(remote_message(settings[:net_remote])) })
+              else
+                error('update', { :file => blue('Vagrantfile') })
+                myself.status = code.network_save_failure
+              end
             end
           end
+        else
+          puts corl_vagrantfile
         end 
       end
     end

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class IP < CORL.plugin_class(:nucleon, :cloud_action)
+class IP < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -18,7 +18,7 @@ class IP < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       ensure_node(node) do
         render(CORL.public_ip)
       end

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class SSH < CORL.plugin_class(:nucleon, :cloud_action)
+class SSH < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -53,8 +53,8 @@ class SSH < 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[:ssh_nodes], settings[:node_provider], false) do |node|
           render_options = { :id => node.id, :hostname => node.hostname }
           

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

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

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Bootstrap < CORL.plugin_class(:nucleon, :cloud_action)
+class Bootstrap < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -16,31 +16,18 @@ class Bootstrap < CORL.plugin_class(:nucleon, :cloud_action)
   
   def configure
     super do
-      register :auth_files, :array, [] do |values|
-        success = true
-        values.each do |value|
-          unless File.exists?(value)
-            warn('corl.actions.bootstrap.errors.auth_files', { :value => value })
-            success = false
-          end
-        end
-        success
-      end
-      register :home_env_var, :str, 'HOME'
-      register :home, :str, nil    
-      register :bootstrap_path, :str, File.join(CORL.lib_path, '..', 'bootstrap') do |value|
-        unless File.directory?(value)
-          warn('corl.actions.bootstrap.errors.bootstrap_path', { :value => value })
-          next false
-        end
-        true
-      end
-      register :bootstrap_glob, :str, '**/*.sh'
-      register :bootstrap_init, :str, 'bootstrap.sh'
+      register_directory :bootstrap_path, File.join(CORL.lib_path, '..', 'bootstrap')
+      register_files :auth_files
+      
+      register_str :home_env_var, 'HOME'
+      register_str :home, nil    
+            
+      register_str :bootstrap_glob, '**/*.sh'
+      register_str :bootstrap_init, 'bootstrap.sh'
       
-      register :bootstrap_nodes, :array, nil do |values|
+      register_array :bootstrap_nodes, nil do |values|
         if values.nil?
-          warn('corl.actions.bootstrap.errors.bootstrap_nodes_empty')
+          warn('bootstrap_nodes_empty')
           next false 
         end
         
@@ -50,7 +37,7 @@ class Bootstrap < CORL.plugin_class(:nucleon, :cloud_action)
         values.each do |value|
           if info = CORL.plugin_class(:CORL, :node).translate_reference(value)
             if ! node_plugins.keys.include?(info[:provider].to_sym) || info[:name].empty?
-              warn('corl.actions.bootstrap.errors.bootstrap_nodes', { :value => value, :node_provider => info[:provider],  :name => info[:name] })
+              warn('bootstrap_nodes', { :value => value, :node_provider => info[:provider],  :name => info[:name] })
               success = false
             end
           end
@@ -74,18 +61,18 @@ class Bootstrap < 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[:bootstrap_nodes], settings[:node_provider], settings[:parallel]) do |node|
           render_options = { :id => node.id, :hostname => node.hostname }
           
-          info('corl.actions.bootstrap.start', render_options)
+          info('start', render_options)
           success = node.bootstrap(network.home, extended_config(:bootstrap, settings.clone))
           if success
-            info('corl.actions.bootstrap.success', render_options)
+            success('complete', render_options)
           else
             render_options[:status] = node.status
-            error('corl.actions.bootstrap.failure', render_options)
+            error('failure', render_options)
           end
           success
         end

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Build < CORL.plugin_class(:nucleon, :cloud_action)
+class Build < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -16,7 +16,7 @@ class Build < CORL.plugin_class(:nucleon, :cloud_action)
   
   def configure
     super do
-      register :environment, :str, ''
+      register_str :environment
     end
   end
   
@@ -30,8 +30,8 @@ class Build < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
-      info('corl.actions.build.start') 
+    super do |node|
+      info('start') 
       ensure_node(node) do
         settings.delete(:environment) if settings[:environment] == ''
         

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

@@ -2,9 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Cache < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Cache < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -41,7 +39,7 @@ class Cache < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       ensure_node(node) do
         if settings.delete(:clear, false)
           clear_node_cache(node)

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Destroy < CORL.plugin_class(:nucleon, :cloud_action)
+class Destroy < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -16,25 +16,9 @@ class Destroy < CORL.plugin_class(:nucleon, :cloud_action)
   
   def configure
     super do
-      register :destroy_nodes, :array, nil do |values|
-        if values.nil?
-          warn('corl.actions.destroy.errors.destroy_nodes_empty')
-          next false 
-        end
-        
-        node_plugins = CORL.loaded_plugins(:CORL, :node)
-        success      = true
-        
-        values.each do |value|
-          if info = CORL.plugin_class(:CORL, :node).translate_reference(value)
-            if ! node_plugins.keys.include?(info[:provider].to_sym) || info[:name].empty?
-              warn('corl.actions.destroy.errors.destroy_nodes', { :value => value, :node_provider => info[:provider],  :name => info[:name] })
-              success = false
-            end
-          end
-        end
-        success
-      end
+      register_bool :force, false
+      
+      register_nodes :destroy_nodes
     end
   end
   
@@ -52,13 +36,28 @@ class Destroy < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |local_node, network|
-      ensure_network(network) do
-        batch_success = network.batch(settings[:destroy_nodes], settings[:node_provider], settings[:parallel]) do |node|
-          info('corl.actions.destroy.start', { :provider => node.plugin_provider, :name => node.plugin_name })
-          node.destroy
+    super do |local_node|
+      ensure_network do
+        if settings[:force]
+          answer = 'YES'
+        else
+          message = render_message('prompt', { :operation => :ask }) + "\n\n"
+        
+          array(settings[:destroy_nodes]).each do |hostname|
+            message << "  #{hostname}\n"
+          end
+        
+          message << "\n" + render_message('yes_query', { :operation => :ask, :yes => 'YES' }) + ' '
+          answer = ask(message)
+        end
+        
+        if answer.upcase == 'YES'
+          batch_success = network.batch(settings[:destroy_nodes], settings[:node_provider], settings[:parallel]) do |node|
+            info('start', { :provider => node.plugin_provider, :name => node.plugin_name })
+            node.destroy
+          end
+          myself.status = code.batch_error unless batch_success
         end
-        myself.status = code.batch_error unless batch_success
       end
     end
   end

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Exec < CORL.plugin_class(:nucleon, :cloud_action)
+class Exec < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -30,7 +30,7 @@ class Exec < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       ensure_node(node) do
         if settings[:command].length > 1
           settings[:command].collect! do |value|

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

@@ -2,15 +2,13 @@
 module Nucleon
 module Action
 module Node
-class Fact < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Fact < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
   
   def self.describe(action = :fact, weight = 570)
-    super(:node, action, weight)
+    describe_base(:node, action, weight, nil, nil, :node_fact)
   end
   
   #-----------------------------------------------------------------------------
@@ -43,7 +41,7 @@ class Fact < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       ensure_node(node) do
         if ! settings[:name] || settings[:name].empty?
           render_node_facts(node)
@@ -113,6 +111,13 @@ class Fact < CORL.plugin_class(:nucleon, :cloud_action)
       myself.status = code.fact_save_failed  
     end  
   end
+  
+  #-----------------------------------------------------------------------------
+  # Output
+  
+  def render_provider
+    :node_fact
+  end
 end
 end
 end

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

@@ -2,15 +2,13 @@
 module Nucleon
 module Action
 module Node
-class Group < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Group < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
   
   def self.describe(action = :group, weight = 670)
-    super(:node, action, weight)
+    describe_base(:node, action, weight, nil, nil, :node_group)
   end
   
   #-----------------------------------------------------------------------------
@@ -41,7 +39,7 @@ class Group < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do |node|
       ensure_node(node) do
         if ! settings[:name] || settings[:name].empty?
           render_node_groups(node)
@@ -109,6 +107,13 @@ class Group < CORL.plugin_class(:nucleon, :cloud_action)
       myself.status = code.group_save_failed  
     end  
   end
+  
+  #-----------------------------------------------------------------------------
+  # Output
+  
+  def render_provider
+    :node_group
+  end
 end
 end
 end

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

@@ -2,10 +2,8 @@
 module Nucleon
 module Action
 module Node
-class Identity < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
-  
+class Identity < Nucleon.plugin_class(:nucleon, :cloud_action)
+ 
   #-----------------------------------------------------------------------------
   # Info
   
@@ -20,7 +18,7 @@ class Identity < CORL.plugin_class(:nucleon, :cloud_action)
     super do
       codes :identity_upload_failure
       
-      register :name, :str
+      register_str :name
       register_project :identity
       register_nodes :identity_nodes      
     end
@@ -40,15 +38,15 @@ class Identity < 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
         builder = network.identity_builder({ settings[:name] => settings[:identity] })
         
         if builder.build(local_node)
           identity_directory = File.join(builder.build_directory, settings[:name])
           
           success = network.batch(settings[:identity_nodes], settings[:node_provider], settings[:parallel]) do |node|
-            info('corl.actions.identity.start', { :provider => node.plugin_provider, :name => node.plugin_name })
+            info('start', { :provider => node.plugin_provider, :name => node.plugin_name })
             
             remote_network_directory  = node.lookup(:corl_network)
             

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Node
-class Image < CORL.plugin_class(:nucleon, :cloud_action)
+class Image < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -52,8 +52,8 @@ class Image < 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[:image_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.image.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.create_image