dotenv 0.4.0 → 0.5.0

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.0 - Jan 25, 2013
+
+* Load immediately on require in Rails instead of waiting for initialization
+* Add YAML-style variables
+    VARIABLE: some value
+
 ## 0.4.0 - Nov 13, 2012
 
 * Add support for quoted options, e.g.:

data/README.md

@@ -1,4 +1,4 @@
-# dotenv
+# dotenv [![Build Status](https://secure.travis-ci.org/bkeepers/dotenv.png)](https://travis-ci.org/bkeepers/dotenv)
 
 Loads environment variables from `.env` into `ENV`, automagically.
 
@@ -10,7 +10,9 @@ Read more about the [motivation for dotenv at opensoul.org](http://opensoul.org/
 
 Add this line to your application's Gemfile:
 
-    gem 'dotenv', :groups => [:development, :test]
+```ruby
+gem 'dotenv', :groups => [:development, :test]
+```
 
 And then execute:
 
@@ -24,32 +26,49 @@ Install the gem:
 
 As early as possible in your application bootstrap process, load `.env`:
 
-    require 'dotenv'
-    Dotenv.load
+```ruby
+require 'dotenv'
+Dotenv.load
+```
 
 To ensure `.env` is loaded in rake, load the tasks:
 
-    require 'dotenv/tasks'
+```ruby
+require 'dotenv/tasks'
 
-    task :mytask => :dotenv do
-      # things that require .env
-    end
+task :mytask => :dotenv do
+    # things that require .env
+end
+```
 
 ## Usage
 
 Add your application configuration to `.env`.
 
-    S3_BUCKET=dotenv
-    SECRET_KEY=sssshhh!
+```shell
+S3_BUCKET=dotenv
+SECRET_KEY=sssshhh!
+```
 
 You can also create files per environment, such as `.env.test`:
 
-    S3_BUCKET=test
-    SECRET_KEY=test
+```shell
+S3_BUCKET=test
+SECRET_KEY=test
+```
+
+An alternate yaml-like syntax is supported:
+
+```yaml
+S3_BUCKET: dotenv
+SECRET_KEY: 'sesame, open'
+```
 
 Whenever your application loads, these variables will be available in `ENV`:
 
-    config.fog_directory  = ENV['S3_BUCKET']
+```ruby
+config.fog_directory  = ENV['S3_BUCKET']
+```
 
 ## Contributing
 

data/dotenv.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.version       = '0.4.0'
+  gem.version       = '0.5.0'
   gem.authors       = ["Brandon Keepers"]
   gem.email         = ["brandon@opensoul.org"]
   gem.description   = %q{Loads environment variables from `.env`.}

data/lib/dotenv/environment.rb

@@ -7,7 +7,7 @@ module Dotenv
 
     def load
       read.each do |line|
-        self[$1] = $3 || $4 if line =~ /\A([\w_]+)=('([^']*)'|([^']*))\z/
+        self[$1] = $2 || $3 if line =~ /\A(\w+)(?:=|: ?)(?:'([^']*)'|([^']*))\z/
       end
     end
 

data/lib/dotenv/railtie.rb

@@ -7,12 +7,8 @@ module Dotenv
       task :dotenv do
         Dotenv.load ".env.#{Rails.env}", '.env'
       end
-
-      task :environment => :dotenv
-    end
-
-    initializer 'dotenv', :group => :all do
-      Dotenv.load ".env.#{Rails.env}", '.env'
     end
   end
-end
+end
+
+Dotenv.load ".env.#{Rails.env}", '.env'

data/spec/dotenv_spec.rb

@@ -51,6 +51,18 @@ describe Dotenv do
         end
 
       end
+
+      context 'with yaml file' do
+        let(:expected) do
+          {'OPTION_A' => '1', 'OPTION_B' => '2', 'OPTION_C' => '', 'OPTION_D' => '\n', 'DOTENV' => 'true'}
+        end
+        let(:env_path) { fixture_path('yaml.env') }
+
+        it 'returns hash of loaded environments' do
+          expect(subject).to eq(expected)
+        end
+
+      end
     end
   end
 

data/spec/fixtures/yaml.env

@@ -0,0 +1,4 @@
+OPTION_A: 1
+OPTION_B: '2'
+OPTION_C: ''
+OPTION_D: '\n'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,7 @@ files:
 - spec/dotenv_spec.rb
 - spec/fixtures/plain.env
 - spec/fixtures/quoted.env
+- spec/fixtures/yaml.env
 - spec/spec_helper.rb
 homepage: https://github.com/bkeepers/dotenv
 licenses: []
@@ -79,12 +80,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3615033000965864371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3615033000965864371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -95,4 +102,5 @@ test_files:
 - spec/dotenv_spec.rb
 - spec/fixtures/plain.env
 - spec/fixtures/quoted.env
+- spec/fixtures/yaml.env
 - spec/spec_helper.rb