git 1.19.1 → 4.4.5

data/Rakefile

@@ -1,60 +1,18 @@
-require 'bundler/gem_tasks'
-require 'English'
+# frozen_string_literal: true
 
-require 'git/version'
+require 'rake/clean'
 
-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 tests/units/test_archive.rb
-  #
-  # $ bin/test tests/units/test_archive.rb tests/units/test_object.rb
-end
-default_tasks << :test
-
-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'
+# Load all .rake files from tasks and its subdirectories.
+Dir.glob('tasks/**/*.rake').each { |r| load r }
 
-  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 = []
+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

data/git.gemspec

@@ -1,52 +1,58 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'git/version'
 
-Gem::Specification.new do |s|
-  s.author = 'Scott Chacon and others'
-  s.email = 'schacon@gmail.com'
-  s.homepage = 'http://github.com/ruby-git/ruby-git'
-  s.license = 'MIT'
-  s.name = 'git'
-  s.summary = 'An API to create, read, and manipulate Git repositories'
-  s.description = <<~DESCRIPTION
+Gem::Specification.new do |spec|
+  spec.author = 'Scott Chacon and others'
+  spec.email = 'schacon@gmail.com'
+  spec.homepage = 'http://github.com/ruby-git/ruby-git'
+  spec.license = 'MIT'
+  spec.name = 'git'
+  spec.summary = 'An API to create, read, and manipulate Git repositories'
+  spec.description = <<~DESCRIPTION
     The git gem provides an API that can be used to
     create, read, and manipulate Git repositories by wrapping system calls to the git
     command line. The API can be used for working with Git in complex interactions
     including branching and merging, object inspection and manipulation, history, patch
     generation and more.
   DESCRIPTION
-  s.version = Git::VERSION
+  spec.version = Git::VERSION
 
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"
+  spec.metadata['documentation_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
-  s.metadata['homepage_uri'] = s.homepage
-  s.metadata['source_code_uri'] = s.homepage
-  s.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{s.name}/#{s.version}/file/CHANGELOG.md"
-  s.metadata['documentation_uri'] = "https://rubydoc.info/gems/#{s.name}/#{s.version}"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 3.2.0'
+  spec.requirements = ['git 2.28.0 or greater']
 
-  s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.3'
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
-  s.requirements = ['git 1.6.0.0, or greater']
+  spec.add_dependency 'activesupport', '>= 5.0'
+  spec.add_dependency 'addressable', '~> 2.8'
+  spec.add_dependency 'process_executer', '~> 4.1'
+  spec.add_dependency 'rchardet', '~> 1.9'
 
-  s.add_runtime_dependency 'addressable', '~> 2.8'
-  s.add_runtime_dependency 'rchardet', '~> 1.8'
+  spec.add_development_dependency 'create_github_release', '~> 2.1'
+  spec.add_development_dependency 'main_branch_shared_rubocop_config', '~> 0.1'
+  spec.add_development_dependency 'minitar', '~> 1.0'
+  spec.add_development_dependency 'mocha', '~> 2.7'
+  spec.add_development_dependency 'rake', '~> 13.2'
+  spec.add_development_dependency 'rubocop', '~> 1.77'
 
-  s.add_development_dependency 'bump', '~> 0.10'
-  s.add_development_dependency 'create_github_release', '~> 0.2'
-  s.add_development_dependency 'minitar', '~> 0.9'
-  s.add_development_dependency 'mocha', '~> 2.1'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'test-unit', '~> 3.3'
+  spec.add_development_dependency 'test-unit', '~> 3.6'
 
   unless RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'redcarpet', '~> 3.5'
-    s.add_development_dependency 'yard', '~> 0.9', '>= 0.9.28'
-    s.add_development_dependency 'yardstick', '~> 0.9'
+    spec.add_development_dependency 'irb', '~> 1.6'
+    spec.add_development_dependency 'redcarpet', '~> 3.6'
+    spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.28'
+    spec.add_development_dependency 'yardstick', '~> 0.9'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  s.files = Dir.chdir(File.expand_path(__dir__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(tests|spec|features|bin)/}) }
   end
 end

data/lib/git/args_builder.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Git
+  # Takes a hash of user options and a declarative map and produces
+  # an array of command-line arguments. Also validates that only
+  # supported options are provided based on the map.
+  #
+  # @api private
+  class ArgsBuilder
+    # This hash maps an option type to a lambda that knows how to build the
+    # corresponding command-line argument. This is a scalable dispatch table.
+    ARG_BUILDERS = {
+      boolean: ->(config, value) { value ? config[:flag] : [] },
+
+      boolean_negatable: lambda do |config, value|
+        case value
+        when true then config[:flag]
+        when false then config[:flag].sub('--', '--no-')
+        else []
+        end
+      end,
+
+      valued_equals: ->(config, value) { "#{config[:flag]}=#{value}" if value },
+
+      valued_space: ->(config, value) { [config[:flag], value.to_s] if value },
+
+      repeatable_valued_space: lambda do |config, value|
+        Array(value).flat_map { |v| [config[:flag], v.to_s] }
+      end,
+
+      custom: ->(config, value) { config[:builder].call(value) },
+
+      validate_only: ->(_config, _value) { [] } # Does not build any args
+    }.freeze
+
+    # Main entrypoint to validate options and build arguments
+    def self.build(opts, option_map)
+      validate!(opts, option_map)
+      new(opts, option_map).build
+    end
+
+    # Public validation method that can be called independently
+    def self.validate!(opts, option_map)
+      validate_unsupported_keys!(opts, option_map)
+      validate_configured_options!(opts, option_map)
+    end
+
+    def initialize(opts, option_map)
+      @opts = opts
+      @option_map = option_map
+    end
+
+    def build
+      @option_map.flat_map do |config|
+        type = config[:type]
+        next config[:flag] if type == :static
+
+        key = config[:keys].find { |k| @opts.key?(k) }
+        next [] unless key
+
+        build_arg_for_option(config, @opts[key])
+      end.compact
+    end
+
+    private
+
+    def build_arg_for_option(config, value)
+      builder = ARG_BUILDERS[config[:type]]
+      builder&.call(config, value) || []
+    end
+
+    private_class_method def self.validate_unsupported_keys!(opts, option_map)
+      all_valid_keys = option_map.flat_map { |config| config[:keys] }.compact
+      unsupported_keys = opts.keys - all_valid_keys
+
+      return if unsupported_keys.empty?
+
+      raise ArgumentError, "Unsupported options: #{unsupported_keys.map(&:inspect).join(', ')}"
+    end
+
+    private_class_method def self.validate_configured_options!(opts, option_map)
+      option_map.each do |config|
+        next unless config[:keys] # Skip static flags
+
+        check_for_missing_required_option!(opts, config)
+        validate_option_value!(opts, config)
+      end
+    end
+
+    private_class_method def self.check_for_missing_required_option!(opts, config)
+      return unless config[:required]
+
+      key_provided = config[:keys].any? { |k| opts.key?(k) }
+      return if key_provided
+
+      raise ArgumentError, "Missing required option: #{config[:keys].first}"
+    end
+
+    private_class_method def self.validate_option_value!(opts, config)
+      validator = config[:validator]
+      return unless validator
+
+      user_key = config[:keys].find { |k| opts.key?(k) }
+      return unless user_key # Don't validate if the user didn't provide the option
+
+      return if validator.call(opts[user_key])
+
+      raise ArgumentError, "Invalid value for option: #{user_key}"
+    end
+  end
+end

data/lib/git/author.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Git
+  # An author in a Git commit
   class Author
     attr_accessor :name, :email, :date
-    
+
     def initialize(author_string)
-      if m = /(.*?) <(.*?)> (\d+) (.*)/.match(author_string)
-        @name = m[1]
-        @email = m[2]
-        @date = Time.at(m[3].to_i)
-      end
+      return unless (m = /(.*?) <(.*?)> (\d+) (.*)/.match(author_string))
+
+      @name = m[1]
+      @email = m[2]
+      @date = Time.at(m[3].to_i)
     end
-    
   end
 end