Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
591eaf3b
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,发现更多精彩内容 >>
提交
591eaf3b
编写于
10月 16, 2009
作者:
C
Carl Lerche
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get apps generated with working again.
上级
2ca93403
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
51 deletion
+44
-51
railties/lib/rails/commands/server.rb
railties/lib/rails/commands/server.rb
+1
-1
railties/lib/rails/generators/rails/app/templates/config/boot.rb
...s/lib/rails/generators/rails/app/templates/config/boot.rb
+43
-50
未找到文件。
railties/lib/rails/commands/server.rb
浏览文件 @
591eaf3b
...
...
@@ -7,7 +7,7 @@
:Port
=>
3000
,
:Host
=>
"0.0.0.0"
,
:environment
=>
(
ENV
[
'RAILS_ENV'
]
||
"development"
).
dup
,
:config
=>
Rails
.
root
+
"
/config.ru"
,
:config
=>
"
#{
Rails
.
root
}
/config.ru"
,
:detach
=>
false
,
:debugger
=>
false
}
...
...
railties/lib/rails/generators/rails/app/templates/config/boot.rb
浏览文件 @
591eaf3b
...
...
@@ -10,38 +10,33 @@ module Rails
class
<<
self
def
boot!
unless
booted?
preinitialize
pick_boot
.
run
root
=
File
.
expand_path
(
'../..'
,
__FILE__
)
booter
=
File
.
exist?
(
"
#{
root
}
/vendor/rails"
)
?
VendorBoot
:
GemBoot
booter
.
new
(
root
).
run
end
end
def
booted?
defined?
Rails
::
Initializer
end
def
pick_boot
(
vendor_rails?
?
VendorBoot
:
GemBoot
).
new
end
def
vendor_rails?
File
.
exist?
(
"
#{
RAILS_ROOT
}
/vendor/rails"
)
end
def
preinitialize
load
(
preinitializer_path
)
if
File
.
exist?
(
preinitializer_path
)
end
def
preinitializer_path
"
#{
RAILS_ROOT
}
/config/preinitializer.rb"
end
end
class
Boot
def
initialize
(
root
)
@root
=
root
end
def
run
preinitialize
set_load_paths
load_initializer
end
def
preinitialize
path
=
"
#{
@root
}
/config/preinitializer.rb"
load
(
path
)
if
File
.
exist?
(
path
)
end
def
set_load_paths
%w(
actionmailer/lib
...
...
@@ -60,7 +55,7 @@ def set_load_paths
end
def
framework_root_path
defined?
(
::
RAILS_FRAMEWORK_ROOT
)
?
::
RAILS_FRAMEWORK_ROOT
:
"
#{
RAILS_ROOT
}
/vendor/rails"
defined?
(
::
RAILS_FRAMEWORK_ROOT
)
?
::
RAILS_FRAMEWORK_ROOT
:
"
#{
@root
}
/vendor/rails"
end
end
...
...
@@ -85,13 +80,13 @@ def install_gem_spec_stubs
class
GemBoot
<
Boot
def
load_initializer
self
.
class
.
load_rubygems
load_rubygems
load_rails_gem
require
'rails'
end
def
load_rails_gem
if
version
=
self
.
class
.
gem_version
if
version
=
gem_version
gem
'rails'
,
version
else
gem
'rails'
...
...
@@ -101,43 +96,41 @@ def load_rails_gem
exit
1
end
class
<<
self
def
rubygems_version
Gem
::
RubyGemsVersion
rescue
nil
end
def
rubygems_version
Gem
::
RubyGemsVersion
rescue
nil
end
def
gem_version
if
defined?
RAILS_GEM_VERSION
RAILS_GEM_VERSION
elsif
ENV
.
include?
(
'RAILS_GEM_VERSION'
)
ENV
[
'RAILS_GEM_VERSION'
]
else
parse_gem_version
(
read_environment_rb
)
end
def
gem_version
if
defined?
RAILS_GEM_VERSION
RAILS_GEM_VERSION
elsif
ENV
.
include?
(
'RAILS_GEM_VERSION'
)
ENV
[
'RAILS_GEM_VERSION'
]
else
parse_gem_version
(
read_environment_rb
)
end
end
def
load_rubygems
min_version
=
'1.3.2'
require
'rubygems'
unless
rubygems_version
>=
min_version
$stderr
.
puts
%Q(Rails requires RubyGems >=
#{
min_version
}
(you have
#{
rubygems_version
}
). Please `gem update --system` and try again.)
exit
1
end
rescue
LoadError
$stderr
.
puts
%Q(Rails requires RubyGems >=
#{
min_version
}
. Please install RubyGems and try again: http://rubygems.rubyforge.org)
def
load_rubygems
min_version
=
'1.3.2'
require
'rubygems'
unless
rubygems_version
>=
min_version
$stderr
.
puts
%Q(Rails requires RubyGems >=
#{
min_version
}
(you have
#{
rubygems_version
}
). Please `gem update --system` and try again.)
exit
1
end
def
parse_gem_version
(
text
)
$1
if
text
=~
/^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
end
rescue
LoadError
$stderr
.
puts
%Q(Rails requires RubyGems >=
#{
min_version
}
. Please install RubyGems and try again: http://rubygems.rubyforge.org)
exit
1
end
private
def
read_environment_rb
File
.
read
(
"
#{
RAILS_ROOT
}
/config/environment.rb"
)
end
def
parse_gem_version
(
text
)
$1
if
text
=~
/^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
end
private
def
read_environment_rb
File
.
read
(
"
#{
@root
}
/config/environment.rb"
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录