files_in_my_diff 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a88f0f02b2aefb31e6da55d59de6c6daf93d4bb4fbe747f3ec1a6a374e95eb0
-  data.tar.gz: 4054752c36ceaa2b84fed573babefa0cecf41785acfa5dcb2b075b053cbc89f0
+  metadata.gz: 73cfb3c9c2d66b1c6ba5511b857e2ed8aa1c4bb54d9a9012229c1ae19af340a0
+  data.tar.gz: 4da7cd64d5e793a53df01b94c962db468464e4a8b2aaa79edc53d12579807be9
 SHA512:
-  metadata.gz: eae51049ca35c407e012f1d79d3035872a69758ec4a750c46ec274aecad9254941b6b3f402db96f0e2bf9e2e6225a45d2f0e0f03a984f4870892cc05bf4a92f2
-  data.tar.gz: 5504a07ab0d7c1b3e6ed5acb367384b0daf9d784343e20730cd75835693728756fbcbea43f9365845ef410a6cb367ef4d93a9f5566f87a566924eeaad2963a5a
+  metadata.gz: c23de3b55a3b13b6ccdf316ecfa79560d2626095f4317a564cdfde6000efa93a3be2902d38bf38e9643dc9d66c413860718123b85ff88185afc7d89975e40707
+  data.tar.gz: b528f92d629db85de8fff74ddc8e6eb31f927cc1cd1dd016792b1bf3049ec9ccf1f03168bb4d3d6f75511df9e008e5add88d10d40be9a805847e246553f595c7

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.1.0] - 2026-09-20
+
+- The `git` dependency moves from 2.x to 5.x. The gem monkey-patched
+  `Git::Base` to add a worktree command, and `Git::Base` is no longer a class in
+  5.x, so loading the gem raised `TypeError: Base is not a class`. The patch is
+  gone: git 5 has a public `worktree_add`.
+- The executable failed with a `LoadError` when run from inside a project that
+  uses Bundler, which is most of the repositories this tool exists to inspect.
+  It required `bundler/setup`, so it resolved against the inspected project's
+  Gemfile instead of its own installed gems.
+- `require 'files_in_my_diff'` raised `uninitialized constant Git`. Nothing in
+  the library required the `git` gem; it happened to work because the executable
+  loaded a file that did.
+- The published gem no longer carries the Rakefile, the rubocop config, the TODO
+  or the development scripts.
+
+## [1.0.1] - 2024-11-09
+
+- Fix links in gemspec
+
 ## [1.0.0] - 2024-11-09
 
 - Initial release

data/bin/files_in_my_diff

@@ -12,8 +12,6 @@ if folder.nil? || folder == '--help' || revision.nil?
   exit 1
 end
 
-require 'bundler/setup'
-require 'setup_git'
 require 'files_in_my_diff'
 require 'json'
 

data/lib/files_in_my_diff/errors.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module FilesInMyDiff
+  class Error < StandardError; end
+  class ValidationError < Error; end
+end

data/lib/files_in_my_diff/git/adapter.rb

@@ -12,7 +12,7 @@ module FilesInMyDiff
       end
 
       def checkout_worktree(path, revision)
-        @repo.add_worktree(path, revision)
+        @repo.worktree_add(path, revision)
       rescue ::Git::FailedError => e
         unless e.result.stderr.include? 'already exists'
           raise CheckoutError,

data/lib/files_in_my_diff/git.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# The gem this wraps. Nothing else requires it, so a caller doing only
+# `require 'files_in_my_diff'` would otherwise get an uninitialized constant.
+require 'git'
+
 require_relative 'git/adapter'
 require_relative 'git/diff'
 

data/lib/files_in_my_diff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FilesInMyDiff
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/lib/files_in_my_diff.rb

@@ -2,11 +2,7 @@
 
 require 'fileutils'
 
-module FilesInMyDiff
-  class Error < StandardError; end
-  class ValidationError < Error; end
-end
-
+require_relative 'files_in_my_diff/errors'
 require_relative 'files_in_my_diff/version'
 require_relative 'files_in_my_diff/tmp_dir'
 require_relative 'files_in_my_diff/git'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: files_in_my_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Erik T. Madsen
 bindir: bin
 cert_chain: []
-date: 2024-11-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '5.0'
 description: A command line tool that takes a git repository path and revision as
   input. It creates a temporary worktree, checks out the specified revision, and returns
   a JSON object containing the worktree path, commit SHA, and list of changed files.
@@ -35,14 +35,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rubocop.yml"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- Rakefile
-- TODO
 - bin/files_in_my_diff
 - lib/files_in_my_diff.rb
+- lib/files_in_my_diff/errors.rb
 - lib/files_in_my_diff/git.rb
 - lib/files_in_my_diff/git/adapter.rb
 - lib/files_in_my_diff/git/diff.rb
@@ -51,7 +49,6 @@ files:
 - lib/files_in_my_diff/tmp_dir/file_strategy.rb
 - lib/files_in_my_diff/tmp_dir/revision_dir.rb
 - lib/files_in_my_diff/version.rb
-- lib/setup_git.rb
 homepage: https://github.com/beatmadsen/files_in_my_diff
 licenses:
 - MIT
@@ -74,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 4.0.9
 specification_version: 4
 summary: Checks out a git revision in a new worktree and provides you the changed
   files

data/.rubocop.yml

@@ -1,30 +0,0 @@
-
-require:
-  - rubocop-minitest
-  - rubocop-rake
-
-AllCops:
-  TargetRubyVersion: 3.2
-  NewCops: enable
-  
-
-Layout/LineLength:
-  Max: 120
-
-Style/Documentation:
-  Enabled: false
-
-Style/ModuleFunction:
-  Enabled: false
-
-Style/TrailingCommaInArrayLiteral:
-  Enabled: true
-  EnforcedStyleForMultiline: consistent_comma
-
-Style/TrailingCommaInHashLiteral:
-  Enabled: true
-  EnforcedStyleForMultiline: consistent_comma
-
-Style/TrailingCommaInArguments:
-  Enabled: true
-  EnforcedStyleForMultiline: consistent_comma

data/Rakefile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'minitest/test_task'
-
-Minitest::TestTask.create
-
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-
-# auto-correct rubocop offenses
-task default: %i[test rubocop:autocorrect]

data/lib/setup_git.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'git'
-
-module Git
-  class Base
-    def add_worktree(path, revision)
-      lib.send(:command, 'worktree', 'add', path, revision)
-    end
-  end
-end