From e784cf3e983a36f94f0b90b40f705b691f19b187 Mon Sep 17 00:00:00 2001
From: Drew Caddell <dcaddell@invoca.com>
Date: Thu, 27 Mar 2025 08:05:57 -0700
Subject: [PATCH 1/2] WEB-8121: depend on diff-lcs so that we can share the
 global namespace

---
 CHANGELOG.md             | 7 +++++++
 Gemfile.lock             | 5 +++--
 invoca-utils.gemspec     | 1 +
 lib/invoca/utils.rb      | 4 +---
 lib/invoca/utils/diff.rb | 4 ++++
 spec/unit/utils_spec.rb  | 9 +++++++--
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20556c7..e0ec88f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 **Note:** This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.1] - Unreleased
+### Fixed
+- Fixed a global namespace collision with diff-lcs over the `Diff` constant
+
+### Added
+- Loading `invoca/utils/diff` now gives access to both `invoca-utils` and `diff-lcs` diff helpers
+
 ## [0.6.0] - 2024-07-10
 ### Added
 - Require Ruby > 3.1
diff --git a/Gemfile.lock b/Gemfile.lock
index a9bebfb..68ccb55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,6 +3,7 @@ PATH
   specs:
     invoca-utils (0.6.0)
       activesupport (>= 6.0)
+      diff-lcs (>= 1.6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -27,7 +28,7 @@ GEM
     bigdecimal (3.1.8)
     concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.1)
     drb (2.2.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -40,7 +41,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
diff --git a/invoca-utils.gemspec b/invoca-utils.gemspec
index f3dbacf..99ef107 100644
--- a/invoca-utils.gemspec
+++ b/invoca-utils.gemspec
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.1"
 
   spec.add_dependency "activesupport", ">= 6.0"
+  spec.add_dependency "diff-lcs", ">= 1.6.1"
 
   # Specify this gem's development and test dependencies in Gemfile
 end
diff --git a/lib/invoca/utils.rb b/lib/invoca/utils.rb
index 303fdf6..90a3259 100644
--- a/lib/invoca/utils.rb
+++ b/lib/invoca/utils.rb
@@ -20,9 +20,7 @@ module Utils
 require "invoca/utils/guaranteed_utf8_string"
 require "invoca/utils/version"
 
-unless defined?(Diff)
-  Diff = Invoca::Utils::Diff
-end
+Diff = Invoca::Utils::Diff
 
 unless defined?(Diffable)
   Diffable = Invoca::Utils::Diffable
diff --git a/lib/invoca/utils/diff.rb b/lib/invoca/utils/diff.rb
index 3711eff..afc1c46 100644
--- a/lib/invoca/utils/diff.rb
+++ b/lib/invoca/utils/diff.rb
@@ -2,10 +2,14 @@
 
 # adapted from http://users.cybercity.dk/~dsl8950/ruby/diff-0.3.tar.gz
 
+require "diff/lcs"
+
 module Invoca
   module Utils
     class Diff
 
+      LCS = ::Diff::LCS
+
       VERSION = 0.3
 
       def self.lcs(a, b)
diff --git a/spec/unit/utils_spec.rb b/spec/unit/utils_spec.rb
index 9df2086..dad63df 100644
--- a/spec/unit/utils_spec.rb
+++ b/spec/unit/utils_spec.rb
@@ -30,8 +30,13 @@
         load 'invoca/utils.rb'
       end
 
-      it "not define Diff as Invoca::Utils::Diff" do
-        expect(@class).to eq(::Diff)
+      it "define Diff as Invoca::Utils::Diff" do
+        expect(Invoca::Utils::Diff).to eq(::Diff)
+      end
+
+      it "still allows access to diff-lcs methods" do
+        expect(defined?(Diff::LCS)).to eq("constant")
+        expect(Diff::LCS).to respond_to(:diff)
       end
     end
 

From d75a199e32bab4d8fb50e4dedfbde3787e0c3540 Mon Sep 17 00:00:00 2001
From: Drew Caddell <dcaddell@invoca.com>
Date: Thu, 27 Mar 2025 10:34:53 -0700
Subject: [PATCH 2/2] Release v0.6.1

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0ec88f..497ea3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 **Note:** This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.6.1] - Unreleased
+## [0.6.1] - 2025-03-27
 ### Fixed
 - Fixed a global namespace collision with diff-lcs over the `Diff` constant