itamae-node_env 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f262a5b50b2917c267347f115164a015f8ab90
-  data.tar.gz: 3176500e2eaf820e855256173727063531f0493f
+  metadata.gz: 5cc60de2a77f52cf7151ca7718a6c39227738812
+  data.tar.gz: b4fb51ca20a78494d942bb36532912eaa1179618
 SHA512:
-  metadata.gz: 5dcb2bb6c76f0d5f64e01136e7f9fbafe7adb9df73ce7d258b51c7c1edfbac53841901a64ca343ea27c89e4c645e0049d414043bde12e313feed28d13a813acd
-  data.tar.gz: 0c36d26a6aa4cf1b630edead68021db0fd8d69071a3c650cef110cb8a78874d7473e2f0d063ffc35868866ea4ef0b245f92e21b502bdd08a85b1f631eb4036a8
+  metadata.gz: 90ef9be9f16f9f8de64dab976ec91d6f30c0d140f42ef3c0a5460a457e28d47c8da5392afae9fee9fc03397a0fdad0297cbbcee8a64926245dd84c9cf669dae7
+  data.tar.gz: 77b4d655522566e47d89f6690252262fd00acf7759853ef91c98e01be117f5ec8948dcf580d31003d25fe0f6e5d652f78d27fb217047d957f34c3454a58f8dbf

data/itamae-node_env.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "itamae", "~> 1.1.1"
+  spec.add_dependency "itamae", '>= 1.1.1', '< 1.3.0'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/itamae/node_env.rb

@@ -3,30 +3,57 @@ require "itamae/node_env/version"
 
 module Itamae
   module NodeEnv
-    def convert_env(val)
+    private
+
+    def apply_env(val, klass = nil)
+      klass ||= self.class
+
       case val
-      when String then
-        if /\Aenv\[([^\]]+)\]\z/ =~ val
-          return ENV[$1]
+      when String
+        if /\Aenv\[(?<key>[^\]]+)\]\z/ =~ val
+          ENV[key]
+        else
+          val
         end
-      when Array then
-        return val.map {|v| convert_env(v)}
-      when Hash then
-        hash = Hash.new
-        val.each {|k,v| hash[k] = convert_env(v)}
-        return hash
+      when Array
+        val.map { |v| apply_env(v, klass) }
+      when klass
+        val.each { |k, v| val[k] = apply_env(v, klass) }
+        val
+      else
+        val
       end
-      return val
     end
+  end
+
+  module NodeEnv11
+    include NodeEnv
 
     def initialize(source_hash = nil, default = nil, &blk)
-      source_hash = convert_env(source_hash)
-      super(source_hash, default, &blk)
+      super
+      self.each do |key, val|
+        self[key] = apply_env(val)
+      end
+    end
+  end
+
+  module NodeEnv12
+    include NodeEnv
+
+    def initialize(initial_hash, backend)
+      super
+      @mash = apply_env(@mash, Hashie::Mash)
     end
   end
 end
 
-::Itamae::Node.send(:prepend, ::Itamae::NodeEnv)
+major, minor, revision = ::Itamae::VERSION.split(".").map(&:to_i)
 
-Dotenv.load if Object.const_defined?(:Dotenv)
+case minor.to_i
+when 1
+  ::Itamae::Node.send(:prepend, ::Itamae::NodeEnv11)
+when 2
+  ::Itamae::Node.send(:prepend, ::Itamae::NodeEnv12)
+end
 
+Dotenv.load if Object.const_defined?(:Dotenv)

data/lib/itamae/node_env/version.rb

@@ -1,5 +1,5 @@
 module Itamae
   module NodeEnv
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: itamae-node_env
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - nownabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement