nucleon 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 538f4bb7721e53ea65e86fcd9dabe27a3def5f67
-  data.tar.gz: 4fa312d8415f9db8d1b29537c95749358252a598
+  metadata.gz: 8c8807425d4796bbacc3ab9b91273fce43c75dad
+  data.tar.gz: acc2ebd35998fb5d9beab4c83bca35a67e6cadc5
 SHA512:
-  metadata.gz: afe85d0df90e8f5114d1d929e9806c01077ea5bbb293c4cef5aa886dc8a678e8a29baf653de081306a1873f9702f0da1d99f7776976b603600b3c4e283b1fb11
-  data.tar.gz: cd73b96970c6fc5ce2e29e1965bccd66b32c26d051f542c707de49bd0f99063bcd0c0f83d56eb7528cb794d5f62d4dfb57e4ec899db76ae8b1a8c936d66eef86
+  metadata.gz: 66642c1e07a8c2387fb6bc761dc1986019d56ae1ecb0267745343be0df59cec44c9e6c39f5d6cdf20b7f4f11d7e917acde82e8098845ac156bba70cf3ec59cb6
+  data.tar.gz: 9e887f1c8b8f9df44e6d2b64eeb4b98ed3b25574e52889170870764e274b30529120db7c3b4256bcb7ec785d32f4b17a929a0ec69e2bf4f62bcbab9baee7abf5

data/Gemfile

@@ -4,6 +4,7 @@ gem "log4r", "~> 1.1"
 gem "i18n", "~> 0.6"
 gem "netrc", "~> 0.7"
 gem "highline", "~> 1.6"
+gem "erubis", "~> 2.7"
 
 gem "deep_merge", "~> 1.0"
 gem "multi_json", "~> 1.7"

data/Gemfile.lock

@@ -22,6 +22,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
@@ -106,6 +107,7 @@ DEPENDENCIES
   celluloid (~> 0.15)
   childprocess (~> 0.5)
   deep_merge (~> 1.0)
+  erubis (~> 2.7)
   highline (~> 1.6)
   i18n (~> 0.6)
   jeweler (~> 2.0)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/core/config.rb

@@ -11,37 +11,38 @@ class Config
   #-----------------------------------------------------------------------------
   # Instance generators
   
-  def self.ensure(config)
+  def self.ensure(config, defaults = {}, force = true, basic_merge = true)
     case config
     when Nucleon::Config
-      return config
+      return config.defaults(defaults)
     when Hash
-      return new(config) 
+      return new(config, defaults, force, basic_merge) 
     end
-    return new
+    return new({}, defaults, force, basic_merge)
   end
   
   #---
   
-  def self.init(options, contexts = [], hierarchy = [], defaults = {})
+  def self.init(options, contexts = [], hierarchy = [], defaults = {}, force = true, basic_merge = true)
     contexts = contexts(contexts, hierarchy)
-    config   = new(get_options(contexts), defaults)
+    config   = new(get_options(contexts), defaults, force, basic_merge)
     config.import(options) unless Util::Data.empty?(options)
     return config
   end
   
   #---
   
-  def self.init_flat(options, contexts = [], defaults = {})
-    return init(options, contexts, [], defaults)
+  def self.init_flat(options, contexts = [], defaults = {}, force = true, basic_merge = true)
+    return init(options, contexts, [], defaults, force, basic_merge)
   end
    
   #-----------------------------------------------------------------------------
   # Constructor / Destructor
    
-  def initialize(data = {}, defaults = {}, force = true)
-    @force      = force
-    @properties = {}
+  def initialize(data = {}, defaults = {}, force = true, basic_merge = true)
+    @force       = force
+    @basic_merge = basic_merge
+    @properties  = {}
     
     if defaults.is_a?(Hash) && ! defaults.empty?
       defaults = symbol_map(defaults.clone)
@@ -49,12 +50,12 @@ class Config
     
     case data
     when Nucleon::Config
-      @properties = Util::Data.merge([ defaults, data.export ], force)
+      @properties = Util::Data.merge([ defaults, data.export ], force, basic_merge)
     when Hash
       @properties = {}
       if data.is_a?(Hash)
-        @properties = Util::Data.merge([ defaults, symbol_map(data.clone) ], force)
-      end  
+        @properties = Util::Data.merge([ defaults, symbol_map(data.clone) ], force, basic_merge)
+      end
     end
   end
   
@@ -103,7 +104,7 @@ class Config
   
   #---
   
-  def modify(data, keys, value = nil) 
+  def modify(data, keys, value = nil, delete_nil = false) 
     if keys.is_a?(String) || keys.is_a?(Symbol)
       keys = [ keys ]
     end
@@ -119,7 +120,7 @@ class Config
     if keys.empty?      
       existing[:value] = data[key] if has_key
       
-      if value.nil?
+      if value.nil? && delete_nil
         data.delete(key) if has_key
       else
         data[key] = value
@@ -170,8 +171,8 @@ class Config
 
   #---
   
-  def set(keys, value)
-    modify(@properties, array(keys).flatten, value)
+  def set(keys, value, delete_nil = false)
+    modify(@properties, array(keys).flatten, value, delete_nil)
     return self
   end
   
@@ -184,7 +185,7 @@ class Config
   #---
   
   def delete(keys, default = nil)
-    existing = modify(@properties, array(keys).flatten, nil)
+    existing = modify(@properties, array(keys).flatten, nil, true)
     return existing[:value] unless existing[:value].nil?
     return default
   end
@@ -200,7 +201,7 @@ class Config
   # Import / Export
  
   def import_base(properties, options = {})
-    config      = Config.new(options, { :force => @force }).set(:context, :hash)    
+    config      = Config.new(options, { :force => @force, :basic => @basic_merge }).set(:context, :hash)    
     import_type = config.get(:import_type, :override)
     
     properties  = properties.export if properties.is_a?(Nucleon::Config)

data/lib/core/environment.rb

@@ -306,13 +306,13 @@ class Environment
   
   def parse_plugin_info(namespace, plugin_type, base_path, file)
     dir_components   = base_path.split(File::SEPARATOR)    
-    file_components  = file.split(File::SEPARATOR)  
+    file_components  = file.split(File::SEPARATOR)
     
     file_name        = file_components.pop.sub(/\.rb/, '')
     directory        = file_components.join(File::SEPARATOR)
     
     file_class       = sanitize_class(file_name)
-    group_components = file_components - dir_components
+    group_components = directory.sub(/^#{base_path}#{File::SEPARATOR}?/, '').split(File::SEPARATOR)
     
     class_components = [ sanitize_class(namespace), sanitize_class(plugin_type) ]
       

data/lib/core/facade.rb

@@ -602,6 +602,21 @@ module Facade
   def render_object(data)
     require 'pp'
     PP.pp(data, "").strip
+  end
+  
+  #---
+  
+  def render_tree(data, logger, state = :debug, padding = '')
+    if data.is_a?(Hash) || data.is_a?(Nucleon::Config)
+      data = data.export if data.is_a?(Nucleon::Config)
+      data.each do |key, value|
+        logger.send(state, "#{padding}#{key}")
+        if value.is_a?(Hash) || value.is_a?(Nucleon::Config)
+          value = value.export if value.is_a?(Nucleon::Config)
+          render_tree(value, logger, state, "#{padding}  ")   
+        end
+      end
+    end
   end  
 end
 end

data/lib/core/mixin/action/registration.rb

@@ -0,0 +1,84 @@
+
+module Nucleon
+module Mixin
+module Action
+module Registration
+        
+  #-----------------------------------------------------------------------------
+  # Options
+    
+  def register_file(name, default = nil)
+    name = name.to_sym
+    
+    register name, :str, default do |value|
+      validate_file(value)
+    end
+  end
+  
+  #---
+    
+  def register_directory(name, default = nil)
+    name = name.to_sym
+    
+    register name, :str, default do |value|
+      validate_directory(value)
+    end
+  end
+  
+  #---
+    
+  def register_project(name, default = nil)
+    name = name.to_sym
+    
+    register name, :str, default do |value|
+      validate_plugins(:nucleon, :project, name, value)
+    end
+  end
+  
+  #---
+    
+  def register_projects(name, default = nil)
+    name = name.to_sym
+    
+    register name, :array, default do |values|
+      validate_plugins(:nucleon, :project, name, values)
+    end
+  end
+  
+  #---
+    
+  def register_translator(name, default = nil)
+    name = name.to_sym
+    
+    register name, :str, default do |value|
+      validate_plugins(:nucleon, :translator, name, value)
+    end
+  end
+  
+  #---
+    
+  def register_translators(name, default = nil)
+    name = name.to_sym
+    
+    register name, :array, default do |values|
+      validate_plugins(:nucleon, :translator, name, values)
+    end
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Validators
+  
+  def validate_file(file_name)
+    file_name.nil? || File.exists?(file_name)  
+  end
+  
+  #---
+  
+  def validate_directory(dir_name)
+    dir_name.nil? || File.directory?(dir_name)
+  end
+end
+end
+end
+end
+

data/lib/core/mixin/sub_config.rb

@@ -58,22 +58,22 @@ module SubConfig
 
   #---
  
-  def _set(keys, value = '')
-    modify(@properties, array(keys).flatten, value)
+  def _set(keys, value = '', delete_nil = false)
+    modify(@properties, array(keys).flatten, value, delete_nil)
   end
   protected :_set
   
   #---
     
-  def set(keys, value = '')
+  def set(keys, value = '', delete_nil = false)
     init_subconfig
-    config.set(keys, value)
+    config.set(keys, value, delete_nil)
   end
   
   #---
  
   def _delete(keys, default = nil)
-    existing = modify(@properties, array(keys).flatten, nil)
+    existing = modify(@properties, array(keys).flatten, nil, true)
     return existing[:value] if existing[:value]
     return default 
   end

data/lib/core/plugin/action.rb

@@ -9,6 +9,10 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   # Info
   
   def self.describe(group = nil, action = 'unknown', weight = -1000, description = nil, help = nil)
+    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"
@@ -43,7 +47,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
       @name      = name
       @type      = type
       @default   = default
-      @locale    = locale.nil? ? "#{namespace}.actions.#{provider}.options.#{name}" : locale
+      @locale    = locale.nil? ? "#{namespace}.action.#{provider.to_s.gsub('_', '.')}.options.#{name}" : locale
       @validator = validator if validator
     end
     
@@ -76,7 +80,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
       action        = Nucleon.action(provider, options)
       exit_status   = action.execute
       action_result = action.result
-      
+            
     rescue => error
       logger.error("Nucleon action #{provider} experienced an error:")
       logger.error(error.inspect)
@@ -105,7 +109,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   
   def normalize(reload)
     args = array(delete(:args, []))
-       
+      
     @action_interface = Util::Liquid.new do |method, method_args|
       options = {}
       options = method_args[0] if method_args.length > 0
@@ -136,6 +140,12 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   #-----------------------------------------------------------------------------
   # Checks
   
+  def strict?
+    true # Override in providers if needed (allow extra options if false)
+  end
+  
+  #---
+  
   def processed?
     get(:processed, false)
   end
@@ -180,12 +190,12 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   
   #---
   
-  def register(name, type, default, locale = nil)
+  def register(name, type, default = nil, locale = nil, &code)
     name = name.to_sym
         
-    if block_given?
+    if code
       option = Option.new(namespace, plugin_provider, name, type, default, locale) do |value, success|
-        yield(value, success)
+        code.call(value, success)
       end
     else
       option = Option.new(namespace, plugin_provider, name, type, default, locale)
@@ -197,6 +207,28 @@ 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)
@@ -290,6 +322,8 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
     end
     
     @parser = Util::CLI::Parser.new(args, usage, "\n#{help_text}\n") do |parser|
+      parser.strict = strict?
+      
       parse(parser)      
       extension(:parse, { :parser => parser, :config => config })
     end
@@ -297,7 +331,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
     if @parser 
       if @parser.processed
         set(:processed, true)
-        settings.import(Util::Data.merge([ @parser.options, @parser.arguments ], true))
+        settings.import(Util::Data.merge([ @parser.extra, @parser.options, @parser.arguments ], true))
         logger.debug("Parse successful")
         
       elsif @parser.options[:help] && ! quiet?
@@ -316,11 +350,15 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   
   #---
   
+  def parse_types
+    [ :bool, :int, :float, :str, :array ]  
+  end
+  
   def parse(parser)
          
     generate = lambda do |format, name|
       formats = [ :option, :arg ]
-      types   = [ :bool, :int, :float, :str, :array ]
+      types   = parse_types
       name    = name.to_sym
           
       if config.export.has_key?(name) && formats.include?(format.to_sym)
@@ -414,7 +452,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
     
     if processed? && status != code.success
       logger.warn("Execution failed for #{plugin_provider} with status #{status}")
-      alert(Codes.render_index(status))
+      warn(Codes.render_index(status), { :i18n => false })
     end  
     
     status
@@ -447,6 +485,24 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
   #-----------------------------------------------------------------------------
   # 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 = []
       
@@ -523,7 +579,7 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
         action_id_pattern = action_id.gsub('::', ':.*:')
         
         action_index.each do |loaded_action_id, loaded_action_info|
-          if loaded_action_id.match(/#{action_id_pattern}/)
+          if loaded_action_id.match(/(^|\:)#{action_id_pattern.gsub(/\-/, '\-')}(\:|$)/)
             loaded_action_info[:action_id] = loaded_action_id
             actions_found << loaded_action_info
           end