nucleon 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/core/config/collection.rb

@@ -40,15 +40,13 @@ class Collection
   
   #---
   
-  def self.save
-    log_options = Options.get(:nucleon_log)
-    
-    unless Util::Data.empty?(log_options[:config_log])
-      config_log = log_options[:config_log]
+  def self.save(options = {})
+    unless Util::Data.empty?(options[:log_dir])
+      log_dir = options[:log_dir]
       
-      if log_options[:config_store]
-        Util::Disk.write(config_log, MultiJson.dump(@@properties, :pretty => true))
-        Util::Disk.close(config_log)
+      if options[:config_store]
+        Util::Disk.write(File.join(log_dir, "common.json"), Util::Data.to_json(@@properties, true))
+        Util::Disk.write(File.join(log_dir, "common.yaml"), Util::Data.to_yaml(Util::Data.string_map(@@properties)))
       end
     end
   end

data/lib/core/config/options.rb

@@ -27,6 +27,12 @@ class Options
   
   #---
   
+  def self.all
+    @@options
+  end
+  
+  #---
+  
   def self.get(contexts, force = true)
     options = {}
     

data/lib/core/facade.rb

@@ -447,6 +447,13 @@ module Facade
       $stderr.reopen orig_stderr
     end
     result
+  end
+  
+  #---
+  
+  def render_object(data)
+    require 'pp'
+    PP.pp(data, "").strip
   end  
 end
 end

data/lib/core/mixin/config/collection.rb

@@ -12,41 +12,37 @@ module ConfigCollection
   # Configuration collection interface
   
   def all_properties
-    return Config::Collection.all
+    Config::Collection.all
   end
   
   #---
   
   def get_property(name)
-    return Config::Collection.get(name)
+    Config::Collection.get(name)
   end
   
   #---
   
   def set_property(name, value)
     Config::Collection.set(name, value)
-    return self  
   end
   
   #---
   
   def delete_property(name)
     Config::Collection.delete(name)
-    return self
   end
   
   #---
   
   def clear_properties
     Config::Collection.clear
-    return self  
   end
   
   #---
   
-  def save_properties
-    Config::Collection.save
-    return self
+  def save_properties(options = {})
+    Config::Collection.save(options)
   end
 end
 end

data/lib/core/mixin/config/options.rb

@@ -12,27 +12,31 @@ module ConfigOptions
   # Configuration options interface
   
   def contexts(contexts = [], hierarchy = [])
-    return Config::Options.contexts(contexts, hierarchy)  
+    Config::Options.contexts(contexts, hierarchy)  
+  end
+  
+  #---
+  
+  def all_options
+    Config::Options.all
   end
   
   #---
   
   def get_options(contexts, force = true)
-    return Config::Options.get(contexts, force)  
+    Config::Options.get(contexts, force)  
   end
   
   #---
   
   def set_options(contexts, options, force = true)
     Config::Options.set(contexts, options, force)
-    return self  
   end
   
   #---
   
   def clear_options(contexts)
     Config::Options.clear(contexts)
-    return self  
   end
 end
 end

data/lib/core/util/console.rb

@@ -3,22 +3,34 @@ module Nucleon
 module Util
 class Console
   
+  # Flush output immediately.
+  $stderr.sync = true
+  $stdout.sync = true
+  
+  #---
+  
   @@console_lock = Mutex.new
   @@quiet        = false
+  @@use_colors   = true
   
   #---
 
-  COLORS = {
+  @@colors = {
     :clear  => "\e[0m",
+    :black  => "\e[30m",
     :red    => "\e[31m",
     :green  => "\e[32m",
-    :yellow => "\e[33m"
+    :yellow => "\e[33m",
+    :blue   => "\e[34m",
+    :purple => "\e[35m",
+    :cyan   => "\e[36m",
+    :grey   => "\e[37m"
   }
 
-  COLOR_MAP = {
-    :warn    => COLORS[:yellow],
-    :error   => COLORS[:red],
-    :success => COLORS[:green]
+  @@color_map = {
+    :warn    => @@colors[:yellow],
+    :error   => @@colors[:red],
+    :success => @@colors[:green]
   }
 
   #-----------------------------------------------------------------------------
@@ -55,10 +67,24 @@ class Console
   
   #---
   
+  def self.quiet
+    @@quiet
+  end
+  
   def self.quiet=quiet
     @@quiet = quiet
   end
   
+  #---
+  
+  def self.use_colors
+    @@use_colors  
+  end
+  
+  def self.use_colors=use_colors
+    @@use_colors = use_colors
+  end
+  
   #-----------------------------------------------------------------------------
   # UI functionality
 
@@ -198,12 +224,12 @@ class Console
     end
     message = "#{prefix} #{message}".lstrip.gsub(/\n+$/, '')
     
-    if @color
+    if @@use_colors && @color
       if options.has_key?(:color)
-        color = COLORS[options[:color]]
-        message = "#{color}#{message}#{COLORS[:clear]}"
+        color = @@colors[options[:color]]
+        message = "#{color}#{message}#{@@colors[:clear]}"
       else
-        message = "#{COLOR_MAP[type]}#{message}#{COLORS[:clear]}" if COLOR_MAP[type]
+        message = "#{@@color_map[type]}#{message}#{@@colors[:clear]}" if @@color_map[type]
       end
     end
     return message
@@ -232,6 +258,63 @@ class Console
   def check_delegate(method)
     return ( @delegate && @delegate.respond_to?(method.to_s) )
   end
+  
+  #-----------------------------------------------------------------------------
+  # Color translation
+  
+  def self.black(string)
+    return string unless @@use_colors
+    "#{@@colors[:black]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+  
+  def self.red(string)
+    return string unless @@use_colors
+    "#{@@colors[:red]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+  
+  def self.green(string)
+    return string unless @@use_colors
+    "#{@@colors[:green]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+    
+  def self.yellow(string)
+    return string unless @@use_colors
+    "#{@@colors[:yellow]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+    
+  def self.blue(string)
+    return string unless @@use_colors
+    "#{@@colors[:blue]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+    
+  def self.purple(string)
+    return string unless @@use_colors
+    "#{@@colors[:purple]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+    
+  def self.cyan(string)
+    return string unless @@use_colors
+    "#{@@colors[:cyan]}#{string}#{@@colors[:clear]}"  
+  end
+  
+  #---
+    
+  def self.grey(string)
+    return string unless @@use_colors
+    "#{@@colors[:grey]}#{string}#{@@colors[:clear]}"  
+  end
 end
 end
 end

data/lib/core/util/data.rb

@@ -126,11 +126,11 @@ class Data
   
   #---
   
-  def self.value(value)
+  def self.value(value, undefined_value = nil)
     case value
     when String
       if undef?(value)
-        value = nil
+        value = undefined_value
       elsif true?(value)
         value = true
       elsif false?(value)
@@ -139,12 +139,12 @@ class Data
     
     when Array
       value.each_with_index do |item, index|
-        value[index] = value(item)
+        value[index] = value(item, undefined_value)
       end
     
     when Hash
       value.each do |key, data|
-        value[key] = value(data)
+        value[key] = value(data, undefined_value)
       end
     end
     return value  
@@ -244,6 +244,22 @@ class Data
   
   #---
   
+  def self.deep_clean(data, remove_empty = true)
+    data.keys.each do |key|
+      obj = data[key]
+        
+      if obj.nil? || ( remove_empty && obj.is_a?(Hash) && obj.empty? )
+        data.delete(key)
+          
+      elsif data[key].is_a?(Hash)
+        deep_clean(data[key], remove_empty)
+      end
+    end
+    data
+  end
+  
+  #---
+  
   def self.merge(data, force = true)
     value = data
     

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-16"
+  s.date = "2014-03-19"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &21624320 !ruby/object:Gem::Requirement
+  requirement: &6185280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *21624320
+  version_requirements: *6185280
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &21623400 !ruby/object:Gem::Requirement
+  requirement: &6184240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *21623400
+  version_requirements: *6184240
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &21180980 !ruby/object:Gem::Requirement
+  requirement: &6183160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *21180980
+  version_requirements: *6183160
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &20893780 !ruby/object:Gem::Requirement
+  requirement: &6182300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20893780
+  version_requirements: *6182300
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &20891780 !ruby/object:Gem::Requirement
+  requirement: &6177800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *20891780
+  version_requirements: *6177800
 - !ruby/object:Gem::Dependency
   name: sshkey
-  requirement: &20890120 !ruby/object:Gem::Requirement
+  requirement: &6176180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *20890120
+  version_requirements: *6176180
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &20875100 !ruby/object:Gem::Requirement
+  requirement: &6174600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *20875100
+  version_requirements: *6174600
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &20868900 !ruby/object:Gem::Requirement
+  requirement: &6173300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *20868900
+  version_requirements: *6173300
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &20863720 !ruby/object:Gem::Requirement
+  requirement: &6171960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *20863720
+  version_requirements: *6171960
 - !ruby/object:Gem::Dependency
   name: octokit
-  requirement: &20862300 !ruby/object:Gem::Requirement
+  requirement: &6123040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *20862300
+  version_requirements: *6123040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20860560 !ruby/object:Gem::Requirement
+  requirement: &6121580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *20860560
+  version_requirements: *6121580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20859660 !ruby/object:Gem::Requirement
+  requirement: &6120220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *20859660
+  version_requirements: *6120220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20858540 !ruby/object:Gem::Requirement
+  requirement: &6119220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *20858540
+  version_requirements: *6119220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20853600 !ruby/object:Gem::Requirement
+  requirement: &6117760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *20853600
+  version_requirements: *6117760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &20851920 !ruby/object:Gem::Requirement
+  requirement: &6113400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *20851920
+  version_requirements: *6113400
 description: ! '
 
   A framework that provides a simple foundation for building Ruby applications that