Revert "Drop MRI 1.8.7-2.2 support (#158)"

.github/workflows/main.yml

@@ -17,10 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '3.4'
           - '3.3'
           - '3.2'
           - '3.1'
           - '3.0'
+          - '2.7'
           - 'head'
           - jruby
           - jruby-head
@@ -38,10 +40,23 @@ jobs:
       - name: Update bundler
         env:
           RUBY_VERSION: ${{ matrix.ruby }}
+        # See: https://dev.to/galtzo/matrix-ruby-gem-bundler-etc-4kk7
         run: |
           case ${RUBY_VERSION} in
-            truffleruby|truffleruby-head)
-              gem install bundler -v 2.5.18
+            1.8|1.9|2.0|2.1|2.2)
+              gem install bundler -v 1.17.3
+            ;;
+
+            2.3|2.4|2.5)
+              gem install bundler -v 2.3.27
+            ;;
+
+            2.6|2.7)
+              gem install bundler -v 2.4.22
+            ;;
+
+            3.0)
+              gem install bundler -v 2.5.23
             ;;
 
             *)

.rspec

@@ -0,0 +1,4 @@
+--format progress
+--color
+--require spec_helper
+--warnings

.rubocop.yml

@@ -0,0 +1,17 @@
+inherit_gem:
+  rubocop-lts: config/rubygem_rspec.yml
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false
+
+# TODO: We would need to implement Mutexes in order to make violations thread safe.
+#       But even then they would still trigger the violation.
+#       See: https://coderscat.com/ruby-change-current-working-directory/
+ThreadSafety/DirChdir:
+  Enabled: false

.tool-versions

@@ -0,0 +1,2 @@
+`ruby 3.4.2
+ruby 3.3.7

Gemfile

@@ -2,10 +2,47 @@ source "https://rubygems.org"
 
 gemspec
 
+# For Ruby version specific dependencies
+ruby_version = Gem::Version.new(RUBY_VERSION)
+
+platform :mri do
+  # Debugging
+  if ruby_version < Gem::Version.new("2.7")
+    # Use byebug in code
+    gem "byebug", ">= 11"
+  else
+    # Use binding.break, binding.b, or debugger in code
+    gem "debug", ">= 1.0.0"
+  end
+
+  # Dev Console - Binding.pry - Irb replacement
+  gem "pry", "~> 0.14"                     # ruby >= 2.0
+end
+
 # This here to make sure appraisal works with Rails 3.0.0.
 gem "thor", "~> 0.14.0"
 
-group :development, :test do
-  gem "activesupport", ">= 3.2.21"
-  gem "rspec", "~> 3.0"
+if ruby_version < Gem::Version.new("1.9")
+  eval File.read("Gemfile-1.8")
+elsif ruby_version < Gem::Version.new("2.1")
+  eval File.read("Gemfile-2.0")
+elsif ruby_version < Gem::Version.new("2.2")
+  eval File.read("Gemfile-2.1")
+elsif ruby_version < Gem::Version.new("2.7")
+  # Std Lib extractions
+  gem "benchmark", "~> 0.4" # Removed from Std Lib in Ruby 3.5
+else
+  # Ruby >= 2.7 we can run style / lint checks via rubocop-gradual with rubocop-lts rules for Ruby 1.8+.
+  # This means we can develop on modern Ruby but remain compatible with ancient Ruby.
+  # TODO: Replace individual style gems below with modular gemfile, once eval_gemfile support is added to appraisal.
+  # eval_gemfile "gemfiles/modular/style.gemfile"
+  # We run rubocop on the latest version of Ruby,
+  #   but in support of the oldest supported version of Ruby
+  gem "rubocop-lts", "~> 0.1", ">= 0.1.1" # Style and Linting support for Ruby >= 1.8
+  gem "rubocop-packaging", "~> 0.5", ">= 0.5.2"
+  gem "rubocop-rspec", "~> 3.2"
+  gem "standard", ">= 1.35.1", "!= 1.41.1", "!= 1.42.0"
+
+  # Std Lib extractions
+  gem "benchmark", "~> 0.4" # Removed from Std Lib in Ruby 3.5
 end

Gemfile-1.8

@@ -0,0 +1,6 @@
+# These gems are locked for Ruby 1.8.7 compatibility
+gem "i18n", "~> 0.6.0"
+gem "activesupport", "~> 3.2.21"
+gem "rake", "~> 10.5"
+gem "rack", "~> 1.6.5"
+gem "benchmark", "~> 0.3" # Removed from Std Lib in Ruby 3.5

Gemfile-2.0

@@ -0,0 +1,4 @@
+# These gems are locked for Ruby 1.9 & 2.0 compatibility
+gem "activesupport", "~> 4.2.7"
+gem "rack", "~> 1.6.5"
+gem "benchmark", "~> 0.3" # Removed from Std Lib in Ruby 3.5

Gemfile-2.1

@@ -0,0 +1,4 @@
+# These gems are locked for Ruby 2.1 compatibility
+gem "activesupport", "~> 4.2.7"
+gem "rack", "~> 1.6.5"
+gem "benchmark", "~> 0.4" # Removed from Std Lib in Ruby 3.5

README.md

@@ -122,31 +122,31 @@ To do this, use the `remove_gem` declaration within the necessary `appraise` blo
 
 **Gemfile**
 ```ruby
-gem 'rails', '~> 4.2'
+gem "rails", "~> 4.2"
 
 group :test do
-  gem 'rspec', '~> 4.0'
-  gem 'test_after_commit'
+  gem "rspec", "~> 4.0"
+  gem "test_after_commit"
 end
 ```
 
 **Appraisals**
 ```ruby
-appraise 'rails-5' do
-  gem 'rails', '~> 5.2'
+appraise "rails-5" do
+  gem "rails", "~> 5.2"
 
   group :test do
-    remove_gem 'test_after_commit'
+    remove_gem "test_after_commit"
   end
 end
 ```
 
 Using the `Appraisals` file defined above, this is what the resulting `Gemfile` will look like:
 ```ruby
-gem 'rails', '~> 5.2'
+gem "rails", "~> 5.2"
 
 group :test do
-  gem 'rspec', '~> 4.0'
+  gem "rspec", "~> 4.0"
 end
 ```
 
@@ -174,12 +174,12 @@ You can also provide variables for substitution in the heading, based on each ap
 ```ruby
 customize_gemfiles do
   {
-    single_quotes: true,
-    heading: <<~HEADING
-      frozen_string_literal: true
+    :single_quotes => true,
+    :heading => <<-HEADING,
+frozen_string_literal: true
 
-      `%{gemfile}` has been generated by Appraisal, do NOT modify it or `%{lockfile}` directly!
-      Make the changes to the "%{appraisal}" block in `Appraisals` instead. See the conventions at https://example.com/
+`%{gemfile}` has been generated by Appraisal, do NOT modify it or `%{lockfile}` directly!
+Make the changes to the "%{appraisal}" block in `Appraisals` instead. See the conventions at https://example.com/
     HEADING
   }
 end
@@ -196,7 +196,7 @@ Using the `Appraisals` file defined above, this is what the resulting `Gemfile`
 # `rails-3.gemfile` has been generated by Appraisal, do NOT modify it or `rails-3.gemfile.lock` directly!
 # Make the changes to the "rails-3" block in `Appraisals` instead. See the conventions at https://example.com/
 
-gem 'rails', '3.2.14'
+gem "rails", "3.2.14"
 ```
 
 Version Control

Rakefile

@@ -10,5 +10,14 @@ RSpec::Core::RakeTask.new do |t|
   t.verbose = false
 end
 
-desc "Default: run the rspec examples"
-task default: [:spec]
+begin
+  require "rubocop/lts"
+  Rubocop::Lts.install_tasks
+rescue LoadError
+  task(:rubocop_gradual) do
+    warn("RuboCop (Gradual) is disabled")
+  end
+end
+
+desc "Default: rubocop_gradual's autocorrect and run the rspec examples"
+task :default => ["rubocop_gradual:autocorrect", :spec]

appraisal.gemspec

@@ -1,26 +1,51 @@
 # frozen_string_literal: true
 
-require_relative "lib/appraisal/version"
+# TODO: Switch to require_relative once support for Ruby < 2 is dropped.
+# require_relative "lib/appraisal/version"
+
+$:.push(File.expand_path("lib", __dir__))
+require "appraisal/version"
 
 Gem::Specification.new do |s|
-  s.name        = "appraisal"
-  s.version     = Appraisal::VERSION.dup
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Joe Ferris", "Prem Sichanugrist"]
-  s.email       = ["[email protected]", "[email protected]"]
-  s.homepage    = "http://github.com/thoughtbot/appraisal"
-  s.summary     = "Find out what your Ruby gems are worth"
+  s.name = "appraisal"
+  s.version = Appraisal::VERSION.dup
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Joe Ferris", "Prem Sichanugrist"]
+  s.email = ["[email protected]", "[email protected]"]
+  s.homepage = "http://github.com/thoughtbot/appraisal"
+  s.summary = "Find out what your Ruby gems are worth"
   s.description = 'Appraisal integrates with bundler and rake to test your library against different versions of dependencies in repeatable scenarios called "appraisals."'
-  s.license     = "MIT"
+  s.license = "MIT"
+
+  # specify which files should be added to the gem when it is released.
+  s.files = Dir[
+    # Splats (keep alphabetical)
+    "lib/**/*.rb",
+  ]
+
+  # automatically included with gem package, no need to list twice (i.e. do not list in files above).
+  s.extra_rdoc_files = Dir[
+    # Files (keep alphabetical)
+    "CONTRIBUTING.md",
+    "MIT-LICENSE",
+    "README.md",
+    "SECURITY.md",
+  ]
+
+  # bin/ is scripts, in any available language, for development of this specific gem
+  # exe/ is for ruby scripts that will ship with this gem to be used by other tools
+  s.bindir = "exe"
+  # files listed are relative paths from bindir above.
+  s.executables = [
+    "appraisal",
+  ]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- exe/*`.split("\n").map { |f| File.basename(f) }
-  s.bindir        = "exe"
+  s.required_ruby_version = ">= 1.8.7"
 
-  s.required_ruby_version = ">= 2.3.0"
+  s.add_runtime_dependency("bundler", ">= 1.17.3") # Last version supporting Ruby 1.8.7
+  s.add_runtime_dependency("rake", ">= 10") # Last version supporting Ruby 1.8.7
+  s.add_runtime_dependency("thor", ">= 0.14.0")
 
-  s.add_dependency("rake")
-  s.add_dependency("bundler")
-  s.add_dependency("thor", ">= 0.14.0")
+  s.add_development_dependency("activesupport", ">= 3.2.21")
+  s.add_development_dependency("rspec", "~> 3.0")
 end

bin/bundle

@@ -24,14 +24,14 @@ m = Module.new do
   def cli_arg_version
     return unless invoked_as_script? # don't want to hijack other binstubs
     return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+
     bundler_version = nil
     update_index = nil
     ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1
+      bundler_version = a if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/o
+
+      bundler_version = Regexp.last_match(1)
       update_index = i
     end
     bundler_version
@@ -55,8 +55,10 @@ m = Module.new do
 
   def lockfile_version
     return unless File.file?(lockfile)
+
     lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/o
+
     Regexp.last_match(1)
   end
 
@@ -83,15 +85,19 @@ m = Module.new do
 
   def activate_bundler
     gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
+      gem("bundler", bundler_requirement)
     end
     return if gem_error.nil?
+
     require_error = activation_error_handling do
       require "bundler/version"
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
+    if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+      return
+    end
+
+    warn("Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`")
+    exit(42)
   end
 
   def activation_error_handling
@@ -104,6 +110,4 @@ end
 
 m.load_bundler!
 
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end
+load Gem.bin_path("bundler", "bundle") if m.invoked_as_script?

exe/appraisal

@@ -10,5 +10,5 @@ begin
   Appraisal::CLI.start
 rescue Appraisal::AppraisalsNotFound => e
   puts e.message
-  exit 127
+  exit(127)
 end

gemfiles/modular/style.gemfile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# We run rubocop on the latest version of Ruby,
+#   but in support of the oldest supported version of Ruby
+
+gem "rubocop-lts", "~> 0.1", ">= 0.1.1" # Style and Linting support for Ruby >= 1.8
+gem "rubocop-packaging", "~> 0.5", ">= 0.5.2"
+gem "rubocop-rspec", "~> 3.2"
+gem "standard", ">= 1.35.1", "!= 1.41.1", "!= 1.42.0"
+
+# Std Lib extractions
+gem "benchmark", "~> 0.4" # Removed from Std Lib in Ruby 3.5