Skip to content

Commit 05dd389

Browse files
committed
[build] Remove early JRuby/rubygems backward compat code
1 parent 60892e3 commit 05dd389

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

Rakefile

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,12 @@ end
5151
desc "Unpack the rack gem"
5252
task :unpack_gem => "target" do |t|
5353
target = File.expand_path(t.prerequisites.first)
54-
spec = Gem.loaded_specs['rack']
55-
# JRuby <= 1.7.20 does not handle respond_to? with method_missing right
56-
# ... issue with Bundler::StubSpecification wrapping (in bundler 1.10.x)
57-
unless ( gem_file = spec.cache_file rescue nil )
58-
#if defined?(::Bundler) && ::Bundler.const_defined?(:StubSpecification) # since Bundler 1.10.1
59-
# spec = spec.to_spec if spec.is_a?(::Bundler::StubSpecification)
60-
#else
61-
# spec = spec.to_spec if spec.respond_to?(:to_spec)
62-
#end
63-
gem_file = File.join(spec.base_dir, 'cache', spec.file_name)
64-
end
65-
unless uptodate?("#{target}/vendor/rack.rb", [__FILE__, gem_file])
54+
rack_gemfile = Gem.loaded_specs['rack'].cache_file
55+
unless uptodate?("#{target}/vendor/rack.rb", [__FILE__, rack_gemfile])
6656
mkdir_p "target/vendor"
6757
require 'rubygems/installer'
68-
rack_dir = File.basename(gem_file).sub(/\.gem$/, '')
69-
Gem::Package.new(gem_file).extract_files("#{target}/#{rack_dir}")
58+
rack_dir = File.basename(rack_gemfile).sub(/\.gem$/, '')
59+
Gem::Package.new(rack_gemfile).extract_files("#{target}/#{rack_dir}")
7060
File.open("#{target}/vendor/rack.rb", "w") do |f|
7161
f << "dir = File.dirname(__FILE__)\n"
7262
f << "if dir =~ /.jar!/ && dir !~ /^file:/\n"
@@ -187,9 +177,9 @@ task :gem => [target_jar, target_jruby_rack, target_jruby_rack_version] do
187177
gem.homepage = %q{http://jruby.org}
188178
gem.required_ruby_version = '>= 3.1.0' # JRuby >= 9.4
189179
end
190-
defined?(Gem::Builder) ? Gem::Builder.new(gemspec).build : begin
191-
require 'rubygems/package'; Gem::Package.build(gemspec)
192-
end
180+
181+
require 'rubygems/package'
182+
Gem::Package.build(gemspec)
193183
File.open('jruby-rack.gemspec', 'w') { |f| f << gemspec.to_ruby }
194184
mv FileList['*.gem'], '..'
195185
end

0 commit comments

Comments
 (0)