git 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa18499d23585a949951d7e9cec7ffcda07eb1085deb3f43bb1396da678b7ba2
-  data.tar.gz: aa41f2fbc6558e54549ad49381492f0ec952d31b56256f1cb72f0e845df3eb55
+  metadata.gz: 745cd9f7795f87b785c30e602beac5dbb8316285483c09fb2916501abbe3bfc5
+  data.tar.gz: 55d63b9dbc37818a2cd8318719c574cc6bf3d5ea0ec472bc30b1c20f7aa72469
 SHA512:
-  metadata.gz: 2d9bffd83ac45d0fc88b5f9f83ca8bd06b447989f74c68b279ea7ad8b35618ec059709d71f391ad1ee75ff3bbc2b40e1eabe7718446b588c68bb77fab4d5e10d
-  data.tar.gz: ba02db38b890b206c68bf8f7b09f3d13758beddd057977ebaf9b0259f20bcc4125f124713c15a230c7822a8c521801e9dfec4181582b58ac82ca873563721798
+  metadata.gz: e69ba4cc1d26544190b301efee7ecefc735aa39cf516dd668194a8bb3dbaa2db46ba21556c94ba434c88397615b9cab46141a9fe616bba8948964190ac6163af
+  data.tar.gz: 9f66300f937ca9bef982a6c149c53c404548fb59d27fa07e3be853f7b783525f65ef03f8e2a184189dc780fd0556716199162ddfadbc007e315a7f5c2988275a

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "4.0.5"
+  ".": "4.0.6"
 }

data/CHANGELOG.md

@@ -5,6 +5,19 @@
 
 # Change Log
 
+## [4.0.6](https://github.com/ruby-git/ruby-git/compare/v4.0.5...v4.0.6) (2025-11-11)
+
+
+### Bug Fixes
+
+* Standardize deprecation handling and consolidate tests (fixes [#842](https://github.com/ruby-git/ruby-git/issues/842)) ([a731110](https://github.com/ruby-git/ruby-git/commit/a73111017a64bd1ae83d35f9d5f4a18f43f7c2eb))
+
+
+### Other Changes
+
+* Refactor Rakefile by splitting tasks into separate files ([bd69f9b](https://github.com/ruby-git/ruby-git/commit/bd69f9b6a48298a9c6eed1987bec55b67384b89c))
+* Remove redundant escape in BRANCH_LINE_REGEXP (Style/RedundantRegexpEscape) ([4a03b5c](https://github.com/ruby-git/ruby-git/commit/4a03b5ce2939ad8a92496a443a6edcd6ce059a70))
+
 ## [4.0.5](https://github.com/ruby-git/ruby-git/compare/v4.0.4...v4.0.5) (2025-08-20)
 
 

data/Rakefile

@@ -1,79 +1,18 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'English'
+require 'rake/clean'
 
-require 'git/version'
+# Load all .rake files from tasks and its subdirectories.
+Dir.glob('tasks/**/*.rake').each { |r| load r }
 
 default_tasks = []
-
-desc 'Run Unit Tests'
-task :test do
-  sh 'ruby bin/test'
-
-  # You can run individual test files (or multiple files) from the command
-  # line with:
-  #
-  # $ bin/test test_archive.rb
-  #
-  # $ bin/test test_archive.rb test_object.rb
-end
-default_tasks << :test
-
-# Rubocop
-
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-
-default_tasks << :rubocop
-
-# YARD
-
-unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
-  #
-  # YARD documentation for this project can NOT be built with JRuby.
-  # This project uses the redcarpet gem which can not be installed on JRuby.
-  #
-  require 'yard'
-  YARD::Rake::YardocTask.new
-  CLEAN << '.yardoc'
-  CLEAN << 'doc'
-  default_tasks << :yard
-
-  require 'yardstick/rake/verify'
-  Yardstick::Rake::Verify.new(:'yardstick:coverage') do |t|
-    t.threshold = 50
-    t.require_exact_threshold = false
-  end
-  default_tasks << :'yardstick:coverage'
-
-  desc 'Run yardstick to check yard docs'
-  task :yardstick do
-    sh "yardstick 'lib/**/*.rb'"
-  end
-  # Do not include yardstick as a default task for now since there are too many
-  # warnings.  Will work to get the warnings down before re-enabling it.
-  #
-  # default_tasks << :yardstick
-end
-
-default_tasks << :build
+default_tasks << :test if Rake::Task.task_defined?(:test)
+default_tasks << :rubocop if Rake::Task.task_defined?(:rubocop)
+default_tasks << :yard if Rake::Task.task_defined?(:yard)
+default_tasks << :'yardstick:coverage' if Rake::Task.task_defined?(:'yardstick:coverage')
+# Do not include yardstick as a default task for now since there are too many
+# warnings. Will work to get the warnings down before re-enabling it.
+# default_tasks << :yardstick if Rake::Task.task_defined?(:yardstick)
+default_tasks << :build if Rake::Task.task_defined?(:build)
 
 task default: default_tasks
-
-desc 'Build and install the git gem and run a sanity check'
-task 'test:gem': :install do
-  output = `ruby -e "require 'git'; g = Git.open('.'); puts g.log.size"`.chomp
-  raise 'Gem test failed' unless $CHILD_STATUS.success?
-  raise 'Expected gem test to return an integer' unless output =~ /^\d+$/
-
-  puts 'Gem Test Succeeded'
-end
-
-# Make it so that calling `rake release` just calls `rake release:rubygem_push` to
-# avoid creating and pushing a new tag.
-
-Rake::Task['release'].clear
-desc 'Customized release task to avoid creating a new tag'
-task release: 'release:rubygem_push'

data/lib/git/base.rb

@@ -286,7 +286,10 @@ module Git
     end
 
     def is_local_branch?(branch) # rubocop:disable Naming/PredicatePrefix
-      Git.deprecation('Git::Base#is_local_branch? is deprecated. Use Git::Base#local_branch? instead.')
+      Git::Deprecation.warn(
+        'Git::Base#is_local_branch? is deprecated and will be removed in a future version. ' \
+        'Use Git::Base#local_branch? instead.'
+      )
       local_branch?(branch)
     end
 
@@ -297,7 +300,10 @@ module Git
     end
 
     def is_remote_branch?(branch) # rubocop:disable Naming/PredicatePrefix
-      Git.deprecated('Git::Base#is_remote_branch? is deprecated. Use Git::Base#remote_branch? instead.')
+      Git::Deprecation.warn(
+        'Git::Base#is_remote_branch? is deprecated and will be removed in a future version. ' \
+        'Use Git::Base#remote_branch? instead.'
+      )
       remote_branch?(branch)
     end
 
@@ -308,7 +314,10 @@ module Git
     end
 
     def is_branch?(branch) # rubocop:disable Naming/PredicatePrefix
-      Git.deprecated('Git::Base#is_branch? is deprecated. Use Git::Base#branch? instead.')
+      Git::Deprecation.warn(
+        'Git::Base#is_branch? is deprecated and will be removed in a future version. ' \
+        'Use Git::Base#branch? instead.'
+      )
       branch?(branch)
     end
 

data/lib/git/lib.rb

@@ -679,7 +679,7 @@ module Git
         # The branch's full refname
         (?:
           (?<not_a_branch>\(not[[:blank:]]a[[:blank:]]branch\)) |
-          (?:\(HEAD[[:blank:]]detached[[:blank:]]at[[:blank:]](?<detached_ref>[^\)]+)\)) |
+           (?:\(HEAD[[:blank:]]detached[[:blank:]]at[[:blank:]](?<detached_ref>[^)]+)\)) |
           (?<refname>[^[[:blank:]]]+)
         )
 

data/lib/git/object.rb

@@ -213,7 +213,10 @@ module Git
       end
 
       def set_commit(data) # rubocop:disable Naming/AccessorMethodName
-        Git.deprecation('Git::Object::Commit#set_commit is deprecated. Use #from_data instead.')
+        Git::Deprecation.warn(
+          'Git::Object::Commit#set_commit is deprecated and will be removed in a future version. ' \
+          'Use #from_data instead.'
+        )
         from_data(data)
       end
 

data/lib/git/version.rb

@@ -3,5 +3,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION = '4.0.5'
+  VERSION = '4.0.6'
 end

data/tasks/gem_tasks.rake

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+
+# Make it so that calling `rake release` just calls `rake release:rubygem_push` to
+# avoid creating and pushing a new tag.
+
+Rake::Task['release'].clear
+desc 'Customized release task to avoid creating a new tag'
+task release: 'release:rubygem_push'

data/tasks/rubocop.rake

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new

data/tasks/test.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+desc 'Run Unit Tests'
+task :test do
+  sh 'ruby bin/test'
+
+  # You can run individual test files (or multiple files) from the command
+  # line with:
+  #
+  # $ bin/test test_archive.rb
+  #
+  # $ bin/test test_archive.rb test_object.rb
+end

data/tasks/test_gem.rake

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'English'
+
+desc 'Build and install the git gem and run a sanity check'
+task 'test:gem': :install do
+  output = `ruby -e "require 'git'; g = Git.open('.'); puts g.log.size"`.chomp
+  raise 'Gem test failed' unless $CHILD_STATUS.success?
+  raise 'Expected gem test to return an integer' unless output =~ /^\d+$/
+
+  puts 'Gem Test Succeeded'
+end

data/tasks/yard.rake

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# YARD documentation for this project can NOT be built with JRuby or TruffleRuby.
+# This project uses the redcarpet gem which can not be installed on JRuby.
+#
+unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+  CLEAN << '.yardoc'
+  CLEAN << 'doc'
+
+  require 'yardstick/rake/verify'
+  Yardstick::Rake::Verify.new(:'yardstick:coverage') do |t|
+    t.threshold = 50
+    t.require_exact_threshold = false
+  end
+
+  desc 'Run yardstick to check yard docs'
+  task :yardstick do
+    sh "yardstick 'lib/**/*.rb'"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Scott Chacon and others
@@ -278,14 +278,19 @@ files:
 - redesign/2_architecture_redesign.md
 - redesign/3_architecture_implementation.md
 - release-please-config.json
+- tasks/gem_tasks.rake
+- tasks/rubocop.rake
+- tasks/test.rake
+- tasks/test_gem.rake
+- tasks/yard.rake
 homepage: http://github.com/ruby-git/ruby-git
 licenses:
 - MIT
 metadata:
   homepage_uri: http://github.com/ruby-git/ruby-git
   source_code_uri: http://github.com/ruby-git/ruby-git
-  changelog_uri: https://rubydoc.info/gems/git/4.0.5/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/4.0.5
+  changelog_uri: https://rubydoc.info/gems/git/4.0.6/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/4.0.6
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: