invoca-utils 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8684fc70ce068552001b1cd99cf11a8f60882e23d46b9a56f94276e5c5b6403
-  data.tar.gz: c429285201930b90be6ea32d043f9625fcd22b493b6c4871ea912d55800958d2
+  metadata.gz: 443126af15b2537b1e27e80293dc05c81304f30ddd26a1af189dc132a46d033e
+  data.tar.gz: a0846a8f5c9d0b80b5204b08bdead40bb2730f2aa0addb926306cd9da51e50cf
 SHA512:
-  metadata.gz: a8c825cfa1b59d065cd8ea81a56cbe1e1d5c1acd277b2d9d05b452392b027de3a07acd6537aef12732fe70b7994b3aa2a0b74c03355c053b3c4d0db6552ccf43
-  data.tar.gz: e641a1ef06cd907e48d5b6addec2bcb8ae27b125528ec645bd2366153938245c0a3de6635241aebe416a86a196509337c6ad9a88ee3685d97d84ceb60e11f3e1
+  metadata.gz: a178753bf9f95c9ba7b5ce2620b987dfd36aa618d7f0ec7660245d242d056a9512b3e7b51b19e45fb790c4159ecfafc910e7b00e6dbe792f005611557d39e555
+  data.tar.gz: 84e20b7543da792234fe69b90046023d05e3fb24ca109717997b644a6075a05aada044b4f321347d6aa08ec0cd20b911bbb5e3eac5aabb2df90022f8fac95007

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Invoca/octothorpe

data/.github/workflows/pipeline.yml

@@ -1,40 +1,8 @@
----
 name: Pipeline
-
-on: [push]
-
+on:
+  push:
+  schedule:
+  - cron: '0 1 * * 1' # Every Monday at 1AM UTC
 jobs:
   tests:
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2]
-        gemfile:
-          - Gemfile
-          - gemfiles/activesupport_5.gemfile
-          - gemfiles/activesupport_6.gemfile
-          - gemfiles/activesupport_7.gemfile
-        exclude:
-          - ruby: 2.5
-            gemfile: gemfiles/activesupport_7.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/activesupport_7.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/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.6

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.5
+ruby 3.1.6

data/Appraisals

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'activesupport-5' do
-  gem 'activesupport', '~> 5.2'
-end
+require 'appraisal/matrix'
 
-appraise 'activesupport-6' do
-  gem 'activesupport', '~> 6.0'
-end
-
-appraise 'activesupport-7' do
-  gem 'activesupport', '~> 7.0'
-end
+appraisal_matrix(activesupport: "7.0")

data/CHANGELOG.md

@@ -4,6 +4,21 @@ 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
+- Allow ActiveSupport >= 6
+### Removed
+- Support for Ruby < 3
+- Support for ActiveSupport < 6
+
 ## [0.5.1] - 2023-02-17
 ### Added
 - Integrated Appraisal into github actions for testing across multiple versions of ActiveSupport

data/Gemfile

@@ -7,9 +7,17 @@ gemspec
 
 # Specify your gem's development and test dependencies below
 gem "appraisal",             "~> 2.4"
+gem "appraisal-matrix"
 gem "rake",                  "~> 13.0"
 gem "rspec",                 "~> 3.0"
 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,46 +1,58 @@
 PATH
   remote: .
   specs:
-    invoca-utils (0.5.1)
-      activesupport (>= 5.0)
+    invoca-utils (0.6.1)
+      activesupport (>= 6.0)
+      diff-lcs (>= 1.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.8.1)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.4.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.2.0)
-    diff-lcs (1.5.0)
-    i18n (1.12.0)
+    appraisal-matrix (0.1.0)
+      appraisal (~> 2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    diff-lcs (1.6.1)
+    drb (2.2.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     minitest (5.10.3)
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    mutex_m (0.2.0)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    thor (1.2.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    thor (1.3.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   arm64-darwin-22
@@ -49,11 +61,16 @@ 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

@@ -0,0 +1,33 @@
+# This file is partially auto-generated by the invoca-backstage-tools gem
+# The following fields should not be edited manually as they are auto-generated
+# based on the contents of the repo:
+#  - metadata.name
+#  - metadata.title
+#  - metadata.description
+#  - annotations.github.com/project-slug
+#  - invoca.com/version-repository-location
+#  - invoca.com/version-repository-name
+#  - spec.type
+#  - spec.owner
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: invoca-utils-gem
+  title: Invoca::Utils
+  description: A public collection of helpers used in multiple projects
+  tags:
+  - ruby
+  - gem
+  - public
+  - rails-dependent
+  annotations:
+    buildkite.com/project-slug: Invoca/invoca-utils
+    github.com/project-slug: Invoca/invoca-utils
+    invoca.com/version-repository-location: rubygems
+    invoca.com/version-repository-name: invoca-utils
+spec:
+  type: library
+  lifecycle: production
+  owner: octothorpe
+  dependsOn: []

data/gemfiles/{activesupport_5.gemfile → activesupport_7_0.gemfile}

@@ -3,10 +3,15 @@
 source "https://rubygems.org"
 
 gem "appraisal", "~> 2.4"
+gem "appraisal-matrix"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
-gem "activesupport", "~> 5.2"
+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_6.gemfile → activesupport_7_1.gemfile}

@@ -3,10 +3,15 @@
 source "https://rubygems.org"
 
 gem "appraisal", "~> 2.4"
+gem "appraisal-matrix"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
-gem "activesupport", "~> 6.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_7.gemfile → activesupport_7_2.gemfile}

@@ -3,10 +3,15 @@
 source "https://rubygems.org"
 
 gem "appraisal", "~> 2.4"
+gem "appraisal-matrix"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.4"
 gem "minitest", "~> 5.10.0"
-gem "activesupport", "~> 7.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_8_0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.4"
+gem "appraisal-matrix"
+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", "~> 8.0.0"
+
+gemspec path: "../"

data/invoca-utils.gemspec

@@ -25,10 +25,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # this should match the minimum github pipeline targets
-  # which is currently set to 2.5
-  spec.required_ruby_version = ">= 2.5.0"
+  # which is currently set to 3.1
+  spec.required_ruby_version = ">= 3.1"
 
-  spec.add_dependency "activesupport", ">= 5.0"
+  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.5.1"
+    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.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Invoca development
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        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
@@ -31,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/workflows/pipeline.yml"
 - ".gitignore"
 - ".rspec"
@@ -44,9 +59,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activesupport_5.gemfile
-- gemfiles/activesupport_6.gemfile
-- gemfiles/activesupport_7.gemfile
+- catalog-info.yaml
+- 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
@@ -83,7 +100,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,15 +108,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: A public collection of helpers used in multiple projects
 test_files: