nucleon 0.2.0 → 0.2.1

data/lib/core/util/data.rb

@@ -260,12 +260,15 @@ class Data
   
   #---
   
-  def self.merge(data, force = true)
+  def self.merge(data, force = true, basic = true)
     value = data
     
     # Special case because this method is called from within Config.new so we 
     # can not use Config.ensure, as that would cause an infinite loop.
-    force = force.is_a?(Nucleon::Config) ? force.get(:force, true) : force
+    if force.is_a?(Nucleon::Config)
+      basic = force.get(:basic, true)
+      force = force.get(:force, true)      
+    end
     
     if data.is_a?(Array)
       value = undef?(data[0]) ? nil : data.shift.clone
@@ -275,15 +278,23 @@ class Data
         
         case value
         when Hash
-          begin
-            require 'deep_merge'
-            value = force ? value.deep_merge!(item) : value.deep_merge(item)
-            
-          rescue LoadError
-            if item.is_a?(Hash) # Non recursive top level by default.
+          if basic
+            if item.is_a?(Hash)
               value = value.merge(item)              
             elsif force
               value = item
+            end  
+          else
+            begin
+              require 'deep_merge'
+              value = force ? value.deep_merge!(item) : value.deep_merge(item)
+              
+            rescue LoadError
+              if item.is_a?(Hash) # Non recursive top level by default.
+                value = value.merge(item)              
+              elsif force
+                value = item
+              end
             end
           end  
         when Array
@@ -298,7 +309,6 @@ class Data
         end
       end  
     end
-    
     return value
   end
 

data/lib/core/util/logger.rb

@@ -116,32 +116,42 @@ class Logger
   # Log statements
   
   def debug(message)
-    @logger.debug(message)
+    unless Util::Console.quiet
+      @logger.debug(message)
+    end
   end
   
   #---
   
   def info(message)
-    @logger.info(message)
+    unless Util::Console.quiet
+      @logger.info(message)
+    end
   end
   
   #---
   
   def warn(message)
-    @logger.warn(message)
+    unless Util::Console.quiet
+      @logger.warn(message)
+    end
   end
   
   #---
   
   def error(message)
-    @logger.error(message)
+    unless Util::Console.quiet
+      @logger.error(message)
+    end
   end
   
   #---
   
   def hook(message)
-    @logger.hook(message)  
-  end          
+    unless Util::Console.quiet
+      @logger.hook(message)
+    end
+  end         
 end
 end
 end

data/lib/core/util/shell.rb

@@ -111,7 +111,9 @@ class Shell < Core
         error_success  = close_exec_pipe(t2, $stderr, error_orig, error_new, 'error')
       end
       
-      logger.warn("`#{command}` messages: #{system_result.errors}") if system_result.errors.length > 0
+      unless config.get(:quiet, false)
+        logger.warn("`#{command}` messages: #{system_result.errors}") if system_result.errors.length > 0
+      end
       logger.warn("`#{command}` status: #{system_result.status}") unless system_result.status == 0
         
       success = ( system_success && output_success && error_success )

data/lib/core/util/ssh.rb

@@ -140,6 +140,8 @@ class SSH < Core
   @@sessions = {}
   @@auth     = {}
   
+  @@session_lock = Mutex.new
+  
   #---
   
   def self.session_id(hostname, user)
@@ -152,37 +154,40 @@ class SSH < Core
     require 'net/ssh'
     
     session_id  = session_id(hostname, user)
-    config      = Config.ensure(options)
     
-    ssh_options = Config.new({
-      :user_known_hosts_file => [ File.join(key_path, 'known_hosts'), File.join(key_path, 'known_hosts2') ],
-      :auth_methods          => [ 'publickey' ],
-      :paranoid              => :very
-    }).import(Util::Data.subset(config, config.keys - [ :keypair, :key_dir, :key_name ]))
+    @@session_lock.synchronize do    
+      config      = Config.ensure(options)
     
-    if private_key
-      auth_id = [ session_id, private_key ].join('_')      
+      ssh_options = Config.new({
+        :user_known_hosts_file => [ File.join(key_path, 'known_hosts'), File.join(key_path, 'known_hosts2') ],
+        :auth_methods          => [ 'publickey' ],
+        :paranoid              => :very
+      }).import(Util::Data.subset(config, config.keys - [ :keypair, :key_dir, :key_name ]))
+    
+      if private_key
+        auth_id = [ session_id, private_key ].join('_')      
       
-      if ! @@auth[auth_id] && keypair = unlock_private_key(private_key, config)
-        @@auth[auth_id] = keypair
-      end
-      config[:keypair] = @@auth[auth_id] # Reset so caller can access updated keypair      
+        if ! @@auth[auth_id] && keypair = unlock_private_key(private_key, config)
+          @@auth[auth_id] = keypair
+        end
+        config[:keypair] = @@auth[auth_id] # Reset so caller can access updated keypair      
       
-      if @@auth[auth_id].is_a?(String)
-        ssh_options[:keys_only] = false
-        ssh_options[:keys]      = [ @@auth[auth_id] ]  
-      else
-        ssh_options[:keys_only] = true
-        ssh_options[:key_data]  = [ @@auth[auth_id].private_key ]
+        if @@auth[auth_id].is_a?(String)
+          ssh_options[:keys_only] = false
+          ssh_options[:keys]      = [ @@auth[auth_id] ]  
+        else
+          ssh_options[:keys_only] = true
+          ssh_options[:key_data]  = [ @@auth[auth_id].private_key ]
+        end
       end
-    end
     
-    ssh_options[:port] = port    
+      ssh_options[:port] = port    
     
-    if reset || ! @@sessions.has_key?(session_id)
-      @@sessions[session_id] = Net::SSH.start(hostname, user, ssh_options.export)
+      if reset || ! @@sessions.has_key?(session_id)
+        @@sessions[session_id] = Net::SSH.start(hostname, user, ssh_options.export)
+      end
     end
-    yield(@@sessions[session_id]) if block_given? && @@sessions[session_id]    
+    yield(@@sessions[session_id]) if block_given? && @@sessions[session_id]
     @@sessions[session_id] 
   end
   
@@ -244,7 +249,6 @@ class SSH < Core
           logger.info(">> running SSH: #{command}")
               
           ssh.open_channel do |ssh_channel|
-            ssh_channel.request_pty
             ssh_channel.exec(command) do |channel, success|
               unless success
                 raise "Could not execute command: #{command.inspect}"
@@ -256,7 +260,6 @@ class SSH < Core
               end
 
               channel.on_extended_data do |ch, type, data|
-                next unless type == 1
                 result.append_errors(data)
                 yield(:error, command, data) if block_given?
               end

data/lib/nucleon/translator/JSON.rb

@@ -9,7 +9,7 @@ class JSON < Nucleon.plugin_class(:nucleon, :translator)
   def parse(json_text)
     return super do |properties|
       if json_text && ! json_text.empty?
-        properties = Util::Data.parse_json(json_text)
+        properties = Util::Data.symbol_map(Util::Data.parse_json(json_text))
       end
       properties
     end
@@ -19,7 +19,7 @@ class JSON < Nucleon.plugin_class(:nucleon, :translator)
   
   def generate(properties)
     return super do
-      Util::Data.to_json(properties, get(:pretty, true))
+      Util::Data.to_json(Util::Data.string_map(properties), get(:pretty, true))
     end
   end
 end

data/lib/nucleon/translator/YAML.rb

@@ -9,7 +9,7 @@ class YAML < Nucleon.plugin_class(:nucleon, :translator)
   def parse(yaml_text)
     return super do |properties|
       if yaml_text && ! yaml_text.empty?
-        properties = Util::Data.parse_yaml(yaml_text)
+        properties = Util::Data.symbol_map(Util::Data.parse_yaml(yaml_text))
       end
       properties
     end
@@ -19,7 +19,7 @@ class YAML < Nucleon.plugin_class(:nucleon, :translator)
   
   def generate(properties)
     return super do
-      Util::Data.to_yaml(properties)
+      Util::Data.to_yaml(Util::Data.string_map(properties))
     end
   end
 end

data/lib/nucleon_base.rb

@@ -64,6 +64,18 @@ module Nucleon
   def self.VERSION
     File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))  
   end
+  
+  #-----------------------------------------------------------------------------
+  
+  @@dump_enabled = false
+  
+  def self.dump_enabled=dump
+    @@dump_enabled = dump
+  end
+  
+  def self.dump_enabled
+    @@dump_enabled
+  end
  
   #-----------------------------------------------------------------------------
   
@@ -170,16 +182,18 @@ end
 
 module Kernel
   
-  def dbg(data, label = '')
+  def dbg(data, label = '', override_enabled = false)
     # Invocations of this function should NOT be committed to the project
-    require 'pp'
-    puts '>>----------------------'
-    unless ! label || label.empty?
-      puts label
-      puts '---'
+    if Nucleon.dump_enabled || override_enabled
+      require 'pp'
+      puts '>>----------------------'
+      unless ! label || label.empty?
+        puts label
+        puts '---'
+      end
+      pp data
+      puts '<<'
     end
-    pp data
-    puts '<<'
   end
 end
   

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-07-01"
+  s.date = "2014-07-10"
   s.description = "\nA framework that provides a simple foundation for building Ruby applications that are:\n\n* Highly configurable (with both distributed and persistent configurations)\n* Extremely pluggable and extendable\n* Easily parallel\n\nNote: This framework is still very early in development!\n"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["nucleon"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/core/mixin/action/commit.rb",
     "lib/core/mixin/action/project.rb",
     "lib/core/mixin/action/push.rb",
+    "lib/core/mixin/action/registration.rb",
     "lib/core/mixin/colors.rb",
     "lib/core/mixin/config/collection.rb",
     "lib/core/mixin/config/options.rb",
@@ -202,6 +203,122 @@ Gem::Specification.new do |s|
     "rdoc/site/0.1.19/js/searcher.js",
     "rdoc/site/0.1.19/rdoc.css",
     "rdoc/site/0.1.19/table_of_contents.html",
+    "rdoc/site/0.2.0/ARCHITECTURE_rdoc.html",
+    "rdoc/site/0.2.0/Hash.html",
+    "rdoc/site/0.2.0/Kernel.html",
+    "rdoc/site/0.2.0/Nucleon.html",
+    "rdoc/site/0.2.0/Nucleon/Action.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Extract.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Project.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Project/Add.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Project/Create.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Project/Remove.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Project/Save.html",
+    "rdoc/site/0.2.0/Nucleon/Action/Project/Update.html",
+    "rdoc/site/0.2.0/Nucleon/Codes.html",
+    "rdoc/site/0.2.0/Nucleon/Command.html",
+    "rdoc/site/0.2.0/Nucleon/Command/Bash.html",
+    "rdoc/site/0.2.0/Nucleon/Config.html",
+    "rdoc/site/0.2.0/Nucleon/Config/Collection.html",
+    "rdoc/site/0.2.0/Nucleon/Config/Options.html",
+    "rdoc/site/0.2.0/Nucleon/Core.html",
+    "rdoc/site/0.2.0/Nucleon/Environment.html",
+    "rdoc/site/0.2.0/Nucleon/Errors.html",
+    "rdoc/site/0.2.0/Nucleon/Errors/BatchError.html",
+    "rdoc/site/0.2.0/Nucleon/Errors/NucleonError.html",
+    "rdoc/site/0.2.0/Nucleon/Errors/SSHUnavailable.html",
+    "rdoc/site/0.2.0/Nucleon/Event.html",
+    "rdoc/site/0.2.0/Nucleon/Event/Regex.html",
+    "rdoc/site/0.2.0/Nucleon/Facade.html",
+    "rdoc/site/0.2.0/Nucleon/Gems.html",
+    "rdoc/site/0.2.0/Nucleon/Manager.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Action.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Action/Commit.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Action/Project.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Action/Push.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Colors.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/ConfigCollection.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/ConfigOptions.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Macro.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Macro/ObjectInterface.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Macro/PluginInterface.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/Settings.html",
+    "rdoc/site/0.2.0/Nucleon/Mixin/SubConfig.html",
+    "rdoc/site/0.2.0/Nucleon/Parallel.html",
+    "rdoc/site/0.2.0/Nucleon/Parallel/ClassMethods.html",
+    "rdoc/site/0.2.0/Nucleon/Parallel/InstanceMethods.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Action.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Action/Option.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Base.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Command.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Event.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Extension.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Project.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Template.html",
+    "rdoc/site/0.2.0/Nucleon/Plugin/Translator.html",
+    "rdoc/site/0.2.0/Nucleon/Project.html",
+    "rdoc/site/0.2.0/Nucleon/Project/Git.html",
+    "rdoc/site/0.2.0/Nucleon/Project/Github.html",
+    "rdoc/site/0.2.0/Nucleon/Template.html",
+    "rdoc/site/0.2.0/Nucleon/Template/JSON.html",
+    "rdoc/site/0.2.0/Nucleon/Template/Wrapper.html",
+    "rdoc/site/0.2.0/Nucleon/Template/YAML.html",
+    "rdoc/site/0.2.0/Nucleon/Translator.html",
+    "rdoc/site/0.2.0/Nucleon/Translator/JSON.html",
+    "rdoc/site/0.2.0/Nucleon/Translator/YAML.html",
+    "rdoc/site/0.2.0/Nucleon/Util.html",
+    "rdoc/site/0.2.0/Nucleon/Util/CLI.html",
+    "rdoc/site/0.2.0/Nucleon/Util/CLI/Parser.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Cache.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Console.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Data.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Disk.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Git.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Liquid.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Logger.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Package.html",
+    "rdoc/site/0.2.0/Nucleon/Util/SSH.html",
+    "rdoc/site/0.2.0/Nucleon/Util/SSH/Keypair.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Shell.html",
+    "rdoc/site/0.2.0/Nucleon/Util/Shell/Result.html",
+    "rdoc/site/0.2.0/README_rdoc.html",
+    "rdoc/site/0.2.0/TODO_rdoc.html",
+    "rdoc/site/0.2.0/created.rid",
+    "rdoc/site/0.2.0/images/add.png",
+    "rdoc/site/0.2.0/images/brick.png",
+    "rdoc/site/0.2.0/images/brick_link.png",
+    "rdoc/site/0.2.0/images/bug.png",
+    "rdoc/site/0.2.0/images/bullet_black.png",
+    "rdoc/site/0.2.0/images/bullet_toggle_minus.png",
+    "rdoc/site/0.2.0/images/bullet_toggle_plus.png",
+    "rdoc/site/0.2.0/images/date.png",
+    "rdoc/site/0.2.0/images/delete.png",
+    "rdoc/site/0.2.0/images/find.png",
+    "rdoc/site/0.2.0/images/loadingAnimation.gif",
+    "rdoc/site/0.2.0/images/macFFBgHack.png",
+    "rdoc/site/0.2.0/images/package.png",
+    "rdoc/site/0.2.0/images/page_green.png",
+    "rdoc/site/0.2.0/images/page_white_text.png",
+    "rdoc/site/0.2.0/images/page_white_width.png",
+    "rdoc/site/0.2.0/images/plugin.png",
+    "rdoc/site/0.2.0/images/ruby.png",
+    "rdoc/site/0.2.0/images/tag_blue.png",
+    "rdoc/site/0.2.0/images/tag_green.png",
+    "rdoc/site/0.2.0/images/transparent.png",
+    "rdoc/site/0.2.0/images/wrench.png",
+    "rdoc/site/0.2.0/images/wrench_orange.png",
+    "rdoc/site/0.2.0/images/zoom.png",
+    "rdoc/site/0.2.0/index.html",
+    "rdoc/site/0.2.0/js/darkfish.js",
+    "rdoc/site/0.2.0/js/jquery.js",
+    "rdoc/site/0.2.0/js/navigation.js",
+    "rdoc/site/0.2.0/js/search.js",
+    "rdoc/site/0.2.0/js/search_index.js",
+    "rdoc/site/0.2.0/js/searcher.js",
+    "rdoc/site/0.2.0/rdoc.css",
+    "rdoc/site/0.2.0/table_of_contents.html",
     "spec/coral_mock_input.rb",
     "spec/coral_test_kernel.rb",
     "spec/core/util/console_spec.rb",
@@ -224,6 +341,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
       s.add_runtime_dependency(%q<netrc>, ["~> 0.7"])
       s.add_runtime_dependency(%q<highline>, ["~> 1.6"])
+      s.add_runtime_dependency(%q<erubis>, ["~> 2.7"])
       s.add_runtime_dependency(%q<deep_merge>, ["~> 1.0"])
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.7"])
       s.add_runtime_dependency(%q<sshkey>, ["~> 1.6"])
@@ -244,6 +362,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, ["~> 0.6"])
       s.add_dependency(%q<netrc>, ["~> 0.7"])
       s.add_dependency(%q<highline>, ["~> 1.6"])
+      s.add_dependency(%q<erubis>, ["~> 2.7"])
       s.add_dependency(%q<deep_merge>, ["~> 1.0"])
       s.add_dependency(%q<multi_json>, ["~> 1.7"])
       s.add_dependency(%q<sshkey>, ["~> 1.6"])
@@ -265,6 +384,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, ["~> 0.6"])
     s.add_dependency(%q<netrc>, ["~> 0.7"])
     s.add_dependency(%q<highline>, ["~> 1.6"])
+    s.add_dependency(%q<erubis>, ["~> 2.7"])
     s.add_dependency(%q<deep_merge>, ["~> 1.0"])
     s.add_dependency(%q<multi_json>, ["~> 1.7"])
     s.add_dependency(%q<sshkey>, ["~> 1.6"])