rconfig 0.4.3.1 → 0.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWVkNjJhODhkNTllYTE2Y2NiOTJlNTdiNTJkMDA1YTEwNWVjNzgyOA==
-  data.tar.gz: !binary |-
-    MjdhYjAxOGQ4ZDk3OTkzMTJhNmZjNjRhYzY4MzcwM2JiYjliOWExZQ==
+SHA1:
+  metadata.gz: 4de105772ea9dcfc41a47a23df53342ad4f6efdc
+  data.tar.gz: 4067b78c457ec794bf956e45ddbedcb252b91c07
 SHA512:
-  metadata.gz: !binary |-
-    OWFiNDIzNjJlOTg2ZmI4ZmYwZjEwMjdiNjU5MTVmMDk1ZWNiNDVhNzIxYTA1
-    OGUxZDQzZjMwN2M0YjQ4NGQ1NzdkMmVhN2JhYTZjNDUwMzkxYWU3OWNhYzM1
-    YWQ2NjU0NGFmNzQ1ZTliN2JhMjQwNDgyZjFkMmNmN2ViOWMzNjk=
-  data.tar.gz: !binary |-
-    YjBhNWM4OTkwYjA3ZjUzY2E5ZjM4MDdkZGRmYTI5NmUyYzBlZTU0NGNiZDQ1
-    NWEyZTQ3OWZjNTMxYWMyMGY2YWFjMGY3N2FjNjI4N2VlNGM1YjZhNjlmN2Ni
-    OTQ3MDgyNDc5Y2I0OWE3Y2IwNjdiNTJkMGRhODFiOGQwYjM0Y2Y=
+  metadata.gz: dd71203d348b908d47fad71f869fddcd00ca9294472c7ef3917e2b8f00de3cc86e7f2b9c95e1ef62251530c7c775b630d01ac53c21e731f81120b5825be56a93
+  data.tar.gz: 2be95370f7e9dea1006ad821bdf55ee2dfea5cd34ce2434d8aaaef13ecbff6188fd2343defbf685e234307f7502078efaa7fb7d0b7d573ab1053b0e1674f6ba8

data/ChangeLog

@@ -1,6 +1,11 @@
-0.4.3.1
-=======
-* Fixed typo preventing use of custome Logger.
+0.5.0
+=====
+* Corrected typo in generator template
+* Updated to support Rails 4
+
+0.4.4
+=====
+* Updated README file
 
 0.4.3
 =====

data/Gemfile

@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
-gem 'activesupport', '~> 3.0', :require => 'active_support'
+gem 'activesupport', '> 3.0', :require => 'active_support'
 
 group :development do
-  gem 'rspec',   '~> 2.3.0'
-  gem 'bundler', '~> 1.0.0'
-  gem 'jeweler', '~> 1.6.4'
-  gem 'i18n',    '~> 0.6.0'
+  gem 'rspec',   '> 2.3.0'
+  gem 'bundler', '> 1.0.0'
+  gem 'jeweler', '> 1.6.4'
+  gem 'i18n',    '> 0.6.0'
 end

data/Gemfile.lock

@@ -3,30 +3,59 @@ GEM
   specs:
     activesupport (3.1.1)
       multi_json (~> 1.0)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    addressable (2.3.5)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    git (1.2.6)
+    github_api (0.4.10)
+      faraday (~> 0.7.6)
+      hashie (~> 1.2.0)
+      multi_json (~> 1.0)
+      oauth2 (~> 0.5.2)
+    hashie (1.2.0)
+    highline (1.6.20)
+    i18n (0.6.9)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
+      rdoc
+    json (1.8.1)
+    mini_portile (0.5.2)
     multi_json (1.1.0)
-    rake (0.9.2.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    multipart-post (1.2.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0)
-  bundler (~> 1.0.0)
-  i18n (~> 0.6.0)
-  jeweler (~> 1.6.4)
-  rspec (~> 2.3.0)
+  activesupport (> 3.0)
+  bundler (> 1.0.0)
+  i18n (> 0.6.0)
+  jeweler (> 1.6.4)
+  rspec (> 2.3.0)

data/README.rdoc

@@ -39,7 +39,7 @@ If you're not using RConfig in a Rails app, and you don't use Gemfile you can in
 
 
 == Requirements
-Starting with version 0.4.0, RConfig requires at least Ruby 1.9, and Rails 3. Previous versions can be used in Ruby 1.8 and Rails 2.2+. Non-rails projects need ActiveSupport (>= 3 for RConfig 0.4.0, and > 2.2 for RConfig 0.3).
+Starting with version 0.4.0, RConfig requires at least Ruby 1.9, and Rails 3. Previous versions can be used in Ruby 1.8 and Rails 2.2+. Non-rails projects need ActiveSupport (>= 3 for RConfig 0.4.0, and > 2.2 for RConfig 0.3). RConfig now supports Rails 4 as of 0.5.0.
 
 * Ruby 1.9+
 * ActiveSupport 3.0+
@@ -65,7 +65,7 @@ Starting with version 0.4.0, RConfig requires at least Ruby 1.9, and Rails 3. Pr
 
  demo.rb => 
   require 'rconfig'
-  RConfig.config_paths = ['$HOME/config', '#{APP_ROOT}/config', '/demo/conf']
+  RConfig.load_paths = ['$HOME/config', '#{APP_ROOT}/config', '/demo/conf']
   RConfig.demo[:server][:port] => 81
   RConfig.demo.server.address  => 'host.domain.com'
   RConfig.demo.server.host     => 'host.local'

data/lib/generators/rconfig/templates/rconfig.rb

@@ -45,7 +45,7 @@ RConfig.setup do |config|
   # Flag variable indicating whether or not periodic reloads should 
   # be performed. Defaults to false.
   #
-  # config.enabled_reload = false
+  # config.enable_reload = false
 
   # ==> Interval for Reloading Configuration Data
   # The interval in which to perform periodic reloading of config files (in

data/lib/rconfig.rb

@@ -65,7 +65,7 @@ require 'rconfig/core_ext/hash'
 require 'rconfig/core_ext/nil'
 
 module RConfig
-  VERSION = '0.4.3.1'
+  VERSION = '0.5.0'
 
   autoload :Socket,                    'socket'
   autoload :YAML,                      'yaml'

data/lib/rconfig/constants.rb

@@ -6,9 +6,12 @@ module RConfig
     CONFIG_ROOT = File.join(::Rails.root || '', 'config').gsub(/^\//, '').gsub(/\/$/,'') if defined?(::Rails) && !defined?(CONFIG_ROOT)
 
     # ENV TIER i.e. (development, integration, staging, or production)
-    # Defaults to RAILS_ENV if running in Rails, otherwise, it checks
-    # if ENV['TIER'] is present. If not, it assumes production.
-    ENV_TIER = (defined?(RAILS_ENV) ? RAILS_ENV : (ENV['TIER'] || 'production')) unless defined? ENV_TIER
+    # Defaults to Rails.env (or RAILS_ENV) if running in Rails, otherwise, 
+    # it checks ENV for 'RACK_ENV', or 'CONFIG_ENV'. If neither is present, it 
+    # assumes production. In apps that are not Rails or Rack-based, CONFIG_ENV 
+    # can be set to provide RConfig with a environment other than prodution.
+    ENV_TIER = ((defined?(Rails) && Rails.env) || (defined?(RAILS_ENV) && RAILS_ENV) || 
+                ENV['RAILS_ENV'] || ENV['RACK_ENV'] || ENV['CONFIG_ENV'] || 'production') unless defined? ENV_TIER
 
     # yml, yaml => yaml files, parsable by YAML library
     YML_FILE_TYPES = [:yml, :yaml].freeze unless defined? YML_FILE_TYPES
@@ -55,4 +58,4 @@ module RConfig
     EMPTY_ARRAY = [].freeze unless defined? EMPTY_ARRAY
     
   end
-end
+end

data/lib/rconfig/core_methods.rb

@@ -21,7 +21,7 @@ module RConfig
       logger.info "Loading config files for: #{name}"
       logger.debug "load_config_files(#{name.inspect})"
 
-
+      # Get current time for checking last loaded status.
       now = Time.now
 
       # Get array of all the existing files file the config name.

data/lib/rconfig/logger.rb

@@ -19,7 +19,7 @@ module RConfig
       end
 
       # Use log file
-      if output.nil? && options[:file] && File.exists?(options[:file])
+      if output.nil? && options[:file] && File.exists?(optios[:file])
         @output = File.open(options[:file].to_s, 'a')
         @needs_close = true
       end

data/rconfig.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Dependencies
-  s.add_dependency 'activesupport',       '~>   3.0'
+  s.add_dependency 'activesupport',       '>   3.0'
 
   # Development Dependencies
-  s.add_development_dependency 'rspec',   '~> 2.3.0'
-  s.add_development_dependency 'bundler', '~> 1.0.0'
-  s.add_development_dependency 'jeweler', '~> 1.6.4'
+  s.add_development_dependency 'rspec',   '> 2.3.0'
+  s.add_development_dependency 'bundler', '> 1.0.0'
+  s.add_development_dependency 'jeweler', '> 1.6.4'
   s.add_development_dependency 'i18n'
 end
 

data/spec/spec_helper.rb

@@ -1,6 +1,15 @@
 ROOT_DIR = File.expand_path(File.dirname(__FILE__))
 CONF_DIR = File.join(ROOT_DIR, 'config')
 
+# Set the environment to test
+ENV['CONFIG_ENV'] = 'test'
+
+# Host-specific config to test cascade logic
+cascade_host_file = "spec/config/cascade2_#{Socket.gethostname}.yml"
+unless File.exist?(cascade_host_file)
+  %x[ cp spec/config/cascade2_host.yml #{cascade_host_file}]
+end
+
 # Loads the rconfig library
 $LOAD_PATH << File.join(ROOT_DIR, '..', 'lib')
 

metadata

@@ -1,91 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rconfig
 version: !ruby/object:Gem::Version
-  version: 0.4.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Rahmal Conda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4w
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4w
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4zLjA=
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4zLjA=
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4wLjA=
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4wLjA=
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjQ=
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjQ=
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Configuration management library for Ruby applications.
@@ -202,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The complete solution for Ruby Configuration Management. RConfig is a Ruby