tarot 0.1.4 → 0.1.5

data/lib/tarot.rb

@@ -26,11 +26,23 @@ module Tarot
       @config_cache[env][key] ||= key.split('.').inject(@yaml[env || @env]) {|e, part| e.try(:[], part) } || default
     end
 
+    def merge(hash, namespace = nil)
+      target = namespace.nil? ? @yaml[@env] : get(namespace)
+      add_mm hash
+      recursive_merge(target, hash)
+      @config_cache.clear
+    end
+
+    def merge_file(file, namespace = nil)
+      merge YAML::load(open(file).read).stringify_keys!, namespace
+    end
+
     def with_environment(env)
+      env ||= self.env
       old_env, self.env = self.env, env
-      yield if block_given?
+      result = yield if block_given?
       self.env = old_env
-      nil
+      result
     end
 
     private

data/lib/tarot/version.rb

@@ -1,3 +1,3 @@
 module Tarot
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tarot
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Chris Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 Z
+date: 2011-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport