figaro 0.5.3 → 0.5.4

data/README.md

@@ -1,4 +1,4 @@
-# Figaro [![Build Status](https://secure.travis-ci.org/laserlemon/figaro.png)](http://travis-ci.org/laserlemon/figaro) [![Dependency Status](https://gemnasium.com/laserlemon/figaro.png)](https://gemnasium.com/laserlemon/figaro)
+# Figaro [![Build Status](https://travis-ci.org/laserlemon/figaro.png?branch=master)](https://travis-ci.org/laserlemon/figaro)
 
 Simple Rails app configuration
 

data/Rakefile

@@ -1,9 +1,6 @@
-#!/usr/bin/env rake
-
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "cucumber/rake/task"
-require "appraisal"
 
 RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:cucumber)

data/features/step_definitions/rails_steps.rb

@@ -1,5 +1,12 @@
 Given "a new Rails app" do
-  in_current_dir{ FileUtils.rm_rf("example") }
-  run_simple("bundle exec rails new example --skip-bundle --skip-active-record --skip-sprockets --skip-javascript --skip-test-unit")
+  in_current_dir { FileUtils.rm_rf("example") }
+  run_simple(<<-CMD)
+    bundle exec rails new example \
+      --skip-bundle \
+      --skip-active-record \
+      --skip-sprockets \
+      --skip-javascript \
+      --skip-test-unit
+    CMD
   cd("example")
 end

data/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.5.3"
+  gem.version = "0.5.4"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]
@@ -12,11 +12,10 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rails", "~> 3.0"
 
-  gem.add_development_dependency "appraisal", "~> 0.4"
-  gem.add_development_dependency "aruba", "~> 0.4"
-  gem.add_development_dependency "cucumber", "~> 1.0"
+  gem.add_development_dependency "aruba", "~> 0.5.1"
+  gem.add_development_dependency "cucumber", "~> 1.2.1"
   gem.add_development_dependency "rake", ">= 0.8.7"
-  gem.add_development_dependency "rspec", "~> 2.0"
+  gem.add_development_dependency "rspec", "~> 2.12.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(/^(features|gemfiles|spec)/)

data/gemfiles/rails30.gemfile

@@ -1,7 +1,5 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31.gemfile

@@ -1,7 +1,5 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -1,7 +1,5 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/figaro.rb

@@ -36,10 +36,10 @@ module Figaro
   private
 
   def flatten(hash)
-    hash.reject{|_,v| Hash === v }
+    hash.reject { |_, v| Hash === v }
   end
 
   def stringify(hash)
-    hash.inject({}){|h,(k,v)| h[k.to_s] = v.to_s; h }
+    hash.inject({}) { |h, (k, v)| h[k.to_s] = v && v.to_s; h }
   end
 end

data/lib/figaro/env.rb

@@ -5,7 +5,7 @@ module Figaro
     end
 
     def method_missing(method, *)
-      ENV.fetch(method.to_s.upcase){ super }
+      ENV.fetch(method.to_s.upcase) { super }
     end
 
     def respond_to?(method)

data/lib/figaro/tasks.rb

@@ -1,5 +1,3 @@
-require "open3"
-
 module Figaro
   module Tasks
     def self.heroku(app = nil)

data/lib/generators/figaro/install/install_generator.rb

@@ -4,12 +4,12 @@ module Figaro
       source_root File.expand_path("../templates", __FILE__)
 
       def create_configuration
-        copy_file "application.yml", "config/application.yml"
+        copy_file("application.yml", "config/application.yml")
       end
 
       def ignore_configuration
         if File.exists?(".gitignore")
-          append_to_file ".gitignore" do
+          append_to_file(".gitignore") do
             <<-EOF.strip_heredoc
 
             # Ignore application configuration

data/spec/figaro/env_spec.rb

@@ -18,6 +18,6 @@ describe Figaro::Env do
   end
 
   it "raises an error if no ENV key matches" do
-    expect{ subject.goodbye }.to raise_error(NoMethodError)
+    expect { subject.goodbye }.to raise_error(NoMethodError)
   end
 end

data/spec/figaro_spec.rb

@@ -27,25 +27,31 @@ describe Figaro do
 
   describe ".env" do
     it "is a Figaro env instance" do
-      Figaro.stub(:raw => {"FOO" => "bar"})
+      Figaro.stub(:raw => { "FOO" => "bar" })
 
       Figaro.env.should be_a(Figaro::Env)
     end
 
     it "allows access to a particular environment" do
       Figaro.stub(:raw).and_return(
-        "development" => {"HELLO" => "developers"},
-        "production" => {"HELLO" => "world"}
+        "development" => { "HELLO" => "developers" },
+        "production" => { "HELLO" => "world" }
       )
 
-      Figaro.env(:development).should == {"HELLO" => "developers"}
-      Figaro.env(:production).should == {"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"}
+      Figaro.env.should == { "LUFTBALLOONS" => "99" }
+    end
+
+    it "allows nil values" do
+      Figaro.stub(:raw).and_return("FOO" => nil)
+
+      Figaro.env.should == { "FOO" => nil }
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,4 +3,4 @@ require "pathname"
 
 ROOT = Pathname.new(File.expand_path("../..", __FILE__))
 
-Dir[ROOT.join("spec/support/**/*.rb")].each{|f| require f }
+Dir[ROOT.join("spec/support/**/*.rb")].each { |f| require f }

data/spec/support/rake.rb

@@ -1,11 +1,11 @@
 require "rake"
 
 shared_context "rake", :rake => true do
-  let(:rake){ Rake.application = Rake::Application.new }
-  let(:task){ rake[self.class.description] }
+  let(:rake) { Rake.application = Rake::Application.new }
+  let(:task) { rake[self.class.description] }
 
   before do
     rake.rake_require("lib/figaro/tasks", [ROOT.to_s], [])
     Rake::Task.define_task(:environment)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
 description: Simple, Heroku-friendly Rails app configuration using ENV and a single
   YAML file
 email:
@@ -117,7 +101,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- Appraisals
 - Gemfile
 - LICENSE
 - README.md
@@ -158,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2716496267294423407
+      hash: 1204089814045213834
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,10 +150,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2716496267294423407
+      hash: 1204089814045213834
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple Rails app configuration

data/Appraisals

@@ -1,11 +0,0 @@
-appraise "rails30" do
-  gem "rails", "~> 3.0.0"
-end
-
-appraise "rails31" do
-  gem "rails", "~> 3.1.0"
-end
-
-appraise "rails32" do
-  gem "rails", "~> 3.2.0"
-end