Permalink
Browse files

Get specs running clean on 1.9.2

  • Loading branch information...
1 parent 79f830f commit 5344f839f349ce0b53a3495d1d06b703575fecc0 @nicksieger nicksieger committed Apr 16, 2011
View
@@ -47,6 +47,11 @@ spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem
spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7
spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb
spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec
+spec/sample_bundler/vendor/bundle/ruby/1.9.1
+spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem
+spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7
+spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb
+spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec
spec/sample_jar/History.txt
spec/sample_jar/Manifest.txt
spec/sample_jar/README.txt
@@ -138,7 +138,7 @@ def add_gemjar(jar)
# Helper class for holding arbitrary config.webxml values for injecting into +web.xml+.
class WebxmlOpenStruct < OpenStruct
- %w(java com org javax gem).each {|name| undef_method name if Object.methods.include?(name) }
+ %w(java com org javax gem).each {|name| undef_method name.to_sym if Object.methods.include?(name.to_sym) }
def initialize(key = 'webxml')
@key = key
@@ -180,7 +180,8 @@ def context_params(escape = true)
params[escape ? CGI::escapeHTML(k.to_s) : k.to_s] = escape ? CGI::escapeHTML(v.to_s) : v.to_s
end
end
- params.delete_if {|k,v| ['ignored', *ignored].include?(k.to_s) }
+ extra_ignored = Array === ignored ? ignored : []
+ params.delete_if {|k,v| ['ignored', *extra_ignored].include?(k.to_s) }
params
end
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+ version = $1
+ ARGV.shift
+end
+
+gem 'rake', version
+load Gem.bin_path('rake', 'rake', version)
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright (c) 2003, 2004, 2005, 2006, 2007 Jim Weirich
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#++
+
+begin
+ require 'rake'
+rescue LoadError
+ require 'rubygems'
+ require 'rake'
+end
+Rake.application.run
Oops, something went wrong.

0 comments on commit 5344f83

Please sign in to comment.