chore: Switch to Minitest for primary tests

Signed-off-by: Austin Ziegler <austin@zieglers.ca>

Author: halostatue

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: '3.4'
           rubygems: latest
@@ -71,7 +71,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: '3.4'
           rubygems: latest
@@ -120,7 +120,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: latest
@@ -167,7 +167,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: latest
@@ -216,7 +216,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: latest
@@ -262,7 +262,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: latest
@@ -308,7 +308,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: latest

.github/workflows/dco-check.yml

@@ -27,4 +27,4 @@ jobs:
             api.github.com:443
             github.com:443
 
-      - uses: KineticCafe/actions-dco@76b7fc30ff5988e68d01ea07deeaf7e71256598f # v2.1.0
+      - uses: KineticCafe/actions-dco@6e1652ef3027ce128e65e6edd215ae053350bd16 # v2.1.1

.github/workflows/publish-docs.yml

@@ -38,7 +38,7 @@ jobs:
             'print "version=", Gem::Specification.load(ARGV[0]).rubygems_version, "\n"' \
             diff-lcs.gemspec >>"${GITHUB_OUTPUT}"
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           bundler-cache: false
           ruby-version: ruby

.github/workflows/publish-gem.yml

@@ -65,7 +65,7 @@ jobs:
             'print "version=", Gem::Specification.load(ARGV[0]).rubygems_version, "\n"' \
             diff-lcs.gemspec >>"${GITHUB_OUTPUT}"
 
-      - uses: ruby/setup-ruby@8a836efbcebe5de0fe86b48a775b7a31b5c70c93 # v1.277.0
+      - uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
         with:
           bundler-cache: false
           ruby-version: ruby

.github/zizmor.yml

@@ -1,4 +1,4 @@
 rules:
   artipacked:
     ignore:
-      - publish-gem.yml:53 # publish-gem adds and pushes a tag.
+      - publish-gem.yml:58 # publish-gem adds and pushes a tag.

CHANGELOG.md

@@ -35,6 +35,14 @@ This release has significant **breaking changes**.
   Most callers are using `Diff::LCS.lcs` and modern Ruby did-you-mean support
   should assist with this update.
 
+- `Diff::LCS::Change` objects implemented the comparison operator (`<=>`)
+  incorrectly. Comparisons are now done so that the `position` is compared
+  first, then the `action` (by index of `VALID_ACTIONS`), and finally the
+  element. `Diff::LCS::ContextChange` works similarly, comparing the old and new
+  positions prior to comparing the actions by index.
+
+  The order of `VALID_ACTIONS` was changed for the index order to make sense.
+
 ## 1.6.2 / 2025-05-12
 
 - Handle upcoming changes to the `cgi` gem in Ruby 3.5 ([#147][pull-147])

Manifest.txt

@@ -24,76 +24,6 @@ licenses/artistic.txt
 licenses/dco.txt
 spec/change_spec.rb
 spec/diff_spec.rb
-spec/fixtures/123_x
-spec/fixtures/456_x
-spec/fixtures/aX
-spec/fixtures/bXaX
-spec/fixtures/ds1.csv
-spec/fixtures/ds2.csv
-spec/fixtures/empty
-spec/fixtures/file1.bin
-spec/fixtures/file2.bin
-spec/fixtures/four_lines
-spec/fixtures/four_lines_with_missing_new_line
-spec/fixtures/ldiff/diff.missing_new_line1-e
-spec/fixtures/ldiff/diff.missing_new_line1-f
-spec/fixtures/ldiff/diff.missing_new_line2-e
-spec/fixtures/ldiff/diff.missing_new_line2-f
-spec/fixtures/ldiff/error.diff.chef-e
-spec/fixtures/ldiff/error.diff.chef-f
-spec/fixtures/ldiff/error.diff.missing_new_line1-e
-spec/fixtures/ldiff/error.diff.missing_new_line1-f
-spec/fixtures/ldiff/error.diff.missing_new_line2-e
-spec/fixtures/ldiff/error.diff.missing_new_line2-f
-spec/fixtures/ldiff/output.diff
-spec/fixtures/ldiff/output.diff-c
-spec/fixtures/ldiff/output.diff-u
-spec/fixtures/ldiff/output.diff.bin1
-spec/fixtures/ldiff/output.diff.bin1-c
-spec/fixtures/ldiff/output.diff.bin1-e
-spec/fixtures/ldiff/output.diff.bin1-f
-spec/fixtures/ldiff/output.diff.bin1-u
-spec/fixtures/ldiff/output.diff.bin2
-spec/fixtures/ldiff/output.diff.bin2-c
-spec/fixtures/ldiff/output.diff.bin2-e
-spec/fixtures/ldiff/output.diff.bin2-f
-spec/fixtures/ldiff/output.diff.bin2-u
-spec/fixtures/ldiff/output.diff.chef
-spec/fixtures/ldiff/output.diff.chef-c
-spec/fixtures/ldiff/output.diff.chef-u
-spec/fixtures/ldiff/output.diff.chef2
-spec/fixtures/ldiff/output.diff.chef2-c
-spec/fixtures/ldiff/output.diff.chef2-d
-spec/fixtures/ldiff/output.diff.chef2-u
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-c
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-e
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-f
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-u
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-c
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-e
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-f
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-u
-spec/fixtures/ldiff/output.diff.issue95_trailing_context
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-c
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-e
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-f
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-u
-spec/fixtures/ldiff/output.diff.missing_new_line1
-spec/fixtures/ldiff/output.diff.missing_new_line1-c
-spec/fixtures/ldiff/output.diff.missing_new_line1-e
-spec/fixtures/ldiff/output.diff.missing_new_line1-f
-spec/fixtures/ldiff/output.diff.missing_new_line1-u
-spec/fixtures/ldiff/output.diff.missing_new_line2
-spec/fixtures/ldiff/output.diff.missing_new_line2-c
-spec/fixtures/ldiff/output.diff.missing_new_line2-e
-spec/fixtures/ldiff/output.diff.missing_new_line2-f
-spec/fixtures/ldiff/output.diff.missing_new_line2-u
-spec/fixtures/new-chef
-spec/fixtures/new-chef2
-spec/fixtures/old-chef
-spec/fixtures/old-chef2
 spec/hunk_spec.rb
 spec/issues_spec.rb
 spec/lcs_spec.rb
@@ -103,3 +33,84 @@ spec/sdiff_spec.rb
 spec/spec_helper.rb
 spec/traverse_balanced_spec.rb
 spec/traverse_sequences_spec.rb
+test/fixtures/123_x
+test/fixtures/456_x
+test/fixtures/aX
+test/fixtures/bXaX
+test/fixtures/ds1.csv
+test/fixtures/ds2.csv
+test/fixtures/empty
+test/fixtures/file1.bin
+test/fixtures/file2.bin
+test/fixtures/four_lines
+test/fixtures/four_lines_with_missing_new_line
+test/fixtures/ldiff/diff.missing_new_line1-e
+test/fixtures/ldiff/diff.missing_new_line1-f
+test/fixtures/ldiff/diff.missing_new_line2-e
+test/fixtures/ldiff/diff.missing_new_line2-f
+test/fixtures/ldiff/error.diff.chef-e
+test/fixtures/ldiff/error.diff.chef-f
+test/fixtures/ldiff/error.diff.missing_new_line1-e
+test/fixtures/ldiff/error.diff.missing_new_line1-f
+test/fixtures/ldiff/error.diff.missing_new_line2-e
+test/fixtures/ldiff/error.diff.missing_new_line2-f
+test/fixtures/ldiff/output.diff
+test/fixtures/ldiff/output.diff-c
+test/fixtures/ldiff/output.diff-u
+test/fixtures/ldiff/output.diff.bin1
+test/fixtures/ldiff/output.diff.bin1-c
+test/fixtures/ldiff/output.diff.bin1-e
+test/fixtures/ldiff/output.diff.bin1-f
+test/fixtures/ldiff/output.diff.bin1-u
+test/fixtures/ldiff/output.diff.bin2
+test/fixtures/ldiff/output.diff.bin2-c
+test/fixtures/ldiff/output.diff.bin2-e
+test/fixtures/ldiff/output.diff.bin2-f
+test/fixtures/ldiff/output.diff.bin2-u
+test/fixtures/ldiff/output.diff.chef
+test/fixtures/ldiff/output.diff.chef-c
+test/fixtures/ldiff/output.diff.chef-u
+test/fixtures/ldiff/output.diff.chef2
+test/fixtures/ldiff/output.diff.chef2-c
+test/fixtures/ldiff/output.diff.chef2-d
+test/fixtures/ldiff/output.diff.chef2-u
+test/fixtures/ldiff/output.diff.empty.vs.four_lines
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-c
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-e
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-f
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-u
+test/fixtures/ldiff/output.diff.four_lines.vs.empty
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-c
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-e
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-f
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-u
+test/fixtures/ldiff/output.diff.issue95_trailing_context
+test/fixtures/ldiff/output.diff.issue95_trailing_context-c
+test/fixtures/ldiff/output.diff.issue95_trailing_context-e
+test/fixtures/ldiff/output.diff.issue95_trailing_context-f
+test/fixtures/ldiff/output.diff.issue95_trailing_context-u
+test/fixtures/ldiff/output.diff.missing_new_line1
+test/fixtures/ldiff/output.diff.missing_new_line1-c
+test/fixtures/ldiff/output.diff.missing_new_line1-e
+test/fixtures/ldiff/output.diff.missing_new_line1-f
+test/fixtures/ldiff/output.diff.missing_new_line1-u
+test/fixtures/ldiff/output.diff.missing_new_line2
+test/fixtures/ldiff/output.diff.missing_new_line2-c
+test/fixtures/ldiff/output.diff.missing_new_line2-e
+test/fixtures/ldiff/output.diff.missing_new_line2-f
+test/fixtures/ldiff/output.diff.missing_new_line2-u
+test/fixtures/new-chef
+test/fixtures/new-chef2
+test/fixtures/old-chef
+test/fixtures/old-chef2
+test/test_change.rb
+test/test_diff.rb
+test/test_helper.rb
+test/test_hunk.rb
+test/test_issues.rb
+test/test_lcs.rb
+test/test_ldiff.rb
+test/test_patch.rb
+test/test_sdiff.rb
+test/test_traverse_balanced.rb
+test/test_traverse_sequences.rb

Rakefile

@@ -4,14 +4,15 @@ require "rspec/core/rake_task"
 require "hoe"
 require "rake/clean"
 require "rdoc/task"
+require "minitest/test_task"
 
 Hoe.plugin :halostatue
-Hoe.plugin :rubygems
 
 Hoe.plugins.delete :debug
 Hoe.plugins.delete :newb
 Hoe.plugins.delete :publish
 Hoe.plugins.delete :signing
+Hoe.plugins.delete :test
 
 hoe = Hoe.spec "diff-lcs" do
   developer("Austin Ziegler", "halostatue@gmail.com")
@@ -29,33 +30,65 @@ hoe = Hoe.spec "diff-lcs" do
   extra_dev_deps << ["hoe", "~> 4.0"]
   extra_dev_deps << ["hoe-halostatue", "~> 2.1", ">= 2.1.1"]
   extra_dev_deps << ["rspec", ">= 2.0", "< 4"]
+  extra_dev_deps << ["minitest", "~> 6.0"]
+  extra_dev_deps << ["minitest-autotest", "~> 1.0"]
+  extra_dev_deps << ["minitest-focus", "~> 1.1"]
   extra_dev_deps << ["rake", ">= 10.0", "< 14"]
-  extra_dev_deps << ["rdoc", ">= 6.3.1", "< 7"]
+  extra_dev_deps << ["rantly", "~> 3.0"]
+  extra_dev_deps << ["rdoc", ">= 6.0", "< 8"]
   extra_dev_deps << ["simplecov", "~> 0.9"]
   extra_dev_deps << ["simplecov-lcov", "~> 0.9"]
   extra_dev_deps << ["standard", "~> 1.50"]
   extra_dev_deps << ["standard-thread_safety", "~> 1.0"]
   extra_dev_deps << ["fasterer", "~> 0.11"]
 end
 
+task :nocover do
+  require "fileutils"
+  FileUtils.rm_rf("./coverage")
+end
+
+# To be replaced with an integration test that uses rspec on a different suite
 desc "Run all specifications"
 RSpec::Core::RakeTask.new(:spec) do |t|
   rspec_dirs = %w[spec lib].join(":")
   t.rspec_opts = ["-I#{rspec_dirs}"]
 end
 
-namespace :spec do
-  desc "Runs test coverage. Only works Ruby 2.0+ and assumes 'simplecov' is installed."
-  task :coverage do
-    Rake::Task["spec"].execute
-  end
-end
+task spec: :nocover
+
+task default: :spec
 
-task coverage: "spec:coverage"
 Rake::Task["spec"].actions.uniq! { |a| a.source_location }
 
-task default: :spec unless Rake::Task["default"].prereqs.include?("spec")
-task test: :spec unless Rake::Task["test"].prereqs.include?("spec")
+Minitest::TestTask.create :test
+Minitest::TestTask.create :coverage do |t|
+  formatters = <<-RUBY.split($/).join(" ")
+    SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::LcovFormatter,
+      SimpleCov::Formatter::SimpleFormatter
+    ])
+  RUBY
+  t.test_prelude = <<-RUBY.split($/).join("; ")
+  require "simplecov"
+  require "simplecov-lcov"
+
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    config.report_with_single_file = true
+    config.lcov_file_name = "lcov.info"
+  end
+
+  SimpleCov.start "test_frameworks" do
+    enable_coverage :branch
+    primary_coverage :branch
+    formatter #{formatters}
+  end
+  RUBY
+end
+
+task test: :nocover
+task default: :test
 
 task :version do
   require "diff/lcs/version"
@@ -64,7 +97,6 @@ end
 
 RDoc::Task.new do |config|
   config.title = "diff-lcs"
-  # config.main = "lib/diff/lcs.rb"
   config.main = "README.md"
   config.rdoc_dir = "doc"
   config.rdoc_files = hoe.spec.require_paths - ["Manifest.txt"] + hoe.spec.extra_rdoc_files