nucleon 0.1.19 → 0.2.0

data/lib/core/plugin/base.rb

@@ -3,9 +3,13 @@ module Nucleon
 module Plugin
 class Base < Core
   
+  def self.register_ids
+    :name
+  end
+  
   # All Plugin classes should directly or indirectly extend Base
   
-  def initialize(type, provider, options)
+  def initialize(namespace, plugin_type, provider, options)
     config = Util::Data.clean(Config.ensure(options), false)
     name   = Util::Data.ensure_value(config.delete(:plugin_name), config.delete(:name, provider))
     
@@ -13,11 +17,11 @@ class Base < Core
        
     set_meta(config.delete(:meta, Config.new))
     
-    # No logging statements aove this line!!
-    super(config.import({ :logger => "#{plugin_type}->#{plugin_provider}" }), {}, true, false)
+    # No logging statements above this line!!
+    super(config.import({ :logger => "#{namespace}->#{plugin_type}->#{plugin_provider}" }), {}, true, false)
     myself.plugin_name = name
-    
-    logger.debug("Normalizing #{plugin_type} plugin #{plugin_name} with meta data: #{meta.inspect}")
+            
+    logger.debug("Normalizing #{namespace} #{plugin_type} plugin #{plugin_name}")
     normalize(false)
     
     @initialized = true
@@ -25,6 +29,12 @@ class Base < Core
   
   #---
   
+  def parallel_finalize
+    remove_plugin
+  end
+  
+  #---
+  
   def method_missing(method, *args, &block)  
     return nil  
   end
@@ -128,11 +138,11 @@ class Base < Core
   # Status codes
     
   def code
-    CORL.code
+    Nucleon.code
   end
   
   def codes(*codes)
-    CORL.codes(*codes)
+    Nucleon.codes(*codes)
   end
 
   #---
@@ -238,14 +248,14 @@ class Base < Core
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def self.build_info(type, data)  
+  def self.build_info(namespace, plugin_type, data)  
     plugins = []
         
     if data.is_a?(Hash)
       data = [ data ]
     end
     
-    logger.debug("Building plugin list of #{type} from data: #{data.inspect}")
+    logger.debug("Building plugin list of #{plugin_type}")
     
     if data.is_a?(Array)
       data.each do |info|
@@ -253,11 +263,9 @@ class Base < Core
           info = translate(info)
           
           if Util::Data.empty?(info[:provider])
-            info[:provider] = Nucleon.type_default(type)
+            info[:provider] = Nucleon.type_default(namespace, plugin_type)
           end
           
-          logger.debug("Translated plugin info: #{info.inspect}")
-          
           plugins << info
         end
       end
@@ -268,7 +276,7 @@ class Base < Core
   #---
 
   def self.translate(data)
-    logger.debug("Translating data to internal plugin structure: #{data.inspect}")
+    logger.debug("Translating input data to internal plugin structure")
     return ( data.is_a?(Hash) ? symbol_map(data) : data )
   end
   
@@ -294,7 +302,7 @@ class Base < Core
       return result if return_result
       return true
       
-    rescue Exception => error
+    rescue => error
       logger.error(error.inspect)
       logger.error(error.message)
       

data/lib/core/plugin/command.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Plugin
-class Command < Base
+class Command < Nucleon.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Command plugin interface

data/lib/core/plugin/event.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Plugin
-class Event < Base
+class Event < Nucleon.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Event plugin interface
@@ -27,9 +27,9 @@ class Event < Base
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def self.build_info(type, data)  
+  def self.build_info(namespace, plugin_type, data)  
     data = data.split(/\s*,\s*/) if data.is_a?(String)
-    return super(type, data)
+    return super(namespace, plugin_type, data)
   end
   
   #---

data/lib/core/plugin/extension.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Plugin
-class Extension < Base
+class Extension < Nucleon.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Extension plugin interface

data/lib/core/plugin/project.rb

@@ -1,11 +1,7 @@
 
 module Nucleon
 module Plugin
-class Project < Base
-  
-  @@ignore_lock = Mutex.new
-  
-  #---
+class Project < Nucleon.plugin_class(:nucleon, :base)
   
   @@projects = {}
   
@@ -14,6 +10,12 @@ class Project < Base
   def self.collection
     @@projects
   end
+  
+  #---
+  
+  def self.register_ids
+    [ :name, :directory ]
+  end
      
   #-----------------------------------------------------------------------------
   # Constructor / Destructor
@@ -48,7 +50,7 @@ class Project < Base
     
     set_url(get(:url)) if get(:url, false)
     
-    myself.plugin_name = path if ! plugin_name || plugin_name == plugin_provider
+    myself.plugin_name = path if ! plugin_name || plugin_name.to_sym == plugin_provider
     
     ui.resource = plugin_name
     logger      = plugin_name
@@ -476,7 +478,7 @@ class Project < Base
         end
       end
     else
-      logger.warn("Project #{name} does not meet the criteria for persistence and can be committed to")                
+      logger.warn("Project #{name} does not meet the criteria for persistence and can not be committed to")                
     end
     success     
   end
@@ -486,11 +488,9 @@ class Project < Base
   def ignore(files)
     return unless directory && manage_ignore?
     
-    @@ignore_lock.synchronize do
-      files = nil
-      files = yield if block_given?
-      commit(files, { :message => "Adding project ignores." }) if files
-    end
+    files = nil
+    files = yield if block_given?
+    commit(files, { :message => "Adding project ignores." }) if files
   end
   
   #-----------------------------------------------------------------------------
@@ -874,9 +874,9 @@ class Project < Base
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def self.build_info(type, data)  
+  def self.build_info(namespace, plugin_type, data)  
     data = data.split(/\s*,\s*/) if data.is_a?(String)
-    super(type, data)
+    super(namespace, plugin_type, data)
   end
   
   #---
@@ -914,7 +914,7 @@ class Project < Base
       
       logger.debug("Translating project reference: #{provider}  #{url}  #{revision}")
       
-      if provider && Nucleon.loaded_plugins(:project).keys.include?(provider.to_sym)
+      if provider && Nucleon.loaded_plugins(:nucleon, :project).keys.include?(provider.to_sym)
         klass        = Nucleon.class_const([ :nucleon, :project, provider ])          
         expanded_url = klass.send(:expand_url, url, editable) if klass.respond_to?(:expand_url)
       end

data/lib/core/plugin/template.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Plugin
-class Template < Base
+class Template < Nucleon.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Template plugin interface

data/lib/core/plugin/translator.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Plugin
-class Translator < Base
+class Translator < Nucleon.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Translator plugin interface

data/lib/core/util/cache.rb

@@ -21,7 +21,7 @@ class Cache < Core
     FileUtils.mkdir_p(base_path) unless File.directory?(base_path)
     
     @cache_id         = id.to_sym
-    @cache_translator = Nucleon.type_default(:translator)
+    @cache_translator = Nucleon.type_default(:nucleon, :translator)
     @cache_filename   = "#{id}.#{translator}"
     @cache_path       = File.join(@cache_root, @cache_filename)
   end

data/lib/core/util/cli.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Util
 module CLI
-         
+        
   #-----------------------------------------------------------------------------
   # Utilities
         
@@ -32,7 +32,11 @@ module CLI
     attr_accessor :options
     attr_accessor :arguments
     attr_accessor :processed
-        
+ 
+    #---
+    
+    include Mixin::Colors
+          
     #---
         
     def initialize(args, banner = '', help = '', split_help = false)
@@ -100,6 +104,12 @@ module CLI
         parser.separator help
       end
     end
+    
+    #---
+    
+    def version
+      # Override in executable script
+    end
         
     #---
         
@@ -108,7 +118,15 @@ module CLI
       error = false
           
       self.processed = false
-          
+      
+      option_bool(:version, false, 
+        '--version', 
+        'nucleon.core.util.cli.options.version'
+      )
+      option_bool(:color, true, 
+        '--[no]-color', 
+        'nucleon.core.util.cli.options.color'
+      )
       option_str(:log_level, nil, 
         '--log_level STR', 
         'nucleon.core.util.cli.options.log_level'
@@ -133,6 +151,13 @@ module CLI
       parser.parse!(args)
       
       # Now we can act on options given
+      Util::Console.use_colors = options[:color] unless split_help
+      
+      if options[:version]
+        puts version
+        exit 0
+      end
+      
       return if options[:help]
       
       parse_encoded
@@ -218,6 +243,10 @@ module CLI
             
         encoded_properties.each do |name, value|
           self.options[name] = value
+          
+          if name == :color
+            Util::Console.use_colors = value
+          end
         end
       end
       options.delete(:encoded_params)

data/lib/core/util/console.rb

@@ -9,7 +9,7 @@ class Console
   
   #---
   
-  @@console_lock = Mutex.new
+  @@console_lock = Nucleon.console_lock
   @@quiet        = false
   @@use_colors   = true
   
@@ -78,7 +78,7 @@ class Console
   #---
   
   def self.use_colors
-    @@use_colors  
+    @@use_colors && ! ENV['NUCLEON_NO_COLOR'] 
   end
   
   def self.use_colors=use_colors
@@ -105,9 +105,9 @@ class Console
     end
     
     if options[:sync]
-      @@console_lock.synchronize do
+      #@@console_lock.synchronize do
         render.call
-      end
+      #end
     else
       render.call
     end
@@ -140,9 +140,9 @@ class Console
     end
 
     if options[:sync]
-      @@console_lock.synchronize do
+      #@@console_lock.synchronize do
         return collect.call
-      end
+      #end
     else
       return collect.call  
     end
@@ -176,9 +176,9 @@ class Console
     end
     
     if options[:sync]
-      @@console_lock.synchronize do
+      #@@console_lock.synchronize do
         return collect.call
-      end
+      #end
     else
       return collect.call  
     end
@@ -222,7 +222,27 @@ class Console
     if @resource && ! @resource.empty? && options[:prefix]
       prefix = "[#{@resource}]"
     end
-    message = "#{prefix} #{message}".lstrip
+    
+    lines         = []
+    prev_color    = nil
+    escaped_clear = Regexp.escape(@@colors[:clear])
+    
+    message.split("\n").each do |line|
+      line = prev_color + line if prev_color
+            
+      lines << "#{prefix} #{line}".sub(/^ +/, '')
+      
+      # Set next previous color
+      if line =~ /#{escaped_clear}$/
+        prev_color = nil  
+      else
+        line_section = line.split(/#{escaped_clear}/).pop
+        prev_colors  = line_section.scan(/\e\[[0-9][0-9]?m/)
+        prev_color   = prev_colors.pop unless prev_colors.empty?
+      end      
+    end
+       
+    message = lines.join("\n")
     
     if @@use_colors && @color
       if options.has_key?(:color)
@@ -263,7 +283,7 @@ class Console
   
   def self.colorize(string, color)
     return '' unless string
-    return string.to_s unless @@use_colors
+    return string.to_s unless use_colors
     
     color        = color.to_sym
     string       = string.to_s

data/lib/core/util/data.rb

@@ -341,9 +341,13 @@ class Data
   
   #---
   
-  def self.rm_keys(data, keys)
+  def self.rm_keys(data, keys, symbolize = false)
     keys = [ keys ] unless keys.is_a?(Array)
+    data = hash(data)
+    data = symbol_map(data) if symbolize
+    
     keys.each do |key|
+      key = key.to_sym if symbolize
       data.delete(key)
     end
     data
@@ -351,10 +355,14 @@ class Data
   
   #---
   
-  def self.subset(data, keys)
+  def self.subset(data, keys, symbolize = false)
     keys     = [ keys ] unless keys.is_a?(Array)
-    new_data = {} 
+    data     = hash(data)
+    data     = symbol_map(data) if symbolize
+    new_data = {}
+     
     keys.each do |key|
+      key           = key.to_sym if symbolize
       new_data[key] = data[key] if data.has_key?(key)
     end
     new_data 

data/lib/core/util/logger.rb

@@ -109,7 +109,7 @@ class Logger
     else
       @logger = logger
     end
-    self.class.add_logger(@resource, @logger)  
+    self.class.add_logger(@resource, @logger) unless self.class.loggers.has_key?(@resource)  
   end
   
   #-----------------------------------------------------------------------------