Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
ruby-version: ${{ matrix.ruby }}
bundler: none
- name: Install rubygems
run: ruby -Ilib -S rake install
run: ruby -Ilib -S rake install 2> errors.txt
- name: Check rubygems install produced no warnings
run: test ! -s errors.txt || (cat errors.txt && exit 1)
- name: Run bundler installed as a default gem
run: bundle --version
- name: Check bundler man pages were installed and are properly picked up
Expand Down
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# -*- ruby -*-

RakeFileUtils.verbose_flag = false

require 'rubygems'
require 'rubygems/package_task'
require "rake/testtask"
Expand Down
4 changes: 2 additions & 2 deletions lib/rubygems/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#++

require 'optparse'
require 'rubygems/requirement'
require 'rubygems/user_interaction'
require_relative 'requirement'
require_relative 'user_interaction'

##
# Base class for all Gem commands. When creating a new gem command, define
Expand Down
12 changes: 6 additions & 6 deletions lib/rubygems/ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

module Gem::Ext; end

require 'rubygems/ext/build_error'
require 'rubygems/ext/builder'
require 'rubygems/ext/configure_builder'
require 'rubygems/ext/ext_conf_builder'
require 'rubygems/ext/rake_builder'
require 'rubygems/ext/cmake_builder'
require_relative 'ext/build_error'
require_relative 'ext/builder'
require_relative 'ext/configure_builder'
require_relative 'ext/ext_conf_builder'
require_relative 'ext/rake_builder'
require_relative 'ext/cmake_builder'
2 changes: 1 addition & 1 deletion lib/rubygems/ext/build_error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
##
# Raised when there is an error while building extensions.

require 'rubygems/exceptions'
require_relative '../exceptions'

class Gem::Ext::BuildError < Gem::InstallError
end
2 changes: 1 addition & 1 deletion lib/rubygems/ext/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# See LICENSE.txt for permissions.
#++

require 'rubygems/user_interaction'
require_relative '../user_interaction'

class Gem::Ext::Builder

Expand Down
2 changes: 1 addition & 1 deletion lib/rubygems/ext/cmake_builder.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'rubygems/command'
require_relative '../command'

class Gem::Ext::CmakeBuilder < Gem::Ext::Builder

Expand Down
2 changes: 1 addition & 1 deletion lib/rubygems/specification_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def validate_removed_attributes # :nodoc:
end

def validate_extensions # :nodoc:
require 'rubygems/ext'
require_relative 'ext'
builder = Gem::Ext::Builder.new(@specification)

rake_extension = @specification.extensions.any? {|s| builder.builder_for(s) == Gem::Ext::RakeBuilder }
Expand Down
2 changes: 1 addition & 1 deletion setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

Dir.chdir File.dirname(__FILE__)

$:.unshift 'lib'
$:.unshift File.expand_path('lib')
require 'rubygems'
require 'rubygems/gem_runner'
require 'rubygems/exceptions'
Expand Down