loquacious 1.4.2 → 1.5.0

data/History.txt

@@ -1,3 +1,10 @@
+== 1.5.0 / 2010-03-11
+
+* 2 minor enhancements
+  * Adding support for evaluation of Proc objects
+  * Upgrading to the latest Mr Bones
+
+
 == 1.4.2 / 2010-02-01
 
 * 1 bug fix

data/README.rdoc

@@ -212,7 +212,7 @@ they can appear above the attribute and value on their own line.
 
 (The MIT License)
 
-Copyright (c) 2009
+Copyright (c) 2009-2010
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -5,9 +5,6 @@ rescue LoadError
   abort '### please install the "bones" gem ###'
 end
 
-ensure_in_path 'lib'
-require 'loquacious'
-
 task :default => 'spec:specdoc'
 task 'gem:release' => 'spec:run'
 
@@ -16,7 +13,6 @@ Bones {
   authors      'Tim Pease'
   email        'tim.pease@gmail.com'
   url          'http://gemcutter.org/gems/loquacious'
-  version      Loquacious::VERSION
   readme_file  'README.rdoc'
   ignore_file  '.gitignore'
   spec.opts << '--color'
@@ -31,6 +27,6 @@ task 'ann:prereqs' do
 end
 
 # depending on bones (even as a development dependency) creates a circular
-# reference that prevents the auto install of little-plugger when instsalling
+# reference that prevents the auto install of loquacious when instsalling
 # bones
 ::Bones.config.gem._spec.dependencies.delete_if {|d| d.name == 'bones'}

data/lib/loquacious.rb

@@ -2,7 +2,6 @@
 module Loquacious
 
   # :stopdoc:
-  VERSION = '1.4.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -35,36 +34,40 @@ module Loquacious
     # Returns the version string for the library.
     #
     def version
-      VERSION
+      @version ||= File.read(path('version.txt')).strip
     end
 
     # Returns the library path for the module. If any arguments are given,
     # they will be joined to the end of the libray path using
     # <tt>File.join</tt>.
     #
-    def libpath( *args )
-      args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+    def libpath( *args, &block )
+      rv =  args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+      if block
+        begin
+          $LOAD_PATH.unshift LIBPATH
+          rv = block.call
+        ensure
+          $LOAD_PATH.shift
+        end
+      end
+      return rv
     end
 
     # Returns the lpath for the module. If any arguments are given, they
     # will be joined to the end of the path using <tt>File.join</tt>.
     #
-    def path( *args )
-      args.empty? ? PATH : ::File.join(PATH, args.flatten)
-    end
-
-    # Utility method used to require all files ending in .rb that lie in the
-    # directory below this file that has the same name as the filename
-    # passed in. Optionally, a specific _directory_ name can be passed in
-    # such that the _filename_ does not have to be equivalent to the
-    # directory.
-    #
-    def require_all_libs_relative_to( fname, dir = nil )
-      dir ||= ::File.basename(fname, '.*')
-      search_me = ::File.expand_path(
-          ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-      Dir.glob(search_me).sort.each {|rb| require rb}
+    def path( *args, &block )
+      rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
+      if block
+        begin
+          $LOAD_PATH.unshift PATH
+          rv = block.call
+        ensure
+          $LOAD_PATH.shift
+        end
+      end
+      return rv
     end
 
     # This is merely a convenience method to remove methods from the
@@ -91,6 +94,11 @@ module Loquacious
   end  # class << self
 end  # module Loquacious
 
-Loquacious.require_all_libs_relative_to(__FILE__)
+Loquacious.libpath {
+  require 'loquacious/core_ext/string'
+  require 'loquacious/configuration'
+  require 'loquacious/configuration/iterator'
+  require 'loquacious/configuration/help'
+}
 
 # EOF

data/lib/loquacious/configuration.rb

@@ -86,18 +86,22 @@ module Loquacious
       __eigenclass_eval "attr_writer :#{m}"
       __eigenclass_eval <<-CODE
         def #{m}( *args, &block )
+          if args.empty? and !block
+            return @#{m} if @#{m}.kind_of?(Configuration)
+            return @#{m}.respond_to?(:call) ? @#{m}.call : @#{m}
+          end
+
           v = (1 == args.length ? args.first : args)
-          v = nil if args.empty?
           v = DSL.evaluate(&block) if block
 
-          return @#{m} unless v or v == false
-
           if @#{m}.kind_of?(Configuration)
             @#{m}.merge! v
           else
             @#{m} = v
           end
-          return @#{m}
+
+          return @#{m} if @#{m}.kind_of?(Configuration)
+          return @#{m}.respond_to?(:call) ? @#{m}.call : @#{m}
         end
       CODE
 

data/spec/configuration_spec.rb

@@ -88,6 +88,28 @@ describe Loquacious::Configuration do
     cfg[:split].should == 'join'
     cfg[:raise].should == 'double down'
     cfg[:puts].should == 'not what you think'
+
+    cfg.fork.should == 'spoon knife spork'
+    cfg.split.should == 'join'
+    cfg.raise.should == 'double down'
+    cfg.puts.should == 'not what you think'
+  end
+
+  it 'should evaluate Proc objects when fetching values' do
+    obj = Loquacious::Configuration.new  {
+            first    'foo'
+            second   'bar'
+          }
+
+    obj.third = Proc.new { obj.first + obj.second }
+    obj.third.should == 'foobar'
+
+    obj.second = 'baz'
+    obj.third.should == 'foobaz'
+
+    obj.first = 'Hello '
+    obj.second = 'World!'
+    obj.third.should == 'Hello World!'
   end
 
   # -----------------------------------------------------------------------

data/spec/loquacious_spec.rb

@@ -12,11 +12,11 @@ describe Loquacious do
 
   it "finds things releative to 'lib'" do
     Loquacious.libpath(%w[loquacious config.rb]).should == File.join(@root_dir, %w[lib loquacious config.rb])
-  end 
-    
+  end
+
   it "finds things releative to 'root'" do
     Loquacious.path('Rakefile').should == File.join(@root_dir, 'Rakefile')
-  end 
+  end
 end
 
 # EOF

data/version.txt

@@ -0,0 +1 @@
+1.5.0

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: loquacious
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -07:00
+date: 2010-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id001
 description: |-
   Descriptive configuration files for Ruby written in Ruby.
   
@@ -74,8 +83,8 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - README.rdoc
+- version.txt
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -94,6 +103,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/string_spec.rb
+- version.txt
 has_rdoc: true
 homepage: http://gemcutter.org/gems/loquacious
 licenses: []
@@ -108,18 +118,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Descriptive configuration files for Ruby written in Ruby

data/.gitignore

@@ -1,16 +0,0 @@
-# The list of files that should be ignored by Mr Bones.
-# Lines that start with '#' are comments.
-#
-# A .gitignore file can be used instead by setting it as the ignore
-# file in your Rakefile:
-#
-#   PROJ.ignore_file = '.gitignore'
-#
-# For a project with a C extension, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-announcement.txt
-coverage
-doc
-pkg