dotenv 0.3.0 → 0.5.0

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - ree

data/Changelog.md

@@ -1,5 +1,17 @@
 # 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.:
+    VARIABLE='some value'
+* Fix rake deprecation warnings
+
 ## 0.3.0 - Oct 25, 2012
 
 * Avoid overriding existing ENV variables so values set before loading the app are maintained.

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.3.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] = $2 if line =~ /\A([\w_]+)=(.*)\z/
+        self[$1] = $2 || $3 if line =~ /\A(\w+)(?:=|: ?)(?:'([^']*)'|([^']*))\z/
       end
     end
 

data/lib/dotenv/railtie.rb

@@ -1,16 +1,14 @@
 module Dotenv
   class Railtie < Rails::Railtie
+    include Rake::DSL if defined?(Rake)
+
     rake_tasks do
       desc 'Load environment settings from .env'
       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

@@ -39,6 +39,30 @@ describe Dotenv do
       it 'returns hash of loaded environments' do
         expect(subject).to eq(expected)
       end
+
+      context 'with quoted file' do
+        let(:expected) do
+          {'OPTION_A' => '1', 'OPTION_B' => '2', 'OPTION_C' => '', 'OPTION_D' => '\n', 'DOTENV' => 'true'}
+        end
+        let(:env_path) { fixture_path('quoted.env') }
+
+        it 'returns hash of loaded environments' do
+          expect(subject).to eq(expected)
+        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/quoted.env

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

data/spec/fixtures/yaml.env

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

metadata

@@ -1,62 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dotenv
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Loads environment variables from `.env`.
-email: 
+email:
 - brandon@opensoul.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .env
 - .gitignore
+- .travis.yml
 - Changelog.md
 - Gemfile
 - LICENSE
@@ -69,41 +65,42 @@ files:
 - lib/dotenv/tasks.rb
 - 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3615033000965864371
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3615033000965864371
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Loads environment variables from `.env`.
-test_files: 
+test_files:
 - spec/dotenv_spec.rb
 - spec/fixtures/plain.env
+- spec/fixtures/quoted.env
+- spec/fixtures/yaml.env
 - spec/spec_helper.rb