corl 0.5.0 → 0.5.1

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

@@ -44,7 +44,7 @@ module SSH
       end
       
     rescue => error
-      ui.warn(error)
+      warn(error, { :i18n => false })
       success = false
     end
     success
@@ -64,7 +64,7 @@ module SSH
         success = true
       end  
     rescue => error
-      ui.error(error.message)
+      error(error.message, { :i18n => false })
     end
     
     success
@@ -84,7 +84,7 @@ module SSH
         success = true
       end  
     rescue => error
-      ui.error(error.message)
+      error(error.message, { :i18n => false })
     end
     
     success  
@@ -96,7 +96,7 @@ module SSH
     config  = Config.ensure(options)
     results = nil
     
-    if commands
+    if commands && commands = commands.clone
       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  

data/lib/core/plugin/cloud_action.rb

@@ -147,7 +147,7 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
       if validate(node, network)
         yield(node, network) if block_given?
       else
-        puts "\n" + I18n.t('corl.core.exec.help.usage') + ': ' + help + "\n" unless quiet?
+        puts "\n" + I18n.t('nucleon.core.exec.help.usage') + ': ' + help + "\n" unless quiet?
         myself.status = code.validation_failed 
       end
     end
@@ -198,6 +198,13 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
       myself.status = code.node_failure
     end
   end
+    
+  #-----------------------------------------------------------------------------
+  # Utilities
+  
+  def sanitize_remote(network, remote)
+    remote && network.remote(remote) ? remote : nil
+  end
 end
 end
 end

data/lib/core/plugin/configuration.rb

@@ -113,22 +113,22 @@ class Configuration < CORL.plugin_class(:nucleon, :base)
   #-----------------------------------------------------------------------------
     
   def set(keys, value = '', options = {})
-    super(keys, value)
-    save(options) if autosave
+    super(keys, value, true)
+    save(options) if initialized? && autosave
   end
    
   #---
    
   def delete(keys, options = {})
     super(keys)
-    save(options) if autosave
+    save(options) if initialized? && autosave
   end
   
   #---
   
   def clear(options = {})
     super
-    save(options) if autosave
+    save(options) if initialized? && autosave
   end
   
   #-----------------------------------------------------------------------------
@@ -165,15 +165,14 @@ class Configuration < CORL.plugin_class(:nucleon, :base)
         config.clear if method_config.get(:override, false)
       
         properties = Config.new
-        yield(method_config, properties) if block_given?
+        success    = yield(method_config, properties) if block_given?
           
-        unless properties.export.empty?
+        if success && ! properties.export.empty?
           logger.debug("Source configuration parsed properties: #{properties}")
         
           extension(:load_process, { :properties => properties, :config => method_config })               
           config.import(properties, method_config)
         end
-        success = true
       end
     else
       logger.warn("Loading of source configuration failed")

data/lib/core/plugin/fog_node.rb

@@ -210,6 +210,13 @@ class Fog < CORL.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
+  
+  #-----------------------------------------------------------------------------
+  # Utilities
+  
+  def filter_output(type, data)
+    super
+  end
 end
 end
 end

data/lib/core/plugin/network.rb

@@ -76,6 +76,12 @@ class Network < CORL.plugin_class(:nucleon, :base)
   
   #---
   
+  def key_directory
+    File.join(directory, 'keys')
+  end
+  
+  #---
+  
   def build_directory
     File.join(directory, 'build')
   end
@@ -85,6 +91,13 @@ class Network < CORL.plugin_class(:nucleon, :base)
   def key_cache_directory
     File.join(build_directory, 'keys')
   end
+  
+  #---
+  
+  def config_directory
+    File.join(directory, 'config')
+  end
+  
   #---
   
   def cache
@@ -220,6 +233,22 @@ class Network < CORL.plugin_class(:nucleon, :base)
     @build
   end
   
+  #---
+  
+  def create_builder(name, provider, options = {})
+    CORL.create_plugin(:CORL, :builder, provider, extended_config(name, options).import({ :meta => { :parent => myself }}))
+  end
+  
+  #---
+  
+  def identity_builder(options = {})
+    create_builder(:network_identity_builder, :identity, options)
+  end
+  
+  def package_builder(name, options = {})
+    create_builder(:network_package_builder, :package, options)
+  end
+  
   #-----------------------------------------------------------------------------
   # Operations
   
@@ -408,6 +437,8 @@ class Network < CORL.plugin_class(:nucleon, :base)
   def batch(node_references, default_provider = nil, parallel = true, &code)
     success = true
     
+    node_references = array(node_references.clone)
+    
     if has_nodes? && ! node_references.empty?
       # Execute action on selected nodes      
       nodes = nodes_by_reference(node_references, default_provider)

data/lib/core/plugin/node.rb

@@ -30,7 +30,7 @@ class Node < CORL.plugin_class(:nucleon, :base)
         end
         if result
           result = result.first
-          alert(result.errors) unless result.errors.empty?
+          warn(result.errors, { :i18n => false }) unless result.errors.empty?
         end
         result
       end
@@ -85,47 +85,6 @@ class Node < CORL.plugin_class(:nucleon, :base)
   
   #---
   
-  def fact_var
-    @facts
-  end
-  
-  def fact_var=facts
-    @facts = facts
-  end
- 
-  #---
-  
-  def facts(reset = false, clone = true)
-    if reset || fact_var.nil?
-      default_configs = extended_config(:hiera_default_facts, {
-        :fqdn          => hostname, 
-        :hostname      => hostname.gsub(/\..*$/, ''),
-        :corl_provider => plugin_provider.to_s
-      })
-      self.fact_var = Config.new(lookup_facts).defaults(default_configs).export
-    end
-    return fact_var.clone if clone
-    fact_var
-  end
-  
-  #---
-  
-  def hiera_var
-    @hiera
-  end
-  
-  def hiera_var=hiera
-    @hiera = hiera
-  end
-  
-  #---
-  
-  def hiera_override_dir
-    network.hiera_override_dir
-  end
-  
-  #---
-  
   def keypair
     @keypair
   end
@@ -339,6 +298,18 @@ class Node < CORL.plugin_class(:nucleon, :base)
     search(:facts, {}, :hash)
   end
   
+  def ensure_custom_facts(facts)
+    hash(facts).each do |name, value|
+      set_setting([ :facts, name ], value)
+    end
+  end
+  
+  def remove_custom_facts(*facts)
+    facts.each do |name|
+      delete_setting([ :facts, name ])
+    end  
+  end
+  
   #---
   
   def profiles=profiles
@@ -407,7 +378,135 @@ class Node < CORL.plugin_class(:nucleon, :base)
     yield(config) if block_given?
     config
   end
-    
+  
+  #-----------------------------------------------------------------------------
+  # Machine information
+  
+  def fact_var
+    @facts
+  end
+  
+  def fact_var=facts
+    @facts = facts
+  end
+ 
+  #---
+  
+  def facts(reset = false, clone = true)
+    if reset || fact_var.nil?
+      default_facts = extended_config(:hiera_default_facts, {
+        :fqdn          => hostname, 
+        :hostname      => hostname.gsub(/\..*$/, ''),
+        :corl_provider => plugin_provider.to_s
+      })
+      
+      unless local?
+        result = run.node_facts({ :quiet => true })
+      
+        if result.status == code.success
+          node_facts = Util::Data.symbol_map(Util::Data.parse_json(result.errors))
+        end
+      end
+      unless node_facts
+        node_facts = local? ? Util::Data.merge([ CORL.facts, custom_facts ]) : custom_facts
+      end
+      
+      self.fact_var = Config.new(node_facts).defaults(default_facts).export
+    end
+    return fact_var.clone if clone
+    fact_var
+  end
+  
+  #---
+  
+  def create_facts_post(data, names)
+    fact_values = {}
+    names.each do |name|
+      name              = name.to_sym
+      fact_values[name] = data[name]
+    end
+    ensure_custom_facts(fact_values)
+    data
+  end
+  
+  #---
+  
+  def delete_facts_post(data, old_data)
+    remove_custom_facts(*old_data.keys)
+    data
+  end
+  
+  #---
+  
+  def hiera_var
+    @hiera
+  end
+  
+  def hiera_var=hiera
+    @hiera = hiera
+  end
+  
+  #---
+  
+  def hiera_override_dir
+    network.hiera_override_dir
+  end
+  
+  #---
+  
+  def lookup(property, default = nil, options = {})
+    unless local?
+      config = Config.ensure(options).import({ :property => property, :quiet => true })
+      result = run.node_lookup(config)
+      
+      if result.status == code.success
+        return Util::Data.value(Util::Data.parse_json(result.errors), default)
+      end
+      return default
+    end
+    options[:hiera_scope] = Util::Data.prefix('::', facts, '')
+    lookup_base(property, default, options)  
+  end
+  
+  #---
+  
+  def remote_cache_setting(keys, default = nil, format = false)
+    cache_id = keys.flatten.join('.')   
+    result   = run.node_cache({ :name => cache_id })
+      
+    if result.status == code.success
+      value = Util::Data.value(Util::Data.parse_json(result.errors), default)
+    else
+      value = default
+    end 
+    filter(value, format)
+  end
+  
+  #---
+
+  def set_remote_cache_setting(keys, value)
+    run.node_cache({ 
+      :name  => keys.flatten.join('.'), 
+      :value => Util::Data.to_json(value, false), 
+      :json  => true 
+    }).status == code.success
+  end
+  
+  #---
+
+  def delete_remote_cache_setting(keys)
+    run.node_cache({ 
+      :name   => keys.flatten.join('.'), 
+      :delete => true 
+    }).status == code.success
+  end
+  
+  #---
+
+  def clear_remote_cache
+    run.node_cache({ :clear => true }).status == code.success
+  end
+      
   #-----------------------------------------------------------------------------
   # Machine operations
   
@@ -416,6 +515,7 @@ class Node < CORL.plugin_class(:nucleon, :base)
     success = true
     
     # TODO: Figure out what's going on with the parallel implementation here.
+    parallel_original          = ENV['NUCLEON_NO_PARALLEL']
     ENV['NUCLEON_NO_PARALLEL'] = 'true'
     
     status  = parallel(:build_provider, network.builders, config)
@@ -429,7 +529,7 @@ class Node < CORL.plugin_class(:nucleon, :base)
         myself.build_time = Time.now.to_s if success
         
         if config.delete(:save, true)
-          ui.success("Saving successful build")    
+          success("Saving successful build", { :i18n => false })    
          
           success = save(extended_config(:build, {
             :message => config.get(:message, "Built #{plugin_provider} node: #{plugin_name}"),
@@ -439,24 +539,23 @@ class Node < CORL.plugin_class(:nucleon, :base)
       end
     end
     
-    ENV['NUCLEON_NO_PARALLEL'] = nil
-    
+    ENV['NUCLEON_NO_PARALLEL'] = parallel_original  
     success
   end
   
   def build_provider(provider, plugin, config)
-    ui.info("Building #{provider} components")
+    info("Building #{provider} components", { :i18n => false })
     plugin.build(myself, config)
   end
   
   def build_provisioners(provider, collection, config)
-    ui.info("Building #{provider} provisioner collection")
+    info("Building #{provider} provisioner collection", { :i18n => false })
     status = parallel(:build_provisioner, collection, provider, config)
     status.values.include?(false) ? false : true  
   end
   
   def build_provisioner(name, plugin, provider, config)
-    ui.info("Building #{provider} #{name} provisioner components")
+    info("Building #{provider} #{name} provisioner components", { :i18n => false })
     plugin.build(myself, config) 
   end
   
@@ -577,18 +676,18 @@ class Node < CORL.plugin_class(:nucleon, :base)
       if extension_check(:download, hook_config)
         logger.info("Downloading from #{plugin_name}")
       
-        render("Starting download of #{remote_path} to #{local_path}") 
+        info("Starting download of #{remote_path} to #{local_path}", { :i18n => false }) 
         yield(:config, hook_config) if block_given?
         
         active_machine = local? ? local_machine : machine
         
         success = active_machine.download(remote_path, local_path, config.export) do |name, received, total|
-          render("#{name}: Sent #{received} of #{total}")
+          info("#{name}: Sent #{received} of #{total}", { :i18n => false })
           yield(:progress, { :name => name, :received => received, :total => total })
         end
         
         if success && block_given?
-          render("Successfully finished download of #{remote_path} to #{local_path}")
+          info("Successfully finished download of #{remote_path} to #{local_path}", { :i18n => false })
           process_success = yield(:process, hook_config)
           success         = process_success if process_success == false        
         end
@@ -615,18 +714,18 @@ class Node < CORL.plugin_class(:nucleon, :base)
       if extension_check(:upload, hook_config)
         logger.info("Uploading to #{plugin_name}")
       
-        render("Starting upload of #{local_path} to #{remote_path}") 
+        info("Starting upload of #{local_path} to #{remote_path}", { :i18n => false }) 
         yield(:config, hook_config) if block_given?
         
         active_machine = local? ? local_machine : machine
         
         success = active_machine.upload(local_path, remote_path, config.export) do |name, sent, total|
-          render("#{name}: Sent #{sent} of #{total}")
+          info("#{name}: Sent #{sent} of #{total}", { :i18n => false })
           yield(:progress, { :name => name, :sent => sent, :total => total })  
         end
         
         if success && block_given?
-          render("Successfully finished upload of #{local_path} to #{remote_path}")
+          info("Successfully finished upload of #{local_path} to #{remote_path}", { :i18n => false })
           process_success = yield(:process, hook_config)
           success         = process_success if process_success == false        
         end
@@ -690,24 +789,25 @@ class Node < CORL.plugin_class(:nucleon, :base)
         
         if local? && local_machine
           active_machine = local_machine
-          
-          config[:info_prefix]  = "[#{hostname}] "
-          config[:error_prefix] = "[#{hostname}] "
         else
           active_machine = machine
         end
         
         if commands = config.get(:commands, nil)
+          quiet = config.get(:quiet, false)
+          
           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))
+              unless quiet
+                unless local?
+                  if type == :error
+                    warn(filter_output(type, data), { :i18n => false })
+                  else
+                    info(filter_output(type, data), { :i18n => false })
+                  end
                 end
-              end
-              yield(:progress, { :type => type, :command => command, :data => data }) if block_given?   
+                yield(:progress, { :type => type, :command => command, :data => data }) if block_given?
+              end   
             end
             results = test if test
             
@@ -750,11 +850,13 @@ class Node < CORL.plugin_class(:nucleon, :base)
   #---
   
   def command(command, options = {})
-    config   = Config.ensure(options)
-    as_admin = config.delete(:as_admin, false)
+    config         = Config.ensure(options)
+    as_admin       = config.delete(:as_admin, false)
+    remove_command = false
     
     unless command.is_a?(CORL::Plugin::Command)
-      command = CORL.command(Config.new({ :command => command }).import(config), :bash)
+      command        = CORL.command(Config.new({ :command => command }).import(config), :bash)
+      remove_command = true
     end
     
     admin_command = ''
@@ -763,11 +865,13 @@ class Node < CORL.plugin_class(:nucleon, :base)
       admin_command = extension_set(:admin_command, admin_command, config)
     end
     
-    results = exec({ :commands => [ "#{admin_command} #{command.to_s}".strip ] }) do |op, data|
+    config[:commands] = [ "#{admin_command} #{command.to_s}".strip ]
+    
+    results = exec(config) do |op, data|
       yield(op, data) if block_given?  
     end
     
-    CORL.remove_plugin(command)    
+    CORL.remove_plugin(command) if remove_command    
     results.first 
   end
   
@@ -790,7 +894,8 @@ class Node < CORL.plugin_class(:nucleon, :base)
       :data    => { :encoded => encoded_config }
     })
     
-    result = command(:corl, { :subcommand => action_config, :as_admin => true }) do |op, data|
+    quiet  = config.get(:quiet, false)    
+    result = command(:corl, { :subcommand => action_config, :as_admin => true, :quiet => quiet }) do |op, data|
       yield(op, data) if block_given?  
     end
     
@@ -820,9 +925,6 @@ class Node < CORL.plugin_class(:nucleon, :base)
         
         if local? && local_machine
           active_machine = local_machine
-          
-          config[:info_prefix]  = "[#{hostname}] "
-          config[:error_prefix] = "[#{hostname}] "
         else
           active_machine = machine
         end
@@ -842,49 +944,6 @@ class Node < CORL.plugin_class(:nucleon, :base)
     status == code.success
   end
   
-  #---
-  
-  def lookup_facts
-    if ! local? && bootstrap_script
-      result = run.facts
-      
-      if result.status == code.success
-        return Util::Data.symbol_map(Util::Data.parse_json(result.output))
-      end
-    end
-    local? ? Util::Data.merge([ CORL.facts, custom_facts ]) : custom_facts
-  end
-  
-  #---
-  
-  def lookup_config(property, default = nil, options = {})
-    if ! local? && bootstrap_script
-      config = Config.ensure(options).import({ :property => property })
-      result = run.lookup(config)
-      
-      if result.status == code.success
-        return Util::Data.value(Util::Data.parse_json(result.output), default)
-      end
-      return default
-    end
-    options[:hiera_scope] = Util::Data.prefix('::', facts, '')
-    lookup(property, default, options)  
-  end
-  
-  #---
-  
-  def lookup_array(property, default = [], options = {})
-    config = Config.ensure(options).import({ :context => :array })
-    lookup_config(property, default, config)  
-  end
-  
-  #---
-  
-  def lookup_hash(property, default = {}, options = {})
-    config = Config.ensure(options).import({ :context => :hash })
-    lookup_config(property, default, config)  
-  end
-  
   #---
    
   def bootstrap(local_path, options = {})
@@ -1276,6 +1335,12 @@ class Node < CORL.plugin_class(:nucleon, :base)
   #---
   
   def filter_output(type, data)
+    if type == :output
+      # Hide redundant Facter output
+      if data =~ /^Already evaluated [a-z]+ at [^,]+, reevaluating anyways$/
+        data = ''
+      end  
+    end
     data  
   end
    

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

@@ -50,7 +50,7 @@ class CORL < ::Vagrant.plugin("2", :provisioner)
           :dry_run           => config.dry_run
         }).export))
         
-        node.ui.warn("CORL provisioner failed") unless success
+        node.warn("CORL provisioner failed", { :i18n => false }) unless success
       end
     end
   end