diff options
| author | Sam Stephenson <sam@37signals.com> | 2005-11-07 04:06:05 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2005-11-07 04:06:05 +0000 |
| commit | 5c1eb899dea9aad18220b6403d3dd83863591f28 (patch) | |
| tree | e17db707a217fa177e23e38ca8fffd91908bcbb5 /railties/lib | |
| parent | 5feb3124d431b69e9c4921857289593a655f2e86 (diff) | |
| download | rails-5c1eb899dea9aad18220b6403d3dd83863591f28.tar.gz rails-5c1eb899dea9aad18220b6403d3dd83863591f28.tar.bz2 rails-5c1eb899dea9aad18220b6403d3dd83863591f28.zip | |
Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2903 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/commands/lighttpd.rb | 4 | ||||
| -rw-r--r-- | railties/lib/commands/plugin.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails_info.rb | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/railties/lib/commands/lighttpd.rb b/railties/lib/commands/lighttpd.rb index 73bd466446..df6ad663f9 100644 --- a/railties/lib/commands/lighttpd.rb +++ b/railties/lib/commands/lighttpd.rb @@ -1,4 +1,6 @@ -unless RUBY_PLATFORM !~ /mswin/ && `lighttpd -version 2>/dev/null`.size > 0 +require 'active_support' + +unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? puts "lighttpd is not available on your system (or not in your path)" exit 1 end diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb index dc702fb4bb..4dd8689345 100644 --- a/railties/lib/commands/plugin.rb +++ b/railties/lib/commands/plugin.rb @@ -119,7 +119,7 @@ class RailsEnvironment def externals return [] unless use_externals? - ext = `svn propget svn:externals #{root}/vendor/plugins 2> /dev/null` + ext = silence_stderr { `svn propget svn:externals #{root}/vendor/plugins` } ext.reject{ |line| line.strip == '' }.map do |line| line.strip.split(/\s+/, 2) end diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb index edd90b36ad..c0237dab7c 100644 --- a/railties/lib/rails_info.rb +++ b/railties/lib/rails_info.rb @@ -29,8 +29,8 @@ module Rails "#{component.classify}::Version::STRING".constantize end - def edge_rails_revision - svn_info[/^Revision: (\d+)/, 1] || 'unknown' + def edge_rails_revision(info = svn_info) + info[/^Revision: (\d+)/, 1] end def to_s @@ -45,7 +45,7 @@ module Rails protected def svn_info Dir.chdir("#{RAILS_ROOT}/vendor/rails") do - IO.popen('svn info') { |f| f.read } + silence_stderr { `svn info` } end end end |