enviro 0.0.4 → 0.0.5

data/features/enviro/version.feature

@@ -5,4 +5,4 @@ Feature: Enviro should be versioned
   So I can respond as needed
 
   Scenario: Enviro::VERSION
-    Then "Enviro::VERSION" should be "0.0.1"
+    Then "Enviro::VERSION" should be "0.0.5"

data/lib/core_ext/hash.rb

@@ -0,0 +1,11 @@
+class Hash
+  def deep_symbolize_keys
+    inject({}) do |hash, item|
+      key, value = item
+      new_key = key.to_sym rescue key
+      hash[new_key] = self[key]
+      hash[new_key].deep_symbolize_keys if hash[new_key].kind_of?(Hash)
+      hash
+    end
+  end
+end

data/lib/enviro.rb

@@ -1,4 +1,6 @@
 require 'forwardable'
+require 'ostruct'
+require 'core_ext/hash'
 
 module Enviro
   autoload :Environment,   'enviro/environment'

data/lib/enviro/configuration.rb

@@ -11,7 +11,7 @@ module Enviro
     module ClassMethods
 
       def configuration_path_env(value=nil)
-        @_configuration_path_env ||= 'ENVY_CONF_PATH'
+        @_configuration_path_env ||= 'ENVIRO_CONF_PATH'
         @_configuration_path_env = value.to_s.upcase unless value.nil?
         @_configuration_path_env
       end
@@ -38,12 +38,12 @@ module Enviro
           raise FileNotFound.new(self.configuration_path) unless
             File.exists?(self.configuration_path)
 
-          @raw_configuration = YAML.load_file(self.configuration_path)
+          @raw_configuration = YAML.load_file(self.configuration_path).deep_symbolize_keys
 
           raise UnknownEnvironment.new(self.environment) unless
             @raw_configuration.key?(self.environment)
 
-          OpenStruct.new(@raw_configuration[self.environment].merge(:environment => self.environment))
+          ::OpenStruct.new(@raw_configuration[self.environment].merge(:environment => self.environment))
         end
 
     end

data/lib/enviro/environment.rb

@@ -23,9 +23,9 @@ module Enviro
 
         def _setup_environment
           if defined?(Rails)
-            Rails.env
+            Rails.env.to_sym
           else
-            ENV['ENVY_ENV'].nil? ? :development : ENV['ENVY_ENV'].to_sym
+            ENV['ENVIRO_ENV'].nil? ? :development : ENV['ENVIRO_ENV'].to_sym
           end
         end
 

data/lib/enviro/logger.rb

@@ -16,7 +16,7 @@ module Enviro
     module ClassMethods
 
       def logger_dir_env(value=nil)
-        @_logger_dir_env ||= 'ENVY_LOG_DIR'
+        @_logger_dir_env ||= 'ENVIRO_LOG_DIR'
         @_logger_dir_env = value.to_s.upcase unless value.nil?
         @_logger_dir_env
       end

data/lib/enviro/version.rb

@@ -1,3 +1,3 @@
 module Enviro
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/enviro/configuration_spec.rb

@@ -4,7 +4,7 @@ describe Enviro::Configuration do
   context "with standard environment variable" do
     before(:each) do
       Object.send(:remove_const, :TestEnviroConfiguration) if defined?(TestEnviroConfiguration)
-      ENV['ENVY_CONF_PATH'] = '/tmp/enviro.yml'
+      ENV['ENVIRO_CONF_PATH'] = '/tmp/enviro.yml'
       class TestEnviroConfiguration
         include Enviro::Environment
         include Enviro::Configuration
@@ -17,7 +17,7 @@ describe Enviro::Configuration do
         :production => {
         },
       }
-      File.open(ENV['ENVY_CONF_PATH'], 'w') do |f|
+      File.open(ENV['ENVIRO_CONF_PATH'], 'w') do |f|
         f.write(YAML.dump(config))
       end
     end
@@ -31,14 +31,14 @@ describe Enviro::Configuration do
     end
 
     it "should raise when configuration file is not found" do
-      ENV['ENVY_CONF_PATH'] = 'who_the_heck_knows'
+      ENV['ENVIRO_CONF_PATH'] = 'who_the_heck_knows'
       expect {
         TestEnviroConfiguration.configuration
       }.should raise_error(Enviro::Configuration::FileNotFound)
     end
 
     it "should raise when configuration for current environment is not found" do
-      ENV['ENVY_ENV'] = 'who_the_heck_knows'
+      ENV['ENVIRO_ENV'] = 'who_the_heck_knows'
       expect {
         TestEnviroConfiguration.configuration.environment
       }.should raise_error(Enviro::Configuration::UnknownEnvironment)
@@ -82,7 +82,7 @@ describe Enviro::Configuration do
     before(:each) do
       Object.send(:remove_const, :TestEnviroConfiguration) if defined?(TestEnviroConfiguration)
       ENV['CUSTOM_PATH'] = '/tmp/enviro_custom.yml'
-      ENV['ENVY_ENV'] = nil
+      ENV['ENVIRO_ENV'] = nil
 
       $custom_str_path = '/tmp/enviro_custom_str.yml'
 
@@ -114,7 +114,7 @@ describe Enviro::Configuration do
     end
 
     it "should raise when configuration for current environment is not found" do
-      ENV['ENVY_ENV'] = 'who_the_heck_knows'
+      ENV['ENVIRO_ENV'] = 'who_the_heck_knows'
       expect {
         TestEnviroConfiguration.configuration.environment
       }.should raise_error(Enviro::Configuration::UnknownEnvironment)

data/spec/enviro/environment_spec.rb

@@ -9,32 +9,32 @@ describe Enviro::Environment do
   end
 
   it "should have the environment attribute set the default when no session ENV setting is set" do
-    ENV['ENVY_ENV'] = nil
-    ENV['ENVY_ENV'].should be_nil
+    ENV['ENVIRO_ENV'] = nil
+    ENV['ENVIRO_ENV'].should be_nil
     TestEnviroEnvironment.environment.should == :development
   end
 
   it "should have the environment attribute set the same as the session ENV setting" do
-    ENV['ENVY_ENV'] = 'production'
-    ENV['ENVY_ENV'].should == "production"
+    ENV['ENVIRO_ENV'] = 'production'
+    ENV['ENVIRO_ENV'].should == "production"
     TestEnviroEnvironment.environment.should == :production
   end
 
   it "should alias env to environment" do
-    ENV['ENVY_ENV'] = nil
-    ENV['ENVY_ENV'].should be_nil
+    ENV['ENVIRO_ENV'] = nil
+    ENV['ENVIRO_ENV'].should be_nil
     TestEnviroEnvironment.env.should == :development
   end
 
   it "should return true on env?(value) when value is environment" do
-    ENV['ENVY_ENV'] = nil
-    ENV['ENVY_ENV'].should be_nil
+    ENV['ENVIRO_ENV'] = nil
+    ENV['ENVIRO_ENV'].should be_nil
     TestEnviroEnvironment.env?('development').should be_true
   end
 
   it "should return false on env?(value) when value is not environment" do
-    ENV['ENVY_ENV'] = nil
-    ENV['ENVY_ENV'].should be_nil
+    ENV['ENVIRO_ENV'] = nil
+    ENV['ENVIRO_ENV'].should be_nil
     TestEnviroEnvironment.env?('production').should be_false
   end
 
@@ -52,8 +52,8 @@ describe Enviro::Environment do
     end
 
     it "should inherit the environment from Rails should it be loaded" do
-      ENV['ENVY_ENV'] = nil
-      ENV['ENVY_ENV'].should be_nil
+      ENV['ENVIRO_ENV'] = nil
+      ENV['ENVIRO_ENV'].should be_nil
       TestEnviroEnvironment.environment.should == :production
     end
   end

data/spec/enviro/logger_spec.rb

@@ -8,21 +8,21 @@ describe Enviro::Logger do
         include Enviro::Environment
         include Enviro::Logger
       end
-      ENV['ENVY_LOG_DIR'] = nil
-      ENV['ENVY_CONF_PATH'] = nil
-      ENV['ENVY_ENV'] = nil
+      ENV['ENVIRO_LOG_DIR'] = nil
+      ENV['ENVIRO_CONF_PATH'] = nil
+      ENV['ENVIRO_ENV'] = nil
     end
 
     it "should have logger like object available" do
       TestEnviroLogger.logger.should respond_to(:debug)
     end
 
-    it "should log to STDOUT if ENVY_LOG_DIR is nil" do
+    it "should log to STDOUT if ENVIRO_LOG_DIR is nil" do
       TestEnviroLogger.logger.instance_variable_get(:@logdev).dev.should be(STDOUT)
     end
 
-    it "should log to /tmp/development.log if ENVY_LOG_DIR is /tmp and ENVY_ENV is development" do
-      ENV['ENVY_LOG_DIR'] = '/tmp'
+    it "should log to /tmp/development.log if ENVIRO_LOG_DIR is /tmp and ENVIRO_ENV is development" do
+      ENV['ENVIRO_LOG_DIR'] = '/tmp'
       TestEnviroLogger.logger.instance_variable_get(:@logdev).dev.path.should == '/tmp/development.log'
     end
 
@@ -33,7 +33,7 @@ describe Enviro::Logger do
     end
 
     it "should raise when log file is not writable" do
-      ENV['ENVY_LOG_DIR'] = '/tmp/this_dir_is_not_here'
+      ENV['ENVIRO_LOG_DIR'] = '/tmp/this_dir_is_not_here'
       expect {
         TestEnviroLogger.logger
       }.should raise_error(Enviro::Logger::DirectoryNotFound)
@@ -53,10 +53,10 @@ describe Enviro::Logger do
       end
 
       it "should inherit the logger from Rails should it be loaded" do
-        # if we set the log dir to something that doesn't exist 
+        # if we set the log dir to something that doesn't exist
         # we can more sure that the Rails.logger is getting used
         # since otherwise we would raise an error due to the missing dir
-        ENV['ENVY_LOG_DIR'] = '/tmp/this_should_not_exits'
+        ENV['ENVIRO_LOG_DIR'] = '/tmp/this_should_not_exits'
         TestEnviroLogger.logger.instance_variable_get(:@logdev).dev.should == Rails.logger.instance_variable_get(:@logdev).dev
       end
     end
@@ -70,9 +70,9 @@ describe Enviro::Logger do
         include Enviro::Logger
         logger_dir_env :custom_log
       end
-      ENV['ENVY_LOG_DIR'] = nil
-      ENV['ENVY_CONF_PATH'] = nil
-      ENV['ENVY_ENV'] = nil
+      ENV['ENVIRO_LOG_DIR'] = nil
+      ENV['ENVIRO_CONF_PATH'] = nil
+      ENV['ENVIRO_ENV'] = nil
     end
 
     it "should upcase the logger_dir_env attribute" do

data/spec/enviro/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Enviro::VERSION do
-  it "should be 0.0.4" do
-    Enviro::VERSION.should == '0.0.4'
+  it "should be 0.0.5" do
+    Enviro::VERSION.should == '0.0.5'
   end
 end

metadata

@@ -1,91 +1,94 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: enviro
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Bram Swenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-04 00:00:00.000000000 -06:00
+
+date: 2011-06-18 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &19642440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19642440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &19642020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19642020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: autotest-standalone
-  requirement: &19641600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19641600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: autotest-growl
-  requirement: &19641180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19641180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &19640760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19640760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &19640340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19640340
-description: ! ' Add rails like application wide environment configuration, logging
-  and more. '
-email:
+  version_requirements: *id006
+description: " Add rails like application wide environment configuration, logging and more. "
+email: 
 - bram@craniumisajar.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc
@@ -98,6 +101,7 @@ files:
 - features/step_definitions/.initialize_steps.rb.swp
 - features/step_definitions/version_steps.rb
 - features/support/env.rb
+- lib/core_ext/hash.rb
 - lib/enviro.rb
 - lib/enviro/configuration.rb
 - lib/enviro/environate.rb
@@ -114,28 +118,41 @@ files:
 - tasks/default.rake
 - tasks/rspec.rake
 has_rdoc: true
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: enviro
-rubygems_version: 1.5.3
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Add rails like application wide environment configuration, logging and more.
-test_files: []
+test_files: 
+- features/enviro/version.feature
+- features/step_definitions/.initialize_steps.rb.swp
+- features/step_definitions/version_steps.rb
+- features/support/env.rb
+- spec/enviro/configuration_spec.rb
+- spec/enviro/environate_spec.rb
+- spec/enviro/environment_spec.rb
+- spec/enviro/logger_spec.rb
+- spec/enviro/version_spec.rb
+- spec/spec_helper.rb