confection 0.0.2 → 0.1.0

data/.ruby

@@ -28,7 +28,7 @@ repositories:
   name: upstream
 resources:
   home: http://rubyworks.github.com/confection
-  docs: http://rubydoc.info/gems/confection
+  docs: http://rubydoc.info/gems/confection/frames
   code: http://github.com/rubyworks/confection
   mail: http://groups.google.com/group/rubyworks-mailinglist
 extra: {}
@@ -38,8 +38,8 @@ revision: 0
 created: '2011-11-06'
 summary: Multi-tenant configuration for Ruby
 title: Confection
-version: 0.0.2
+version: 0.1.0
 name: confection
 description: Confection is a multi-tenant configuration system for Ruby projects.
 organization: Rubyworks
-date: '2011-11-07'
+date: '2011-11-17'

data/HISTORY.rdoc

@@ -1,6 +1,23 @@
 = RELEASE HISTORY
 
-== 0.0.2 / 2011-11-07
+== 0.1.0 | 2011-11-17
+
+This major release, probably the first truly usable release,
+adds support for multiple configration files by storing them
+on a per working directory basis, renames the default config
+file name to `.confile` or `confile` with or without an optional
+`.rb` extension, and adds a class method for changing the file
+name (though using the global variable still works if needed).
+
+Changes:
+
+* Configuration file default is '{.,}confile{.rb,}'.
+* Default can be changed via class method or global.
+* Configrations are stored per-working directory, to
+  support multiple configurations at once.
+
+
+== 0.0.2 | 2011-11-07
 
 You can now use $CONFIG_FILE to change the default config file.
 Just set the variable prior to using confection. Confection
@@ -13,7 +30,7 @@ Changes:
 * Add $CONFIG_FILE to allow default config file to be adjusted.
 
 
-== 0.0.1 / 2011-11-06
+== 0.0.1 | 2011-11-06
 
 This is the initial release of Confection.
 

data/README.rdoc

@@ -2,6 +2,7 @@
 
 {Homepage}[http://rubyworks.github.com/confection] |
 {Source Code}[http://github.com/rubyworks/confection] |
+{Report Issue}[http://github.com/rubyworks/confection/issues] |
 {Mailing List}[http://googlegroups.com/group/rubyworks-mailinglist]
 
 {<img src="http://travis-ci.org/rubyworks/confection.png" />}[http://travis-ci.org/rubyworks/confection]
@@ -10,17 +11,19 @@
 == Description
 
 Confection is multi-tenant configuration system for Ruby projects. If was 
-designed to faciliate Ruby-based configuration for multiple tools in a
-single file. If is extremely simple, which makes it easy to understand
+designed to facilitate Ruby-based configuration for multiple tools in a
+single file. It is extremely simple, which makes it easy to understand
 and flexible in use.
 
 
 == Synopsis
 
-Create a file in you project called `config.rb`. In it, add configuration blocks
-by name. As an example let's demonstrate how we could use this for Rake tasks.
+Create a file in you project called `Confile`. By default the file can have any
+name tha matches the glob `{.,}confile{.rb,}` case insensitive. In this file
+add configuration blocks by name. For example, let's demonstrate how we could
+use this to configure Rake tasks.
 
-  $ cat config.rb
+  $ cat Confile
   rake do
     desc 'generate yard docs'
     task :yard do
@@ -34,11 +37,11 @@ In our Rakefile:
   require 'confection'
   confection(:rake).call
 
-Now you might wonder why the heck you would do this. That's where the
- *multi-tenancy* comes into play. Let's add another configuration. This time
-for a tool that has native support for Confection.
+Now you might wonder why the heck you would do this. That's where the *multi-tenancy*
+comes into play. Let's add another configuration, and this time for a tool that has
+native support for Confection.
 
-  $ cat config.rb
+  $ cat Confile
   title = "myapp"
 
   rake do
@@ -54,12 +57,12 @@ for a tool that has native support for Confection.
 
 Now we have configuration for both the rake tool and the qed test tool in
 a single file. Thus we gain the advantage of reducing the file count of our 
-project while pulling our project configuration together into one place.
+project while pulling our tool configurations together into one place.
 Moreover, these configurations can potentially share settings as demonstrated
-here via the `TITLE` constant.
+here via the `title` variable.
 
-Using Confection in your libraries is very simele. As you can see from our
-example Rakefile the #confection method is used to get a handle on a name
+Using Confection in your libraries is very simple. As you can see from our
+example Rakefile. The `#confection` method is used to get a handle on a named
 configuration. With it you have two options, `#call` or `#exec`. The first
 evaluates the configuration block at the toplevel, while the later evaluates
 the block in the context of the caller.
@@ -74,7 +77,7 @@ Please see HISTORY.rdoc file.
 
 Copyright (c) 2011 Rubyworks
 
-Confection is distributable in accordance with the terms of the BSD-2-Clause license.
+Confection is distributable in accordance with the terms of the *BSD-2-Clause* license.
 
-See COPYING.rdoc for detiails.
+See COPYING.rdoc for details.
 

data/lib/confection.rb

@@ -5,30 +5,45 @@ require 'confection/basic_object'
 module Confection
 
   #
-  if $CONFIG_FILE
-    FILENAMES = [$CONFIG_FILE].flatten.compact
-  else
-    FILENAMES = ['.config.rb', 'config.rb']
+  @config = Hash.new{|h,k| h[k]={}}
+
+  #
+  def self.filename
+    @filename ||= (
+      $CONFIG_FILE ? $CONFIG_FILE : '{.,}confile{.rb,}'
+    )
+  end
+
+  # Configuration file can be changed using this method.
+  # Alternatively it can be changed using `$CONFIG_FILE`.
+  def self.filename=(glob)
+    @filename = glob
   end
 
   # Bootstrap the system, loading current configurations.
   #
   def self.bootstrap
-    @config = {}
-    begin
-      ::Kernel.eval(read, Evaluator.binding, file)
-    rescue => e
-      raise e if $DEBUG
-      abort e.message
+    if file
+      @config[Dir.pwd] = {}
+      begin
+        ::Kernel.eval(read, Evaluator.binding, file)
+      rescue => e
+        raise e if $DEBUG
+        warn e.message
+      end
     end
-    @config
+    @config[Dir.pwd]
   end
 
   # Stores the configuration blocks.
   #
   # @return [Hash] configuration store
   def self.config
-    @config ||= bootstrap
+    if @config.key?(Dir.pwd)
+      @config[Dir.pwd]
+    else
+      bootstrap
+    end
   end
 
   # Look-up configuration block.
@@ -55,30 +70,26 @@ module Confection
 
   # Read config file.
   #
-  # @return [String] contents of the `.co.rb` file
+  # @return [String] contents of the `.conf.rb` file
   def self.read
     File.read(file)
   end
 
-  # Find config file by looking up the '.co.rb' file.
+  # Find config file by looking up the '.conf.rb' file.
   #
   # @param dir [String]
   #   Optional directory to begin search.
   #
   # @return [String] file path
   def self.file(dir=nil)
-    @file ||= (
-      file = nil
-      dir  = dir || Dir.pwd
-      while dir != '/'
-        FILENAMES.each do |fname|
-          f = File.join(dir, fname)
-          break(file = f) if File.exist?(f)
-        end
-        dir = File.dirname(dir)
+    dir  = dir || Dir.pwd
+    while dir != '/'
+      if file = Dir.glob(File.join(dir,filename),File::FNM_CASEFOLD).first
+        return file
       end
-      file
-    )
+      dir = File.dirname(dir)
+    end
+    nil
   end
 
   # Root directory, where config file is located.
@@ -99,7 +110,7 @@ module Confection
       new.__binding__
     end
     def __binding__ 
-      ::Kernel.binding
+      binding
     end
     def method_missing(sym, *args, &block)
       #def block.call
@@ -113,18 +124,26 @@ module Confection
   # that are posible on configuration blocks.
   #
   class Controller
-    def initialize(block, &exec_block)
-      @block      = block
-      @exec_block = exec_block
+    def initialize(scope, &block)
+      @scope = scope
+      @block = block
     end
-    def exec(*args)
-      @exec_block.call(*args)
+    def exec(*args)  # should this be named #call instead?
+      @scope.instance_exec(*args, &@block)
     end
     def call(*args)
       ::Kernel.eval('self',::TOPLEVEL_BINDING).instance_exec(*args, &@block)
     end
+    def to_proc
+      @block
+    end
   end
 
+  class NullController
+    def exec(*); end
+    def call(*); end
+    def to_proc; Proc.new{}; end
+  end
 end
 
 # Confection's primary use method.
@@ -133,11 +152,10 @@ end
 def confection(name, *args)
   config_block = Confection[name.to_sym]
   if config_block
-    Confection::Controller.new(config_block) do |*args|
-      instance_exec *args, &config_block
-    end
+    Confection::Controller.new(self, &config_block)
   else
-    warn "no configuration -- `#{name}'"
+    #warn "no configuration -- `#{name}'"
+    Confection::NullController.new
   end
 end
 

data/lib/confection/basic_object.rb

@@ -1,5 +1,5 @@
-if !defined?(BasicObject)
+unless Object.const_defined?(:BasicObject)
   require 'blankslate'
-  ::BasicObject == ::BlankSlate
+  Object::BasicObject = Object::BlankSlate
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confection
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &23201580 !ruby/object:Gem::Requirement
+  requirement: &26062180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23201580
+  version_requirements: *26062180
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &23200860 !ruby/object:Gem::Requirement
+  requirement: &26077440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23200860
+  version_requirements: *26077440
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &23200280 !ruby/object:Gem::Requirement
+  requirement: &26076620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23200280
+  version_requirements: *26076620
 description: Confection is a multi-tenant configuration system for Ruby projects.
 email:
 - transfire@gmail.com