dbenvy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2ca8dc51341425a9b3f00a5d58f9819b3aa89d
-  data.tar.gz: c815f682f306ecf0f5c6a2de078ba9d067e63054
+  metadata.gz: c4cbf40ffe72b693dd603e82176a823ad5b36d8f
+  data.tar.gz: 1ee3cffdba2ed2b609736d7ce19bc121af998b9a
 SHA512:
-  metadata.gz: b999b5909f36bfcb42a55013bcb7cf8bdf721ee92167f5705a7a42ad2cb0b8cf31505479511c294a0875c4a5f31fdabc21151f2b76a54db445b7c6d53848f056
-  data.tar.gz: 08fb0c39d6df36f85ca63c8b0b2eae8ff46bb5d30dc9c9115b9d3688c11bc7d2c1fbc898a611c257c58f33681468bed9aba18b221f93859c7d3b5265a977b0f5
+  metadata.gz: ef5b63db0130967cf8bf74efdec9466453de491a48521d0df78ba844b7a60902dbbb71fe5ab4d2ce9f9cbdae05b11b1c465367ffff93590f5299d3f779810857
+  data.tar.gz: 99472c23d5c814e41c188ce9698ccf96231309e2b31cd6a55a9bd805800908b9ae7b373ecf1d2a893f4312178a87498ba79424bdc64e9a5745559ba93806f46e

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3-p551
+  - 2.0.0-p598
+  - 2.1.5

data/README.md

@@ -1,4 +1,6 @@
-# Dbenvy
+[![Build Status](https://travis-ci.org/reevoo/dbenvy.svg?branch=master)](https://travis-ci.org/reevoo/dbenvy)
+
+# DBEnvy
 
 Load DB info from the environment
 
@@ -16,12 +18,16 @@ And then execute:
 
 ## Usage
 
-Add the following to your database.yml file and set the DATABASE_URL environment variable
+Add the following to your database.yml file and set the DATABASE_URL environment variable.
 
 ```
-<% DBEnvy.yaml %>
+<%= DBEnvy.yaml %>
 ```
 
+## Note
+
+You do not need this in a Rails 4.1 app as loading database info from DATABASE_URL is supported out of the box
+
 ## Contributing
 
 1. Fork it ( https://github.com/reevoo/dbenvy/fork )

data/Rakefile

@@ -3,3 +3,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task release: :spec
+task default: :spec

data/lib/dbenvy.rb

@@ -29,7 +29,7 @@ class DBEnvy
   private
 
   def rails_env
-    ENV['RAILS_ENV']
+    ENV['RAILS_ENV'] || Rails.env if defined?(Rails)
   end
 
   def credentials

data/lib/dbenvy/version.rb

@@ -1,3 +1,3 @@
 class DBEnvy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/unit/dbenvy_spec.rb

@@ -56,6 +56,42 @@ describe DBEnvy do
       end
     end
 
+    context 'when RAILS_ENV is not set but Rails.env is avaliable' do
+      module Rails
+        extend self
+
+        def env
+          nil
+        end
+      end
+
+      context 'uses RAILS_ENV if it can' do
+        before do
+          ENV['DATABASE_URL'] = 'mysql2://reevoo:secret@db456.reevoover.com:3306/reevoo_awesome'
+          ENV['RAILS_ENV'] = 'ENV'
+          allow(Rails).to receive(:env).and_return('env')
+        end
+
+        specify do
+          expect(YAML.load(yaml)['ENV']).to_not be_nil
+          expect(YAML.load(yaml)['env']).to be_nil
+        end
+      end
+
+      context 'uses Rails.env if RAILS_ENV is not set' do
+        before do
+          ENV['DATABASE_URL'] = 'mysql2://reevoo:secret@db456.reevoover.com:3306/reevoo_awesome'
+          ENV['RAILS_ENV'] = nil
+          allow(Rails).to receive(:env).and_return('env')
+        end
+
+        specify do
+          expect(YAML.load(yaml)['ENV']).to be_nil
+          expect(YAML.load(yaml)['env']).to_not be_nil
+        end
+      end
+    end
+
     context 'when RAILS_ENV is set' do
       before do
         ENV['RAILS_ENV'] = 'production'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbenvy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,8 +75,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile