figaro 0.6.4 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQzMmQ3NWI4M2ExYWE0OTc2MGY3NDY1YTQ0MDlmNDM5ZWEzOTI1Mw==
+    NzdlMWViMjZiNjk2MDk0MTE1YWZiNDcyMzU1ZmExOTAzYjI3ZTQyMA==
   data.tar.gz: !binary |-
-    ZWRlNjM4ZjViMGExMGE1ODkyOWI1M2Y0YTAxNWVkNGYwMGViY2UxMw==
+    MzY4M2FhNmZkZTQ4ZWMxYTQ3NjFjYTUwYjM0YTgyYTNhNTk2YzY2OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NThjYmVmYTZjM2YzNTNiZWI1MmI4ZTMxZTBlZWZhMTA3M2UwYjc2MWIxNjlj
-    Y2YxZjFlY2ZkM2ZjNzY3ZjQ4MTQyMTUzMDRhY2Q0OTE2MDY5NmQ2ODg1ZmM1
-    MWQ4NTc4NzFiMTkwMmEzMmQ4OWU2YjgzMzVjNTUzMDIwOWZiYmQ=
+    M2Y4NjlmNjJhNTZmOGM2MTAzODhlZjBmYzg3ZGNkMzQxNDFlMWI5ZTgxNzlj
+    YmQ5YmY4NDlhZDI5ZTIyZDA0ODc4NDI0NmViNzVhYjdmMDI1YWM0YWU3Zjkw
+    NTBkNDJmY2ZkYjdiMDk0NzQwZmI0ZmFlM2M4NDBmYTNhOTA1MTI=
   data.tar.gz: !binary |-
-    ZTU0NDQ3YmMwYjY4NWFkMzgwMzJjZjNhZWE3MmQxZWIwNDExYWQyM2RmOTVm
-    ZDA0NmJkYjY5NWM5Y2QwZTRmOTU5NWI4ZjVmZTUwOTQ3ZjBmZTU1ZTA2OGIz
-    NzA2MWRkNWU4ZmZjMzMwOTc4NTVhYWQzMDBjZDYyMzA4MmQwZTU=
+    YjBlYWZkZDU5MzA3NjJlNjc3N2FlZjE0OWIwZDA1YzA1MjRhM2NiNDI1MzA0
+    MjQxNjYwNzRlYWFiNDM5YzYzY2Q0ODAzZDA3ZDVjZjVmMzcyMTk5Nzk2ZTRh
+    ZDE0MDk1ZmJkZjRjMzkyNjk1ZmU3M2ExNjE5NmJlZGVjMmM0Y2Y=

data/.gitignore

@@ -1,20 +1,6 @@
-*.gem
-*.rbc
-.DS_Store
-.bundle
-.config
-.rvmrc
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-gemfiles/*.gemfile.lock
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.bundle
+/Gemfile.lock
+/coverage
+/gemfiles/*.gemfile.lock
+/pkg
+/tmp

data/.travis.yml

@@ -22,6 +22,6 @@ matrix:
     - gemfile: gemfiles/rails40.gemfile
       rvm: 1.9.2
   include:
-    - gemfile: Gemfile
-      rvm: 1.9.3
-      env: COVERAGE=true
+    - gemfile: gemfiles/rails40.gemfile
+      rvm: 2.0.0
+      env: COVERAGE=1

data/Gemfile

@@ -7,7 +7,7 @@ gem "rails", ">= 3.0.2", "< 5"
 group :test do
   gem "aruba", "~> 0.5"
   gem "coveralls", "~> 0.6", :require => false
-  gem "cucumber", "~> 1.2"
+  gem "cucumber", "~> 1.3"
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.13"
   gem "simplecov", "~> 0.7", :require => false

data/features/rails.feature

@@ -6,7 +6,7 @@ Feature: Rails
     And I create "lib/tasks/hello.rake" with:
       """
       task :hello => :environment do
-        puts ["Hello", ENV["HELLO"]].compact.join(", ") << "!"
+        puts ["Hello", ENV["HELLO"]].reject(&:blank?).join(", ") << "!"
       end
 
       task :greet => :environment do
@@ -71,3 +71,27 @@ Feature: Rails
       """
     When I run "rake greet"
     Then the output should be "Figaro, Figaro, Figaro!"
+
+  Scenario: Overriding values in application.yml
+    Given I create "config/application.yml" with:
+      """
+      GREETING: Figaro
+      """
+    When I run "rake greet GREETING=Ho"
+    Then the output should be "Ho, Ho, Ho!"
+
+  Scenario: Nullifying values in application.yml
+    Given I create "config/application.yml" with:
+      """
+      HELLO: world
+      """
+    When I run "rake hello HELLO="
+    Then the output should be "Hello!"
+
+  Scenario: Using ERB in application.yml
+    Given I create "config/application.yml" with:
+      """
+      GREETING: <%= "Yo" %>
+      """
+    When I run "rake greet"
+    Then the output should be "Yo, Yo, Yo!"

data/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.6.4"
+  gem.version = "0.7.0"
 
   gem.author      = "Steve Richert"
   gem.email       = "steve.richert@gmail.com"

data/gemfiles/rails30.gemfile

@@ -6,7 +6,7 @@ gem "rails", "~> 3.0.2"
 
 group :test do
   gem "aruba", "~> 0.5"
-  gem "cucumber", "~> 1.2"
+  gem "cucumber", "~> 1.3"
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.13"
 end

data/gemfiles/rails31.gemfile

@@ -6,7 +6,7 @@ gem "rails", "~> 3.1.0"
 
 group :test do
   gem "aruba", "~> 0.5"
-  gem "cucumber", "~> 1.2"
+  gem "cucumber", "~> 1.3"
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.13"
 end

data/gemfiles/rails32.gemfile

@@ -6,7 +6,7 @@ gem "rails", "~> 3.2.0"
 
 group :test do
   gem "aruba", "~> 0.5"
-  gem "cucumber", "~> 1.2"
+  gem "cucumber", "~> 1.3"
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.13"
 end

data/gemfiles/rails40.gemfile

@@ -2,11 +2,14 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "rails", ">= 4.0.0.beta", "< 4.1"
+gem "rails", "~> 4.0.0"
 
 group :test do
   gem "aruba", "~> 0.5"
-  gem "cucumber", "~> 1.2"
+  gem "coveralls", "~> 0.6", :require => false
+  gem "cucumber", "~> 1.3"
+  gem "json", "~> 1.7.7"
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.13"
+  gem "simplecov", "~> 0.7", :require => false
 end

data/lib/figaro.rb

@@ -22,7 +22,7 @@ module Figaro
   end
 
   def yaml
-    @yaml ||= File.exist?(path) ? File.read(path) : nil
+    @yaml ||= File.exist?(path) ? ERB.new(File.read(path)).result : nil
   end
 
   def path

data/lib/figaro/railtie.rb

@@ -4,7 +4,9 @@ require "yaml"
 module Figaro
   class Railtie < ::Rails::Railtie
     config.before_configuration do
-      ENV.update(Figaro.env)
+      Figaro.env.each do |key, value|
+        ENV[key] = value unless ENV.key?(key)
+      end
     end
 
     rake_tasks do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Steve Richert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler