nucleon 0.2.1 → 0.2.2

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

@@ -291,11 +291,11 @@ module ObjectInterface
                 if group_options.has_key?(:settings)
                   group_options = add_settings.call(group_options, group_options[:settings])
                 end
-                local_options = Util::Data.merge([ local_options, group_options ], true)  
+                local_options = Util::Data.merge([ local_options, group_options ], true, false)  
               end
             end
             unless local_options.empty?
-              final_options = Util::Data.merge([ local_options, final_options ], true)   
+              final_options = Util::Data.merge([ local_options, final_options ], true, false)   
             end
           end
           final_options
@@ -332,7 +332,7 @@ module ObjectInterface
           final_config = Config.new(Util::Data.merge([ 
             Util::Data.clean(settings), 
             Util::Data.clean(obj_config.export) 
-          ], true))
+          ], true, false))
           value = final_config.get(keys)
            
           logger.debug("Final configuration: #{final_config.export.inspect}")

data/lib/core/mixin/sub_config.rb

@@ -15,7 +15,7 @@ module SubConfig
     return if @subconfig_initialized && ! reset
     
     unless @config
-      @config = Config.new
+      @config = Config.new({}, {}, true, false)
     end
     
     @subconfig_initialized = true

data/lib/core/plugin/action.rb

@@ -5,6 +5,8 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   
   extend Mixin::Colors
   
+  include Mixin::Action::Registration
+  
   #-----------------------------------------------------------------------------
   # Info
   
@@ -12,14 +14,20 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
     describe_base(group, action, weight, description, help)
   end
   
-  def self.describe_base(group = nil, action = 'unknown', weight = -1000, description = nil, help = nil)
-    if group
-      group_name  = Util::Data.array(group).join('.')
-      description_id = "#{namespace}.action.#{group_name}.#{action}.description"
-      help_id        = "#{namespace}.action.#{group_name}.#{action}.help"
+  def self.describe_base(group = nil, action = 'unknown', weight = -1000, description = nil, help = nil, provider_override = nil)
+    if provider_override
+      provider_override = provider_override.to_s.gsub('_', '.')
+      description_id    = "#{namespace}.action.#{provider_override}.description"
+      help_id           = "#{namespace}.action.#{provider_override}.help"  
     else
-      description_id = "#{namespace}.action.#{action}.description"
-      help_id        = "#{namespace}.action.#{action}.help"
+      if group
+        group_name     = Util::Data.array(group).join('.')
+        description_id = "#{namespace}.action.#{group_name}.#{action}.description"
+        help_id        = "#{namespace}.action.#{group_name}.#{action}.help"
+      else
+        description_id = "#{namespace}.action.#{action}.description"
+        help_id        = "#{namespace}.action.#{action}.help"
+      end
     end
     
     {
@@ -207,28 +215,6 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   
   #---
   
-  def register_bool(name, default = false, locale = nil, &code)
-    register(name, :bool, default, locale, &code)
-  end
-  
-  def register_int(name, default = nil, locale = nil, &code)
-    register(name, :int, default, locale, &code)
-  end
-  
-  def register_float(name, default = nil, locale = nil, &code)
-    register(name, :float, default, locale, &code)
-  end
-  
-  def register_str(name, default = '', locale = nil, &code)
-    register(name, :str, default, locale, &code)
-  end
-  
-  def register_array(name, default = [], locale = nil, &code)
-    register(name, :array, default, locale, &code)
-  end
-  
-  #---
-  
   def remove(names)
     Util::Data.rm_keys(config, names)
     Util::Data.rm_keys(settings, names)
@@ -318,7 +304,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
     
     help_text = ''
     action_info[:description][:help].split("\n").each do |line|
-      help_text << '     ' + line + "\n"
+      help_text << '     ' + green(line) + "\n"
     end
     
     @parser = Util::CLI::Parser.new(args, usage, "\n#{help_text}\n") do |parser|
@@ -479,30 +465,13 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   # Output
   
   def render_options
-    settings
+    options = super
+    options.merge(settings.export)
   end
   
   #-----------------------------------------------------------------------------
   # Utilities
-  
-  def validate_plugins(namespace, type, name, values)
-    plugin_class   = Nucleon.plugin_class(namespace, type)
-    loaded_plugins = Nucleon.loaded_plugins(namespace, type)
-    success          = true
-        
-    array(values).each do |value|
-      if info = plugin_class.translate_reference(value)
-        if ! loaded_plugins.keys.include?(info[:provider].to_sym)
-          warn("corl.action.#{plugin_name.to_s.gsub('_', '.')}.errors.#{name}", Util::Data.merge([ info, { :value => value } ]))
-          success = false
-        end
-      end
-    end      
-    success
-  end
-  
-  #---
-  
+
   def self.components(search)
     components = []
       
@@ -668,7 +637,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
       namespace    = info[:description][:namespace]
       group        = info[:description][:group]
       
-      group_id = group.is_a?(Array) ? group.flatten.join('::') : group
+      group_id = group.is_a?(Array) ? group.flatten.join('::') : group.to_s
       group_id = '' unless group_id
       
       output << "\n" if group_id != last_group

data/lib/core/plugin/base.rb

@@ -20,7 +20,7 @@ class Base < Core
     set_meta(config.delete(:meta, Config.new))
     
     # No logging statements above this line!!
-    super(config.import({ :logger => "#{namespace}->#{plugin_type}->#{plugin_provider}" }), {}, true, false)
+    super(config.import({ :logger => "#{namespace}->#{plugin_type}->#{plugin_provider}" }), {}, true, false, false)
     myself.plugin_name = name
             
     logger.debug("Normalizing #{namespace} #{plugin_type} plugin #{plugin_name}")
@@ -219,18 +219,44 @@ class Base < Core
   #-----------------------------------------------------------------------------
   # Output
   
+  def render_provider
+    plugin_provider
+  end
+  protected :render_provider
+  
+  #---
+  
   def render_options
-    export  
+    export.merge({ 
+      :plugin_namespace => self.class.respond_to?(:namespace) ? self.class.namespace : plugin_namespace, 
+      :plugin_type      => plugin_type, 
+      :plugin_provider  => render_provider 
+    })  
   end
   protected :render_options
   
   #---
   
   def render_message(message, options = {})
-    config = Config.ensure(options)
+    config     = Config.ensure(options)
+    use_prefix = true
     
     if config.delete(:i18n, true)
-      message = I18n.t(message, Util::Data.merge([ Config.ensure(render_options).export, config.export ], true))  
+      Nucleon.namespaces.each do |namespace|
+        if message =~ /^#{namespace.to_s.downcase}\./
+          use_prefix = false
+          break
+        end
+      end      
+      
+      if use_prefix
+        plugin_namespace = self.class.namespace if self.class.respond_to?(:namespace)
+        operation_id     = config.has_key?(:operation) ? config[:operation] : ''
+        prefix           = "#{plugin_namespace}.#{plugin_type}.#{render_provider.to_s.gsub('_', '.')}."
+      
+        message = prefix + ( operation_id.empty? ? '' : "#{operation_id}." ) + message.sub(/^#{prefix}/, '')
+      end
+      message = I18n.t(message, Util::Data.merge([ Config.ensure(render_options).export, config.export ], true))
     end
     message  
   end
@@ -254,7 +280,7 @@ class Base < Core
   #---
         
   def info(message, options = {})
-    config = Config.ensure(options)
+    config = Config.new(options).import({ :operation => :info })
     
     unless quiet?
       message = render_message(message, config)
@@ -266,7 +292,7 @@ class Base < Core
   #---
        
   def warn(message, options = {})
-    config = Config.ensure(options)
+    config = Config.new(options).import({ :operation => :warn })
     
     unless quiet?
       message = render_message(message, config)
@@ -278,7 +304,7 @@ class Base < Core
   #---
         
   def error(message, options = {})
-    config = Config.ensure(options)
+    config = Config.new(options).import({ :operation => :error })
     
     unless quiet?
       message = render_message(message, config)
@@ -290,7 +316,7 @@ class Base < Core
   #---
         
   def success(message, options = {})
-    config = Config.ensure(options)
+    config = Config.new(options).import({ :operation => :success })
     
     unless quiet?
       message = render_message(message, config)
@@ -299,6 +325,13 @@ class Base < Core
     message
   end
   
+  #---
+  
+  def prefixed_message(type, prefix, message, options = {})
+    return unless [ :info, :warn, :error, :success ].include?(type.to_sym)
+    send(type, prefix.to_s + render_message(message, Config.new(options).import({ :prefix => false, :operation => type.to_sym }).export), Config.new(options).import({ :i18n => false }).export)
+  end
+  
   #-----------------------------------------------------------------------------
   # Utilities
   

data/lib/core/plugin/project.rb

@@ -45,7 +45,9 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
   def normalize(reload)
     super
     
-    set_directory(Util::Disk.filename(get(:directory, Dir.pwd)))
+    directory = Util::Disk.filename(get(:directory, Dir.pwd))
+    
+    set_directory(directory)
     register
     
     set_url(get(:url)) if get(:url, false)
@@ -70,6 +72,10 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
     unless reload
       @cache = Util::Cache.new(directory, Nucleon.sha1(plugin_name), '.project_cache')
       init_cache
+      
+      unless self.class.load_provider(directory)
+        self.class.store_provider(directory, plugin_provider)
+      end
     end
   end
   
@@ -177,7 +183,7 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
   #---
   
   def set_url(url)
-    if url && url = extension_set(:set_url, url.strip)      
+    if url && url = extension_set(:set_url, url.strip)
       logger.info("Setting project #{name} url to #{url}")
       
       set(:url, url)
@@ -326,7 +332,7 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
   # Project operations
   
   def init_cache
-    # Override in providers if needed
+    ignore(self.class.state_file)
   end
   protected :init_cache
   
@@ -806,11 +812,12 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
     
   def push(remote = :edit, options = {})
     config  = Config.ensure(options).import({ :remote => remote })
+    no_pull = config.delete(:no_pull, false)
     success = false
     
     push_project = lambda do |push_remote|
       logger.info("Pushing to #{push_remote} from #{directory}") 
-      success = yield(config, push_remote) if block_given? && pull(push_remote, config)  
+      success = yield(config, push_remote) if block_given? && ( no_pull || pull(push_remote, config) )  
     end
     
     if can_persist?
@@ -870,7 +877,46 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
     end
     success
   end
-     
+  
+  #-----------------------------------------------------------------------------
+  # State configurations
+    
+  def self.state_file
+    '.corl'
+  end
+  
+  #---
+  
+  @@project_data = {}
+  
+  def self.store_provider(directory, provider)
+    if File.directory?(directory)
+      @@project_data[directory] = {
+        :provider => provider
+      }
+      json_data = Util::Data.to_json(@@project_data[directory], true)    
+      Util::Disk.write(File.join(directory, state_file), json_data)
+    end
+  end
+  
+  #---
+  
+  def self.clear_provider(directory)
+    @@project_data.delete(directory)
+  end
+  
+  #---
+  
+  def self.load_provider(directory, override = nil)
+    @@project_data[directory] = {} unless @@project_data.has_key?(directory)
+    
+    if override.nil? && @@project_data[directory].empty?
+      json_data                 = Util::Disk.read(File.join(directory, state_file))
+      @@project_data[directory] = hash(Util::Data.parse_json(json_data)) if json_data
+    end
+    override.nil? ? symbol_map(@@project_data[directory])[:provider] : override  
+  end
+    
   #-----------------------------------------------------------------------------
   # Utilities
   
@@ -893,9 +939,10 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
     
     if options.has_key?(:url)
       if matches = translate_reference(options[:url])
-        options[:provider] = matches[:provider]
-        options[:url]      = matches[:url]
-        options[:revision] = matches[:revision] unless options.has_key?(:revision)
+        options[:provider]  = matches[:provider]
+        options[:reference] = matches[:reference]
+        options[:url]       = matches[:url]
+        options[:revision]  = matches[:revision] unless options.has_key?(:revision)
         
         logger.debug("Translating project options: #{options.inspect}")  
       end

data/lib/nucleon/action/project/add.rb

@@ -23,26 +23,12 @@ class Add < Nucleon.plugin_class(:nucleon, :action)
             :add_failure,
             :push_failure
       
-      register :path, :str, Dir.pwd        
+      register_str :path, Dir.pwd        
+      register_str :sub_path, nil
       
-      register :sub_path, :str, nil
-      register :sub_reference, :str, nil do |value|
-        success = true
-        if info = Nucleon.plugin_class(:nucleon, :project).translate_reference(value)
-          if ! Nucleon.loaded_plugins(:nucleon, :project).keys.include?(info[:provider].to_sym)
-            warn('nucleon.core.mixin.action.project.errors.project_reference', { 
-              :value     => value, 
-              :provider  => info[:provider],  
-              :reference => info[:reference],
-              :url       => info[:url],
-              :revision  => info[:revision] 
-            })
-            success = false
-          end
-        end
-        success
-      end      
-      register :editable, :bool, false
+      register_project :sub_reference, nil
+      
+      register_bool :editable
       
       project_config
       push_config
@@ -60,7 +46,7 @@ class Add < Nucleon.plugin_class(:nucleon, :action)
    
   def execute
     super do
-      info('nucleon.action.project.add.start')
+      info('start')
       
       if project = project_load(settings[:path], false)
         sub_info = project.translate_reference(settings[:sub_reference], settings[:editable])

data/lib/nucleon/action/project/create.rb

@@ -20,7 +20,7 @@ class Create < Nucleon.plugin_class(:nucleon, :action)
     super do    
       codes :project_failure
       
-      register :path, :str, Dir.pwd      
+      register_str :path, Dir.pwd      
       project_config
       
       config[:project_reference].default = ''
@@ -38,7 +38,7 @@ class Create < Nucleon.plugin_class(:nucleon, :action)
    
   def execute
     super do
-      info('nucleon.action.project.create.start')
+      info('start')
       
       project       = project_load(settings[:path], true, true)
       myself.status = code.project_failure unless project

data/lib/nucleon/action/project/remove.rb

@@ -23,8 +23,8 @@ class Remove < Nucleon.plugin_class(:nucleon, :action)
             :delete_failure,
             :push_failure
       
-      register :path, :str, Dir.pwd       
-      register :sub_path, :str, nil
+      register_str :path, Dir.pwd       
+      register_str :sub_path, nil
       
       project_config
       push_config
@@ -46,7 +46,7 @@ class Remove < Nucleon.plugin_class(:nucleon, :action)
   
   def execute
     super do
-      info('nucleon.action.project.remove.start')
+      info('start')
       
       if project = project_load(settings[:path], false)
         if project.delete_subproject(settings[:sub_path])

data/lib/nucleon/action/project/save.rb

@@ -24,8 +24,8 @@ class Save < Nucleon.plugin_class(:nucleon, :action)
             :commit_failure,
             :push_failure
       
-      register :path, :str, Dir.pwd
-      register :files, :array, '.'
+      register_str :path, Dir.pwd
+      register_files :files, '.'
       
       project_config
       commit_config(false)
@@ -44,7 +44,7 @@ class Save < Nucleon.plugin_class(:nucleon, :action)
    
   def execute          
     super do
-      info('nucleon.action.project.save.start')
+      info('start')
           
       if project = project_load(settings[:path], false, false)
         if commit(project, settings[:files])