activeconfig 0.6.1 → 0.6.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 6
-:patch: 1
+:patch: 2
 :build: 

data/activeconfig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activeconfig"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Lawler"]
-  s.date = "2012-08-07"
+  s.date = "2012-08-27"
   s.description = "An extremely flexible configuration system.\ns the ability for certain values to be \"overridden\" when conditions are met.\nr example, you could have your production API keys only get read when the Rails.env == \"production\""
   s.email = "jeremylawler@gmail.com"
   s.executables = ["active_config"]

data/lib/active_config/suffixes.rb

@@ -31,7 +31,17 @@ class ActiveConfig
        Socket.gethostname
       } 
       @symbols[:hostname_short]=proc {|sym_table| sym_table[:hostname].call(sym_table).sub(/\..*$/, '').freeze}
-      @symbols[:rails_env]=proc { |sym_table| (RAILS_ENV if defined?(RAILS_ENV))||ENV['RAILS_ENV']}
+      @symbols[:rails_env]=proc { |sym_table| 
+        if defined?(RAILS_ENV)
+          RAILS_ENV
+        elsif defined?(Rails) and Rails.respond_to?(:env)
+          Rails.env
+        elsif ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']
+          ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']  
+        else
+          ENV['RAILS_ENV']
+        end
+      }
       @symbols[:overlay]=proc { |sym_table| ENV['ACTIVE_CONFIG_OVERLAY']}
       @symbols.add_write_hook do
         ac_instance.flush_cache

data/lib/active_config_rails.rb

@@ -1,6 +1,30 @@
 
 module ActiveConfigRails
   module Generators
+    class ForceUpgradeGenerator < ::Rails::Generators::Base
+      namespace 'active_config:upgrade'
+      source_root File.expand_path('../active_config_rails/templates', __FILE__)
+
+      def generate_config
+        template 'active_config_initializer.rb', 'config/initializers/active_config.rb'
+      end
+
+      def insert_to_application
+        ln = "require File.expand_path('../initializers/active_config', __FILE__)\n"
+        append_to_file 'config/boot.rb', ln
+      end
+      def convert_database_yaml
+        copy_file 'database.yml', 'config/database.yml'
+        copy_file 'rails.yml', 'etc/rails.yml'
+
+
+        #comment = "\n  # Set the logging destination(s)\n  %s\n"
+        #insert_into_file 'config/environments/development.rb', comment % 'config.log_to = %w[stdout file]', :before => %r/^end\s*$/
+        #insert_into_file 'config/environments/production.rb', comment % 'config.log_to = %w[file]', :before => %r/^end\s*$/
+      end
+
+    end
+
     class InstallGenerator < ::Rails::Generators::Base
       namespace 'active_config:install'
       source_root File.expand_path('../active_config_rails/templates', __FILE__)
@@ -12,6 +36,7 @@ module ActiveConfigRails
       def insert_to_application
         ln = "require File.expand_path('../initializers/active_config', __FILE__)\n"
         prepend_to_file 'config/application.rb', ln
+        append_to_file 'config/boot.rb', ln
       end
       def convert_database_yaml
         empty_directory('etc')

data/lib/active_config_rails/templates/active_config_initializer.rb

@@ -1,14 +1,29 @@
 require 'active_config'
-
-if Object.const_defined? :CONF
-  Object.send(:remove_const, :CONF)
+module ActiveConfigRails
+  def init_conf
+    if Object.const_defined? :CONF
+      Object.send(:remove_const, :CONF)
+    end
+  
+    etc_dir = File.dirname(File.expand_path(__FILE__)) + '/../../etc'
+    Object.const_set(:CONF,ActiveConfig.new(:path => etc_dir))
+  end
+  module_function :init_conf
 end
+ActiveConfigRails.init_conf
 
-etc_dir = File.dirname(File.expand_path(__FILE__)) + '/../../etc'
-Object.const_set(:CONF,ActiveConfig.new(:path => etc_dir))
+if CONF.rails && CONF.rails.env and not ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']
+  ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']=CONF.rails.env
+  ENV['RAILS_ENV']||=CONF.rails.env
+  ActiveConfigRails.init_conf
+end
 
-if CONF.rails.force_env and not ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']
+if CONF.rails && CONF.rails.force_env and not ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']
   ENV['ACTIVE_CONFIG_FORCE_RAILS_ENV']=CONF.rails.force_env
+  if ENV['RAILS_ENV']
+    STDERR.puts "WARNING:  ACTIVE CONFIG IS OVERRIDING YOUR ENVIRONMENT VARIABLE RAILS_ENV!\nPLEASE FIX YOUR rails.yml!"
+  end 
   ENV['RAILS_ENV']=CONF.rails.force_env
+  ActiveConfigRails.init_conf
 end
 

data/lib/active_config_rails/templates/rails.yml

@@ -1,8 +1,12 @@
-# If you need to force a rails env for a host
+# If you need to set a rails env for a host
 # make a host override of this file and
-# set the force_env key.
+# set the env key.  This will not override
+# the RAILS_ENV environment variable.
 #
-# Setting force_env in a non-host override is
-# crazy dangerous.
+# On the other hand, force_env WILL override the 
+# RAILS_ENV environment variable.  In short, 
+# both of thse are crazy dangerous if they 
+# aren't in a host override.  In fact, force_env
+# is probably pretty close to bat-shit-crazy.
 
-force_env: ~
+env: ~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeconfig
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9724980 !ruby/object:Gem::Requirement
+  requirement: &16056160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *9724980
+  version_requirements: *16056160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9723520 !ruby/object:Gem::Requirement
+  requirement: &16070380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9723520
+  version_requirements: *16070380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9739780 !ruby/object:Gem::Requirement
+  requirement: &16068780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *9739780
+  version_requirements: *16068780
 description: ! 'An extremely flexible configuration system.
 
   s the ability for certain values to be "overridden" when conditions are met.
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1505972558787035087
+      hash: 3156518043701645317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: