Skip to content
Browse files

Move railties/builtin into lib

  • Loading branch information...
1 parent f868c2a commit f38e89cfbad6886a2812b1176e0c47b7d95cda43 @josh josh committed
View
2 railties/builtin/rails_info/rails/info_helper.rb
@@ -1,2 +0,0 @@
-module Rails::InfoHelper
-end
View
1 railties/lib/rails/application.rb
@@ -1,5 +1,4 @@
require 'fileutils'
-require 'rails/railties_path'
require 'rails/plugin'
require 'rails/engine'
View
4 railties/lib/rails/application/configuration.rb
@@ -78,7 +78,7 @@ def cache_store
end
def builtin_controller
- File.join(RAILTIES_PATH, "builtin", "rails_info") if Rails.env.development?
+ File.expand_path('../info_routes', __FILE__) if Rails.env.development?
end
def log_level
@@ -96,4 +96,4 @@ def colorize_logging=(val)
end
end
end
-end
+end
View
4 railties/lib/rails/application/finisher.rb
@@ -23,7 +23,7 @@ module Finisher
initializer :add_builtin_route do |app|
if Rails.env.development?
- app.routes_reloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb')
+ app.routes_reloader.paths << File.expand_path('../../info_routes.rb', __FILE__)
end
end
@@ -45,4 +45,4 @@ module Finisher
end
end
end
-end
+end
View
0 railties/builtin/rails_info/rails/info.rb → railties/lib/rails/info.rb
File renamed without changes.
View
0 ...iltin/rails_info/rails/info_controller.rb → railties/lib/rails/info_controller.rb
File renamed without changes.
View
0 railties/builtin/routes.rb → railties/lib/rails/info_routes.rb
File renamed without changes.
View
1 railties/lib/rails/railties_path.rb
@@ -1 +0,0 @@
-RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
View
7 railties/lib/rails/tasks/documentation.rake
@@ -66,13 +66,14 @@ namespace :doc do
task :plugins => plugins.collect { |plugin| "doc:plugins:#{plugin}" }
desc "Remove plugin documentation"
- task :clobber_plugins do
+ task :clobber_plugins do
rm_rf 'doc/plugins' rescue nil
end
desc "Generate Rails guides"
task :guides do
- require File.join(RAILTIES_PATH, "guides/rails_guides")
+ # FIXME: Reaching outside lib directory is a bad idea
+ require File.expand_path('../../../../guides/rails_guides', __FILE__)
RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
end
@@ -92,7 +93,7 @@ namespace :doc do
files.include("#{plugin_base}/lib/**/*.rb")
if File.exist?("#{plugin_base}/README")
- files.include("#{plugin_base}/README")
+ files.include("#{plugin_base}/README")
options << "--main '#{plugin_base}/README'"
end
files.include("#{plugin_base}/CHANGELOG") if File.exist?("#{plugin_base}/CHANGELOG")
View
7 railties/lib/rails/tasks/misc.rake
@@ -15,7 +15,6 @@ end
desc 'Explain the current environment'
task :about do
- $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
require 'rails/info'
puts Rails::Info
end
@@ -26,12 +25,12 @@ namespace :time do
task :all do
build_time_zone_list(:all)
end
-
+
desc 'Displays names of US time zones recognized by the Rails TimeZone class, grouped by offset. Results can be filtered with optional OFFSET parameter, e.g., OFFSET=-6'
task :us do
build_time_zone_list(:us_zones)
end
-
+
desc 'Displays names of time zones recognized by the Rails TimeZone class with the same offset as the system local time'
task :local do
require 'active_support'
@@ -41,7 +40,7 @@ namespace :time do
offset = jan_offset < jul_offset ? jan_offset : jul_offset
build_time_zone_list(:all, offset)
end
-
+
# to find UTC -06:00 zones, OFFSET can be set to either -6, -6:00 or 21600
def build_time_zone_list(method, offset = ENV['OFFSET'])
require 'active_support'
View
2 railties/railties.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.homepage = 'http://www.rubyonrails.org'
s.rubyforge_project = 'rails'
- s.files = Dir['CHANGELOG', 'README', 'bin/**/*', 'builtin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
+ s.files = Dir['CHANGELOG', 'README', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
s.require_path = 'lib'
s.bindir = 'bin'
s.executables = ['rails']
View
1 railties/test/abstract_unit.rb
@@ -1,7 +1,6 @@
ORIG_ARGV = ARGV.dup
require File.expand_path("../../../load_paths", __FILE__)
-$:.unshift File.expand_path("../../builtin/rails_info", __FILE__)
require 'stringio'
require 'test/unit'

0 comments on commit f38e89c

Please sign in to comment.
Something went wrong with that request. Please try again.