Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Make use of silence_stderr in script/lighttpd, script/plugin, and Rai…

…ls::Info

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2903 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 5c1eb899dea9aad18220b6403d3dd83863591f28 1 parent 5feb312
@sstephenson sstephenson authored
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info [Sam Stephenson]
+
* Enable HTTP installation of plugins when svn isn't avaialable. Closes #2661. [Chad Fowler]
* Load Rails::Info after initialization [Sam Stephenson]
View
4 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
View
2  railties/lib/commands/plugin.rb
@@ -119,7 +119,7 @@ def best_install_method
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
View
6 railties/lib/rails_info.rb
@@ -29,8 +29,8 @@ def component_version(component)
"#{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 @@ def to_s
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
View
41 railties/test/rails_info_test.rb
@@ -5,10 +5,22 @@
require 'active_support'
require 'rails_info'
-class << Rails::Info
-protected
- def svn_info
- <<-EOS
+class InfoTest < Test::Unit::TestCase
+ def setup
+ Rails.send :remove_const, :Info
+ silence_warnings { load 'rails_info.rb' }
+ end
+
+ def test_edge_rails_revision_not_set_when_svn_info_is_empty
+ Rails::Info.property 'Test that this will not be defined' do
+ Rails::Info.edge_rails_revision ''
+ end
+ assert !property_defined?('Test that this will not be defined')
+ end
+
+ def test_edge_rails_revision_extracted_from_svn_info
+ Rails::Info.property 'Test Edge Rails revision' do
+ Rails::Info.edge_rails_revision <<-EOS
Path: .
URL: http://www.rubyonrails.com/svn/rails/trunk
Repository UUID: 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
@@ -20,13 +32,10 @@ def svn_info
Last Changed Date: 2005-11-04 21:04:41 -0600 (Fri, 04 Nov 2005)
Properties Last Updated: 2005-10-28 19:30:00 -0500 (Fri, 28 Oct 2005)
- EOS
- end
-end
-
-class InfoTest < Test::Unit::TestCase
- def test_edge_rails_revision_extracted_from_svn_info
- assert_equal '2881', Rails::Info.edge_rails_revision
+EOS
+ end
+
+ assert_property 'Test Edge Rails revision', '2881'
end
def test_property_with_block_swallows_exceptions_and_ignores_property
@@ -57,6 +66,16 @@ def test_component_version
end
protected
+ def svn_info=(info)
+ Rails::Info.module_eval do
+ class << self
+ def svn_info
+ info
+ end
+ end
+ end
+ end
+
def properties
Rails::Info.properties
end

0 comments on commit 5c1eb89

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