ENV[] > confstruct

12 years ago · 452a0f30d3
parent 50428b9c66
commit 452a0f30d3
4 changed files with 2 additions and 5 deletions
--- a/1
+++ b/1
@ -4,7 +4,6 @@ gem 'rails'
 gem 'jquery-rails'
 gem 'tzinfo'
 gem 'carrierwave'
-gem 'confstruct'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-github'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -61,7 +61,6 @@ GEM
      execjs
    coffee-script-source (1.2.0)
    commonjs (0.2.6)
-    confstruct (0.2.1)
    connection_pool (0.1.0)
    diff-lcs (1.1.3)
    draper (0.14.0)
@ -280,7 +279,6 @@ DEPENDENCIES
  capybara
  carrierwave
  coffee-rails
-  confstruct
  draper
  factory_girl_rails
  fog
--- a/config/application.rb
+++ b/config/application.rb
@ -15,7 +15,7 @@ if defined?(Bundler)
  # Bundler.require(:default, :assets, Rails.env)
 end

-require File.expand_path('../confstruct', __FILE__)
+require File.expand_path('../cfg', __FILE__)

 module AsciiIo
  class Application < Rails::Application
--- a/config/confstruct.rb
+++ b/config/confstruct.rb
@ -6,4 +6,4 @@ local_hash = YAML.load_file(local_cfg_file)[Rails.env] rescue {}

 cfg_hash.merge!(local_hash)

-CFG = Confstruct::Configuration.new(cfg_hash)
+CFG = cfg_hash.merge(ENV)