dotenv 0.6.0 → 0.7.0

data/.gitignore

@@ -4,3 +4,4 @@
 .config
 .yardoc
 Gemfile.lock
+tmp

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.7.0 - April 15, 2013
+
+* Remove deprectated autoloading. Upgrade to 0.6 first and fix any warnings.
+
+* Add Dotenv.load! which raises Errno::ENOENT if the file does not exist
+
 ## 0.6.0 - Mar 22, 2013
 
 * Add dotenv-rails gem for autoloading in a Rails app
@@ -8,13 +14,13 @@
 
 * Support for double quotes
 
-      A="some value"
-      B="with \"escaped\" quotes"
-      C="and newline\n expansion"
+        A="some value"
+        B="with \"escaped\" quotes"
+        C="and newline\n expansion"
 
 * Support for pow-style variables prefixed with export
 
-      export VARIABLE="some value"
+        export VARIABLE="some value"
 
 [Full Changelog](https://github.com/bkeepers/dotenv/compare/v0.5.0...v0.6.0)
 

data/Rakefile

@@ -1,16 +1,24 @@
 #!/usr/bin/env rake
 
 require 'bundler/gem_helper'
-%w(dotenv dotenv-rails).each do |name|
-  namespace name do
-    Bundler::GemHelper.install_tasks :name => name
+
+namespace 'dotenv' do
+  Bundler::GemHelper.install_tasks :name => 'dotenv'
+end
+
+namespace 'dotenv-rails' do
+  class DotenvRailsGemHelper < Bundler::GemHelper
+    def guard_already_tagged; end # noop
+    def tag_version; end # noop
   end
 
-  task :build => "#{name}:build"
-  task :install => "#{name}:install"
-  task :release => "#{name}:release"
+  DotenvRailsGemHelper.install_tasks :name => 'dotenv-rails'
 end
 
+task :build => ["dotenv:build", 'dotenv-rails:build']
+task :install => ["dotenv:install", 'dotenv-rails:install']
+task :release => ["dotenv:release", 'dotenv-rails:release']
+
 require 'rspec/core/rake_task'
 
 desc "Run all specs"

data/lib/dotenv-rails.rb

@@ -1,2 +1 @@
 require 'dotenv/railtie'
-Dotenv::Railtie.no_warn!

data/lib/dotenv.rb

@@ -2,12 +2,22 @@ require 'dotenv/environment'
 
 module Dotenv
   def self.load(*filenames)
-    filenames << '.env' if filenames.empty?
-    filenames.inject({}) do |hash, filename|
-      hash.merge Dotenv::Environment.new(filename).apply
+    default_if_empty(filenames).inject({}) do |hash, filename|
+      hash.merge(File.exists?(filename) ? Environment.new(filename).apply : {})
     end
   end
-end
 
-# Deprecated
-require 'dotenv/railtie' if defined?(Rails) and defined?(Rails::Railtie)
+  # same as `load`, but raises Errno::ENOENT if any files don't exist
+  def self.load!(*filenames)
+    load(
+      *default_if_empty(filenames).each do |filename|
+        raise(Errno::ENOENT.new(filename)) unless File.exists?(filename)
+      end
+    )
+  end
+
+protected
+  def self.default_if_empty(filenames)
+    filenames.empty? ? (filenames << '.env') : filenames
+  end
+end

data/lib/dotenv/environment.rb

@@ -2,7 +2,7 @@ module Dotenv
   class Environment < Hash
     def initialize(filename)
       @filename = filename
-      load if File.exists? @filename
+      load
     end
 
     def load

data/lib/dotenv/railtie.rb

@@ -10,25 +10,6 @@ module Dotenv
         Dotenv.load ".env.#{Rails.env}", '.env'
       end
     end
-
-    class << self
-      def no_warn!
-        @no_warn = true
-      end
-
-      def no_warn?
-        @no_warn
-      end
-    end
-
-    initializer 'dotenv', :group => :all do
-      unless self.class.no_warn?
-        warn <<-EOF
-[DEPRECATION] Autoloading for dotenv has been moved to the `dotenv-rails` gem. Change your Gemfile to:
-  gem 'dotenv-rails', :groups => [:development, :test]
-EOF
-      end
-    end
   end
 end
 

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/dotenv/environment_spec.rb

@@ -8,6 +8,12 @@ describe Dotenv::Environment do
       expect(subject['OPTION_A']).to eq('1')
       expect(subject['OPTION_B']).to eq('2')
     end
+
+    it 'fails if file does not exist' do
+      expect {
+        Dotenv::Environment.new('.does_not_exists')
+      }.to raise_error(Errno::ENOENT)
+    end
   end
 
   describe 'apply' do
@@ -21,15 +27,6 @@ describe Dotenv::Environment do
       subject.apply
       expect(ENV['OPTION_A']).to eq('predefined')
     end
-
-    context 'when the file does not exist' do
-      subject { Dotenv::Environment.new('.env_does_not_exist') }
-
-      it 'fails silently' do
-        expect { subject.apply }.not_to raise_error
-        expect(ENV.keys).to eq(@env_keys)
-      end
-    end
   end
 
   it 'parses unquoted values' do

data/spec/dotenv_spec.rb

@@ -1,26 +1,24 @@
 require 'spec_helper'
 
 describe Dotenv do
-  let(:env_path) { fixture_path('plain.env') }
-
-  describe 'load' do
+  shared_examples 'load' do
     context 'with no args' do
+      let(:env_files) { [] }
+
       it 'defaults to .env' do
         Dotenv::Environment.should_receive(:new).with('.env').
           and_return(mock(:apply => {}))
-        Dotenv.load
+        subject
       end
     end
 
     context 'with multiple files' do
+      let(:env_files) { ['.env', fixture_path('plain.env')] }
+
       let(:expected) do
         {'OPTION_A' => '1', 'OPTION_B' => '2', 'DOTENV' => 'true'}
       end
 
-      subject do
-        Dotenv.load('.env', env_path)
-      end
-
       it 'loads all files' do
         subject
         expected.each do |key, value|
@@ -34,6 +32,39 @@ describe Dotenv do
     end
   end
 
+  describe 'load' do
+    subject { Dotenv.load(*env_files) }
+
+    it_behaves_like 'load'
+
+    context 'when the file does not exist' do
+      let(:env_files) { ['.env_does_not_exist'] }
+
+      it 'fails silently' do
+        expect { subject }.not_to raise_error
+        expect(ENV.keys).to eq(@env_keys)
+      end
+    end
+  end
+
+  describe 'load!' do
+    subject { Dotenv.load!(*env_files) }
+
+    it_behaves_like 'load'
+
+    context 'when one file exists and one does not' do
+      let(:env_files) { ['.env', '.env_does_not_exist'] }
+
+      it 'raises an Errno::ENOENT error and does not load any files' do
+        expect do
+          expect do
+            subject
+          end.to raise_error(Errno::ENOENT)
+        end.to_not change { ENV.keys }
+      end
+    end
+  end
+
   def fixture_path(name)
     File.join(File.expand_path('../fixtures', __FILE__), name)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake