corl 0.5.1 → 0.5.2

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

@@ -2,9 +2,7 @@
 module Nucleon
 module Action
 module Cloud
-class Config < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -22,14 +20,15 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
             :configuration_save_failed,
             :configuration_delete_failed
       
-      register_str :name, nil
+      register_str :name
       register_array :value
       
+      register_bool :array      
       register_bool :delete
       register_bool :append
       
       register_translator :input_format
-      register_translator :load_format, :json 
+      register_translator :save_format
       register_translator :format, :json
     end
   end
@@ -37,7 +36,7 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
   #---
   
   def ignore
-    [ :nodes ]
+    node_ignore
   end
   
   def arguments
@@ -48,24 +47,24 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
    
   def execute
-    super do |node, network|
-      ensure_network(network) do
-        config_info = parse_config_reference(network, settings[:name])
+    super do |node|
+      ensure_network do
+        config_info = parse_config_reference(node, settings[:name])
         
         unless config_info
           myself.status = code.configuration_parse_failed
         end
         
-        if config_info[:property].nil?
-          render_config_properties(network, config_info)
+        if settings.delete(:delete, false)
+          delete_config_property(config_info)
+          
+        elsif config_info[:property].nil?
+          render_config_properties(config_info)
            
-        elsif settings.delete(:delete, false)
-          delete_config_property(network, config_info, sanitize_remote(network, settings[:net_remote]))
-                          
         elsif ! settings[:value].empty?
-          set_config_property(network, config_info, settings[:value], sanitize_remote(network, settings[:net_remote]))
+          set_config_property(config_info, settings[:value])
         else
-          render_config_property(network, config_info)
+          render_config_property(config_info)
         end
       end
     end
@@ -74,12 +73,14 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
   #-----------------------------------------------------------------------------
   # Sub operations
   
-  def render_config_properties(network, config_info)
-    if file_labels = config_info[:files]
-      info("Sub configurations available:", { :i18n => false })
+  def render_config_properties(config_info)
+    if file_labels = config_info[:rendered_files]
+      info('subconfigurations', { :prefix => false })
+      info("\n", { :i18n => false })
       file_labels.each do |label|
-        info("-> #{yellow(label)}", { :i18n => false })
-      end  
+        prefixed_message(:info, '  ', label, { :i18n => false, :prefix => false })
+      end
+      info("\n", { :i18n => false })  
     else
       format        = settings[:format]
       myself.result = config_info[:config].export
@@ -89,7 +90,7 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
   
   #---
   
-  def render_config_property(network, config_info)
+  def render_config_property(config_info)
     format        = settings[:format]
     myself.result = config_info[:value]
     render result, :format => format 
@@ -97,44 +98,65 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
   
   #---
   
-  def delete_config_property(network, config_info, remote = nil)
-    name        = parse_property_name(config_info[:property])    
-    remote_text = remote_message(remote)
-    config_file = config_info[:file].sub(network.directory + File::SEPARATOR, '')
+  def delete_config_property(config_info)
+    remote_text    = remote_message(settings[:net_remote])
+    config_file    = config_info[:file].sub(network.directory + File::SEPARATOR, '')    
+    render_options = { :config_file => blue(config_file), :remote_text => yellow(remote_text) }
+    success        = false
+    
+    if config_info[:property]
+      name = parse_property_name(config_info[:property])    
+      render_options.merge({ :name => blue(name) })
     
-    config_info[:config].delete(config_info[:property])
+      config_info[:config].delete(config_info[:property])
     
-    if File.exists?(config_info[:file])    
-      if Util::Disk.write(config_info[:file], config_info[:translator].generate(config_info[:config].export))
-        if network.save({ :files => config_file, :remote => remote, :message => "Deleting configuration #{name} from #{config_file}", :allow_empty => true })
-          success("Configuration `#{blue(name)}` deleted (#{yellow(remote_text)})", { :i18n => false })
+      if File.exists?(config_info[:file])    
+        if Util::Disk.write(config_info[:file], config_info[:translator].generate(config_info[:config].export))
+          success = true
         else
-          error("Configuration `#{blue(name)}` deletion could not be saved", { :i18n => false })
-          myself.status = code.configuration_save_failed    
+          error('file_save', render_options)
+          myself.status = code.configuration_save_failed  
         end
       else
-        error("Configuration file `#{blue(config_file)}` could not be saved", { :i18n => false })
-        myself.status = code.configuration_save_failed  
+        info('no_config_file', render_options)    
       end
     else
-      info("Configuration file `#{blue(config_file)} does not exist so configuration can not be deleted", { :i18n => false })    
+      if File.exists?(config_info[:file])
+        if FileUtils.rm(config_info[:file])
+          success = true
+        else
+          error('file_remove', render_options)  
+        end
+      end    
+    end
+    
+    if success
+      if network.save({ :files => config_file, :remote => settings[:net_remote], :message => "Deleting configuration #{name} from #{config_file}", :allow_empty => true })
+        success('delete', render_options)
+      else
+        error('delete', render_options)
+        myself.status = code.configuration_save_failed    
+      end
     end
   end
   
   #---
   
-  def set_config_property(network, config_info, values, remote = nil)
-    name         = parse_property_name(config_info[:property])    
-    remote_text  = remote_message(remote)
+  def set_config_property(config_info, values)
+    name        = parse_property_name(config_info[:property])    
+    remote_text = remote_message(settings[:net_remote])
+    config_file = config_info[:file].sub(network.directory + File::SEPARATOR, '')
+    
+    render_options = { :config_file => blue(config_file), :name => blue(name), :remote_text => yellow(remote_text) }
     
     config_file  = config_info[:file].sub(network.directory + File::SEPARATOR, '')
     input_format = settings[:input_format]
     
-    values.each_with_index do |value, index|    
-      values[index] = render(value, { 
-        :format => input_format, 
-        :silent => true 
-      }) if input_format
+    values.each_with_index do |value, index|
+      if input_format
+        translator    = CORL.translator({}, input_format) 
+        values[index] = translator.parse(value)
+      end
       values[index] = Util::Data.value(values[index])
     end
     
@@ -148,7 +170,9 @@ class Config < 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
@@ -159,14 +183,14 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
     FileUtils.mkdir_p(File.dirname(config_info[:file]))
     
     if Util::Disk.write(config_info[:file], config_info[:translator].generate(config_info[:config].export))
-      if network.save({ :files => config_file, :remote => remote, :message => "Updating configuration #{name} in #{config_file}", :allow_empty => true })
-        success("Configuration `#{blue(name)}` update (#{yellow(remote_text)})", { :i18n => false })
+      if network.save({ :files => config_file, :remote => settings[:net_remote], :message => "Updating configuration #{name} in #{config_file}", :allow_empty => true })
+        success('update', render_options)
       else
-        error("Configuration `#{blue(name)}` update could not be saved", { :i18n => false })
+        error('update', render_options)
         myself.status = code.configuration_save_failed    
       end
     else
-      error("Configuration file `#{blue(config_file)}` could not be saved", { :i18n => false })
+      error('file_save', render_options)
       myself.status = code.configuration_save_failed  
     end
   end
@@ -174,10 +198,13 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def parse_config_reference(network, name)
-    info = {}
-    data = {}
+  def parse_config_reference(node, name)
+    # @TODO: Break this method up, URGENTLY, before it gets too hideous
+    # Oh wait, it's already too hideous
     
+    info        = {}
+    data        = {}
+    config      = CORL::Config.new({}, {}, true, false)    
     translators = CORL.loaded_plugins(:nucleon, :translator).keys
     
     # common@php::apache::memory_limit
@@ -187,28 +214,54 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
     config_elements  = name.split('@')
     
     property         = config_elements.size > 1 ? config_elements.pop : nil
-    config_elements  = config_elements[0].split('/')    
+    config_elements  = config_elements[0].split('/') if config_elements.size > 0   
     config_file_name = config_elements.pop    
     config_path      = File.join(network.config_directory, *config_elements)
-        
+    config_dir       = config_file_name ? File.join(config_path, config_file_name) : config_path
+    config_file      = nil
+    config_files     = nil
+    translator       = []
+          
     if config_file_name
-      config_dir   = File.join(config_path, config_file_name)
-      config_file  = File.join(config_path, "#{config_file_name}." + settings[:load_format].to_s)
-      config_files = nil
-      property     = property.gsub(/\]$/, '').split(/\]?\[/) if property
-      
-      unless translator = CORL.translator({}, settings[:load_format])
-        error("Translator for #{settings[:format]} could not be loaded", { :i18n => false })
-        return nil
+      property = property.gsub(/\]$/, '').split(/\]?\[/) if property
+        
+      translators.each do |translator_name|
+        config_file = File.join(config_path, "#{config_file_name}." + translator_name.to_s)
+        
+        if File.exists?(config_file)
+          unless data = Util::Disk.read(config_file)
+            error('file_read', { :config_file => config_file })
+            return nil
+          end
+          unless load_translator = CORL.translator({}, translator_name)
+            error('translator_load', { :translator => translator_name })
+            return nil
+          end    
+          config.import(load_translator.parse(data))
+          translator << load_translator
+        end
       end
+    end
+    
+    file_exists = translator.empty? ? false : true
+    
+    if settings[:save_format]
+      translator = CORL.translator({}, settings[:save_format])    
+    else
+      if translator.empty?
+        translator = CORL.translator({}, CORL.type_default(:nucleon, :translator))
+      else
+        translator = translator.size > 1 ? translator.shift : translator[0]
+      end
+    end
+    
+    config_file = File.join(config_path, "#{config_file_name}." + translator.plugin_name.to_s)
       
-      if File.exists?(config_file)
-        unless data = Util::Disk.read(config_file)
-          error("Failed to read file: #{config_file}", { :i18n => false })
-          return nil
-        end
-        config = CORL::Config.new(translator.parse(data))
-      elsif File.directory?(config_dir)
+    unless file_exists
+      hiera_search_path = node.hiera_configuration[:hierarchy]
+      config_files      = []
+      
+      if File.directory?(config_dir)
         config_files = Dir.glob("#{config_dir}/**/*").select do |file|
           is_config = false
           
@@ -217,41 +270,55 @@ class Config < CORL.plugin_class(:nucleon, :cloud_action)
           end
           is_config
         end
-        config_files.each_with_index do |file, index|
-          config_files[index] = file.sub(/#{network.config_directory + File::SEPARATOR}/, '')
-          config_files[index] = config_files[index].sub(/\.([a-z0-9]+)$/, ' [ ' + blue('\1') + ' ]') 
+      
+        config_files.collect! do |file|
+          file.sub(/#{network.config_directory + File::SEPARATOR}/, '')
         end
       end
       
-      config = CORL::Config.new unless config            
-      info   = {
-        :translator => translator,
-        :file       => config_file,
-        :files      => config_files,
-        :property   => property,
-        :config     => config,
-        :value      => property ? Util::Data.value(config.get(property)) : nil
-      }
-    end
-    info
-  end
-  
-  #---
-
-  def parse_property_name(property)
-    property = property.clone
-    
-    if property.size > 1
-      property.shift.to_s + '[' + property.join('][') + ']'
-    else
-      property.shift.to_s
+      ordered_config_files  = []
+      rendered_config_files = []
+      
+      hiera_search_path.each do |search_path|
+        search_components = search_path.split(File::SEPARATOR)
+        
+        rendered_config_files << "SEARCH: #{search_path}"
+         
+        config_files.each do |file|
+          file_ext                 = File.extname(file)
+          file_components          = file.sub(/\..*$/, '').split(File::SEPARATOR)
+          rendered_file_components = []
+          file_match               = true
+          
+          search_components.each_with_index do |search_item, index|
+            if search_item.strip =~ /^%{:?:?([^}]+)}$/ && index < file_components.size
+              rendered_file_components << cyan(file_components[index])
+            elsif search_item != file_components[index]
+              file_match = false
+            else
+              rendered_file_components << yellow(search_item)
+            end
+          end
+          
+          rendered_file = "        #{rendered_file_components.join(File::SEPARATOR)} [ #{blue(file_ext.sub('.', ''))} ]"
+          
+          if file_match && ! ordered_config_files.include?(file)
+            ordered_config_files << file
+            rendered_config_files << rendered_file
+          end
+        end
+      end
     end
-  end
-  
-  #---
-  
-  def remote_message(remote)
-    remote ? "#{remote}" : "LOCAL ONLY"
+      
+    {
+      :translator     => translator,
+      :file           => config_file,
+      :files          => ordered_config_files,
+      :rendered_files => rendered_config_files,
+      :property       => property,
+      :config         => config,
+      :value          => property ? Util::Data.value(config.get(property)) : nil
+    }
   end
 end
 end

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

@@ -25,6 +25,10 @@ class Create < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #---
   
+  def ignore
+    node_ignore
+  end
+  
   def arguments
     [ :project_reference ]
   end
@@ -34,7 +38,7 @@ class Create < Nucleon.plugin_class(:nucleon, :cloud_action)
    
   def execute
     super(false) do
-      info('nucleon.action.cloud.create.start')
+      info('start')
       
       project       = project_load(settings[:path], true, true)
       myself.status = code.project_failure unless project

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Cloud
-class Images < CORL.plugin_class(:nucleon, :cloud_action)
+class Images < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -26,6 +26,11 @@ class Images < CORL.plugin_class(:nucleon, :cloud_action)
     end
   end
   
+  def node_config
+    super
+    config[:node_provider].default = nil
+  end
+  
   #---
   
   def ignore
@@ -40,18 +45,16 @@ class Images < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
  
   def execute
-    super do |local_node, network|
-      info('corl.actions.images.start')
-      
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         if node = network.test_node(settings[:node_provider], { :region => settings[:region] })
           if images = node.images(settings[:search], settings)
             images.each do |image|
-              info(node.render_image(image), { :prefix => false, :i18n => false })
+              prefixed_message(:info, '  ', node.render_image(image), { :i18n => false, :prefix => false })
             end
           
             myself.result = images
-            success('corl.actions.images.results', { :images => images.length }) if images.length > 1
+            success('results', { :images => images.length }) if images.length > 1
           else
             myself.status = code.image_load_failure
           end

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

@@ -2,15 +2,13 @@
 module Nucleon
 module Action
 module Cloud
-class Inspect < CORL.plugin_class(:nucleon, :cloud_action)
-  
-  include Mixin::Action::Registration
+class Inspect < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
   
   def self.describe
-    super(:cloud, :inspect, 950)
+    super(:cloud, :inspect, 955)
   end
  
   #-----------------------------------------------------------------------------
@@ -26,6 +24,10 @@ class Inspect < CORL.plugin_class(:nucleon, :cloud_action)
   end
   
   #---
+  
+  def ignore
+    node_ignore
+  end
    
   def arguments
     [ :elements ]
@@ -35,8 +37,8 @@ class Inspect < 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[:elements].empty?
           data = network.config.export
         else

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Cloud
-class Machines < CORL.plugin_class(:nucleon, :cloud_action)
+class Machines < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -21,6 +21,11 @@ class Machines < CORL.plugin_class(:nucleon, :cloud_action)
     end
   end
   
+  def node_config
+    super
+    config[:node_provider].default = nil
+  end
+  
   #---
   
   def ignore
@@ -35,18 +40,16 @@ class Machines < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
   
   def execute
-    super do |local_node, network|
-      info('corl.actions.machines.start')
-      
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         if node = network.test_node(settings[:node_provider])
           if machine_types = node.machine_types
             machine_types.each do |machine_type|
-              info(node.render_machine_type(machine_type), { :prefix => false, :i18n => false })
+              prefixed_message(:info, '  ', node.render_machine_type(machine_type), { :i18n => false, :prefix => false })
             end
           
             myself.result = machine_types
-            success('corl.actions.machines.results', { :machines => machine_types.length }) if machine_types.length > 1
+            success('results', { :machines => machine_types.length }) if machine_types.length > 1
           else
             myself.status = code.machine_load_failure
           end

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

@@ -2,7 +2,7 @@
 module Nucleon
 module Action
 module Cloud
-class Regions < CORL.plugin_class(:nucleon, :cloud_action)
+class Regions < Nucleon.plugin_class(:nucleon, :cloud_action)
   
   #-----------------------------------------------------------------------------
   # Info
@@ -18,7 +18,12 @@ class Regions < CORL.plugin_class(:nucleon, :cloud_action)
     super do
       codes :node_load_failure,
             :region_load_failure
-    end
+    end    
+  end
+  
+  def node_config
+    super
+    config[:node_provider].default = nil
   end
   
   #---
@@ -35,18 +40,18 @@ class Regions < CORL.plugin_class(:nucleon, :cloud_action)
   # Operations
   
   def execute
-    super do |local_node, network|
-      info('corl.actions.regions.start')
-      
-      ensure_network(network) do
+    super do |local_node|
+      ensure_network do
         if node = network.test_node(settings[:node_provider])
           if regions = node.regions
+            region_info = node.region_info            
+            max_length  = regions.collect {|value| value.length }.sort.pop
+            
             regions.each do |region|
-              info(sprintf("> %s", region), { :prefix => false, :i18n => false })
+              prefixed_message(:info, '  ', sprintf("%-#{max_length + 10}s  %s", purple(region), yellow(region_info[region.to_sym])), { :i18n => false, :prefix => false })
             end
           
             myself.result = regions
-            success('corl.actions.regions.results', { :regions => regions.length }) if regions.length > 1
           else
             myself.status = code.region_load_failure
           end

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

@@ -0,0 +1,68 @@
+
+module Nucleon
+module Action
+module Cloud
+class Remote < CORL.plugin_class(:nucleon, :cloud_action)
+ 
+  include Mixin::Action::Project
+  include Mixin::Action::Push
+   
+  #-----------------------------------------------------------------------------
+  # Info
+  
+  def self.describe
+    super([ :cloud ], :remote, 980)
+  end
+ 
+  #-----------------------------------------------------------------------------
+  # Settings
+  
+  def configure
+    super do
+      codes :project_failure, :push_failure
+      
+      project_config
+      push_config
+    end
+  end
+  
+  #---
+  
+  def ignore
+    node_ignore + [ :propogate_push, :pull, :push, :net_remote ]
+  end
+  
+  def arguments
+    [ :project_reference ]
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Operations
+   
+  def execute
+    super do |node|
+      ensure_network do
+        info('start')
+        
+        settings[:pull] = false
+        settings[:push] = true
+                  
+        if project = project_load(network.directory, false, false)
+          provider = settings[:project_provider]
+          
+          if settings[:project_reference].match(/^\s*([a-zA-Z0-9_-]+):::(.*)\s*$/)
+            provider = $1
+          end
+          
+          Nucleon::Plugin::Project.store_provider(project.directory, provider)
+          myself.status = code.push_failure unless push(project)
+        else
+          myself.status = code.project_failure
+        end
+      end
+    end
+  end
+end
+end
+end
+end