Merge pull request #64 from bibendi/fix/run-vars

Fix passing env vars through argv

Author: bibendi

lib/dip/run_vars.rb

@@ -17,8 +17,6 @@ def call(*args)
     def initialize(argv, env = ENV)
       @argv = argv
       @env = env
-
-      self.class.env.clear
     end
 
     def call
@@ -32,7 +30,7 @@ def populate_env_vars
       return if early_envs.empty?
 
       (env.keys - early_envs).each do |key|
-        next if env_excluded?(key)
+        next if ignore_var?(key)
 
         self.class.env[key] = env[key]
       end
@@ -56,7 +54,7 @@ def early_envs
       @early_envs ||= env["DIP_EARLY_ENVS"].to_s.split(",")
     end
 
-    def env_excluded?(key)
+    def ignore_var?(key)
       key.start_with?("DIP_", "_")
     end
   end

spec/lib/dip/run_vars_spec.rb

@@ -8,10 +8,18 @@
   end
 
   context "when env vars in argv" do
-    specify do
+    it "parses them and stores in class var" do
       expect(described_class.call(%w(FOO=foo BAR=bar run rspec))).to eq %w(run rspec)
       expect(described_class.env).to include("FOO" => "foo", "BAR" => "bar")
     end
+
+    context "and call multiple times" do
+      it "doesn't reset previous vars" do
+        expect(described_class.call(%w(FOO=foo BAR=bar run rspec))).to eq %w(run rspec)
+        expect(described_class.call(%w(run rspec))).to eq %w(run rspec)
+        expect(described_class.env).to include("FOO" => "foo", "BAR" => "bar")
+      end
+    end
   end
 
   context "when early_envs is present" do

spec/spec_helper.rb

@@ -43,6 +43,7 @@
 
   config.before do
     Dip.reset!
+    Dip::RunVars.env.clear
   end
 
   Kernel.srand config.seed