envyable 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661545b979cadecd245a677ec876ca2c401a9d8d
-  data.tar.gz: a8601f4fd7d40d933b59ebf55ea193bac1cb4bdc
+  metadata.gz: 6b57186fbe7d6265ce530ab6a33f95fca5c05a03
+  data.tar.gz: 887228621e2fea513d72db59f7f84ceaf59a69c6
 SHA512:
-  metadata.gz: 1df7cfea13ad7efde5c24e34b658af6dfd446782bea413d1b4baa7e7da2b7465510bc3f3bbd9691884707110d1b72d781ed2b934c3eb9b12a823d781bd213f2d
-  data.tar.gz: 6463eda2156c6abb6b6c85652310ac57b68d7b7feda230c25e1df8549593e4270f377cb0c7087ad153474e63970bc9bf4ece971d798d0bc575299cd98936fb8e
+  metadata.gz: 6bd05e5ce62e73555001d214a199135da6732e1ce3b457ca6f58ac7e9dc8c7cdfe0842b9473ae7f5c10af18284f95f6dc739839aec0c71bc4cdf3c5b10b63735
+  data.tar.gz: 1d52aa03bafa7e316fd94c403181339f98f442764120a567cc7e4a1caccb328472563129b8db12f68e5ec3c40259514e389a66f5012f8204730d3f05a1283e83

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-18mode
+  - 2.2.0
   - jruby-19mode
   - rbx

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# ChangeLog
+
+## 0.2.0 / 2015-03-16
+
+* [FEATURE] Allows user to add default values and then override on an environment by environment basis
+* [ENHANCEMENT] Uses `Pathname#join` to form file name in Railtie
+
+## 0.1.0 / 2015-01-22
+
+* [BUGFIX] Stops the loader from choking on a file if the environment requested is not present
+
+## 0.0.2 / 2014-02-02
+
+* [ENHANCEMENT] Tidies up Loader class
+* [ENHANCEMENT] Adds more tests
+* [ENHANCEMENT] Adds TravisCI
+
+## 0.0.1 / 2014-01-06
+
+* Initial version

data/README.md

@@ -20,26 +20,27 @@ Or install it yourself as:
 
 ## Usage
 
-### Rails
+### YAML file
 
-Once installed in a Rails app, add a `config/env.yml` file with your config
-separated into environments, like so:
+Create a yaml file that holds your settings. You can put default settings into the root of the yaml file and then override those on an environment by environment basis. For example, the following yaml file will load the id "development-id" into all environments it is loaded in except for the test environment, where the id would be "test-id".
 
 ```
-development:
-  API_CLIENT_ID: development-id
+API_CLIENT_ID: development-id
 test:
   API_CLIENT_ID: test-id
 ```
 
-The gem will load the correct environment on initialization of the application.
+### Rails
 
-Do not check in the `config/env.yml` file as it may contain application secrets
-that you do not want shared.
+Once installed in a Rails app, add your yaml file at `config/env.yml`. The gem will load the correct environment on initialization of the application.
 
 ### Other applications
 
-You can simply call `Envyable.load(path, environment)` and the yaml file will be loaded into ENV.
+You can create your yaml file anywhere (though why not `config/env.yml`?). Then call `Envyable.load('path/to/yml', environment)` and the yaml file will be loaded into `ENV`.
+
+### Version control
+
+It is not recommended that you check the yaml file in to version control. Personally, I like to check in a `env.yml.example` file that shows the required keys, but does not include any credentials.
 
 ## Contributing
 

data/lib/envyable/loader.rb

@@ -30,8 +30,10 @@ module Envyable
     # Returns nothing.
     def load(environment='development')
       if @yml ||= load_yml
-        return unless @yml[environment]
-        @yml[environment].each { |key, value| set_value(key, value) }
+        @yml.each { |key, value| set_value(key, value) }
+        if @yml[environment]
+          @yml[environment].each { |key, value| set_value(key, value) }
+        end
       end
     end
 
@@ -44,7 +46,7 @@ module Envyable
     end
 
     def set_value(key, value)
-      @loadable[key.to_s] = value.to_s
+      @loadable[key.to_s] = value.to_s unless value.is_a?(Hash)
     end
   end
 end

data/lib/envyable/railtie.rb

@@ -1,7 +1,7 @@
 module Envyable
   class Railtie < Rails::Railtie
     initializer "envyable.load", :before => :load_environment_config do
-      Envyable.load Rails.root + 'config/env.yml', Rails.env
+      Envyable.load Rails.root.join('config', 'env.yml'), Rails.env
     end
   end
 end

data/lib/envyable/version.rb

@@ -1,3 +1,3 @@
 module Envyable
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/envyable/loader_spec.rb

@@ -58,4 +58,36 @@ describe Envyable::Loader do
       end
     end
   end
+
+  describe 'initialized with a path to an env with default values and a loadable hash' do
+    before do
+      @loadable = {}
+      @loader = Envyable::Loader.new('spec/fixtures/default_env.yml', @loadable)
+    end
+
+    describe 'loading the default development environment' do
+      before { @loader.load }
+
+      it 'should load default values into the loadable' do
+        @loadable['CHUNKY'].must_equal 'bacon'
+        @loadable['NUMBER'].must_equal '3'
+      end
+
+      it 'should not load a key for environment specific values' do
+        @loadable['staging'].must_be_nil
+      end
+    end
+
+    describe 'loading the staging environment' do
+      before { @loader.load('staging') }
+
+      it 'should overwrite the default values' do
+        @loadable['CHUNKY'].must_equal 'foxes'
+      end
+
+      it 'should still load the other default values' do
+        @loadable['NUMBER'].must_equal '3'
+      end
+    end
+  end
 end

data/spec/fixtures/default_env.yml

@@ -0,0 +1,5 @@
+CHUNKY: 'bacon'
+NUMBER: 3
+
+staging:
+  CHUNKY: 'foxes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envyable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,6 +73,7 @@ files:
 - lib/envyable/version.rb
 - spec/envyable/loader_spec.rb
 - spec/envyable_spec.rb
+- spec/fixtures/default_env.yml
 - spec/fixtures/env.yml
 - spec/spec_helper.rb
 homepage: https://github.com/philnash/envyable
@@ -94,12 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The simplest yaml to ENV config loader
 test_files:
 - spec/envyable/loader_spec.rb
 - spec/envyable_spec.rb
+- spec/fixtures/default_env.yml
 - spec/fixtures/env.yml
 - spec/spec_helper.rb