diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b06344e..be384bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,17 +22,22 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] - ruby: ['3.0', '3.1'] + os: [ubuntu-24.04] + ruby: + - '3.0' + - '3.1' + - '3.2' + - '3.3' + - '3.4' include: - - { os: ubuntu-20.04 , ruby: ruby-head } - - { os: ubuntu-20.04 , ruby: jruby, allow-failure: true } - - { os: ubuntu-20.04 , ruby: jruby-head } - - { os: ubuntu-20.04 , ruby: truffleruby } - - { os: ubuntu-20.04 , ruby: truffleruby-head, allow-failure: true } + - { os: ubuntu-24.04 , ruby: ruby-head } + - { os: ubuntu-24.04 , ruby: jruby, allow-failure: true } + - { os: ubuntu-24.04 , ruby: jruby-head } + - { os: ubuntu-24.04 , ruby: truffleruby } + - { os: ubuntu-24.04 , ruby: truffleruby-head, allow-failure: true } runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 continue-on-error: ${{ matrix.allow-failure || false }} id: bundle diff --git a/Gemfile b/Gemfile index b9e43e1..2754a90 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source "https://www.rubygems.org" gemspec diff --git a/Rakefile b/Rakefile index 985a49e..1f94ad2 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rake/testtask' require 'rdoc/task' diff --git a/lib/rubygems/commands/compare_command.rb b/lib/rubygems/commands/compare_command.rb index c000205..8f697f1 100644 --- a/lib/rubygems/commands/compare_command.rb +++ b/lib/rubygems/commands/compare_command.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems/command' require 'rubygems/version_option' require 'rubygems/comparator' diff --git a/lib/rubygems/comparator.rb b/lib/rubygems/comparator.rb index 8a5870a..97f6cad 100644 --- a/lib/rubygems/comparator.rb +++ b/lib/rubygems/comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'tmpdir' require 'rbconfig' require 'rainbow' @@ -223,15 +225,14 @@ def get_package(gem_name, version) def download_package(gem_name, version) spec, source = get_specification(gem_name, version) - gem_file = gem_file_name(gem_name, spec.version.to_s) - Dir.chdir @options[:output] do + gem_file_path = Dir.chdir @options[:output] do source.download spec end - package = Gem::Package.new File.join(@options[:output], gem_file) + package = Gem::Package.new(gem_file_path) use_package(package) - info "#{gem_file} downloaded." + info "#{gem_file_path} downloaded." package end diff --git a/lib/rubygems/comparator/base.rb b/lib/rubygems/comparator/base.rb index fb0e06b..d58e77a 100644 --- a/lib/rubygems/comparator/base.rb +++ b/lib/rubygems/comparator/base.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rainbow' require 'rubygems/comparator/utils' require 'rubygems/comparator/report' diff --git a/lib/rubygems/comparator/dependency_comparator.rb b/lib/rubygems/comparator/dependency_comparator.rb index 42c5a57..fbbdf21 100644 --- a/lib/rubygems/comparator/dependency_comparator.rb +++ b/lib/rubygems/comparator/dependency_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems/comparator/base' class Gem::Comparator diff --git a/lib/rubygems/comparator/dir_utils.rb b/lib/rubygems/comparator/dir_utils.rb index 930bde3..dc91518 100644 --- a/lib/rubygems/comparator/dir_utils.rb +++ b/lib/rubygems/comparator/dir_utils.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'pathname' class Gem::Comparator diff --git a/lib/rubygems/comparator/file_list_comparator.rb b/lib/rubygems/comparator/file_list_comparator.rb index 37eedbe..a3aa333 100644 --- a/lib/rubygems/comparator/file_list_comparator.rb +++ b/lib/rubygems/comparator/file_list_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'diffy' require 'rubygems/comparator/base' require 'rubygems/comparator/dir_utils' diff --git a/lib/rubygems/comparator/gemfile_comparator.rb b/lib/rubygems/comparator/gemfile_comparator.rb index 6c56ef3..973d318 100644 --- a/lib/rubygems/comparator/gemfile_comparator.rb +++ b/lib/rubygems/comparator/gemfile_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'gemnasium/parser' require 'rubygems/comparator/base' diff --git a/lib/rubygems/comparator/monitor.rb b/lib/rubygems/comparator/monitor.rb index 6927b1d..727b53f 100644 --- a/lib/rubygems/comparator/monitor.rb +++ b/lib/rubygems/comparator/monitor.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'diffy' require 'rubygems/comparator/base' require 'rubygems/comparator/dir_utils' @@ -15,7 +17,7 @@ def self.lines_changed(prev_file, curr_file) def self.compact_files_diff(prev_file, curr_file) prev_file = prev_file.nil? ? Tempfile.new.path : prev_file - changes = '' + changes = +'' Diffy::Diff.new( prev_file, curr_file, :source => 'files', :context => 0 ).each do |line| @@ -29,7 +31,7 @@ def self.compact_files_diff(prev_file, curr_file) def self.files_diff(prev_file, curr_file) prev_file = prev_file.nil? ? Tempfile.new.path : prev_file - changes = '' + changes = +'' Diffy::Diff.new( prev_file, curr_file, :source => 'files', :context => 0, :include_diff_info => true ).each do |line| diff --git a/lib/rubygems/comparator/report.rb b/lib/rubygems/comparator/report.rb index 160ea05..d71e977 100644 --- a/lib/rubygems/comparator/report.rb +++ b/lib/rubygems/comparator/report.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems/comparator/report/entry' class Gem::Comparator diff --git a/lib/rubygems/comparator/report/entry.rb b/lib/rubygems/comparator/report/entry.rb index 3dbc422..afcb98f 100644 --- a/lib/rubygems/comparator/report/entry.rb +++ b/lib/rubygems/comparator/report/entry.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Gem::Comparator class Report class Entry diff --git a/lib/rubygems/comparator/spec_comparator.rb b/lib/rubygems/comparator/spec_comparator.rb index 28925da..49e404f 100644 --- a/lib/rubygems/comparator/spec_comparator.rb +++ b/lib/rubygems/comparator/spec_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems/comparator/base' class Gem::Comparator diff --git a/lib/rubygems/comparator/utils.rb b/lib/rubygems/comparator/utils.rb index 0b2680a..db54dab 100644 --- a/lib/rubygems/comparator/utils.rb +++ b/lib/rubygems/comparator/utils.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rainbow' require 'rubygems' require 'rubygems/user_interaction' diff --git a/lib/rubygems/comparator/version.rb b/lib/rubygems/comparator/version.rb index 535068a..3c9ba3c 100644 --- a/lib/rubygems/comparator/version.rb +++ b/lib/rubygems/comparator/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Gem::Comparator VERSION = '1.2.1' end diff --git a/lib/rubygems_plugin.rb b/lib/rubygems_plugin.rb index 55bf6f8..2b70105 100644 --- a/lib/rubygems_plugin.rb +++ b/lib/rubygems_plugin.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + require 'rubygems/command_manager' Gem::CommandManager.instance.register_command :compare diff --git a/test/rubygems/comparator/test_dependency_comparator.rb b/test/rubygems/comparator/test_dependency_comparator.rb index e66f844..20149d8 100644 --- a/test/rubygems/comparator/test_dependency_comparator.rb +++ b/test/rubygems/comparator/test_dependency_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class TestDependencyComparator < TestGemComparator diff --git a/test/rubygems/comparator/test_dir_utils.rb b/test/rubygems/comparator/test_dir_utils.rb index 760ec8a..b2929a5 100644 --- a/test/rubygems/comparator/test_dir_utils.rb +++ b/test/rubygems/comparator/test_dir_utils.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class TestDirUtils < TestGemModule diff --git a/test/rubygems/comparator/test_file_list_comparator.rb b/test/rubygems/comparator/test_file_list_comparator.rb index d4c9ae0..f158aae 100644 --- a/test/rubygems/comparator/test_file_list_comparator.rb +++ b/test/rubygems/comparator/test_file_list_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class TestFileListComparator < TestGemComparator diff --git a/test/rubygems/comparator/test_gemfile_comparator.rb b/test/rubygems/comparator/test_gemfile_comparator.rb index e636134..2da11f3 100644 --- a/test/rubygems/comparator/test_gemfile_comparator.rb +++ b/test/rubygems/comparator/test_gemfile_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class TestGemfileComparator < TestGemComparator diff --git a/test/rubygems/comparator/test_monitor.rb b/test/rubygems/comparator/test_monitor.rb index 5928e37..51a6342 100644 --- a/test/rubygems/comparator/test_monitor.rb +++ b/test/rubygems/comparator/test_monitor.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class TestMonitor < TestGemModule diff --git a/test/rubygems/comparator/test_report.rb b/test/rubygems/comparator/test_report.rb index 05f1349..792748c 100644 --- a/test/rubygems/comparator/test_report.rb +++ b/test/rubygems/comparator/test_report.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require_relative '../../test_helper' require 'rubygems/comparator' diff --git a/test/rubygems/comparator/test_spec_comparator.rb b/test/rubygems/comparator/test_spec_comparator.rb index fe4a50e..91cb844 100644 --- a/test/rubygems/comparator/test_spec_comparator.rb +++ b/test/rubygems/comparator/test_spec_comparator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class TestSpecComparator < TestGemComparator diff --git a/test/rubygems/comparator/test_utils.rb b/test/rubygems/comparator/test_utils.rb index d019449..dc1cd4b 100644 --- a/test/rubygems/comparator/test_utils.rb +++ b/test/rubygems/comparator/test_utils.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require_relative '../../test_helper' require 'rubygems/comparator' diff --git a/test/rubygems/mock_gem_ui.rb b/test/rubygems/mock_gem_ui.rb new file mode 100644 index 0000000..218d4b6 --- /dev/null +++ b/test/rubygems/mock_gem_ui.rb @@ -0,0 +1,86 @@ +# frozen_string_literal: true + +require "rubygems/user_interaction" + +## +# This Gem::StreamUI subclass records input and output to StringIO for +# retrieval during tests. + +class Gem::MockGemUi < Gem::StreamUI + ## + # Raised when you haven't provided enough input to your MockGemUi + + class InputEOFError < RuntimeError + def initialize(question) + super "Out of input for MockGemUi on #{question.inspect}" + end + end + + class TermError < SystemExit + attr_reader :exit_code + + def initialize(exit_code) + super + @exit_code = exit_code + end + end + + class SystemExitException < RuntimeError; end + + module TTY + attr_accessor :tty + + def tty? + @tty = true unless defined?(@tty) + @tty + end + + def noecho + yield self + end + end + + def initialize(input = "") + require "stringio" + ins = StringIO.new input + outs = StringIO.new + errs = StringIO.new + + ins.extend TTY + outs.extend TTY + errs.extend TTY + + super ins, outs, errs, true + + @terminated = false + end + + def ask(question) + raise InputEOFError, question if @ins.eof? + + super + end + + def input + @ins.string + end + + def output + @outs.string + end + + def error + @errs.string + end + + def terminated? + @terminated + end + + def terminate_interaction(status=0) + @terminated = true + + raise TermError, status if status != 0 + raise SystemExitException + end +end diff --git a/test/rubygems/test_gem_commands_compare_command.rb b/test/rubygems/test_gem_commands_compare_command.rb index b9b099b..ed0d12c 100644 --- a/test/rubygems/test_gem_commands_compare_command.rb +++ b/test/rubygems/test_gem_commands_compare_command.rb @@ -1,6 +1,8 @@ +# frozen_string_literal: true + require_relative '../test_helper' +require_relative 'mock_gem_ui' require 'rubygems/user_interaction' -require 'rubygems/mock_gem_ui' require 'rubygems/commands/compare_command' class TestGemCommandsCompareCommand < Minitest::Test diff --git a/test/test_helper.rb b/test/test_helper.rb index 43282a4..3d69e5e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'minitest/autorun' require 'rubygems/comparator'