dotenv 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2909dd72a57cf2db579c7d0150f9300d0dca78c5
-  data.tar.gz: 809c0173b3ef00f36ea6d741949d74d8f544e99e
+  metadata.gz: cce545159cfd5b2760d935e32c63de6d00351b75
+  data.tar.gz: d28a58b874827bd2419da6a186d0553563cc0a7f
 SHA512:
-  metadata.gz: 052edd1c3120f6bb90cba716b64147c6aa8261d1ecb7e6b9e39bb01d445b22caa29da5c686ab8f326420f1c0a1ba39fb2aa80f7e3a589e863099d16cc8db3e2f
-  data.tar.gz: 5ed2d634130c83788b9d3a21204952fe257c046df600b1f07e1d2cbcfb3f934dc34f8bb43f895effb86a69826ad027f6041985dbbbe5551723334a9ed9cffa87
+  metadata.gz: 5983f239a869fa1480d0604ba55bcc98f3306af3aed5ec6251ceb685460adda7d691975eaefa5bffeb1b3fa8dbd4eaee9df855a6c62251893d8c61274c2fafd0
+  data.tar.gz: f709294d266b13935e00551f427f9a433fe4b996d786df20e4af9b37fc41ea3a3f8d4d3f10aae83b50c7c05e28f012ae610422006e1fe93b16c241b61c5a9195

data/Changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.0.2 - Oct 14, 2014
+
+* Define `#load` on `Dotenv::Railtie`, which can be called to manually load `dotenv` before Rails has initialized.
+
+* add `dotenv/rails-now`, which can be required in the `Gemfile` to immidately load dotenv.
+
+    gem 'dotenv-rails', :require => 'dotenv/rails-now'
+    gem 'gem-that-requires-env-variables'
+
+[Full Changelog](https://github.com/bkeepers/dotenv/compare/v1.0.1...v1.0.2)
+
 ## 1.0.1 - Oct 4, 2014
 
 * Fix load error with Spring when running `rails server` ([#140](https://github.com/bkeepers/dotenv/issues/140))
@@ -8,6 +19,8 @@
 
 ## 1.0.0 - Oct 3, 2014
 
+* dotenv-rails is now loaded during the `before_configuration` callback, which is fired when the `Application` constant is defined (`class Application < Rails::Application`).
+
 * Remove deprecated features. Upgrade to 0.11.0 and fix deprecation warnings before upgrading to 1.0.0.
 
 * Watch .env for changes with Spring in Rails 4 ([#118](https://github.com/bkeepers/dotenv/pull/118))

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec :name => 'dotenv'
+gemspec :name => 'dotenv-rails'
 
 gem 'dotenv-deployment', :github => 'bkeepers/dotenv-deployment'
 

data/README.md

@@ -24,7 +24,25 @@ And then execute:
 $ bundle
 ```
 
-It should be listed in the Gemfile before any other gems that use environment variables, otherwise those gems will get initialized with the wrong values.
+#### Note on load order
+
+dotenv is initialized in your Rails app during the `before_configuration` callback, which is fired when the `Application` constant is defined in `config/application.rb` with `class Application < Rails::Application`. If you need it to be initialized sooner, you can manually call `Dotenv::Railtie.load`.
+
+```ruby
+# config/application.rb
+Bundler.require(*Rails.groups)
+
+Dotenv::Railtie.load
+
+HOSTNAME = ENV['HOSTNAME']
+```
+
+If you use gems that require environment variables to be set before they are loaded, then list `dotenv-rails` in the `Gemfile` before those other gems and require `dotenv/rails-now`.
+
+```ruby
+gem 'dotenv-rails', :require => 'dotenv/rails-now'
+gem 'gem-that-requires-env-variables'
+```
 
 ### Sinatra or Plain ol' Ruby
 

data/dotenv.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/bkeepers/dotenv"
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files | grep -v rails`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "dotenv"

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,13 +56,10 @@ files:
 - README.md
 - Rakefile
 - bin/dotenv
-- dotenv-rails.gemspec
 - dotenv.gemspec
-- lib/dotenv-rails.rb
 - lib/dotenv.rb
 - lib/dotenv/environment.rb
 - lib/dotenv/parser.rb
-- lib/dotenv/railtie.rb
 - lib/dotenv/substitutions/command.rb
 - lib/dotenv/substitutions/variable.rb
 - lib/dotenv/tasks.rb

data/dotenv-rails.gemspec

@@ -1,18 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/dotenv/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.version       = Dotenv::VERSION
-  gem.authors       = ["Brandon Keepers"]
-  gem.email         = ["brandon@opensoul.org"]
-  gem.description   = %q{Autoload dotenv in Rails.}
-  gem.summary       = %q{Autoload dotenv in Rails.}
-  gem.homepage      = "https://github.com/bkeepers/dotenv"
-  gem.license       = 'MIT'
-
-  gem.files         = ["lib/dotenv-rails.rb"]
-  gem.name          = "dotenv-rails"
-  gem.require_paths = ["lib"]
-
-  gem.add_dependency 'dotenv', Dotenv::VERSION
-end

data/lib/dotenv-rails.rb

@@ -1 +0,0 @@
-require "dotenv/railtie"

data/lib/dotenv/railtie.rb

@@ -1,15 +0,0 @@
-require 'dotenv'
-
-module Dotenv
-  class Railtie < Rails::Railtie
-    config.before_configuration do
-      Dotenv.load Rails.root.join('.env')
-
-      begin
-        require "spring/watcher"
-        Spring.watch Rails.root.join('.env')
-      rescue LoadError
-      end
-    end
-  end
-end