Skip to content

Commit

Permalink
Updated to support Rails 4 and Ruby 2.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
rahmal committed Feb 26, 2014
1 parent 1404356 commit 450a18e
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm use 1.9.2@rconfig
rvm use 2.0.0-p247@socialpro --create
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.5.0
=====
* Corrected typo in generator template
* Updated to support Rails 4

0.4.4
=====
* Updated README file
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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
67 changes: 48 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/rconfig/templates/rconfig.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# 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
Expand Down
2 changes: 1 addition & 1 deletion lib/rconfig.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
require 'rconfig/core_ext/nil'

module RConfig
VERSION = '0.4.4'
VERSION = '0.5.0'

autoload :Socket, 'socket'
autoload :YAML, 'yaml'
Expand Down
2 changes: 1 addition & 1 deletion lib/rconfig/core_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def load_config_files(name, force=false)
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.
Expand Down
8 changes: 4 additions & 4 deletions rconfig.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 450a18e

Please sign in to comment.