figaro 0.6.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmQ0NjAyZmU3NWMzNTZkY2UzNDAyNTA0NTZjMjkwYTRiZDU3ZGU5ZA==
+  data.tar.gz: !binary |-
+    NmNkMTFlM2UwYzdmZTkxMWRmYTczZjI5NjM4M2Y2ZTY5N2QzY2E3NA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YWU3YTgzZmVhYzc2NjhjNTk4YTIyYzdkNzQwZDRiMWU4MzVlYWRiZmIwMDU4
+    OWU2ZTA5ZWQ4Y2RkODI2MmU3NzVmOGUwZTc2MjkyZmI5ODRjYjBkMmVlNDQ1
+    MmNjODFiM2FkNzc2ZjdiMjFjN2RlMmRiODMwNGFkYmRjN2RhODI=
+  data.tar.gz: !binary |-
+    MjczZTlkNmI2NTgwNjZjZTkxMTYxODY1MDI2ZWNjNjViZDkyODU3MzMyZTY1
+    MWRlZWM2ODJhZTMyZDI1NmQxYmUyZTBiYjM1NGMzNjVlMDE1ZWJkMDllNWNm
+    OGZhMzcwOGE3YTI1ZGYzZjIwYzkyMTE0MDU4MTAxNjY4YWU2ZDc=

data/.travis.yml

@@ -21,3 +21,7 @@ matrix:
       rvm: 1.8.7
     - gemfile: gemfiles/rails40.gemfile
       rvm: 1.9.2
+  include:
+    - gemfile: Gemfile
+      rvm: 1.9.3
+      env: COVERAGE=true

data/Gemfile

@@ -4,7 +4,11 @@ gemspec
 
 gem "rails", ">= 3.0.2", "< 5"
 
-gem "aruba", "~> 0.5.1"
-gem "cucumber", "~> 1.2.1"
-gem "rake", "~> 10.0.3"
-gem "rspec", "~> 2.13.0"
+group :test do
+  gem "aruba", "~> 0.5"
+  gem "coveralls", "~> 0.6", :require => false
+  gem "cucumber", "~> 1.2"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.13"
+  gem "simplecov", "~> 0.7", :require => false
+end

data/README.md

@@ -1,4 +1,9 @@
-# Figaro [![Build](https://travis-ci.org/laserlemon/figaro.png?branch=master)](https://travis-ci.org/laserlemon/figaro) [![Code Climate](https://codeclimate.com/github/laserlemon/figaro.png)](https://codeclimate.com/github/laserlemon/figaro)
+# Figaro
+[![Gem Version](https://badge.fury.io/rb/figaro.png)](http://badge.fury.io/rb/figaro)
+[![Build Status](https://travis-ci.org/laserlemon/figaro.png?branch=master)](https://travis-ci.org/laserlemon/figaro)
+[![Code Climate](https://codeclimate.com/github/laserlemon/figaro.png)](https://codeclimate.com/github/laserlemon/figaro)
+[![Coverage Status](https://coveralls.io/repos/laserlemon/figaro/badge.png?branch=master)](https://coveralls.io/r/laserlemon/figaro)
+[![Dependency Status](https://gemnasium.com/laserlemon/figaro.png)](https://gemnasium.com/laserlemon/figaro)
 
 Simple Rails app configuration
 

data/Rakefile

@@ -6,3 +6,12 @@ RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:cucumber)
 
 task :default => [:spec, :cucumber]
+
+if ENV["COVERAGE"]
+  Rake::Task[:default].enhance do
+    require "simplecov"
+    require "coveralls"
+
+    Coveralls::SimpleCov::Formatter.new.format(SimpleCov.result)
+  end
+end

data/features/rails.feature

@@ -9,10 +9,6 @@ Feature: Rails
         puts ["Hello", ENV["HELLO"]].compact.join(", ") << "!"
       end
 
-      task :nena => :environment do
-        puts [ENV["LUFTBALLOONS"], "Luftballoons"].compact.join(" ")
-      end
-
       task :greet => :environment do
         puts ([Figaro.env.greeting] * 3).join(", ") << "!"
       end
@@ -22,15 +18,7 @@ Feature: Rails
     When I run "rake hello"
     Then the output should be "Hello!"
 
-  Scenario: Has application.yml without requested key
-    Given I create "config/application.yml" with:
-      """
-      GOODBYE: Ruby Tuesday
-      """
-    When I run "rake hello"
-    Then the output should be "Hello!"
-
-  Scenario: Has blank application.yml
+ Scenario: Has blank application.yml
     Given I create "config/application.yml" with:
       """
       """
@@ -45,24 +33,6 @@ Feature: Rails
     When I run "rake hello"
     Then the output should be "Hello!"
 
-  Scenario: Has application.yml with requested key
-    Given I create "config/application.yml" with:
-      """
-      HELLO: world
-      """
-    When I run "rake hello"
-    Then the output should be "Hello, world!"
-
-  Scenario: Has application.yml with RAILS_ENV defaulting to "development"
-    Given I create "config/application.yml" with:
-      """
-      HELLO: world
-      development:
-        HELLO: developers
-      """
-    When I run "rake hello"
-    Then the output should be "Hello, developers!"
-
   Scenario: Has application.yml with RAILS_ENV set
     Given I create "config/application.yml" with:
       """
@@ -79,14 +49,6 @@ Feature: Rails
     When I run "rake hello RAILS_ENV=production"
     Then the output should be "Hello, users!"
 
-  Scenario: Has application.yml with non-string values
-    Given I create "config/application.yml" with:
-      """
-      LUFTBALLOONS: 99
-      """
-    When I run "rake nena"
-    Then the output should be "99 Luftballoons"
-
   Scenario: Generator creates and ignores application.yml file
     When I run "rails generate figaro:install"
     Then "config/application.yml" should exist

data/features/support/env.rb

@@ -1,3 +1,8 @@
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start { add_filter("features") }
+end
+
 require "pathname"
 
 ROOT = Pathname.new(File.expand_path("../../..", __FILE__))

data/figaro.gemspec

@@ -2,13 +2,14 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.6.1"
+  gem.version = "0.6.2"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]
   gem.summary     = "Simple Rails app configuration"
   gem.description = "Simple, Heroku-friendly Rails app configuration using ENV and a single YAML file"
   gem.homepage    = "https://github.com/laserlemon/figaro"
+  gem.license     = "MIT"
 
   gem.add_dependency "rails", ">= 3", "< 5"
 

data/gemfiles/rails30.gemfile

@@ -4,7 +4,11 @@ gemspec :path => "../"
 
 gem "rails", "~> 3.0.2"
 
-gem "aruba", "~> 0.5.1"
-gem "cucumber", "~> 1.2.1"
-gem "rake", "~> 10.0.3"
-gem "rspec", "~> 2.13.0"
+group :test do
+  gem "aruba", "~> 0.5"
+  gem "coveralls", "~> 0.6", :require => false
+  gem "cucumber", "~> 1.2"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.13"
+  gem "simplecov", "~> 0.7", :require => false
+end

data/gemfiles/rails31.gemfile

@@ -4,7 +4,11 @@ gemspec :path => "../"
 
 gem "rails", "~> 3.1.0"
 
-gem "aruba", "~> 0.5.1"
-gem "cucumber", "~> 1.2.1"
-gem "rake", "~> 10.0.3"
-gem "rspec", "~> 2.13.0"
+group :test do
+  gem "aruba", "~> 0.5"
+  gem "coveralls", "~> 0.6", :require => false
+  gem "cucumber", "~> 1.2"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.13"
+  gem "simplecov", "~> 0.7", :require => false
+end

data/gemfiles/rails32.gemfile

@@ -4,7 +4,11 @@ gemspec :path => "../"
 
 gem "rails", "~> 3.2.0"
 
-gem "aruba", "~> 0.5.1"
-gem "cucumber", "~> 1.2.1"
-gem "rake", "~> 10.0.3"
-gem "rspec", "~> 2.13.0"
+group :test do
+  gem "aruba", "~> 0.5"
+  gem "coveralls", "~> 0.6", :require => false
+  gem "cucumber", "~> 1.2"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.13"
+  gem "simplecov", "~> 0.7", :require => false
+end

data/gemfiles/rails40.gemfile

@@ -4,7 +4,11 @@ gemspec :path => "../"
 
 gem "rails", ">= 4.0.0.beta", "< 4.1"
 
-gem "aruba", "~> 0.5.1"
-gem "cucumber", "~> 1.2.1"
-gem "rake", "~> 10.0.3"
-gem "rspec", "~> 2.13.0"
+group :test do
+  gem "aruba", "~> 0.5"
+  gem "coveralls", "~> 0.6", :require => false
+  gem "cucumber", "~> 1.2"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.13"
+  gem "simplecov", "~> 0.7", :require => false
+end

data/lib/figaro/tasks.rake

@@ -1,6 +1,6 @@
 namespace :figaro do
   desc "Configure Heroku according to application.yml"
   task :heroku, [:app] => :environment do |_, args|
-    Figaro::Tasks.heroku(args[:app])
+    Figaro::Tasks::Heroku.new(args[:app]).invoke
   end
 end

data/lib/figaro/tasks.rb

@@ -1,12 +1,22 @@
 module Figaro
   module Tasks
-    def self.heroku(app = nil)
-      with_app = app ? " --app #{app}" : ""
+    class Heroku < Struct.new(:app)
+      def invoke
+        heroku("config:set #{vars}")
+      end
 
-      rails_env = `heroku config:get RAILS_ENV#{with_app}`.chomp
-      vars = Figaro.vars(rails_env.presence)
+      def vars
+        Figaro.vars(environment)
+      end
 
-      `heroku config:add #{vars}#{with_app}`
+      def environment
+        heroku("run 'echo $RAILS_ENV'").chomp[/(\w+)\z/]
+      end
+
+      def heroku(command)
+        with_app = app ? " --app #{app}" : ""
+        `heroku #{command}#{with_app}`
+      end
     end
   end
 end

data/spec/figaro/tasks_spec.rb

@@ -1,61 +1,71 @@
 require "spec_helper"
 
-describe Figaro::Tasks do
-  describe ".heroku" do
-    it "configures Heroku" do
-      Figaro.stub(:vars => "FOO=bar")
+module Figaro::Tasks
+  describe Heroku do
+    subject(:heroku) { Heroku.new }
 
-      Figaro::Tasks.should_receive(:`).once.with("heroku config:get RAILS_ENV").
-        and_return("development\n")
-      Figaro::Tasks.should_receive(:`).once.with("heroku config:add FOO=bar")
+    describe "#invoke" do
+      it "configures Heroku" do
+        heroku.stub(:vars => "FOO=bar")
 
-      Figaro::Tasks.heroku
-    end
+        heroku.should_receive(:heroku).once.with("config:set FOO=bar")
 
-    it "configures a specific Heroku app" do
-      Figaro.stub(:vars => "FOO=bar")
+        heroku.invoke
+      end
+    end
 
-      Figaro::Tasks.should_receive(:`).once.
-        with("heroku config:get RAILS_ENV --app my-app").
-        and_return("development\n")
-      Figaro::Tasks.should_receive(:`).once.
-        with("heroku config:add FOO=bar --app my-app")
+    describe "#vars" do
+      it "returns Figaro's vars for Heroku's environment" do
+        heroku.stub(:environment => "staging")
+        Figaro.stub(:vars).with("staging").and_return("FOO=bar")
 
-      Figaro::Tasks.heroku("my-app")
+        expect(heroku.vars).to eq("FOO=bar")
+      end
     end
 
-    it "respects the Heroku's remote Rails environment" do
-      Figaro::Tasks.stub(:`).with("heroku config:get RAILS_ENV").
-        and_return("production\n")
-
-      Figaro.should_receive(:vars).once.with("production").and_return("FOO=bar")
-      Figaro::Tasks.should_receive(:`).once.with("heroku config:add FOO=bar")
+    describe "#environment" do
+      it "returns Heroku's environment" do
+        heroku.stub(:heroku).with("run 'echo $RAILS_ENV'").and_return(<<-OUT)
+Running `echo $RAILS_ENV` attached to terminal... up, run.1234
+staging
+OUT
 
-      Figaro::Tasks.heroku
+        expect(heroku.environment).to eq("staging")
+      end
     end
 
-    it "defaults to the local Rails environment if not set remotely" do
-      Figaro::Tasks.stub(:`).with("heroku config:get RAILS_ENV").
-        and_return("\n")
+    describe "#heroku" do
+      it "runs a command on Heroku" do
+        heroku.should_receive(:`).once.with("heroku info")
 
-      Figaro.should_receive(:vars).once.with(nil).and_return("FOO=bar")
-      Figaro::Tasks.should_receive(:`).once.with("heroku config:add FOO=bar")
+        heroku.heroku("info")
+      end
 
-      Figaro::Tasks.heroku
-    end
+      it "runs a command on a specific Heroku app" do
+        heroku = Heroku.new("my-app")
 
-    describe "figaro:heroku", :rake => true do
-      it "configures Heroku" do
-        Figaro::Tasks.should_receive(:heroku).once.with(nil)
+        heroku.should_receive(:`).once.with("heroku info --app my-app")
 
-        task.invoke
+        heroku.heroku("info")
       end
+    end
+  end
 
-      it "configures a specific Heroku app" do
-        Figaro::Tasks.should_receive(:heroku).once.with("my-app")
+  describe "figaro:heroku", :rake => true do
+    subject(:heroku) { mock(:heroku) }
 
-        task.invoke("my-app")
-      end
+    it "configures Heroku" do
+      Figaro::Tasks::Heroku.stub(:new).with(nil).and_return(heroku)
+      heroku.should_receive(:invoke).once
+
+      task.invoke
+    end
+
+    it "configures a specific Heroku app" do
+      Figaro::Tasks::Heroku.stub(:new).with("my-app").and_return(heroku)
+      heroku.should_receive(:invoke).once
+
+      task.invoke("my-app")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start { add_filter("spec") }
+end
+
 require "figaro"
 require "pathname"
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Steve Richert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,28 +68,28 @@ files:
 - spec/spec_helper.rb
 - spec/support/rake.rb
 homepage: https://github.com/laserlemon/figaro
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Rails app configuration
 test_files:
 - features/rails.feature