figaro 0.5.0 → 0.5.1

data/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.5.0"
+  gem.version = "0.5.1"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]

data/lib/figaro.rb

@@ -1,5 +1,6 @@
 require "figaro/env"
 require "figaro/railtie"
+require "figaro/tasks"
 
 module Figaro
   extend self

data/lib/figaro/tasks.rake

@@ -1,9 +1,6 @@
 namespace :figaro do
   desc "Configure Heroku according to application.yml"
   task :heroku, [:app] => :environment do |_, args|
-    app = args[:app] ? " --app #{args[:app]}" : ""
-    rails_env = Kernel.system("heroku config:get RAILS_ENV#{app}").presence
-    Rails.env = rails_env if rails_env
-    Kernel.system("heroku config:add #{Figaro.vars}#{app}")
+    Figaro::Tasks.heroku(args[:app])
   end
 end

data/lib/figaro/tasks.rb

@@ -0,0 +1,14 @@
+require "open3"
+
+module Figaro
+  module Tasks
+    def self.heroku(app = nil)
+      with_app = app ? " --app #{app}" : ""
+
+      rails_env = Open3.capture2("heroku config:get RAILS_ENV#{with_app}")
+      vars = Figaro.vars(rails_env.presence)
+
+      Open3.capture2("heroku config:add #{vars}#{with_app}")
+    end
+  end
+end

data/spec/figaro/tasks_spec.rb

@@ -1,43 +1,61 @@
 require "spec_helper"
 
-describe "Figaro Rake tasks", :rake => true do
-  describe "figaro:heroku" do
-    before do
-      @original_rails_env = ENV["RAILS_ENV"]
-      ENV["RAILS_ENV"] = "development"
-    end
+describe Figaro::Tasks do
+  describe ".heroku" do
+    it "configures Heroku" do
+      Figaro.stub(:vars => "FOO=bar")
 
-    after do
-      ENV["RAILS_ENV"] = @original_rails_env
-      Rails.send(:remove_instance_variable, :@_env)
-    end
+      Open3.should_receive(:capture2).once.with("heroku config:get RAILS_ENV").
+        and_return("development")
+      Open3.should_receive(:capture2).once.with("heroku config:add FOO=bar")
 
-    it "configures Heroku" do
-      Figaro.stub(:env => {"HELLO" => "world", "FOO" => "bar"})
-      Kernel.stub(:system).with("heroku config:get RAILS_ENV").and_return("development")
-      Kernel.should_receive(:system).once.with("heroku config:add FOO=bar HELLO=world")
-      task.invoke
+      Figaro::Tasks.heroku
     end
 
     it "configures a specific Heroku app" do
-      Figaro.stub(:env => {"HELLO" => "world", "FOO" => "bar"})
-      Kernel.stub(:system).with("heroku config:get RAILS_ENV --app my-app").and_return("development")
-      Kernel.should_receive(:system).once.with("heroku config:add FOO=bar HELLO=world --app my-app")
-      task.invoke("my-app")
+      Figaro.stub(:vars => "FOO=bar")
+
+      Open3.should_receive(:capture2).once.
+        with("heroku config:get RAILS_ENV --app my-app").
+        and_return("development")
+      Open3.should_receive(:capture2).once.
+        with("heroku config:add FOO=bar --app my-app")
+
+      Figaro::Tasks.heroku("my-app")
     end
 
     it "respects the Heroku's remote Rails environment" do
-      Figaro.stub(:raw => {"development" => {"HELLO" => "developers"}, "production" => {"HELLO" => "world"}})
-      Kernel.stub(:system).with("heroku config:get RAILS_ENV").and_return("production")
-      Kernel.should_receive(:system).once.with("heroku config:add HELLO=world")
-      task.invoke
+      Open3.stub(:capture2).with("heroku config:get RAILS_ENV").
+        and_return("production")
+
+      Figaro.should_receive(:vars).once.with("production").and_return("FOO=bar")
+      Open3.should_receive(:capture2).once.with("heroku config:add FOO=bar")
+
+      Figaro::Tasks.heroku
     end
 
     it "defaults to the local Rails environment if not set remotely" do
-      Figaro.stub(:raw => {"development" => {"HELLO" => "developers"}, "production" => {"HELLO" => "world"}})
-      Kernel.stub(:system).with("heroku config:get RAILS_ENV").and_return("\n")
-      Kernel.should_receive(:system).once.with("heroku config:add HELLO=developers")
-      task.invoke
+      Open3.stub(:capture2).with("heroku config:get RAILS_ENV").
+        and_return("\n")
+
+      Figaro.should_receive(:vars).once.with(nil).and_return("FOO=bar")
+      Open3.should_receive(:capture2).once.with("heroku config:add FOO=bar")
+
+      Figaro::Tasks.heroku
+    end
+
+    describe "figaro:heroku", :rake => true do
+      it "configures Heroku" do
+        Figaro::Tasks.should_receive(:heroku).once.with(nil)
+
+        task.invoke
+      end
+
+      it "configures a specific Heroku app" do
+        Figaro::Tasks.should_receive(:heroku).once.with("my-app")
+
+        task.invoke("my-app")
+      end
     end
   end
 end

data/spec/figaro_spec.rb

@@ -3,29 +3,43 @@ require "spec_helper"
 describe Figaro do
   describe ".vars" do
     it "dumps and sorts env" do
-      Figaro.stub(:raw => {"HELLO" => "world", "FOO" => "bar"})
+      Figaro.stub(:env => Figaro::Env.from("HELLO" => "world", "FOO" => "bar"))
+
       Figaro.vars.should == "FOO=bar HELLO=world"
     end
 
     it "allows access to a particular environment" do
-      Figaro.stub(:raw => {"development" => {"HELLO" => "developers"}, "production" => {"HELLO" => "world"}})
-      Figaro.vars(:development).should == "HELLO=developers"
-      Figaro.vars(:production).should == "HELLO=world"
+      Figaro.stub(:env).with("development").
+        and_return(Figaro::Env.from("HELLO" => "developers"))
+      Figaro.stub(:env).with("production").
+        and_return(Figaro::Env.from("HELLO" => "world"))
+
+      Figaro.vars("development").should == "HELLO=developers"
+      Figaro.vars("production").should == "HELLO=world"
     end
   end
 
   describe ".env" do
-    it "makes ENV values accessible" do
-      ENV["HELLO"] = "world"
-      Figaro.stub(:raw => {})
-      Figaro.env.hello.should == "world"
-      ENV.delete("HELLO")
+    it "is a Figaro env instance" do
+      Figaro.stub(:raw => {"FOO" => "bar"})
+
+      Figaro.env.should be_a(Figaro::Env)
     end
 
     it "allows access to a particular environment" do
-      Figaro.stub(:raw => {"development" => {"HELLO" => "developers"}, "production" => {"HELLO" => "world"}})
+      Figaro.stub(:raw).and_return(
+        "development" => {"HELLO" => "developers"},
+        "production" => {"HELLO" => "world"}
+      )
+
       Figaro.env(:development).should == {"HELLO" => "developers"}
       Figaro.env(:production).should == {"HELLO" => "world"}
     end
+
+    it "stringifies keys and values" do
+      Figaro.stub(:raw).and_return(:LUFTBALLOONS => 99)
+
+      Figaro.env.should == {"LUFTBALLOONS" => "99"}
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,7 @@ files:
 - lib/figaro/env.rb
 - lib/figaro/railtie.rb
 - lib/figaro/tasks.rake
+- lib/figaro/tasks.rb
 - lib/generators/figaro/install/install_generator.rb
 - lib/generators/figaro/install/templates/application.yml
 - spec/figaro/env_spec.rb
@@ -157,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3428766527844493391
+      hash: -996973026754623645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3428766527844493391
+      hash: -996973026754623645
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24