config_env 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef1573f36c0335e6447a11bc7727ab2476b79084
-  data.tar.gz: 4333a92141a27773f65a8b220d62dbcabc590f67
+  metadata.gz: e75f4552472ed2977f425b21e00297d7b9dd4621
+  data.tar.gz: 35f68b775b1f64644f2e1902790b55b7136dabe7
 SHA512:
-  metadata.gz: a8ccb2f23be8ba979276f1efc4406c3188a98b843dd977ce477ced0b9d7c5458f6012925bf146af705f4c1b4a43044a79657af90ed51fa3748359e70a176358a
-  data.tar.gz: 130661404a0c633644cbbadc07e914e5590e4925399e9843a625e7c429e792da918b8fb03cde5bc9a9171f6de9d872fc76ba405b58da4366ad3ef8e721ae99a5
+  metadata.gz: f06eafb4efacdeff26ebc735635f97ebf59d6f87805896e0a4f2946f6d5f83983971a57b9b9322f330a6aedca6b48bc6cc0ff505148599eb4043e3c62f005607
+  data.tar.gz: cafdfc567e0cc545c775b6e274b4fda4bc8fcd52777c439f70054ed9d78c736ed761abd784b3656c5da34c8cb4ef0268b04dd4d06a36e0d6f6fa4e745b54b8eb

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Sergey Makridenkov
+Copyright (c) 2016 Sergey Makridenkov
 
 MIT License
 

data/README.md

@@ -1,44 +1,44 @@
-# ConfigEnv - config your ENV['variables']
+# Configurate ENV with Ruby syntax. Upload to Heroku
 
 
 [![Code Climate](https://codeclimate.com/github/SergXIIIth/config_env.png)](https://codeclimate.com/github/SergXIIIth/config_env)
 [![Dependency Status](https://gemnasium.com/SergXIIIth/config_env.svg)](https://gemnasium.com/SergXIIIth/config_env)
 
 
-Configurator of the `ENV['key']` for any Ruby environment
+Features:
 
-- Describe `ENV['key']` variables in config file with Ruby syntax
-- Upload the configuration to Heroku
+- Describe `ENV['key']` configuration with Ruby syntax
+- Upload configuration to Heroku
 
 
 ## Usage
 
 ```ruby
     gem 'config_env'
-
-    # Specify path your `config_env.rb`
-    ConfigEnv.path_to_config("#{__dir__}/config/config_env.rb")
+    ConfigEnv.init("#{__dir__}/env.rb")
 ```
 
 Create file `config/env.rb`:
 
 ```ruby
     config_env do
-      set 'secret_key', 'value_for_all_RACK_ENV'
+      set 'all_env_key', '1'
     end
 
     config_env :test do
-      set 'secret_key', 'overwrite_value_for_test_rack_env'
+      set 'test_key', '2'
     end
 
     config_env :production, :development do
-      set 'secret_key', 'overwrite_value_for_test_or_dev_rack_env'
+      set 'production_and_development_key', '3'
     end
 ```
 
-For Rails add to `application.rb`
+Add to `application.rb`
 
-    ConfigEnv.path_to_config("#{__dir__}/env.rb")
+```ruby
+    ConfigEnv.init("#{__dir__}/env.rb")
+```
 
 Add line to `.gitignore`
 
@@ -49,16 +49,17 @@ Add line to `.gitignore`
 
 Add to `Rakefile`
 
+```ruby
     require 'config_env/rake_tasks'
-    ConfigEnv.path_to_config("#{__dir__}/config/config_env.rb")
+    ConfigEnv.init("#{__dir__}/config/env.rb")
+```
 
-Run rake command
+Run
 
+```bash
     rake config_env:heroku
-
-Optionally, you can pass in the name of the Heroku app
-
-    rake config_env:heroku[app-name]
+    rake config_env:heroku[app]
+```
 
 ## Contributing
 

data/config_env.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = ConfigEnv::VERSION
   spec.authors       = ['Sergey Makridenkov']
   spec.email         = ['sergey@makridenkov.com']
-  spec.description   = %q{Manage ENV[] variables, upload ENV to Heroku}
-  spec.summary       = %q{ENV manager for any Ruby code}
+  spec.description   = %q{Configurate ENV with Ruby syntax. Upload to Heroku}
+  spec.summary       = %q{Configurate ENV variables depend on RACK_ENV. Configuration syntax is Ruby. Upload to Heroku supported}
   spec.homepage      = 'https://github.com/SergXIIIth/config_env'
   spec.license       = 'MIT'
 

data/lib/config_env.rb

@@ -1,31 +1,22 @@
 require "config_env/version"
 
 module ConfigEnv
-  # path to config_env file. Used in app Rakefile
+  # DEPRECATED. Use `init`
   def self.path_to_config(new_path)
-    @path = new_path
-    if File.exists?(path)
-      Kernel.load(path)
-    end
+    init(new_path)
   end
 
-  def self.path
-    @path
+  def self.init(path_to_config)
+    @path = path_to_config
+    Kernel.load(path) if File.exists?(path)
   end
 
-  def self.set_vars(vars, envs)
-    @vars ||= {}
-
-    envs.each do |env|
-      env = env.to_s
-      @vars[env] ||= {}
-      @vars[env].merge!(vars)
-    end
+  def self.path
+    @path
   end
 
   def self.vars(environment = nil)
-    environment ||= self.environment
-    environment = environment.to_s
+    environment = (environment || self.environment).to_s
 
     vars = (vars_hash[environment] || {}).clone
     vars.merge!(vars_hash["any"] || {})
@@ -38,34 +29,36 @@ module ConfigEnv
   end
 
   def self.environment
-    ENV['RACK_ENV'] || 'development'
+    ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
   end
 
 private
 
-  attr_accessor :vars
+  def self.set_envs(vars, envs)
+    envs = envs.map(&:to_s)
 
-  def self.vars_hash
-    @vars ||= {}
-  end
-
-  def self.setup_env(vars, envs)
-    if envs == ['any']
-      env_fit = true
-    else
-      env_fit = envs.map{|env| env.to_s}.include?(environment)
+    envs.each do |env|
+      vars_hash[env] ||= {}
+      vars_hash[env].merge!(vars)
     end
 
-    if env_fit
+    if envs == ['any'] || envs.include?(environment)
       vars.each do |key, value|
         ENV[key] = value
       end
     end
   end
 
-  class Command
+  def self.vars_hash
+    @vars ||= {}
+  end
+
+  class EnvWrap
+    def initialize
+      @vars = {}
+    end
+
     def set(key, value)
-      @vars ||= {}
       @vars[key] = value.to_s
     end
 
@@ -74,13 +67,10 @@ private
 end
 
 def config_env(*envs, &code)
-  command = ConfigEnv::Command.new
-  command.instance_eval(&code)
+  env_wrap = ConfigEnv::EnvWrap.new
+  env_wrap.instance_eval(&code)
 
   envs = envs.size > 0 ? envs : ['any']
 
-  if command.vars
-    ConfigEnv.set_vars(command.vars, envs)
-    ConfigEnv.setup_env(command.vars, envs)
-  end
+  ConfigEnv.set_envs(env_wrap.vars, envs)
 end

data/lib/config_env/version.rb

@@ -1,3 +1,3 @@
 module ConfigEnv
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/config_env/rake_tasts_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'config_env/rake_tasks'
 
 module ConfigEnv::Tasks

data/spec/lib/config_env_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'ostruct'
 
 describe ConfigEnv do
@@ -7,15 +6,15 @@ describe ConfigEnv do
 
   before { ConfigEnv.clear }
 
-  describe '.path_to_config' do
+  describe '.init' do
     let(:path){ double('path') }
-    subject(:path_to_config) { ConfigEnv.path_to_config(path) }
+    subject(:init) { ConfigEnv.init(path) }
 
     # on Heroku ENV set manually and config_env does not exist
     context 'when config_env not exist' do
       it 'do nothing' do
         expect(Kernel).to_not receive(:load)
-        path_to_config
+        init
       end
     end
 
@@ -26,7 +25,7 @@ describe ConfigEnv do
 
       it 'load config_env' do
         expect(Kernel).to receive(:load).with(path)
-        path_to_config
+        init
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_env
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sergey Makridenkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: Manage ENV[] variables, upload ENV to Heroku
+description: Configurate ENV with Ruby syntax. Upload to Heroku
 email:
 - sergey@makridenkov.com
 executables: []
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -108,7 +109,8 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: ENV manager for any Ruby code
+summary: Configurate ENV variables depend on RACK_ENV. Configuration syntax is Ruby.
+  Upload to Heroku supported
 test_files:
 - spec/lib/config_env/rake_tasts_spec.rb
 - spec/lib/config_env_spec.rb