From 691f759da47ebd4b6a77a2ab5041c870265027e2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 13 May 2010 10:54:16 +0100 Subject: [PATCH] Update various files to match current rails versions --- config/boot.rb | 2 +- config/initializers/inflections.rb | 2 +- script/about | 5 +++-- script/breakpointer | 3 --- script/console | 4 ++-- script/dbconsole | 2 +- script/destroy | 4 ++-- script/generate | 4 ++-- script/performance/benchmarker | 2 +- script/performance/profiler | 2 +- script/performance/request | 3 --- script/plugin | 4 ++-- script/runner | 4 ++-- script/server | 4 ++-- script/yaml_to_spec | 21 --------------------- 15 files changed, 20 insertions(+), 46 deletions(-) delete mode 100755 script/breakpointer delete mode 100755 script/performance/request delete mode 100755 script/yaml_to_spec diff --git a/config/boot.rb b/config/boot.rb index 0ad0f787f..dd5e3b691 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -82,8 +82,8 @@ module Rails end def load_rubygems + min_version = '1.3.2' require 'rubygems' - min_version = '1.3.1' 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 diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 09158b865..d531b8bb8 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -2,7 +2,7 @@ # Add new inflection rules using the following format # (all these examples are active by default): -# Inflector.inflections do |inflect| +# ActiveSupport::Inflector.inflections do |inflect| # inflect.plural /^(ox)$/i, '\1en' # inflect.singular /^(ox)en/i, '\1' # inflect.irregular 'person', 'people' diff --git a/script/about b/script/about index 7b07d46a3..1eeb6eb91 100755 --- a/script/about +++ b/script/about @@ -1,3 +1,4 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/about' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info" +require 'commands/about' diff --git a/script/breakpointer b/script/breakpointer deleted file mode 100755 index 64af76edd..000000000 --- a/script/breakpointer +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/breakpointer' \ No newline at end of file diff --git a/script/console b/script/console index 42f28f7d6..235a1f278 100755 --- a/script/console +++ b/script/console @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/console' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/console' diff --git a/script/dbconsole b/script/dbconsole index caa60ce82..83c8436a9 100755 --- a/script/dbconsole +++ b/script/dbconsole @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' +require File.expand_path('../../config/boot', __FILE__) require 'commands/dbconsole' diff --git a/script/destroy b/script/destroy index fa0e6fcd0..88d295f7a 100755 --- a/script/destroy +++ b/script/destroy @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/destroy' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/destroy' diff --git a/script/generate b/script/generate index ef976e09f..62a8a4c0c 100755 --- a/script/generate +++ b/script/generate @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/generate' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/generate' diff --git a/script/performance/benchmarker b/script/performance/benchmarker index c842d35d3..3bff809fb 100755 --- a/script/performance/benchmarker +++ b/script/performance/benchmarker @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../../config/boot', __FILE__) require 'commands/performance/benchmarker' diff --git a/script/performance/profiler b/script/performance/profiler index d855ac8b1..07640575c 100755 --- a/script/performance/profiler +++ b/script/performance/profiler @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../../config/boot', __FILE__) require 'commands/performance/profiler' diff --git a/script/performance/request b/script/performance/request deleted file mode 100755 index ae3f38c74..000000000 --- a/script/performance/request +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' -require 'commands/performance/request' diff --git a/script/plugin b/script/plugin index 26ca64c06..b82201fa8 100755 --- a/script/plugin +++ b/script/plugin @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/plugin' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/plugin' diff --git a/script/runner b/script/runner index ccc30f9d2..be4c5d457 100755 --- a/script/runner +++ b/script/runner @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/runner' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/runner' diff --git a/script/server b/script/server index dfabcb881..b9fcb7179 100755 --- a/script/server +++ b/script/server @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/server' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/server' diff --git a/script/yaml_to_spec b/script/yaml_to_spec deleted file mode 100755 index 4577d9181..000000000 --- a/script/yaml_to_spec +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env ruby -require "yaml" - -buffer = [] -STDIN.each_line { |l| buffer << l } - -contexts = YAML::load(buffer.join("\n")) - -contexts.each do |context,specifications| - puts "" - puts "context \"#{context}\" do" - puts "" - specifications.each do |specification| - puts " specify \"#{specification}\" do" - puts " violated \"no assertions performed\"" - puts " end" - puts "" - end - puts "end" -end - -- 2.43.2