configlet 1.1.0 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 1.2.0 / 2010-05-11
+
+* Change Configlet.for to Configlet.config.
+* Deprecate Configlet.for and Configlet.reset.
+
 === 1.1.0 / 2010-02-25
 
 * Add Configlet#for, a sugary block form.

data/README.rdoc

@@ -31,7 +31,7 @@ and use it instead.
 There's also a block form, which is nice if you're setting a lot of
 defaults:
 
-    Configlet.for :thunk do
+    Configlet.config :thunk do
       default :token => "default-token"
       default :host  => "thunk.local"
     end

data/lib/configlet.rb

@@ -5,7 +5,7 @@
 module Configlet
 
   # What's at the front of our environment variables? This will be
-  # upcased and a trailing semicolon will be added, so
+  # upcased and a trailing underscore will be added, so
   # <tt>Configlet[:foo]</tt> with a prefix of <tt>thunk</tt> maps to
   # the <tt>THUNK_FOO</tt> environment variable. Default is +nil+.
 
@@ -13,7 +13,7 @@ module Configlet
 
   # Duh.
 
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 
   I = lambda { |v| v } #:nodoc:
 
@@ -57,16 +57,21 @@ module Configlet
   # Swanky block form. More pleasant to read when setting multiple
   # defaults, e.g.,
   #
-  #    Configlet.for :myapp do
+  #    Configlet.config :myapp do
   #      default "email.from" => "noreply@myapp.com"
   #      default :host        => "myapp.local"
   #    end
 
-  def for prefix, &block
+  def config prefix, &block
     self.prefix = prefix
     instance_eval(&block)
   end
 
+  def for *args, &block #:nodoc:
+    warn "Configlet.for is deprecated, and will be removed in 2.0."
+    config(*args, &block)
+  end
+
   # Mess with a value when it's retrieved. Useful for turning untyped
   # environment strings into numbers, booleans, enums, or class
   # instances. Here's how to munge a boolean:
@@ -88,6 +93,7 @@ module Configlet
   # Set prefix to +nil+, clear defaults and mungers.
 
   def reset
+    warn "Configlet.reset is deprecated, and will be removed in 2.0."
     self.prefix = nil
 
     defaults.clear

data/test/test_configlet.rb

@@ -2,55 +2,59 @@ require "minitest/autorun"
 require "configlet"
 
 class TestConfiglet < MiniTest::Unit::TestCase
+  class Stub
+    include Configlet
+  end
+
   def setup
+    @cfg = Stub.new
     @env = ENV.to_hash
-    Configlet.reset
   end
 
   def teardown
     ENV.replace @env
   end
 
-  def test_default
-    assert_nil Configlet["foo"]
-
-    Configlet.default :foo => "bar"
-    assert_equal "bar", Configlet["foo"]
-  end
-
-  def test_for
+  def test_config
     ENV["PREFIX_FOO"] = "bar"
 
-    Configlet.for :prefix do
+    @cfg.config :prefix do
       default :bar => "baz"
     end
 
-    assert_equal "bar", Configlet[:foo]
-    assert_equal "baz", Configlet[:bar]
+    assert_equal "bar", @cfg[:foo]
+    assert_equal "baz", @cfg[:bar]
+  end
+
+  def test_default
+    assert_nil @cfg["foo"]
+
+    @cfg.default :foo => "bar"
+    assert_equal "bar", @cfg["foo"]
   end
 
   def test_get
     ENV["FOO"] = "bar"
-    assert_equal "bar", Configlet[:foo]
+    assert_equal "bar", @cfg[:foo]
 
-    Configlet.prefix = "boom"
+    @cfg.prefix = "boom"
     ENV["BOOM_FOO"] = "bar"
-    assert_equal "bar", Configlet[:foo]
+    assert_equal "bar", @cfg[:foo]
   end
 
   def test_munge
     ENV["STUPID"] = "true"
-    Configlet.munge(:stupid) { |v| "true" == v }
-    assert_equal true, Configlet[:stupid]
+    @cfg.munge(:stupid) { |v| "true" == v }
+    assert_equal true, @cfg[:stupid]
   end
 
   def test_set
     assert_nil ENV["FOO"]
-    Configlet[:foo] = "bar"
+    @cfg[:foo] = "bar"
     assert_equal "bar", ENV["FOO"]
 
-    Configlet.prefix = "pow"
-    Configlet[:thud] = "zap"
+    @cfg.prefix = "pow"
+    @cfg[:thud] = "zap"
     assert_equal "zap", ENV["POW_THUD"]
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configlet
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - John Barnette
@@ -14,37 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -08:00
+date: 2010-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
-        - 5
+        - 6
         - 0
-        version: 2.5.0
+        version: 2.6.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 description: |-
   A stupid simple wrapper for environment variables.
   
@@ -80,23 +69,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: configlet
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7.pre.1
 signing_key: 
 specification_version: 3
 summary: A stupid simple wrapper for environment variables