coral_core 0.2.24 → 0.2.25

data/VERSION

@@ -1 +1 @@
-0.2.24
+0.2.25

data/coral_core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coral_core"
-  s.version = "0.2.24"
+  s.version = "0.2.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2013-05-20"
+  s.date = "2013-05-22"
   s.description = "= coral_core\n\nThis library provides core data elements and utilities used in other Coral gems.\n\nThe Coral core library contains functionality that is utilized by other\nCoral gems by providing basic utilities like Git, Shell, Disk, and Data\nmanipulation libraries, a UI system, and a core data model that supports\nEvents, Commands, Repositories, and Memory (version controlled JSON \nobjects).  This library is only used as a starting point for other systems.\n\nNote:  This library is still very early in development!\n\n== Contributing to coral_core\n \n* Check out the latest {major}.{minor} branch to make sure the feature hasn't \n  been implemented or the bug hasn't been fixed yet.\n* Check out the issue tracker to make sure someone already hasn't requested \n  it and/or contributed it.\n* Fork the project.\n* Start a feature/bugfix branch.\n* Commit and push until you are happy with your contribution.\n* Make sure to add tests for it. This is important so I don't break it in a \n  future version unintentionally.\n* Please try not to mess with the Rakefile, version, or history. If you want \n  to have your own version, or is otherwise necessary, that is fine, but \n  please isolate to its own commit so I can cherry-pick around it.\n\n== Copyright\n\nLicensed under GPLv3.  See LICENSE.txt for further details.\n\nCopyright (c) 2013  Adrian Webb <adrian.webb@coraltech.net>\nCoral Technology Group LLC"
   s.email = "adrian.webb@coraltech.net"
   s.extra_rdoc_files = [

data/lib/coral_core/config.rb

@@ -74,8 +74,10 @@ class Config
     unless Util::Data.empty?(log_options['config_log'])
       config_log = log_options['config_log']
       
-      Util::Disk.write(config_log, JSON.pretty_generate(@@properties))
-      Util::Disk.close(config_log)
+      if log_options['config_store']
+        Util::Disk.write(config_log, JSON.pretty_generate(@@properties))
+        Util::Disk.close(config_log)
+      end
     end
   end
   
@@ -158,17 +160,19 @@ class Config
     prefix      = config.get(:prefix, true)    
     prefix_text = prefix ? sep : ''
     
+    debug       = config.get(:debug, false)
+    
     search_name    = config.get(:search_name, true)
     reverse_lookup = config.get(:reverse_lookup, true)
     
-    #dbg(default, "lookup -> #{name}")
+    dbg(default, "lookup -> #{name}") if debug
     
     if Config.initialized?(options)
       unless scope.respond_to?("[]")
         scope = Hiera::Scope.new(scope)
       end
-      value = hiera.lookup(name, default, scope, override, context)
-      #dbg(value, "hiera -> #{name}")
+      value = hiera.lookup(name, nil, scope, override, context)
+      dbg(value, "hiera lookup -> #{name}") if debug
     end 
     
     if Util::Data.undef?(value) && ( scope.respond_to?("[]") || scope.respond_to?("lookupvar") )
@@ -181,14 +185,14 @@ class Config
         end
         base_names = base_names.reverse if reverse_lookup
         
-        #bg(base_names, 'search path')        
+        dbg(base_names, 'lookup search path') if debug        
         base_names.each do |item|
           if scope.respond_to?("lookupvar")
             value = scope.lookupvar("#{prefix_text}#{item}#{sep}#{name}")  
           else
             value = scope["#{prefix_text}#{item}#{sep}#{name}"]
           end
-          #dbg(value, "#{prefix_text}#{item}#{sep}#{name}")
+          dbg(value, "scope lookup #{prefix_text}#{item}#{sep}#{name}") if debug
           break unless Util::Data.undef?(value)  
         end
       end
@@ -198,7 +202,7 @@ class Config
         else
           value = scope["#{prefix_text}#{name}"]
         end
-        #dbg(value, "#{prefix_text}#{name}")
+        dbg(value, "scope lookup #{prefix_text}#{name}") if debug
       end
       Puppet::Util::Log.level = log_level
     end    
@@ -209,7 +213,7 @@ class Config
       set_property(name, value)
     end
     
-    #dbg(value, "result -> #{name}")    
+    dbg(value, "lookup result -> #{name}") if debug    
     return value  
   end
   
@@ -219,6 +223,8 @@ class Config
     config  = Config.ensure(options)
     results = {}
     
+    debug   = config.get(:debug, false)
+    
     unless Util::Data.undef?(override)
       case data
       when String, Symbol
@@ -230,6 +236,9 @@ class Config
       end
     end
     
+    dbg(data, 'config normalize data') if debug
+    dbg(override, 'config normalize override') if debug
+    
     case data
     when String, Symbol
       results = Config.lookup(data.to_s, {}, config)
@@ -248,6 +257,8 @@ class Config
       results = data
     end
     
+    dbg(results, 'config normalize results') if debug
+    
     return results
   end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coral_core
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 2
-  - 24
-  version: 0.2.24
+  - 25
+  version: 0.2.25
 platform: ruby
 authors: 
 - Adrian Webb
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-20 00:00:00 Z
+date: 2013-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log4r