github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Config is deprecated on 1.8.8 and 1.9.3 use RbConfig

Browse Source
This commit is contained in:
Santiago Pastorino
2010-08-23 23:09:35 -03:00
parent 36fcc99cce
commit c8b84a1c8c
9 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/test/controller/layout_test.rb
View File

@@ -208,7 +208,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
end
end
unless Config::CONFIG['host_os'] =~ /mswin|mingw/
unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
class LayoutSymlinkedTest < LayoutTest
layout "symlinked/symlinked_layout"
end

2
activesupport/lib/active_support/core_ext/kernel/reporting.rb
View File

@@ -38,7 +38,7 @@ module Kernel
# puts 'But this will'
def silence_stream(stream)
old_stream = stream.dup
stream.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
stream.sync = true
yield
ensure

2
activesupport/lib/active_support/testing/isolation.rb
View File

@@ -34,7 +34,7 @@ module ActiveSupport
module Isolation
def self.forking_env?
!ENV["NO_FORK"] && ((Config::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
!ENV["NO_FORK"] && ((RbConfig::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
end
def self.included(base)

2
railties/lib/rails/commands/dbconsole.rb
View File

@@ -42,7 +42,7 @@ module Rails
def find_cmd(*commands)
dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
commands += commands.map{|cmd| "#{cmd}.exe"} if Config::CONFIG['host_os'] =~ /mswin|mingw/
commands += commands.map{|cmd| "#{cmd}.exe"} if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
full_path_command = nil
found = commands.detect do |cmd|

2
railties/lib/rails/commands/runner.rb
View File

@@ -19,7 +19,7 @@ ARGV.clone.options do |opts|
opts.on("-h", "--help",
"Show this help message.") { $stderr.puts opts; exit }
if Config::CONFIG['host_os'] !~ /mswin|mingw/
if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/
opts.separator ""
opts.separator "You can also use runner as a shebang line for your scripts like this:"
opts.separator "-------------------------------------------------------------"

2
railties/lib/rails/engine.rb
View File

@@ -119,7 +119,7 @@ module Rails
root = File.exist?("#{root_path}/#{flag}") ? root_path : default
raise "Could not find root path for #{self}" unless root
Config::CONFIG['host_os'] =~ /mswin|mingw/ ?
RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ?
Pathname.new(root).expand_path : Pathname.new(root).realpath
end
end

4
railties/lib/rails/generators/actions.rb
View File

@@ -242,7 +242,7 @@ module Rails
def rake(command, options={})
log :rake, command
env = options[:env] || 'development'
sudo = options[:sudo] && Config::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
end
@@ -309,7 +309,7 @@ module Rails
# Add an extension to the given name based on the platform.
#
def extify(name)
if Config::CONFIG['host_os'] =~ /mswin|mingw/
if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
"#{name}.bat"
else
name

2
railties/lib/rails/generators/rails/app/app_generator.rb
View File

@@ -415,7 +415,7 @@ module Rails
"/opt/local/var/run/mysql4/mysqld.sock", # mac + darwinports + mysql4
"/opt/local/var/run/mysql5/mysqld.sock", # mac + darwinports + mysql5
"/opt/lampp/var/mysql/mysql.sock" # xampp for linux
].find { |f| File.exist?(f) } unless Config::CONFIG['host_os'] =~ /mswin|mingw/
].find { |f| File.exist?(f) } unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
end
def empty_directory_with_gitkeep(destination, config = {})

3
railties/lib/rails/test_unit/testing.rake
View File

@@ -1,3 +1,4 @@
require 'rbconfig'
require 'rake/testtask'
# Monkey-patch to silence the description from Rake::TestTask to cut down on rake -T noise
@@ -62,7 +63,7 @@ end
module Kernel
def silence_stderr
old_stderr = STDERR.dup
STDERR.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
STDERR.sync = true
yield
ensure