ruby-conf 2.5.3 → 2.6.0

data/VERSION

@@ -1 +1 @@
-2.5.3
+2.6.0

data/lib/ruby-conf.rb

@@ -7,6 +7,10 @@ require 'digest/md5'
 
 module RubyConf
 
+  def self.puts(logger = $stdout, *obj) logger.puts(*obj) if logger.respond_to?(:puts) end
+  def self.err(*objs) self.puts($stderr, *objs) end
+  def self.out(*objs) self.puts($stdout, *objs) end
+
   class Loader < BasicObject
     EXTENTIONS = %w{rbc rbcnf rbconf rbconfig rubyconf rubyconfig ruby-conf ruby-config}
 
@@ -21,12 +25,12 @@ module RubyConf
         __rc_set_conf
         if load(path) && @@conf
           @@path, @@mtime, @@md5 = path, File.mtime(path).to_i, Digest::MD5.hexdigest(File.read(path))
-          puts "[ruby-conf] Auto-Loaded config at path: #{path}"
+          RubyConf.out "[ruby-conf] Auto-Loaded config at path: #{path}"
         end
       end
       def method_missing(name, *args, &block)
         if @@mtime && @@mtime != File.mtime(@@path).to_i && @@md5 != Digest::MD5.hexdigest(File.read(@@path))
-          puts "[ruby-conf] Detected change in config file, reloading..."
+          RubyConf.err "[ruby-conf] Detected change in config file, reloading..."
           __rc_load(@@path)
         end
 
@@ -41,6 +45,7 @@ module RubyConf
         @@conf.__send__(name, *args, &block)
       end
       def to_s() @@conf.to_s end
+      def to_str() @@conf.to_str end
       def inspect() @@conf.inspect end
     end
   end
@@ -175,18 +180,38 @@ module RubyConf
       str += "[#{@__rc_name || "CONFIG"}]\n" unless @__rc_parent
       str += "\n"
       @__rc_attributes.keys.map{|k| k.to_s }.sort.each do |key|
-        value = self[key]
+        value = begin
+          self[key]
+        rescue => e
+          "[UNRESOLVED]"
+        end
+
         str += "  " * depth
         str += "#{key}:"
         str += value.is_a?(Config) ? value.__rc_build_string(depth+1) : " #{value}\n"
-        str += "\n" unless depth > 0
+#        str += "\n" unless depth > 0
       end
       str
     end
+    def __rc_build_inspect()
+      istr = ""
+      istr += "[#{@__rc_name || "CONFIG"}] " unless @__rc_parent
+      istr += @__rc_attributes.keys.map{|k| k.to_s }.sort.map{ |key|
+        str = ""
+        value = begin
+          self[key]
+        rescue => e
+          "[UNRESOLVED:#{e}]"
+        end
+        str += "#{key}: "
+        str += value.is_a?(Config) ? "{ #{value.__rc_build_inspect} }" : value.inspect
+        str
+      }.join(", ")
+      istr
+    end
+
     def to_s() __rc_build_string end
     def to_str() to_s end
-
-    def __rc_build_inspect() "#{"[#{@__rc_name || "CONFIG"}] " unless @__rc_parent}#{@__rc_attributes.keys.map {|k| k.to_s }.sort.map { |key| "#{key}: #{self[key].is_a?(Config) ? "{ #{self[key].__rc_build_inspect} }" : self[key].inspect}" }.join(", ")}" end
     def inspect() __rc_build_inspect end
   end
 
@@ -197,6 +222,10 @@ module RubyConf
       @@__rc_configs.clear
     end
 
+    def to_s() @@__rc_configs.to_s end
+    def to_str() @@__rc_configs.to_str end
+    def inspect() @@__rc_configs.inspect end
+
     def [](name) @@__rc_configs[name.to_sym] end
     def method_missing(name, *args) @@__rc_configs[name.to_sym] end
     def respond_to?(name) @@__rc_configs.key?(name.to_sym) end

data/ruby-conf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-conf"
-  s.version = "2.5.3"
+  s.version = "2.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Curtis Schofield & Hollin Wilkins & Mason"]
-  s.date = "2013-01-14"
+  s.date = "2013-01-15"
   s.description = "rubyconf is a ruby configuration dsl that aims to make it simple to write and read configurations for ruby apps without a yaml or xml file"
   s.email = "blazingpair@blazingcloud.net"
   s.extra_rdoc_files = [

data/spec/lib/ruby-conf_spec.rb

@@ -34,7 +34,15 @@ describe RubyConf do
         multi_var_args ->(one,*two,three) { "multivar|#{one.inspect}|#{two.inspect}|#{three.inspect}" }
       end
 
-      LambdaToString.to_s.should == "[LambdaToString]\n\nmulti_args: multi|nil|nil\n\nmulti_var_args: multivar|nil|[nil]|nil\n\nno_args: none\n\none_arg: one|nil\n\nvar_args: var|[nil]\n\n"
+      LambdaToString.to_s.should == <<-TOS
+[LambdaToString]
+
+multi_args: multi|nil|nil
+multi_var_args: multivar|nil|[nil]|nil
+no_args: none
+one_arg: one|nil
+var_args: var|[nil]
+      TOS
     end
   end
 
@@ -98,6 +106,29 @@ describe RubyConf do
   end
 
   describe ".to_s" do
+
+    it "does it's best to print procs but will fail gracefully" do
+      RubyConf.define :ProcStrings do
+        valid ->{ "valid return" }
+        valid_args ->(a, b, c){ "all empty > a:#{a} b:#{b} c:#{c}" }
+        broken ->{ raise "oops" }
+        broken_args ->(a, b, c){ raise "oops: a:#{a} b:#{b} c:#{c}" }
+      end
+
+      tos = <<-STR
+[ProcStrings]
+
+broken: [UNRESOLVED]
+broken_args: [UNRESOLVED]
+valid: valid return
+valid_args: all empty > a: b: c:
+      STR
+
+      ProcStrings.to_s.should == tos
+      ProcStrings.to_str.should == tos
+      ProcStrings.inspect.should == '[ProcStrings] broken: "[UNRESOLVED:oops]", broken_args: "[UNRESOLVED:oops: a: b: c:]", valid: "valid return", valid_args: "all empty > a: b: c:"'
+    end
+
     it "prints out the config in a human readable way" do
       RubyConf.define("some shapes", :as => :Shapes) {
         defaults { position { px 10; py 20 }; size { width 100; height 200 }; rotation lambda { '90 degrees' } }
@@ -127,14 +158,12 @@ circle:
   size:
     height: 200
     width: 100
-
 dafuq:
   holy: fuck this is some god damn evil fucking black sorcery
   how: the hell did he make this happen
   mason: is some kind of sorcerer
   srsly: dude
   this: is freaking me out man
-
 defaults:
   position:
     px: 10
@@ -143,11 +172,9 @@ defaults:
   size:
     height: 200
     width: 100
-
 other:
   color: blue like the color of the sea before a storm
   sides: 4
-
 polygon:
   details:
     actual_sides: 100
@@ -155,7 +182,6 @@ polygon:
       seems: like a lot of damn sides
     named: somename
   sides: many
-
 square:
   named: rectangle
   position:
@@ -165,7 +191,6 @@ square:
   size:
     height: 200
     width: 50
-
 triangle:
   named: rectangle
   position:
@@ -175,7 +200,6 @@ triangle:
   size:
     height: 200
     width: 5
-
 TEXT
     end
 
@@ -383,6 +407,10 @@ TEXT
     end
 
     it "will autoload the first ruby-conf that it can find if none is provided" do
+      module RubyConf
+        def self.puts(*args) end
+      end
+
       dir = Dir["./**/test_conf.rb.tmpl"].first[/^(.*?)\/test_conf.rb.tmpl$/, 1]
 
       val = Random.rand.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-conf
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 540271139098183150
+      hash: 2745882013736486446
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: