Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
594b749f
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
594b749f
编写于
5月 25, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Streamline generators initialization flow.
上级
d1d34ce4
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
11 addition
and
23 deletion
+11
-23
railties/lib/rails/application.rb
railties/lib/rails/application.rb
+3
-3
railties/lib/rails/commands.rb
railties/lib/rails/commands.rb
+5
-1
railties/lib/rails/commands/destroy.rb
railties/lib/rails/commands/destroy.rb
+0
-2
railties/lib/rails/commands/generate.rb
railties/lib/rails/commands/generate.rb
+0
-2
railties/lib/rails/commands/plugin_new.rb
railties/lib/rails/commands/plugin_new.rb
+1
-3
railties/lib/rails/generators.rb
railties/lib/rails/generators.rb
+1
-11
railties/test/generators/generators_test_helper.rb
railties/test/generators/generators_test_helper.rb
+1
-1
未找到文件。
railties/lib/rails/application.rb
浏览文件 @
594b749f
...
...
@@ -106,13 +106,13 @@ def load_tasks
def
load_generators
(
app
=
self
)
initialize_generators
railties
.
all
{
|
r
|
r
.
load_generators
(
app
)
}
Rails
::
Generators
.
configure!
(
app
.
config
.
generators
)
super
self
end
def
load_console
(
sandbox
=
false
)
initialize_console
(
sandbox
)
initialize_console
railties
.
all
{
|
r
|
r
.
load_console
(
sandbox
)
}
super
()
self
...
...
@@ -197,7 +197,7 @@ def initialize_generators
require
"rails/generators"
end
def
initialize_console
(
sandbox
=
false
)
def
initialize_console
require
"pp"
require
"rails/console/app"
require
"rails/console/helpers"
...
...
railties/lib/rails/commands.rb
浏览文件 @
594b749f
...
...
@@ -15,6 +15,8 @@
case
command
when
'generate'
,
'destroy'
,
'plugin'
require
'rails/generators'
if
command
==
'plugin'
&&
ARGV
.
first
==
'new'
require
"rails/commands/plugin_new"
else
...
...
@@ -22,7 +24,9 @@
Rails
.
application
.
require_environment!
if
defined?
(
ENGINE_PATH
)
&&
engine
=
Rails
::
Engine
.
find
(
ENGINE_PATH
)
Rails
.
application
=
engine
Rails
.
application
.
load_generators
(
engine
)
else
Rails
.
application
.
load_generators
end
require
"rails/commands/
#{
command
}
"
...
...
railties/lib/rails/commands/destroy.rb
浏览文件 @
594b749f
require
'rails/generators'
require
'active_support/core_ext/object/inclusion'
Rails
::
Generators
.
configure!
if
ARGV
.
first
.
in?
([
nil
,
"-h"
,
"--help"
])
Rails
::
Generators
.
help
'destroy'
exit
...
...
railties/lib/rails/commands/generate.rb
浏览文件 @
594b749f
require
'rails/generators'
require
'active_support/core_ext/object/inclusion'
Rails
::
Generators
.
configure!
if
ARGV
.
first
.
in?
([
nil
,
"-h"
,
"--help"
])
Rails
::
Generators
.
help
'generate'
exit
...
...
railties/lib/rails/commands/plugin_new.rb
浏览文件 @
594b749f
...
...
@@ -4,7 +4,5 @@
ARGV
.
shift
end
require
'rails/generators'
require
'rails/generators/rails/plugin_new/plugin_new_generator'
Rails
::
Generators
::
PluginNewGenerator
.
start
Rails
::
Generators
::
PluginNewGenerator
.
start
\ No newline at end of file
railties/lib/rails/generators.rb
浏览文件 @
594b749f
...
...
@@ -68,7 +68,7 @@ module Generators
}
}
def
self
.
configure!
(
config
=
Rails
.
application
.
config
.
generators
)
#:nodoc:
def
self
.
configure!
(
config
)
#:nodoc:
no_color!
unless
config
.
colorize_logging
aliases
.
deep_merge!
config
.
aliases
options
.
deep_merge!
config
.
options
...
...
@@ -286,7 +286,6 @@ def self.invoke_fallbacks_for(name, base) #:nodoc:
# Receives namespaces in an array and tries to find matching generators
# in the load path.
def
self
.
lookup
(
namespaces
)
#:nodoc:
load_generators_from_railties!
paths
=
namespaces_to_paths
(
namespaces
)
paths
.
each
do
|
raw_path
|
...
...
@@ -310,8 +309,6 @@ def self.lookup(namespaces) #:nodoc:
# This will try to load any generator in the load path to show in help.
def
self
.
lookup!
#:nodoc:
load_generators_from_railties!
$LOAD_PATH
.
each
do
|
base
|
Dir
[
File
.
join
(
base
,
"{rails/generators,generators}"
,
"**"
,
"*_generator.rb"
)].
each
do
|
path
|
begin
...
...
@@ -324,13 +321,6 @@ def self.lookup! #:nodoc:
end
end
# Allow generators to be loaded from custom paths.
def
self
.
load_generators_from_railties!
#:nodoc:
return
if
defined?
(
@generators_from_railties
)
||
Rails
.
application
.
nil?
@generators_from_railties
=
true
Rails
.
application
.
load_generators
end
# Convert namespaces to paths by replacing ":" for "/" and adding
# an extra lookup. For example, "rails:model" should be searched
# in both: "rails/model/model_generator" and "rails/model_generator".
...
...
railties/test/generators/generators_test_helper.rb
浏览文件 @
594b749f
...
...
@@ -12,7 +12,7 @@ def self.root
# Call configure to load the settings from
# Rails.application.config.generators to Rails::Generators
Rails
::
Generators
.
configure!
Rails
::
Generators
.
configure!
(
Rails
.
application
.
config
.
generators
)
require
'active_record'
require
'action_dispatch'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录