denv 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced7332ac2a27ac268f334af2a886672818f3830
-  data.tar.gz: 1b6ba14c478f1610e173f3a29234a97fe4727bb9
+  metadata.gz: 687c210305951dcf6b7629568a0769fc0c283c40
+  data.tar.gz: a57f042d16d9074bb1f5008d7110aa0f75695534
 SHA512:
-  metadata.gz: 43b8ddc20ff10804d0f74a4b9b126277191c81e8165caf1517c1a454764959c27fd0953c639e3a9e636cb3cd30550763a8ae6ecf8fefb2ffb0672b3b62164430
-  data.tar.gz: 2f5c62c157b1ca0b0d0a90f5d6dc71ff47d27af32ff863813b79ee5fde20e62684d8445730b357355144b335e9451c676f699910e3ab7df0613f5c35da16b87a
+  metadata.gz: 60b454fce0770b1c271bb91d81fbfb70492e8af458aa75f845dae147aa92c11160fda50c732d88ad9d82581b7a1c592c24c082db6c7239cce819341480083e7c
+  data.tar.gz: 8d173935d50cc23b8744f03641e5b01bcc6cc14165d4470cf7d24fbc442db12bf4261e890c029f64e4b86fc771b540090ed166ed234b5c0a4dabe803e5fe7ea6

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG.md for denv
+## 0.2.2
+- Env vars are removed on loading when they are removed from `.env` file. This is useful when use unicorn's graceful reloading.
+
 ## 0.2.1
 - Add command line tool (`denv`)
 

data/README.md

@@ -7,6 +7,7 @@ Loads environment variables to `ENV` from `.env` file.
 
 - No special treatments about shell meta characters (e.g. `$`).
 - Behaves as over-write.
+- Env vars are removed on loading when they are removed from `.env` file. This is useful when use unicorn's graceful reloading.
 
 ## Usage
 Add this line to your application's Gemfile:

data/Rakefile

@@ -10,6 +10,7 @@ end
 desc 'Run all tests'
 task :test do
   Rake::Task[:spec].invoke
+  Rake::Task[:reload_env_test].invoke
   Rake::Task[:integration_test].invoke
 end
 
@@ -21,3 +22,8 @@ end
 def execute_without_bundler
   defined?(Bundler) ? Bundler.with_clean_env { yield } : yield
 end
+
+desc 'Run reload_env_test'
+task :reload_env_test do
+  exit(1) unless ruby('reload_env_test.rb')
+end

data/lib/denv.rb

@@ -23,6 +23,8 @@ module Denv
   end
 
   DEFAULT_ENV_FILENAME = '.env'.freeze
+  SPECIAL_KEY = '__denv_previous_keys__'.freeze
+  DELIMITER = '='.freeze
 
   class << self
     attr_accessor :callback
@@ -34,7 +36,10 @@ module Denv
     def load(filename = DEFAULT_ENV_FILENAME)
       filename = File.expand_path(filename.to_s)
       run_callback(filename) do
-        ENV.update(build_env(filename))
+        remove_previous_denv_envs
+        env = build_env(filename)
+        ENV.update(env)
+        ENV[SPECIAL_KEY] = env.keys.join(DELIMITER)
       end
     end
 
@@ -47,6 +52,15 @@ module Denv
 
     private
 
+    def remove_previous_denv_envs
+      return unless ENV[SPECIAL_KEY]
+
+      previous_keys = ENV[SPECIAL_KEY].split(DELIMITER)
+      unless previous_keys.empty?
+        ENV.delete_if {|k, _| previous_keys.include?(k) }
+      end
+    end
+
     def open_file(filename)
       File.open(filename) {|f| yield f }
     rescue Errno::ENOENT
@@ -60,8 +74,8 @@ module Denv
   end
 
   class Parser
-    COMMENT_CHAR = '#'
-    DELIMITER = '='
+    COMMENT_CHAR = '#'.freeze
+    DELIMITER = '='.freeze
     WHITE_SPACES = /\s/
 
     def initialize(io, filename)

data/lib/denv/version.rb

@@ -1,3 +1,3 @@
 module Denv
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/reload_env_test.rb

@@ -0,0 +1,26 @@
+lib = File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'denv'
+
+require 'fileutils'
+
+FileUtils.rm_rf('tmp')
+FileUtils.mkdir_p('tmp')
+Dir.chdir('tmp') do
+  ENV['INIT'] = '1'
+  File.write('.env', "XXX=1\nYYY=2\n")
+  Denv.load
+  raise('Necessary keys are removed') unless ENV.has_key?('INIT')
+  raise('Can not set env') unless ENV['YYY'] == '2'
+
+  File.write('.env', "XXX=1\n")
+  code = <<-EOS
+    $LOAD_PATH.unshift("#{lib}")
+    require 'denv'
+    Denv.load
+    raise('Previous env vars are not removed') if ENV.has_key?('YYY')
+    raise('Necessary keys are removed') unless ENV.has_key?('XXX')
+    puts 'Success'
+  EOS
+  exec('ruby', '-e', code)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: denv
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/denv/rails.rb
 - lib/denv/version.rb
 - rails_integration_test.rb
+- reload_env_test.rb
 homepage: https://github.com/taiki45/denv
 licenses:
 - MIT