nucleon 0.1.6 → 0.1.7

data/Gemfile.lock

@@ -44,7 +44,7 @@ GEM
     log4r (1.1.10)
     mime-types (1.25.1)
     mini_portile (0.5.2)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.7.7)

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/core/core.rb

@@ -2,6 +2,8 @@
 module Nucleon
 class Core < Config
   
+  include Mixin::Colors
+  
   #-----------------------------------------------------------------------------
   # Properties
   
@@ -15,10 +17,11 @@ class Core < Config
   def initialize(data = {}, defaults = {}, force = true)
     super(data, defaults, force)   
     
-    class_label = self.class.to_s.downcase.gsub(/^nucleon::/, '')
+    @class_color = Util::Data.ensure_value(delete(:class_color, :cyan), :cyan)
+    @class_label = self.class.to_s.downcase.gsub(/^nucleon::/, '')
     
-    self.logger = delete(:logger, class_label)
-    self.ui     = Config.new(export).defaults({ :resource => class_label })
+    self.logger = delete(:logger, @class_label)
+    self.ui     = Config.new(export).defaults({ :resource => Util::Console.colorize(@class_label, @class_color) })
     
     logger.debug('Initialized instance logger and interface')
   end
@@ -61,11 +64,11 @@ class Core < Config
   #-----------------------------------------------------------------------------
   # General utilities
   
-  def self.ui_group(resource)
+  def self.ui_group(resource, color = :cyan)
     @@ui_lock.synchronize do
       begin
         ui_resource = ui.resource
-        ui.resource = resource
+        ui.resource = Util::Console.colorize(resource, color)
         yield(ui)
     
       ensure
@@ -76,9 +79,9 @@ class Core < Config
   
   #---
   
-  def ui_group(resource)
+  def ui_group(resource, color = :cyan)
     ui_resource = ui.resource
-    ui.resource = resource
+    ui.resource = Util::Console.colorize(resource, color)
     yield(ui)
     
   ensure

data/lib/core/facade.rb

@@ -2,12 +2,16 @@
 module Nucleon
 module Facade
  
+  include Mixin::Colors
+  
+  #-----------------------------------------------------------------------------
+ 
   def ui
     Core.ui
   end
   
-  def ui_group(resource, &code)
-    Core.ui_group(resource, &code)
+  def ui_group(resource, color = :cyan, &code)
+    Core.ui_group(resource, color, &code)
   end
   
   def quiet=quiet

data/lib/core/manager.rb

@@ -3,6 +3,7 @@ module Nucleon
 class Manager
   
   include Celluloid
+  task_class TaskThread
   
   #-----------------------------------------------------------------------------
   
@@ -429,7 +430,7 @@ class Manager
     results = nil
     
     if Nucleon.log_level == :hook # To save processing on rendering
-      logger.hook("Executing extension hook { #{method} } at #{Time.now}")
+      logger.hook("Executing extension hook #{Nucleon.blue(method)} at #{Nucleon.green(Time.now.to_s)}")
     end
     
     extensions = plugins(:extension)
@@ -541,6 +542,7 @@ class Manager
         values << data unless data.nil?  
       end
     end
+    values = values.flatten
     
     logger.debug("Extension #{method} collected values: #{values.inspect}")  
     values

data/lib/core/mixin/colors.rb

@@ -0,0 +1,59 @@
+
+# Should be included via include
+#
+# include Mixin::Colors
+#
+
+module Nucleon
+module Mixin
+module Colors
+  
+  def black(string)
+    ::Nucleon::Util::Console.black(string)  
+  end
+  
+  #---
+  
+  def red(string)
+    ::Nucleon::Util::Console.red(string)   
+  end
+  
+  #---
+  
+  def green(string)
+    ::Nucleon::Util::Console.green(string)   
+  end
+  
+  #---
+  
+  def yellow(string)
+    ::Nucleon::Util::Console.yellow(string)   
+  end
+  
+  #---
+  
+  def blue(string)
+    ::Nucleon::Util::Console.blue(string)   
+  end
+  
+  #---
+  
+  def purple(string)
+    ::Nucleon::Util::Console.purple(string)   
+  end
+  
+  #---
+  
+  def cyan(string)
+    ::Nucleon::Util::Console.cyan(string)   
+  end
+  
+  #---
+  
+  def grey(string)
+    ::Nucleon::Util::Console.grey(string)   
+  end
+end
+end
+end
+

data/lib/core/plugin/action.rb

@@ -177,6 +177,8 @@ class Action < Base
   #---
     
   def configure
+    register :color, :bool, true, 'nucleon.core.action.options.color'
+    
     yield if block_given?
     
     usage = "#{plugin_provider} "    
@@ -327,6 +329,10 @@ class Action < Base
     myself.status = code.success
     myself.result = nil
     
+    # TODO: Figure out how to deal with paralleization of actions with global ui settings
+    use_colors = Util::Console.use_colors
+    Util::Console.use_colors = @parser.options[:color]
+    
     if processed?      
       begin
         if skip_validate || validate
@@ -355,6 +361,9 @@ class Action < Base
     end  
     
     status
+    
+  ensure
+    Util::Console.use_colors = use_colors 
   end
   
   #---

data/lib/core/plugin/project.rb

@@ -44,7 +44,7 @@ class Project < Base
     
     set_url(get(:url)) if get(:url, false)
     
-    myself.plugin_name = path
+    myself.plugin_name = path if ! plugin_name || plugin_name == plugin_provider
     
     ui.resource = plugin_name
     logger      = plugin_name
@@ -411,7 +411,7 @@ class Project < Base
           logger.info("Committing changes to project #{name}: #{files.inspect}")
       
           time     = Time.new.strftime("%Y-%m-%d %H:%M:%S")
-          user     = config.delete(:user, ENV['USER'] + '@' + fact(:hostname))
+          user     = config.delete(:user, ENV['USER'] + '@' + fact(:fqdn))
       
           message  = config.get(:message, '')
           message  = 'Saving state: ' + ( files.is_a?(Array) ? "\n\n" + files.join("\n") : files.to_s ) if message.empty?

data/lib/core/util/console.rb

@@ -28,9 +28,9 @@ class Console
   }
 
   @@color_map = {
-    :warn    => @@colors[:yellow],
-    :error   => @@colors[:red],
-    :success => @@colors[:green]
+    :warn    => :yellow,
+    :error   => :red,
+    :success => :green
   }
 
   #-----------------------------------------------------------------------------
@@ -172,7 +172,7 @@ class Console
           try_again = false
         end
       end
-      password
+      password.strip
     end
     
     if options[:sync]
@@ -222,14 +222,13 @@ class Console
     if @resource && ! @resource.empty? && options[:prefix]
       prefix = "[#{@resource}]"
     end
-    message = "#{prefix} #{message}".lstrip.gsub(/\n+$/, '')
+    message = "#{prefix} #{message}".lstrip
     
     if @@use_colors && @color
       if options.has_key?(:color)
-        color = @@colors[options[:color]]
-        message = "#{color}#{message}#{@@colors[:clear]}"
+        message = self.class.colorize(message, options[:color]) 
       else
-        message = "#{@@color_map[type]}#{message}#{@@colors[:clear]}" if @@color_map[type]
+        message = self.class.colorize(message, @@color_map[type]) if @@color_map[type]
       end
     end
     return message
@@ -262,58 +261,72 @@ class Console
   #-----------------------------------------------------------------------------
   # Color translation
   
+  def self.colorize(string, color)
+    return '' unless string
+    return string.to_s unless @@use_colors
+    
+    color        = color.to_sym
+    string       = string.to_s
+    color_string = string
+    
+    if @@colors[color]
+      color         = @@colors[color]
+      clear_color   = @@colors[:clear]
+      escaped_clear = Regexp.escape(clear_color)
+            
+      color_string  = "#{color}"
+      color_string << string.gsub(/#{escaped_clear}(?!\e\[)/, "#{clear_color}#{color}")
+      color_string << "#{clear_color}"
+    end
+    color_string
+  end
+  
+  #---
+  
   def self.black(string)
-    return string unless @@use_colors
-    "#{@@colors[:black]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :black) 
   end
   
   #---
   
   def self.red(string)
-    return string unless @@use_colors
-    "#{@@colors[:red]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :red)   
   end
   
   #---
   
   def self.green(string)
-    return string unless @@use_colors
-    "#{@@colors[:green]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :green)  
   end
   
   #---
     
   def self.yellow(string)
-    return string unless @@use_colors
-    "#{@@colors[:yellow]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :yellow)  
   end
   
   #---
     
   def self.blue(string)
-    return string unless @@use_colors
-    "#{@@colors[:blue]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :blue)  
   end
   
   #---
     
   def self.purple(string)
-    return string unless @@use_colors
-    "#{@@colors[:purple]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :purple)  
   end
   
   #---
     
   def self.cyan(string)
-    return string unless @@use_colors
-    "#{@@colors[:cyan]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :cyan)   
   end
   
   #---
     
   def self.grey(string)
-    return string unless @@use_colors
-    "#{@@colors[:grey]}#{string}#{@@colors[:clear]}"  
+    colorize(string, :grey) 
   end
 end
 end

data/lib/nucleon/project/github.rb

@@ -49,7 +49,7 @@ class Github < Git
       
       if private_key && ssh_key
         begin
-          deploy_keys = client.deploy_keys(myself.plugin_name)
+          deploy_keys = client.deploy_keys(plugin_name)
           github_id   = nil
           keys_match  = true
                    

data/locales/en.yml

@@ -26,6 +26,10 @@ en:
           parse:
             error: |-
               There was a problem with the command arguments given
+      action:
+        options:
+          color: |-
+            Whether or not to output console messages in color (default %{default_value})
       mixin:
         action:
           project:

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-19"
+  s.date = "2014-03-20"
   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"]
@@ -38,6 +38,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/colors.rb",
     "lib/core/mixin/config/collection.rb",
     "lib/core/mixin/config/options.rb",
     "lib/core/mixin/macro/object_interface.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &6185280 !ruby/object:Gem::Requirement
+  requirement: &10501460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *6185280
+  version_requirements: *10501460
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &6184240 !ruby/object:Gem::Requirement
+  requirement: &10500720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *6184240
+  version_requirements: *10500720
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &6183160 !ruby/object:Gem::Requirement
+  requirement: &10499780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *6183160
+  version_requirements: *10499780
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &6182300 !ruby/object:Gem::Requirement
+  requirement: &10498680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *6182300
+  version_requirements: *10498680
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &6177800 !ruby/object:Gem::Requirement
+  requirement: &10498200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *6177800
+  version_requirements: *10498200
 - !ruby/object:Gem::Dependency
   name: sshkey
-  requirement: &6176180 !ruby/object:Gem::Requirement
+  requirement: &10497580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *6176180
+  version_requirements: *10497580
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &6174600 !ruby/object:Gem::Requirement
+  requirement: &10496840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *6174600
+  version_requirements: *10496840
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &6173300 !ruby/object:Gem::Requirement
+  requirement: &10496120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *6173300
+  version_requirements: *10496120
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &6171960 !ruby/object:Gem::Requirement
+  requirement: &10485880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *6171960
+  version_requirements: *10485880
 - !ruby/object:Gem::Dependency
   name: octokit
-  requirement: &6123040 !ruby/object:Gem::Requirement
+  requirement: &10485160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *6123040
+  version_requirements: *10485160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &6121580 !ruby/object:Gem::Requirement
+  requirement: &10484480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *6121580
+  version_requirements: *10484480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &6120220 !ruby/object:Gem::Requirement
+  requirement: &10483800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *6120220
+  version_requirements: *10483800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6119220 !ruby/object:Gem::Requirement
+  requirement: &10483240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *6119220
+  version_requirements: *10483240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &6117760 !ruby/object:Gem::Requirement
+  requirement: &10482740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *6117760
+  version_requirements: *10482740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &6113400 !ruby/object:Gem::Requirement
+  requirement: &10482080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *6113400
+  version_requirements: *10482080
 description: ! '
 
   A framework that provides a simple foundation for building Ruby applications that
@@ -220,6 +220,7 @@ files:
 - lib/core/mixin/action/commit.rb
 - lib/core/mixin/action/project.rb
 - lib/core/mixin/action/push.rb
+- lib/core/mixin/colors.rb
 - lib/core/mixin/config/collection.rb
 - lib/core/mixin/config/options.rb
 - lib/core/mixin/macro/object_interface.rb