confection 0.1.0 → 0.2.0

data/.ruby

@@ -1,6 +1,6 @@
 ---
 source:
-- profile
+- var
 authors:
 - name: Trans
   email: transfire@gmail.com
@@ -8,10 +8,14 @@ copyrights:
 - holder: Rubyworks
   year: '2011'
   license: BSD-2-Clause
-replacements: []
-alternatives: []
 requirements:
+- name: finder
+- name: facets
 - name: blankslate
+  groups:
+  - optional
+  - test
+  development: true
 - name: detroit
   groups:
   - build
@@ -20,7 +24,12 @@ requirements:
   groups:
   - test
   development: true
+- name: ae
+  groups:
+  - test
+  development: true
 dependencies: []
+alternatives: []
 conflicts: []
 repositories:
 - uri: git://github.com/rubyworks/confection.git
@@ -38,8 +47,8 @@ revision: 0
 created: '2011-11-06'
 summary: Multi-tenant configuration for Ruby
 title: Confection
-version: 0.1.0
+version: 0.2.0
 name: confection
 description: Confection is a multi-tenant configuration system for Ruby projects.
 organization: Rubyworks
-date: '2011-11-17'
+date: '2012-03-11'

data/{HISTORY.rdoc → HISTORY.md}

@@ -1,6 +1,21 @@
-= RELEASE HISTORY
+# RELEASE HISTORY
 
-== 0.1.0 | 2011-11-17
+## 0.2.0 | 2012-03-11
+
+The API has changed and no longer uses #method_missing magic.
+Instead the `config` method is used to define a configuration.
+In addition Confection now supports profiles via either a
+block clause or via a second argument, as well as the ability
+to import configurations from other projects.
+
+Changes:
+
+* Use #config method instead of method_missing trick.
+* Add support for configuration profiles.
+* Add #confect method to automatically handle typical configuration.
+
+
+## 0.1.0 | 2011-11-17
 
 This major release, probably the first truly usable release,
 adds support for multiple configration files by storing them
@@ -17,7 +32,7 @@ Changes:
   support multiple configurations at once.
 
 
-== 0.0.2 | 2011-11-07
+## 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
@@ -30,7 +45,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/LICENSE.txt

@@ -0,0 +1,27 @@
+Confection (http://rubyworks.github.com/confection)
+
+Copyright (c) 2011 Rubyworks. All rights reserved.
+
+License (spdx) BSD-2-Clause
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR  SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

data/README.md

@@ -0,0 +1,149 @@
+# Confection
+
+[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) |
+[IRC Channel](http://chat.us.freenode.net/rubyworks)
+
+[![Build Status](https://secure.travis-ci.org/rubyworks/confection.png)](http://travis-ci.org/rubyworks/confection)
+
+
+## Description
+
+Confection is multi-tenant configuration system for Ruby projects. If was 
+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.
+
+
+## Instruction
+
+To get started, create a file in you project called `Confile`. The file can
+have any name that 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 Confile
+    config :rake do
+      desc 'generate yard docs'
+      task :yard do
+        sh 'yard'
+      end
+    end
+
+In our Rakefile:
+
+    $ cat Rakefile
+    require 'confection'
+    confection(:rake, '*').load
+
+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 Confile
+    title = "MyApp"
+
+    config :rake do
+      desc 'generate yard docs'
+      task :yard do
+        sh "yard doc --title #{title}"
+      end
+    end
+
+    config :qedoc do |doc|
+      doc.title = "#{title} Demonstrandum"
+    end
+
+Now we have configuration for both the rake tool and the qedoc tool in
+a single file. Thus we gain the advantage of reducing the file count of our 
+project while pulling our tool configurations together into one place.
+Moreover, these configurations can potentially share settings as demonstrated
+here via the `title` variable.
+
+Confection also supports profiles, either via a `profile` block or via a
+second config argument.
+
+    config :qed, :cov do
+      require 'simplecov'
+      ...
+    end
+
+Or,
+
+    profile :cov
+      config :qed do
+        require 'simplecov'
+        ...
+      end
+    end
+
+Using Confection in your libraries is very simple, as can be seen from our
+Rakefile example. The `#confection` method (alias `#config`) is used to get
+a handle on a named configuration. With it you have a few options, `#call`,
+`#exec` or `#load`, `#to_s` or `#to_h`.
+
+The `#call` method evaluates a config's block in a separate per-configuration
+file context in which it was defined. This is recommended. The `#exec` method,
+on the other hand, will evaluate the block in the  context of the caller. Where 
+as the `#load` method evaluates the block in the toplevel context.
+
+For instance, QED uses `#exec` to import user configuration directly into
+its Settings instance.
+
+    confection(:qed, profile_name).exec
+
+The last two methods, `#to_s` and `#to_h` are used for text-based or hash-based
+configurations. The `qedoc` configuration above is a good example of the later.
+It can be converted directly into a Hash.
+
+    confection(:qedoc, :cov).to_h  #=> {:title => "MyApp Demonstration"}
+
+Lastly, there is the `#confect` method (alias `#configure`). This is just like the
+`#confection` method, but automatically invokes `configure(self)` on each
+selected configuration. In most cases that's exactly what is needed, so it 
+saves having to make the additional invocation on the return value of `#confection`.
+
+
+## Dependencies
+
+### Libraries
+
+Confection depends on the [Finder](http://rubyworks.github.com/finder) library
+to provide reliable load path and Gem searching. This is used when importing
+configurations from external projects.
+
+Confection also depends on [Ruby Facets](http://rubyworks.github.com/facets)
+for just a few very useful core extensions.
+
+To use Confection on Ruby 1.8 series, the `BlankSlate` library is also needed
+in order to emulate Ruby's BasicObject. (This may change to the `Backports`
+project in a future version.)
+
+### Core Extensions
+
+Confection uses two core extensions, `#to_h`, which applies a few different
+classes, `String#tabto`. These come from Ruby Facets to ensure a high standard 
+of interoperability. 
+
+Both of these methods have been suggested for inclusion in Ruby proper.
+Please head over to Ruby Issue Tracker and add your support.
+
+* http://bugs.ruby-lang.org/issues/749
+* http://bugs.ruby-lang.org/issues/6056
+
+
+## Release Notes
+
+Please see HISTORY.rdoc file.
+
+
+## Copyrights
+
+Copyright (c) 2011 Rubyworks
+
+Confection is distributable in accordance with the **BSD-2-Clause** license.
+
+See LICENSE.txt file for details.
+

data/lib/confection/basic_object.rb

@@ -1,3 +1,5 @@
+# TODO: Maybe use `backports` for future version.
+
 unless Object.const_defined?(:BasicObject)
   require 'blankslate'
   Object::BasicObject = Object::BlankSlate

data/lib/confection/config.rb

@@ -0,0 +1,170 @@
+module Confection
+
+  # Config encapsulates a single configuration entry as defined
+  # in a project's configuration file.
+  # 
+  class Config
+
+    #
+    # Initialize Config instance. Config instances are per-configuration,
+    # which means they are associated with one and only one config entry.
+    #
+    def initialize(tool, profile, context, value, &block)
+      self.tool    = tool
+      self.profile = profile
+      self.value   = value
+      self.block   = block if block
+
+      @context = context
+    end
+
+    #
+    # The name of tool being configured.
+    #
+    attr :tool
+
+    #
+    # Change the tool name. Note, this will rarely be used since,
+    # generally speaking, configurations tend to be very tool
+    # specific.
+    #
+    def tool=(name)
+      @tool = name.to_sym
+    end
+
+    #
+    # The name of the profile to which this configuration belongs.
+    #
+    attr :profile
+
+    #
+    # Change the profile name.
+    #
+    def profile=(name)
+      @profile = name.to_sym if name
+    end
+
+    #
+    # Some configuration are simple values. In those cases
+    # the `@value` attributes holds the object, otherwise it
+    # is `nil`. 
+    #
+    def value
+      @value
+    end
+
+    #
+    # Set the configuration value.
+    #
+    # @param [Object] value
+    #   The configuration value.
+    #
+    def value=(value)
+      @block = nil
+      @value = value
+    end
+
+    #
+    # Most configuration are scripted. In thos cases the 
+    # `@block` attributes holds the Proc instance, otherwise
+    # it is `nil`.
+    #
+    attr :block
+
+    #
+    # Set the configuration procedure.
+    #
+    # @param [Proc] procedure
+    #   The configuration procedure.
+    #
+    def block=(proc)
+      @value = nil
+      @block = proc.to_proc
+    end
+
+    #
+    # The arity of the configuration procedure.
+    #
+    # @return [Fixnum] number of arguments
+    #
+    def arity
+      @block ? @block.arity : 0
+    end
+
+    #
+    # Call the procedure. Configuration procedures are evaluated
+    # in the scope of a per-configuration file context instance,
+    # which is extended by the {DSL} evaluation context.
+    #
+    def call(*args)
+      #@value || @block.call(*args)
+      @value || @context.instance_exec(*args, &block)
+    end
+
+    #
+    # Convert the underlying procedure into an `instance_exec`
+    # procedure. This allows the procedure to be evaluated in
+    # any scope that it is be needed.
+    #
+    def to_proc
+      if value = @value
+        lambda{ value }
+      else
+        block = @block
+        lambda do |*args|
+          instance_exec(*args, &block)
+        end
+      end
+    end
+
+    #
+    # Return the value or procedure in the form of a Hash.
+    #
+    # @return [Hash]
+    #
+    def to_h
+      (@value || HashBuilder.new(&@block)).to_h
+    end
+
+    #
+    # Return the value or procedure in the form of a String.
+    #
+    # @return [String]
+    #
+    def to_s
+      (@value || call).to_s
+    end
+
+    #
+    # Alias for #to_s.
+    #
+    # @todo Should this alias be deprecated?
+    #
+    alias text to_s
+
+    #
+    # Copy the configuration with alterations.
+    #
+    # @param [Hash] alt
+    #   Alternate values for configuration attributes.
+    #
+    # @return [Config] copied config
+    #
+    def copy(alt={})
+      copy = dup
+      alt.each do |k,v|
+        copy.__send__("#{k}=", v)
+      end
+      copy
+    end
+
+    #
+    # Ruby 1.9 defines #inspect as #to_s, ugh.
+    #
+    def inspect
+      "#<#{self.class.name}:#{object_id} @tool=%s @profile=%s>" % [tool.inspect, profile.inspect]
+    end
+
+  end
+
+end

data/lib/confection/controller.rb

@@ -0,0 +1,175 @@
+module Confection
+
+  # The Controller class is used to encapsulate the various methods of invocation
+  # that are posible on configuration blocks. It applies those invocations 
+  # across it's set of configurations.
+  #
+  class Controller
+
+    include Enumerable
+
+    #
+    # Initialize new Controller instance.
+    #
+    # @param [Object] scope
+    #
+    # @param [Array<Config>] configs
+    #
+    def initialize(scope, *configs)
+      @scope   = scope
+      @configs = configs
+    end
+
+    #
+    # Iterate over each config.
+    #
+    def each(&block)
+      @configs.each(&block)
+    end
+
+    #
+    # Number of configs.
+    #
+    def size
+      @configs.size
+    end
+
+    #
+    # Execute the configuration code.
+    #
+    def call(*args)
+      result = nil
+      each do |config|
+        result = config.call(*args)
+      end
+      result
+    end
+
+    #
+    # Special configuration call.
+    #
+    def configure
+      result = nil
+      each do |config|
+        case config.arity
+        when 0
+          exec
+        when 1
+          result = config.call(@scope)
+        end
+      end
+      result
+    end
+
+    #
+    # Evaluate configuration in the context of the caller.
+    #
+    # This is the same as calling:
+    #
+    #   instance_exec(*args, &config)
+    #
+    def exec(*args)
+      result = nil
+      each do |config|
+        if config.respond_to?(:to_proc)
+          #@scope.extend(config.dsl) # ?
+          result = @scope.instance_exec(*args, &config)
+        end
+      end
+      result
+    end
+
+    #
+    # Load config as script code in context of TOPLEVEL.
+    #
+    # This is the same as calling:
+    #
+    #   main = ::TOPLEVEL_BINDING.eval('self')
+    #   main.instance_exec(*args, &config)
+    #
+    def main_exec(*args)
+      result = nil
+      main = ::Kernel.eval('self', ::TOPLEVEL_BINDING)  # ::TOPLEVEL_BINDING.eval('self') [1.9+]
+      each do |config|
+        if config.respond_to?(:to_proc)
+          #main.extend(config.dsl)
+          result = main.instance_exec(*args, &config)
+        end
+      end
+      result
+    end
+
+    # @deprecated Alias for `#main_exec` might be deprecated in future.
+    alias load main_exec
+
+    #
+    # Only applicable to script and block configs, this method converts
+    # a set of code configs into a single block ready for execution.
+    #
+    def to_proc
+      #properties = ::Confection.properties  # do these even matter here ?
+      __configs__ = @configs
+      block = Proc.new do |*args|
+        result = nil
+        #extend dsl  # TODO: extend DSL into instance context ?
+        __configs__.each do |config|
+          if config.respond_to?(:to_proc)
+            result = instance_exec(*args, &config)
+          end
+        end
+        result
+      end
+    end
+
+    #
+    # Configurations texts joins together the contents of each
+    # configuration separated by two newlines (`\n\n`).
+    #
+    def to_s
+      txt = []
+      @configs.each do |c|
+        txt << c.to_s #if c.text
+      end
+      txt.join("\n\n")
+    end
+
+    alias text to_s
+
+    #
+    #
+    #
+    def to_h
+      hsh = {}
+      @configs.each do |c|
+        hsh.merge!(c.to_h)
+      end
+      hsh
+    end
+
+    ##
+    ## Treat configurations as YAML mappings, load, merge and return.
+    ##
+    #def yaml
+    #  @configs.inject({}) do |h, c|
+    #    h.merge(c.yaml)
+    #  end
+    #end
+
+    #
+    # Inspection string for controller.
+    #
+    def inspect
+      "#<#{self.class}##{object_id}>"
+    end
+
+  end
+
+  #
+  #class NullController
+  #  def exec(*); end
+  #  def call(*); end
+  #  def text; ''; end
+  #  alias to_s text
+  #end
+
+end

data/lib/confection/dsl.rb

@@ -0,0 +1,154 @@
+module Confection
+
+  # The File class is used to evaluate the configuration file.
+  #
+  class DSL < Module #BasicObject
+
+    #
+    # Create new DSL instance and parse file.
+    #
+    # @todo Does the exception rescue make sense here?
+    #
+    def self.parse(store, file)
+      dsl = new(store, file)
+      begin
+        text = File.read(file)
+      rescue => e
+        raise e if $DEBUG
+        warn e.message
+      end
+      dsl.instance_eval(text, file)
+    end
+
+    #
+    # Initialize new DSL object.
+    #
+    # @param [Store] store
+    #   The configuration storage instance.
+    #
+    # @param [String] file
+    #   Configuration file to load.
+    #
+    def initialize(store, file=nil)
+      @_store   = store
+      @_file    = file
+
+      @_contest = Object.new
+      @_context.extend self
+
+      @_options = {}     
+    end
+
+    # TODO: Separate properties from project metadata ?
+
+    #
+    # Profile block.
+    #
+    def profile(name, options={}, &block)
+      raise SyntaxError, "nested tool sections" if @_options[:profile]
+
+      original_state = @_options.dup
+
+      @_options.update(options)  # TODO: maybe be more exacting about this
+      @_options[:profile] = name.to_sym
+
+      instance_eval(&block)
+
+      @_options = original_state
+    end
+
+    #
+    # Configure a tool.
+    #
+    # @param [Symbol] tool
+    #   The name of the tool to configure.
+    #
+    # @param [Hash] opts
+    #   Configuration options.
+    #
+    # @options opts [String] :file
+    #   File from which to load configuration.
+    #
+    # @options opts [String] :text
+    #   Text of text-based configuration.
+    #
+    # @example
+    #   config :rake, "*.rake"
+    #
+    # @example
+    #   profile :cov do
+    #     config :qed, "qed/simplecov.rb"
+    #   end
+    #
+    # @todo Clean this code up.
+    #
+    def config(tool, *args, &block)
+      case args.first
+      when Symbol
+        profile = args.shift
+      when String
+        profile = args.shift unless args.first.index("\n")
+      end
+
+      case args.first
+      when Hash
+        data = args.shift
+        from = data[:from] # special key
+      when Proc
+        data = args.shift
+        # TODO convert data into OpenHash like object
+      when String
+        data = args.shift
+        data = data.tabto(0)
+      end
+
+      raise ArgumentError, "too many arguments"      if args.first
+      raise SyntaxError,   "nested profile sections" if profile && @_options[:profile]
+      #raise ArgumentError, "use block or :from  setting" if options[:from]  && block
+
+      profile = @_options[:profile] unless profile
+
+      if from
+        @_store.import(tool, profile, data, &block)
+        data = nil
+        return unless block
+      end
+
+      #original_state = @_options.dup
+
+      if data && block
+        raise ArgumentError, "must use data or block, not both"
+      end
+
+      @_store << Config.new(tool, profile, @_context, data, &block)
+
+      #@_options = original_state
+    end
+
+    # TODO: use `:default` profile instead of `nil` ?
+
+    #
+    # Evaluate script directory into current scope.
+    #
+    # @todo Make a core extension ?
+    #
+    def import(feature)
+      file = Find.load_path(feature).first
+      raise LoadError, "no such file -- #{feature}" unless file
+      instance_eval(::File.read(file), file) if file
+    end
+
+    ##
+    ## Cached binding.
+    ##
+    #def __binding__
+    #  @_binding ||= binding
+    #end
+
+    #def __eval__(code, file=nil)
+    #  Kernel.eval(code, __binding__, file || '(eval)')
+    #end
+
+  end
+
+end

data/lib/confection.rb

@@ -1,162 +1,50 @@
-require 'confection/basic_object'
-
 # Welcome to Confection. Your easy means to tool configuration.
 #
 module Confection
+end
 
-  #
-  @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
-    if file
-      @config[Dir.pwd] = {}
-      begin
-        ::Kernel.eval(read, Evaluator.binding, file)
-      rescue => e
-        raise e if $DEBUG
-        warn e.message
-      end
-    end
-    @config[Dir.pwd]
-  end
-
-  # Stores the configuration blocks.
-  #
-  # @return [Hash] configuration store
-  def self.config
-    if @config.key?(Dir.pwd)
-      @config[Dir.pwd]
-    else
-      bootstrap
-    end
-  end
-
-  # Look-up configuration block.
-  #
-  # @param name [Symbol,String]
-  #   The identifying name for the config block.
-  #
-  def self.[](name)
-    config[name.to_sym]
-  end
-
-  # Set configuration block.
-  #
-  # @param name [Symbol,String]
-  #   The identifying name for the config block.
-  #
-  # @param block [Proc]
-  #   Code block for configuration.
-  #
-  # @return [Proc] code block
-  def self.[]=(name, block)
-    config[name.to_sym] = block.to_proc
-  end
-
-  # Read config file.
-  #
-  # @return [String] contents of the `.conf.rb` file
-  def self.read
-    File.read(file)
-  end
-
-  # 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)
-    dir  = dir || Dir.pwd
-    while dir != '/'
-      if file = Dir.glob(File.join(dir,filename),File::FNM_CASEFOLD).first
-        return file
-      end
-      dir = File.dirname(dir)
-    end
-    nil
-  end
+require 'finder'
+require 'yaml'
+require 'ostruct'
 
-  # Root directory, where config file is located.
-  #
-  # @param dir [String]
-  #   Optional directory to begin search.
-  #
-  # @return [String] directory path
-  def self.root(dir=nil)
-    f = file(dir)
-    f ? File.dirname(f) : nil
-  end
+require 'confection/basic_object'
+require 'confection/core_ext'
+require 'confection/project'
+require 'confection/store'
+require 'confection/dsl'
+require 'confection/hash_builder'
+require 'confection/config'
+require 'confection/controller'
+require 'confection/current'
 
-  # The Evaluator class is used to evaluate the `.co.rb` file.
-  #
-  class Evaluator < Module #BasicObject
-    def self.binding
-      new.__binding__
-    end
-    def __binding__ 
-      binding
-    end
-    def method_missing(sym, *args, &block)
-      #def block.call
-      #  ::Kernel.eval('self',::TOPLEVEL_BINDING).instance_exec(&self)
-      #end
-      ::Confection[sym] = block
-    end
-  end
+#
+# Confection's primary use method, lookups a configuration
+# given the tool and profile.
+#
+# To select all profiles for a given tool, use `'*'`.
+#
+# @return [Confection::Controller] config controller
+#
+def config(tool, *options)
+  Confection.controller(self, tool, *options)
+end
 
-  # The Controller class is used to encapsulate the two types of invocation
-  # that are posible on configuration blocks.
-  #
-  class Controller
-    def initialize(scope, &block)
-      @scope = scope
-      @block = block
-    end
-    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
+#
+# Alias for #config.
+#
+alias confection config
 
-  class NullController
-    def exec(*); end
-    def call(*); end
-    def to_proc; Proc.new{}; end
-  end
+#
+# 
+#
+def configure(tool, *options)
+  controller = Confection.controller(self, tool, *options)
+  controller.configure
 end
 
-# Confection's primary use method.
 #
-# @return [Confection::Controller] config controller
-def confection(name, *args)
-  config_block = Confection[name.to_sym]
-  if config_block
-    Confection::Controller.new(self, &config_block)
-  else
-    #warn "no configuration -- `#{name}'"
-    Confection::NullController.new
-  end
-end
+# Alias for #configure.
+#
+alias confect configure
 
 # Copyright (c) 2011 Rubyworks (BSD-2-Clause)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confection
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: blankslate
-  requirement: &26062180 !ruby/object:Gem::Requirement
+  name: finder
+  requirement: &70312239870960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26062180
+  version_requirements: *70312239870960
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: &70312239886780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70312239886780
+- !ruby/object:Gem::Dependency
+  name: blankslate
+  requirement: &70312239886280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70312239886280
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &26077440 !ruby/object:Gem::Requirement
+  requirement: &70312239885780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26077440
+  version_requirements: *70312239885780
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &26076620 !ruby/object:Gem::Requirement
+  requirement: &70312239885280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70312239885280
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &70312239884780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,24 +76,27 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26076620
+  version_requirements: *70312239884780
 description: Confection is a multi-tenant configuration system for Ruby projects.
 email:
 - transfire@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.rdoc
-- README.rdoc
-- COPYING.rdoc
+- LICENSE.txt
+- HISTORY.md
+- README.md
 files:
 - .ruby
 - .yardopts
 - lib/confection/basic_object.rb
+- lib/confection/config.rb
+- lib/confection/controller.rb
+- lib/confection/dsl.rb
 - lib/confection.rb
-- HISTORY.rdoc
-- README.rdoc
-- COPYING.rdoc
+- LICENSE.txt
+- HISTORY.md
+- README.md
 homepage: http://rubyworks.github.com/confection
 licenses:
 - BSD-2-Clause
@@ -82,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Multi-tenant configuration for Ruby

data/COPYING.rdoc

@@ -1,31 +0,0 @@
-= COPYRIGHT NOTICES
-
-== Confection
-
-Copyright:: (c) 2011 Rubyworks
-License:: BSD-2-Clause
-Website:: http://rubyworks.github.com/tapout
-
-    Copyright 2011 Rubyworks. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-       1. Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-
-       2. Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR  SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

data/README.rdoc

@@ -1,83 +0,0 @@
-= Confection
-
-{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]
-
-
-== Description
-
-Confection is multi-tenant configuration system for Ruby projects. If was 
-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 `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 Confile
-  rake do
-    desc 'generate yard docs'
-    task :yard do
-      sh 'yard'
-    end
-  end
-
-In our Rakefile:
-
-  $ cat 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, and this time for a tool that has
-native support for Confection.
-
-  $ cat Confile
-  title = "myapp"
-
-  rake do
-    desc 'generate yard docs'
-    task :yard do
-      sh "yard doc --title #{title}"
-    end
-  end
-
-  qed do |config|
-    config.title = "#{title} Demonstrandum"
-  end
-
-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 tool configurations together into one place.
-Moreover, these configurations can potentially share settings as demonstrated
-here via the `title` variable.
-
-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.
-
-
-== Release Notes
-
-Please see HISTORY.rdoc file.
-
-
-== Copyrights
-
-Copyright (c) 2011 Rubyworks
-
-Confection is distributable in accordance with the terms of the *BSD-2-Clause* license.
-
-See COPYING.rdoc for details.
-