invoca-utils 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4c3ce7e8a1dbe52aa8ab6c6614d9bc2b6ba8ac2e3f04adf233454cb535128b
-  data.tar.gz: b604d11003c903c70b0e63646c87547a426d5af1dec8fdfabff802e4c4ceb8f7
+  metadata.gz: 443126af15b2537b1e27e80293dc05c81304f30ddd26a1af189dc132a46d033e
+  data.tar.gz: a0846a8f5c9d0b80b5204b08bdead40bb2730f2aa0addb926306cd9da51e50cf
 SHA512:
-  metadata.gz: 655134641dc1abd112340418b18c7a1910adf662230f9bfff997de68c03ca70835186beae2ec243a1061d3ce8bec4302dc942f402b798af13034a389c0170223
-  data.tar.gz: e621f9c450234d24d5725f5186e159cfa6e6ea620c45ccd255202f8de00e2cccfc7baf10bbcc90b223c31fdc2c91e1ddac591808bf5f0939b5c1c75a4b020e91
+  metadata.gz: a178753bf9f95c9ba7b5ce2620b987dfd36aa618d7f0ec7660245d242d056a9512b3e7b51b19e45fb790c4159ecfafc910e7b00e6dbe792f005611557d39e555
+  data.tar.gz: 84e20b7543da792234fe69b90046023d05e3fb24ca109717997b644a6075a05aada044b4f321347d6aa08ec0cd20b911bbb5e3eac5aabb2df90022f8fac95007

data/.github/workflows/pipeline.yml

@@ -1,36 +1,8 @@
----
 name: Pipeline
-
-on: [push]
-
+on:
+  push:
+  schedule:
+  - cron: '0 1 * * 1' # Every Monday at 1AM UTC
 jobs:
   tests:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [3.1, 3.2, 3.3]
-        gemfile:
-          - Gemfile
-          - gemfiles/activesupport_6_0.gemfile
-          - gemfiles/activesupport_6_1.gemfile
-          - gemfiles/activesupport_7_0.gemfile
-          - gemfiles/activesupport_7_1.gemfile
-
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-    name: Unit Tests (${{ matrix.ruby }} - ${{ matrix.gemfile }})
-
-    steps:
-      - name: Check out
-        uses: actions/checkout@v2
-      - name: Set up Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: 2.2.29
-          bundler-cache: true
-      - name: Run Tests
-        run: bundle exec rspec
+    uses: Invoca/ruby-test-matrix-workflow/.github/workflows/ruby-test-matrix.yml@main

data/Appraisals

@@ -2,4 +2,4 @@
 
 require 'appraisal/matrix'
 
-appraisal_matrix(activesupport: "6.0")
+appraisal_matrix(activesupport: "7.0")

data/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] - 2025-03-27
+### 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

data/Gemfile

@@ -14,3 +14,10 @@ gem "rspec_junit_formatter", "~> 0.4"
 # minitest, which is a transitive dependency of activesupport,
 # version should support ruby 2.5 which is the minimum github pipeline targets
 gem "minitest",              "~> 5.10.0"
+
+
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    invoca-utils (0.6.0)
+    invoca-utils (0.6.1)
       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)
@@ -61,11 +62,15 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 2.4)
   appraisal-matrix
+  base64 (>= 0.2.0)
+  bigdecimal (>= 3.1)
+  concurrent-ruby (~> 1.3, < 1.3.5)
   invoca-utils!
   minitest (~> 5.10.0)
+  mutex_m (>= 0.2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
   rspec_junit_formatter (~> 0.4)
 
 BUNDLED WITH
-   2.2.29
+   2.6.3

data/catalog-info.yaml

@@ -19,6 +19,8 @@ metadata:
   tags:
   - ruby
   - gem
+  - public
+  - rails-dependent
   annotations:
     buildkite.com/project-slug: Invoca/invoca-utils
     github.com/project-slug: Invoca/invoca-utils

data/gemfiles/activesupport_7_0.gemfile

@@ -8,6 +8,10 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "activesupport", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/activesupport_7_1.gemfile

@@ -8,6 +8,10 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "activesupport", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{activesupport_6_0.gemfile → activesupport_7_2.gemfile}

@@ -8,6 +8,10 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
-gem "activesupport", "~> 6.0.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
+gem "activesupport", "~> 7.2.0"
 
 gemspec path: "../"

data/gemfiles/{activesupport_6_1.gemfile → activesupport_8_0.gemfile}

@@ -8,6 +8,10 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
-gem "activesupport", "~> 6.1.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
+gem "activesupport", "~> 8.0.0"
 
 gemspec path: "../"

data/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

data/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)

data/lib/invoca/utils/version.rb

@@ -2,6 +2,6 @@
 
 module Invoca
   module Utils
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/lib/invoca/utils.rb

@@ -20,9 +20,7 @@ require "invoca/utils/exceptions"
 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

data/spec/unit/utils_spec.rb

@@ -30,8 +30,13 @@ describe Invoca::Utils do
         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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoca-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Invoca development
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 description: A public collection of helpers used in multiple projects
 email:
 - development@invoca.com
@@ -46,11 +60,10 @@ files:
 - README.md
 - Rakefile
 - catalog-info.yaml
-- gemfiles/activesupport_6_0.gemfile
-- gemfiles/activesupport_6_1.gemfile
-- gemfiles/activesupport_7.gemfile
 - gemfiles/activesupport_7_0.gemfile
 - gemfiles/activesupport_7_1.gemfile
+- gemfiles/activesupport_7_2.gemfile
+- gemfiles/activesupport_8_0.gemfile
 - invoca-utils.gemspec
 - lib/invoca/utils.rb
 - lib/invoca/utils/array.rb

data/gemfiles/activesupport_7.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 2.4"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
-gem "rspec_junit_formatter", "~> 0.4"
-gem "minitest", "~> 5.10.0"
-gem "activesupport", "~> 7.0"
-
-gemspec path: "../"