nucleon 0.1.3 → 0.1.4

data/Gemfile

@@ -2,14 +2,18 @@ source "http://rubygems.org"
 
 gem "log4r", "~> 1.1"
 gem "i18n", "~> 0.6"
-gem "rgen", "~> 0.6"
 gem "netrc", "~> 0.7"
-gem "deep_merge", "~> 1.0"
 
+gem "deep_merge", "~> 1.0"
 gem "multi_json", "~> 1.7"
+
+gem "sshkey", "~> 1.6"
+
+gem "childprocess", "~> 0.5.0"
+gem "celluloid", "~> 0.15"
+
 gem "grit", "~> 2.5"
 gem "octokit", "~> 2.7"
-gem "celluloid", "~> 0.15"
 
 group :development do
   gem "bundler", "~> 1.2"

data/Gemfile.lock

@@ -5,11 +5,14 @@ GEM
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    childprocess (0.5.1)
+      ffi (~> 1.0, >= 1.0.11)
     deep_merge (1.0.1)
     descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
     git (1.2.6)
     github_api (0.11.3)
       addressable (~> 2.3)
@@ -24,7 +27,7 @@ GEM
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
     hashie (2.0.5)
-    highline (1.6.20)
+    highline (1.6.21)
     i18n (0.6.9)
     jeweler (2.0.1)
       builder
@@ -41,7 +44,7 @@ GEM
     log4r (1.1.10)
     mime-types (1.25.1)
     mini_portile (0.5.2)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.7.7)
@@ -53,25 +56,25 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    octokit (2.7.1)
+    octokit (2.7.2)
       sawyer (~> 0.5.2)
     posix-spawn (0.3.8)
     rack (1.5.2)
     rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    rgen (0.6.6)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     sawyer (0.5.3)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
+    sshkey (1.6.1)
     timers (1.1.0)
     yard (0.8.7.3)
 
@@ -81,6 +84,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.2)
   celluloid (~> 0.15)
+  childprocess (~> 0.5.0)
   deep_merge (~> 1.0)
   grit (~> 2.5)
   i18n (~> 0.6)
@@ -90,6 +94,6 @@ DEPENDENCIES
   netrc (~> 0.7)
   octokit (~> 2.7)
   rdoc (~> 3.12)
-  rgen (~> 0.6)
   rspec (~> 2.10)
+  sshkey (~> 1.6)
   yard (~> 0.8)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/core/config.rb

@@ -80,19 +80,18 @@ class Config
   
   #---
     
-  def fetch(data, keys, default = nil, format = false)    
+  def fetch(data, keys, default = nil, format = false)
     if keys.is_a?(String) || keys.is_a?(Symbol)
       keys = [ keys ]
     end    
     key = keys.shift.to_sym
-    
     if data.has_key?(key)
       value = data[key]
       
       if keys.empty?
         return filter(value, format)
       else
-        return fetch(data[key], keys, default, format)  
+        return fetch(data[key], keys, default, format) if data[key].is_a?(Hash)   
       end
     end
     return filter(default, format)
@@ -105,7 +104,7 @@ class Config
     if keys.is_a?(String) || keys.is_a?(Symbol)
       keys = [ keys ]
     end
-        
+    
     key      = keys.shift.to_sym
     has_key  = data.has_key?(key)
     existing = { 
@@ -123,7 +122,12 @@ class Config
       end
     else      
       data[key] = {} unless has_key
-      existing  = modify(data[key], keys, value)  
+      
+      if data[key].is_a?(Hash)
+        existing = modify(data[key], keys, value)
+      else
+        existing[:value] = nil 
+      end  
     end
     
     return existing

data/lib/core/errors.rb

@@ -80,5 +80,11 @@ module Errors
   class BatchError < NucleonError
     error_key(:batch_error)
   end
+  
+  #---
+  
+  class SSHUnavailable < NucleonError
+    error_key(:ssh_unavailable)
+  end 
 end
 end

data/lib/core/facade.rb

@@ -38,6 +38,13 @@ module Facade
     is_admin || ext_admin ? true : false
   end
   
+  #---
+  
+  def ip_address
+    result = cli_run(value(:ip_address_command, 'curl --silent ifconfig.me'), { :quiet => true })
+    result.output
+  end
+  
   #-----------------------------------------------------------------------------
   # Status codes
   
@@ -157,7 +164,11 @@ module Facade
   end
   
   def action_config(provider)
-    action(provider, { :settings => {}, :quiet => true }).configure
+    action = action(provider, { :settings => {}, :quiet => true })
+    return {} unless action
+    
+    action.configure
+    action.config
   end
   
   def action_run(provider, options = {}, quiet = true)

data/lib/core/manager.rb

@@ -25,11 +25,11 @@ class Manager
     
     init_manager(name) unless @@supervisors.has_key?(name)
     
-    begin
+    #begin
       @@supervisors[name].test_connection
-    rescue Celluloid::DeadActorError
-      retry
-    end
+    #rescue Celluloid::DeadActorError
+    #  retry
+    #end
     @@supervisors[name]
   end
   
@@ -291,20 +291,30 @@ class Manager
   
   def load_base(type, provider, options = {})
     logger.info("Fetching plugin #{type} provider #{provider} at #{Time.now}")
-        
-    config = Config.ensure(translate_type(type, options))
-    name   = config.get(:name, nil)
+    
+    options = translate_type(type, options)    
+    config  = Config.ensure(options)
+    name    = config.get(:name, nil)
        
     logger.debug("Plugin options: #{config.export.inspect}")
     
-    if name
+    if name && ! config.delete(:new, false)
       logger.debug("Looking up existing instance of #{name}")
       
       existing_instance = get(type, name)
-      logger.info("Using existing instance of #{type}, #{name}") if existing_instance
+      
+      if existing_instance
+        config.export.each do |property_name, value|
+          unless [ :name, :meta ].include?(property_name)
+            existing_instance[property_name] = value  
+          end
+        end
+        existing_instance.normalize(true)
+      
+        logger.info("Using existing instance of #{type}, #{name}")
+        return existing_instance
+      end
     end
-    
-    return existing_instance if existing_instance
     create(type, provider, options)   
   end
   
@@ -315,7 +325,7 @@ class Manager
     
     # Allow options to override provider
     config   = Config.ensure(options)
-    provider = config.get(:provider, provider)
+    provider = config.delete(:provider, provider)
     provider = default_provider unless provider
     
     load_base(type, provider, config)
@@ -419,7 +429,7 @@ class Manager
     results = nil
     
     if Nucleon.log_level == :hook # To save processing on rendering
-      logger.hook("Executing extension hook { #{method} } at #{Time.now} with:\n#{PP.pp(options, '')}\n")
+      logger.hook("Executing extension hook { #{method} } at #{Time.now}")
     end
     
     extensions = plugins(:extension)

data/lib/core/mixin/macro/object_interface.rb

@@ -275,54 +275,60 @@ module ObjectInterface
     unless respond_to? :search_object
       logger.debug("Defining object utility method: search_object")
         
-      define_method :search_object do |obj_config, keys, default = '', format = false|
+      define_method :search_object do |obj_config, keys, default = nil, format = false|
         obj_config = Marshal.load(Marshal.dump(obj_config))
-        value      = obj_config.get(keys)
-        
+                
         logger.debug("Searching object properties: #{obj_config.inspect}")
         
-        if ! value || value.is_a?(Hash)
-          settings = {}
+        # TODO: Figure out a way to effectively cache this search operation
+        #------------------------------------------------------------------
+        settings = {}
     
-          keys = [ keys ] unless keys.is_a?(Array)
-          temp = keys.dup
-          
-          logger.debug("Searching object keys: #{keys.inspect}")
+        keys = [ keys ] unless keys.is_a?(Array)
+        temp = keys.dup
+         
+        logger.debug("Searching object keys: #{keys.inspect}")
           
-          logger.debug("Searching specialized settings")      
-          until temp.empty? do
-            if obj_settings = obj_config.delete([ temp, :settings ])
-              array(obj_settings).each do |group_name|
-                if group_settings = Marshal.load(Marshal.dump(settings(group_name)))
-                  settings = Util::Data.merge([ group_settings.dup, settings ], true)  
-                end
-              end            
-            end
-            temp.pop
-          end
-    
-          logger.debug("Specialized settings found: #{settings.inspect}") 
-          logger.debug("Searching general settings") 
-      
-          if obj_settings = obj_config.delete(:settings)
+        logger.debug("Searching specialized settings")      
+        until temp.empty? do
+          if obj_settings = obj_config.get([ temp, :settings ])
             array(obj_settings).each do |group_name|
               if group_settings = Marshal.load(Marshal.dump(settings(group_name)))
-                settings = Util::Data.merge([ group_settings, settings ], true)  
+                settings = Util::Data.merge([ group_settings.dup, settings ], true)  
               end
             end            
-          end 
-          
-          logger.debug("Final settings found: #{settings.inspect}")  
-        
-          unless settings.empty?
-            final_config = Config.new(Util::Data.merge([ settings, obj_config.export ], true))
-            value        = final_config.get(keys)
-            
-            logger.debug("Final configuration: #{final_config.export.inspect}")
           end
+          temp.pop
+        end
           
-          value = default if Util::Data.undef?(value)
+        logger.debug("Specialized settings found: #{settings.inspect}") 
+        logger.debug("Searching general settings") 
+      
+        if obj_settings = obj_config.get(:settings)
+          array(obj_settings).each do |group_name|
+            if group_settings = Marshal.load(Marshal.dump(settings(group_name)))
+              settings = Util::Data.merge([ group_settings, settings ], true)  
+            end
+          end            
         end
+        #------------------------------------------------------------------
+        # TODO: Cache the above!!! 
+          
+        logger.debug("Final settings found: #{settings.inspect}")
+        
+        if settings.empty?
+          value = obj_config.get(keys)  
+        else
+          final_config = Config.new(Util::Data.merge([ 
+            Util::Data.clean(settings), 
+            Util::Data.clean(obj_config.export) 
+          ], true))
+          value = final_config.get(keys)
+           
+          logger.debug("Final configuration: #{final_config.export.inspect}")
+        end
+          
+        value = default if Util::Data.undef?(value)
         
         logger.debug("Final value found (format: #{format.inspect}): #{value.inspect}")
         filter(value, format)

data/lib/core/mixin/macro/plugin_interface.rb

@@ -104,7 +104,7 @@ module PluginInterface
           if _single_instance
             logger.debug("Initializing single instance plugin: #{instance_settings.inspect}")
             
-            plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(instance_settings).import({ :meta => { :parent => myself } }))
+            plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(instance_settings).import({ :meta => { :parent => myself }, :new => true }))
           
             _set([ _plural, provider ], plugin)
           else
@@ -112,8 +112,7 @@ module PluginInterface
               if name != :settings
                 logger.debug("Initializing plugin #{_plugin_type} #{name}: #{options.inspect}")
                 
-                options[:name] = name
-                plugin         = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself } }))
+                plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :name => name, :meta => { :parent => myself }, :new => true }))
                 
                 _set([ _plural, provider, name ], plugin)
               end
@@ -139,15 +138,14 @@ module PluginInterface
         if _single_instance
           logger.debug("Setting single #{_plugin_type} #{provider}: #{instance_settings.inspect}")
           
-          plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(instance_settings).import({ :meta => { :parent => myself } }))              
+          plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(instance_settings).import({ :meta => { :parent => myself }, :new => true }))              
           
           _set([ _plural, provider ], plugin)  
         else
           instance_settings.each do |name, options|
             logger.debug("Setting #{_plugin_type} #{provider} #{name}: #{options.inspect}")
             
-            options[:name] = name
-            plugin         = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself } }))
+            plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :name => name, :meta => { :parent => myself }, :new => true }))
             
             _set([ _plural, provider, name ], plugin)  
           end
@@ -201,7 +199,7 @@ module PluginInterface
           options = get([ _plural, provider ], nil)
          
           unless options.nil?
-            plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself } }))
+            plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself }, :new => true }))
         
             logger.debug("Initializing plugin #{_plugin_type} #{provider}: #{options.inspect}")
         
@@ -220,7 +218,7 @@ module PluginInterface
       
         set([ _plural, provider ], options)
     
-        plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself } }))
+        plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself }, :new => true }))
         
         logger.debug("Setting single #{_plugin_type} #{provider}: #{options.inspect}")
         
@@ -241,7 +239,7 @@ module PluginInterface
       
       logger.debug("Defining single instance plugin interface method: delete_#{_type}")
 
-      define_method "delete_#{_type}" do |provider|
+      define_method "delete_#{_type}" do |provider, remove_plugin = true|
         plugin = send(_type, provider)
         
         logger.debug("Deleting single #{_type} #{provider}")
@@ -249,7 +247,7 @@ module PluginInterface
         delete([ _plural, provider ])
         _delete([ _plural, provider ])
     
-        Nucleon.remove_plugin(plugin) unless plugin.nil?
+        Nucleon.remove_plugin(plugin) if remove_plugin && ! plugin.nil?
       end
   
       #---
@@ -295,13 +293,12 @@ module PluginInterface
       
       logger.debug("Defining multi instance plugin interface method: #{_type}")
       
-      define_method "#{_type}" do |provider, name|
+      define_method "#{_type}" do |provider, name, reset = false|
         if reset || _get([ _plural, provider, name ], nil).nil?        
           options = get([ _plural, provider, name ], nil)
          
           unless options.nil?
-            options[:name] = name
-            plugin         = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself } }))
+            plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :name => name, :meta => { :parent => myself }, :new => true }))
         
             logger.debug("Initializing plugin #{_plugin_type} #{provider}: #{options.inspect}")
         
@@ -319,9 +316,7 @@ module PluginInterface
         options = Config.ensure(options).export
       
         set([ _plural, provider, name ], options)
-    
-        options[:name] = name
-        plugin         = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :meta => { :parent => myself } }))
+        plugin = Nucleon.plugin(_plugin_type, provider, Config.ensure(options).import({ :name => name, :meta => { :parent => myself }, :new => true }))
         
         logger.debug("Setting #{_plugin_type} #{provider} #{name}: #{options.inspect}")
         
@@ -342,7 +337,7 @@ module PluginInterface
       
       logger.debug("Defining multi instance plugin interface method: delete_#{_type}")
 
-      define_method "delete_#{_type}" do |provider, name|
+      define_method "delete_#{_type}" do |provider, name, remove_plugin = true|
         plugin = send(_type, provider, name)
         
         logger.debug("Deleting #{_type} #{provider} #{name}")
@@ -350,7 +345,7 @@ module PluginInterface
         delete([ _plural, provider, name ])
         _delete([ _plural, provider, name ])
     
-        Nucleon.remove_plugin(plugin) unless plugin.nil?
+        Nucleon.remove_plugin(plugin) if remove_plugin && ! plugin.nil?
       end
   
       #---