capistrano-env 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8394b3df385b2e98915069903bba6a7872d4a748
-  data.tar.gz: 146ab944a4f23d4dadbbdaf55c3906e97998449e
+  metadata.gz: eca7b988424503f05ab3e67e4dfe6a9b9bf18bf0
+  data.tar.gz: 3c5cecb6d77d1c5e51914892964a1bee6165946e
 SHA512:
-  metadata.gz: 5b4b7db0207a332abdfb87863b856b69350894e0724494d96129304474fb8f669967bc70b564e9e28d205251e4b0c904cf96e43e99f2807ec90f835560fefa82
-  data.tar.gz: c738fc446c37cc7795416230bc23f59e80c3c4f4c37f6a9d3e8be9897ce864d7138e5113542ab8104aa708064ca8b09cab7559fd9c3904184cb2d911e6759f52
+  metadata.gz: f71e31fce1fa9e316d74dc3839520e20679b811c0beb75432f7a1299c1d4c02a44903f2ecb47f5487c0a1170b05db29fbee70d1509c1bfcec367fb674114423c
+  data.tar.gz: 79da44e5a2556f819b49759584bf9586ecc6e18034c4fc780b9d16b1771f2b557522b047c3b0291f84beb26e442067b48aa6b1be4e7e716f0ffe892fc2e3be00

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.2

data/README.md

@@ -24,6 +24,9 @@ Or install it yourself as:
 ```ruby
 capenv.use do |env|
   env.add /^MYAPP_/
+  env.add /^MYAPP_/ do |key|
+     key.gsub /^MYAPP_/, '' # replace keyname like MYAPP_DATABASE_URL => DATABASE_URL
+  end
   env.add 'UNICORN_PROCESSES'
   env.add 'HOGE', 'hage'
 end

data/lib/capistrano/env/config.rb

@@ -9,11 +9,11 @@ module Capistrano
         @keys = []
       end
 
-      def add(name_or_regexp, val = nil)
+      def add(name_or_regexp, val = nil, &block)
         if val && name_or_regexp.is_a?(String)
           @values[name_or_regexp] = val
         else
-          @keys << name_or_regexp
+          @keys << [name_or_regexp, block]
         end
       end
 
@@ -26,13 +26,17 @@ module Capistrano
 
       def envs
         result = {}
-        @keys.each do |key|
+        @keys.each do |key, block|
           key_values = if key.is_a? Regexp
                          ENV.select{|x| x =~ key }
                        else
                          ENV.select{|x| x == key }
                        end
-
+          if block
+            key_values = Hash[key_values.map do |k, v|
+              [block.call(k), v]
+            end]
+          end
           result.merge!(key_values)
         end
         result.merge(@values)

data/lib/capistrano/env/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Env
-    VERSION = "0.0.7"
+    VERSION = "0.1.0"
   end
 end

data/spec/capistrano/env/config_spec.rb

@@ -50,5 +50,14 @@ describe Capistrano::Env::Config do
       end
       it { expect(config.envs).to eq({"CAPENV_TEST_A" => "a", "CAPENV_TEST_B" => "UNKO"}) }
     end
+    describe "fix key with block" do
+      before do
+        config.add /^CAPENV_TEST_/
+        config.add /^CAPENV_TEST_/ do |key|
+          key.gsub(/CAPENV_/, '')
+        end
+      end
+      it { expect(config.envs).to eq({"CAPENV_TEST_A" => "a", "CAPENV_TEST_B" => "1,2,3", "TEST_A" => "a", "TEST_B" => "1,2,3"}) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-env
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails