envoker 1.2.0 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc1121c7891baf9586759486f369ee66a14dbda
-  data.tar.gz: 504529abf44f310e4f84b613bad27240a1e93188
+  metadata.gz: 81577165e8bf17349e1df3aabc87de9dd8874f32
+  data.tar.gz: 3ef3c24fd474b137080cadc149ab08e98cd13086
 SHA512:
-  metadata.gz: 9e17b877dd54de3f2e997ba04e9b07043d1184eb4387cc60b1ea986bb1077bdad24d9329e2c124241fdd9de1e9ab70d3a1b96b8333c4712906845cd6b1d953cf
-  data.tar.gz: 7661aefee9aff60bdbba10f75905b198238757f6e5ff2cc2e794aa4b53cc273564921bbb0df03d71661c05d7b00880f0a35296b2996d9e8acd3c5c353cef12f1
+  metadata.gz: bc6ce2150ddbe6caec5c8678cde7ba2cc9592048dce8e616da5f7979cc702067ea852f72f3afe502cd3dd4de3319fe03461432400742e3f78f8a4e2f91bd855f
+  data.tar.gz: f89b711dad46757d35ba934166392016b938b55ca48a788e68d16cc0c5e4d2e77b16b0368b4e03e24f9a582e8ac675c7dd369213244797f2b436ddd0c263f42f

data/.gems

@@ -0,0 +1 @@
+cutest:1.2.2

data/README.md

@@ -1,7 +1,7 @@
 envoker
 =======
 
-Load environment variables from .env file.
+Load environment variables from .env files.
 
 Usage
 -----
@@ -10,18 +10,6 @@ This is a common pattern we use in our applications:
 
 ```ruby
 require "envoker"
-
-module Settings
-  Envoker.load
-
-  DATABASE_URL = Envoker.fetch("DATABASE_URL")
-  RACK_ENV = Envoker.fetch("RACK_ENV", "development")
-
-  # ...
-end
-
-puts(Settings::RACK_ENV)
-# => "development"
 ```
 
 Installation

data/envoker.gemspec

@@ -12,6 +12,5 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_development_dependency "bundler", "~> 1.10"
   s.add_development_dependency "cutest", "~> 1.2"
 end

data/lib/envoker.rb

@@ -1,28 +1,25 @@
 require_relative "envoker/version"
 
 module Envoker
-  DEFAULT = ".env"
-  SETTINGS = /(.+)=(.*)$/
+  KeyNotFound = Class.new(StandardError)
 
-  class KeyNotFound < StandardError
-    MESSAGE = "%s not found in .env file or environment settings."
-
-    def initialize(key)
-      super(sprintf(MESSAGE, key.inspect))
-    end
+  def self.load(file)
+    parse(file).each { |k, v| ENV[k] ||= v }
+  rescue Errno::ENOENT
   end
 
-  def self.load(file = DEFAULT)
-    return unless File.exist?(file)
-
-    parse(file).each { |k, v| ENV[k] ||= v }
+  def self.overload(file)
+    parse(file).each { |k, v| ENV[k] = v }
+  rescue Errno::ENOENT
   end
 
   def self.parse(file)
-    return File.read(file).scan(SETTINGS)
+    return File.read(file).scan(/(.+)=(.*)$/)
   end
 
   def self.fetch(key, default = nil)
-    return ENV.fetch(key, default) || raise(KeyNotFound, key)
+    return ENV.fetch(key) do
+      raise(KeyNotFound, sprintf("ENV[%p] not found", key))
+    end
   end
 end

data/lib/envoker/rack.rb

@@ -0,0 +1,15 @@
+require_relative "../envoker"
+
+module Envoker
+  module Rack
+    def self.load(file = ".env")
+      Envoker.load(file)
+      Envoker.overload(sprintf("%s.%s", file, environment))
+      Envoker.overload(sprintf("%s.local", file))
+    end
+
+    def self.environment
+      return ENV.fetch("RACK_ENV", "development")
+    end
+  end
+end

data/lib/envoker/version.rb

@@ -1,3 +1,3 @@
 module Envoker
-  VERSION = "1.2.0"
+  VERSION = "2.0.0.rc1"
 end

data/makefile

@@ -1,5 +1,9 @@
-default:
-	cutest test/*_test.rb
+default: test
 
-gem:
-	gem build *.gemspec
+install:
+	@cat .gems | xargs gem install
+
+test:
+	@cutest ./test/*.rb
+
+.PHONY: test

data/test/.env.example.development

@@ -0,0 +1,2 @@
+ENVIRONMENT=development
+OVERRIDED=false

data/test/.env.example.local

@@ -0,0 +1 @@
+OVERRIDED=true

data/test/envoker_test.rb

@@ -1,13 +1,12 @@
-require "bundler/setup"
 require "cutest"
 require_relative "../lib/envoker"
+require_relative "../lib/envoker/rack"
 
 FILE = File.expand_path(".env.example", __dir__)
 
-def test(*)
-  defaults = ENV.to_hash
-  super
-ensure
+defaults = ENV.to_hash
+
+setup do
   ENV.replace(defaults)
 end
 
@@ -37,6 +36,16 @@ scope "load" do
   end
 end
 
+scope "overload" do
+  test "override environment vars" do
+    ENV["SECRET"] = "supersecret"
+
+    Envoker.overload(FILE)
+
+    assert_equal "secret", ENV["SECRET"]
+  end
+end
+
 scope "fetch" do
   test "return value from ENV" do
     Envoker.load(FILE)
@@ -44,13 +53,17 @@ scope "fetch" do
     assert_equal "secret", Envoker.fetch("SECRET")
   end
 
-  test "return default if not exists" do
-    assert_equal "secret", Envoker.fetch("notexists", "secret")
-  end
-
   test "raise error if key not exists" do
     assert_raise do
       Envoker.fetch("notexists")
     end
   end
 end
+
+test "rack" do
+  Envoker::Rack.load(FILE)
+
+  assert_equal "secret", Envoker.fetch("SECRET")
+  assert_equal "development", Envoker.fetch("ENVIRONMENT")
+  assert_equal "true", Envoker.fetch("OVERRIDED")
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: envoker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
@@ -45,15 +31,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
+- ".gems"
 - LICENSE
 - README.md
 - envoker.gemspec
 - lib/envoker.rb
+- lib/envoker/rack.rb
 - lib/envoker/version.rb
 - makefile
 - test/.env.example
+- test/.env.example.development
+- test/.env.example.local
 - test/envoker_test.rb
 homepage: https://github.com/harmoni/envoker
 licenses:
@@ -70,9 +58,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/.gitignore

@@ -1 +0,0 @@
-Gemfile.lock

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec