mixlib-config 1.0.12 → 1.1.0.rc01

data/.gitignore

@@ -0,0 +1,6 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+*.gemspec

data/NOTICE

@@ -0,0 +1,27 @@
+Mixin::Config NOTICE
+=================
+
+Developed at Opscode (http://www.opscode.com).
+
+ * Copyright 2009, Opscode, Inc. <legal@opscode.com>
+
+Mixin::Config incorporates code from Chef.  The Chef notice file follows:
+
+Chef NOTICE
+===========
+
+Developed at Opscode (http://www.opscode.com).
+
+Contributors and Copyright holders:
+
+ * Copyright 2008, Adam Jacob <adam@opscode.com>
+ * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com>
+ * Copyright 2008, Bryan McLellan <btm@loftninjas.org>
+ * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
+ * Copyright 2009, Sean Cribbs <seancribbs@gmail.com>
+ * Copyright 2009, Christopher Brown <cb@opscode.com>
+ * Copyright 2009, Thom May <thom@clearairturbulence.org>
+
+Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.
+
+Chef incorporates code modified from Merb (http://www.merbivore.com), which is Copyright (c) 2008 Engine Yard.

data/Rakefile

@@ -13,7 +13,7 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+   puts "Jeweler (or a dependency) not available. Install from gemcutter with: sudo gem install gemcutter jeweler"
 end
 
 require 'spec/rake/spectask'
@@ -62,3 +62,5 @@ end
 
 desc "Run the spec and features"
 task :test => [ :features, :spec ]
+
+Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:major: 1
-:minor: 0
-:patch: 12
+:patch: 0
+:build: rc01
+:major: 1 
+:minor: 1 

data/features/mixlib_config.feature

@@ -0,0 +1,31 @@
+Feature: Configure an application
+  In order to make it trivial to configure an application
+  As a Developer
+  I want to utilize a simple configuration object
+  
+Scenario: Set a configuration option to a string
+  Given a configuration class 'ConfigIt'
+  When I set 'foo' to 'bar' in configuration class 'ConfigIt'
+  Then config option 'foo' is 'bar'
+
+Scenario: Set the same configuration option to different strings for two configuration classes
+  Given a configuration class 'ConfigIt'
+    And a configuration class 'ConfigItToo'
+  When I set 'foo' to 'bar' in configuration class 'ConfigIt'
+   And I set 'foo' to 'bar2' in configuration class 'ConfigItToo'
+  Then in configuration class 'ConfigItToo' config option 'foo' is 'bar2' 
+   And in configuration class 'ConfigIt' config option 'foo' is 'bar'
+  
+Scenario: Set a configuration option to an Array
+  Given a configuration class 'ConfigIt'
+  When I set 'foo' to:
+    |key|
+    |bar|
+    |baz|
+  Then an array is returned for 'foo'
+
+Scenario: Set a configuration option from a file
+  Given a configuration file 'bobo.config'
+   When I load the configuration
+   Then config option 'foo' is 'bar'
+    And config option 'baz' is 'snarl'

data/features/steps/config_steps.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Given /^a configuration class '(.+)'$/ do |classname|
+end
+
+When /^I set '(.+)' to '(.+)' in configuration class '(.+)'$/ do |key, value, classname|
+
+  #ConfigIt[key.to_sym] = value
+  if classname == 'ConfigIt'
+    ConfigIt[key.to_sym] = value
+  elsif classname == 'ConfigItToo'
+    ConfigItToo[key.to_sym] = value
+  else
+    raise ArgumentError, "configuration class must be ConfigIt or ConfigItToo"
+  end 
+end
+
+Then /^config option '(.+)' is '(.+)'$/ do |key, value|
+  ConfigIt[key.to_sym].should == value
+end
+
+Then /^in configuration class '(.+)' config option '(.+)' is '(.+)'$/ do |classname, key, value|
+  if classname == 'ConfigIt'
+    ConfigIt[key.to_sym].should == value 
+  elsif classname == 'ConfigItToo'
+    ConfigItToo[key.to_sym].should == value 
+  else
+    raise ArgumentError, "configuration class must be ConfigIt or ConfigItToo"
+  end 
+end
+
+When /^I set '(.+)' to:$/ do |key, foo_table|
+  ConfigIt[key.to_sym] = Array.new
+  foo_table.hashes.each do |hash|
+    ConfigIt[key.to_sym] << hash['key']
+  end
+end
+
+Then /^an array is returned for '(.+)'$/ do |key|
+  ConfigIt[key.to_sym].should be_a_kind_of(Array)
+end
+
+Given /^a configuration file '(.+)'$/ do |filename|
+  @config_file = File.join(File.dirname(__FILE__), "..", "support", filename)
+end
+
+When /^I load the configuration$/ do
+  ConfigIt.from_file(@config_file)
+end
+

data/features/support/bobo.config

@@ -0,0 +1,3 @@
+# Sample config file
+foo 'bar'
+baz 'snarl'

data/features/support/config_it.rb

@@ -0,0 +1,28 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$: << File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require 'mixlib/config'
+
+class ConfigIt
+  extend Mixlib::Config  
+end
+
+class ConfigItToo
+  extend Mixlib::Config
+end

data/features/support/env.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$: << File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'spec/expectations'
+require 'mixlib/config'
+require 'tmpdir'
+require 'stringio'
+
+class MyWorld
+end
+
+World do
+  MyWorld.new
+end

data/lib/mixlib/config.rb

@@ -1,5 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Author:: Christopher Brown (<cb@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -16,16 +18,13 @@
 # limitations under the License.
 #
 
-class Object # http://whytheluckystiff.net/articles/seeingMetaclassesClearly.html
-  def meta_def name, &blk
-    (class << self; self; end).instance_eval { define_method name, &blk }
-  end
-end
-
 module Mixlib
   module Config
-    
-    @@configuration = Hash.new
+
+    def self.extended(base)
+      class << base; attr_accessor :configuration; end
+      base.configuration = Hash.new
+    end 
     
     # Loads a given ruby file, and runs instance_eval against it in the context of the current 
     # object.  
@@ -38,14 +37,14 @@ module Mixlib
       self.instance_eval(IO.read(filename), filename, 1)
     end
     
-    # Pass Mixlib::Config.configure() a block, and it will yield @@configuration.
+    # Pass Mixlib::Config.configure() a block, and it will yield self.configuration.
     #
     # === Parameters
-    # <block>:: A block that is sent @@configuration as its argument
+    # <block>:: A block that is sent self.configuration as its argument
     def configure(&block)
-      block.call(@@configuration)
+      block.call(self.configuration)
     end
-
+    
     # Get the value of a configuration option
     #
     # === Parameters
@@ -57,7 +56,7 @@ module Mixlib
     # === Raises
     # <ArgumentError>:: If the configuration option does not exist
     def [](config_option)
-      @@configuration[config_option.to_sym]
+      self.configuration[config_option.to_sym]
     end
       
     # Set the value of a configuration option
@@ -81,7 +80,7 @@ module Mixlib
     # <True>:: If the configuration option exists
     # <False>:: If the configuration option does not exist
     def has_key?(key)
-      @@configuration.has_key?(key.to_sym)
+      self.configuration.has_key?(key.to_sym)
     end
 
     # Merge an incoming hash with our config options
@@ -92,7 +91,7 @@ module Mixlib
     # === Returns
     # result of Hash#merge!
     def merge!(hash)
-      @@configuration.merge!(hash)
+      self.configuration.merge!(hash)
     end
     
     # Return the set of config hash keys
@@ -100,7 +99,7 @@ module Mixlib
     # === Returns
     # result of Hash#keys
     def keys
-      @@configuration.keys
+      self.configuration.keys
     end
     
     # Creates a shallow copy of the internal hash
@@ -108,7 +107,7 @@ module Mixlib
     # === Returns
     # result of Hash#dup
     def hash_dup
-      @@configuration.dup
+      self.configuration.dup
     end
     
     # Internal dispatch setter, calling either the real defined method or setting the
@@ -120,10 +119,10 @@ module Mixlib
     #      
     def internal_set(method_symbol,value)
       method_name = method_symbol.id2name
-      if (self.public_methods - ["[]="]).include?("#{method_name}=")
+      if self.respond_to?("#{method_name}=".to_sym)
         self.send("#{method_name}=", value)
       else
-        @@configuration[method_symbol] = value
+        self.configuration[method_symbol] = value
       end
     end
 
@@ -137,9 +136,10 @@ module Mixlib
     # value<Object>:: Value to be set in config hash
     #          
     def config_attr_writer(method_symbol, &blk)
-      method_name = "#{method_symbol.to_s}="
-      meta_def method_name do |value|
-        @@configuration[method_symbol] = blk.call(value)
+      meta = class << self; self; end
+      method_name = "#{method_symbol.to_s}=".to_sym
+      meta.send :define_method, method_name do |value|
+        self.configuration[method_symbol] = blk.call(value)
       end
     end
 
@@ -165,7 +165,7 @@ module Mixlib
       end
       
       # Returning
-      @@configuration[method_symbol]        
+      self.configuration[method_symbol]        
 
     end
   end

data/spec/mixlib/config_spec.rb

@@ -18,6 +18,11 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 
+class ConfigIt
+  extend ::Mixlib::Config
+end
+
+
 describe Mixlib::Config do
   before(:each) do
     ConfigIt.configure do |c|
@@ -96,47 +101,41 @@ describe Mixlib::Config do
   
   describe "when a class method override accessor exists" do
     before do
-      class ConfigIt
-        
+      @klass = Class.new
+      @klass.extend(::Mixlib::Config)
+      @klass.class_eval(<<-EVAL)
         config_attr_writer :test_method do |blah|
           blah.is_a?(Integer) ? blah * 1000 : blah
         end
-        
-      end
+        pp self.methods
+      EVAL
     end
 
     it "should multiply an integer by 1000" do
-      ConfigIt[:test_method] = 53
-      ConfigIt[:test_method].should == 53000
+      @klass[:test_method] = 53
+      @klass[:test_method].should == 53000
     end
 
     it "should multiply an integer by 1000 with the method_missing form" do
-      ConfigIt.test_method = 63
-      ConfigIt.test_method.should == 63000
+      @klass.test_method = 63
+      @klass.test_method.should == 63000
     end
 
     it "should multiply an integer by 1000 with the instance_eval DSL form" do
-      ConfigIt.instance_eval("test_method 73")
-      ConfigIt.test_method.should == 73000
+      @klass.instance_eval("test_method 73")
+      @klass.test_method.should == 73000
     end
 
     it "should multiply an integer by 1000 via from-file, too" do
       IO.stub!(:read).with('config.rb').and_return("test_method 99")
-      ConfigIt.from_file('config.rb')
-      ConfigIt.test_method.should == 99000
+      @klass.from_file('config.rb')
+      @klass.test_method.should == 99000
     end
     
     it "should receive internal_set with the method name and config value" do
-      ConfigIt.should_receive(:internal_set).with(:test_method, 53).and_return(true)
-      ConfigIt[:test_method] = 53
+      @klass.should_receive(:internal_set).with(:test_method, 53).and_return(true)
+      @klass[:test_method] = 53
     end
     
-    after do
-      class ConfigIt
-        class << self
-          undef test_method=
-        end
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mixlib-config
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - 0
+  - rc01
+  version: 1.1.0.rc01
 platform: ruby
 authors: 
 - Opscode, Inc.
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 +12:00
+date: 2010-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,10 +29,18 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - LICENSE
+- NOTICE
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- features/mixlib_config.feature
+- features/step_definitions/mixlib_config_steps.rb
+- features/steps/config_steps.rb
+- features/support/bobo.config
+- features/support/config_it.rb
+- features/support/env.rb
 - lib/mixlib/config.rb
 - spec/mixlib/config_spec.rb
 - spec/spec.opts
@@ -41,21 +55,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A class based config mixin, similar to the one found in Chef.