git 2.0.0.pre3 → 2.0.1

data/lib/git/object.rb

@@ -1,16 +1,18 @@
+require 'git/author'
+require 'git/diff'
+require 'git/errors'
+require 'git/log'
+
 module Git
-  
-  class GitTagNameDoesNotExist< StandardError 
-  end
-  
+
   # represents a git object
   class Object
-    
+
     class AbstractObject
       attr_accessor :objectish, :type, :mode
 
       attr_writer :size
-      
+
       def initialize(base, objectish)
         @base = base
         @objectish = objectish.to_s
@@ -23,11 +25,11 @@ module Git
       def sha
         @sha ||= @base.lib.revparse(@objectish)
       end
-      
+
       def size
         @size ||= @base.lib.object_size(@objectish)
       end
-      
+
       # Get the object's contents.
       # If no block is given, the contents are cached in memory and returned as a string.
       # If a block is given, it yields an IO object (via IO::popen) which could be used to
@@ -41,108 +43,108 @@ module Git
           @contents ||= @base.lib.object_contents(@objectish)
         end
       end
-      
+
       def contents_array
         self.contents.split("\n")
       end
-      
+
       def to_s
         @objectish
       end
-      
+
       def grep(string, path_limiter = nil, opts = {})
         opts = {:object => sha, :path_limiter => path_limiter}.merge(opts)
         @base.lib.grep(string, opts)
       end
-      
+
       def diff(objectish)
         Git::Diff.new(@base, @objectish, objectish)
       end
-      
+
       def log(count = 30)
         Git::Log.new(@base, count).object(@objectish)
       end
-      
+
       # creates an archive of this object (tree)
       def archive(file = nil, opts = {})
         @base.lib.archive(@objectish, file, opts)
       end
-      
+
       def tree?; false; end
-      
+
       def blob?; false; end
-      
+
       def commit?; false; end
 
       def tag?; false; end
-     
+
     end
-  
-    
+
+
     class Blob < AbstractObject
-      
+
       def initialize(base, sha, mode = nil)
         super(base, sha)
         @mode = mode
       end
-      
+
       def blob?
         true
       end
 
     end
-  
+
     class Tree < AbstractObject
-      
+
       def initialize(base, sha, mode = nil)
         super(base, sha)
         @mode = mode
         @trees = nil
         @blobs = nil
       end
-            
+
       def children
         blobs.merge(subtrees)
       end
-      
+
       def blobs
         @blobs ||= check_tree[:blobs]
       end
       alias_method :files, :blobs
-      
+
       def trees
         @trees ||= check_tree[:trees]
       end
       alias_method :subtrees, :trees
       alias_method :subdirectories, :trees
-       
+
       def full_tree
         @base.lib.full_tree(@objectish)
       end
-                  
+
       def depth
         @base.lib.tree_depth(@objectish)
       end
-      
+
       def tree?
         true
       end
-       
+
       private
 
         # actually run the git command
         def check_tree
           @trees = {}
           @blobs = {}
-          
+
           data = @base.lib.ls_tree(@objectish)
 
-          data['tree'].each do |key, tree| 
-            @trees[key] = Git::Object::Tree.new(@base, tree[:sha], tree[:mode]) 
+          data['tree'].each do |key, tree|
+            @trees[key] = Git::Object::Tree.new(@base, tree[:sha], tree[:mode])
           end
-          
-          data['blob'].each do |key, blob| 
-            @blobs[key] = Git::Object::Blob.new(@base, blob[:sha], blob[:mode]) 
+
+          data['blob'].each do |key, blob|
+            @blobs[key] = Git::Object::Blob.new(@base, blob[:sha], blob[:mode])
           end
 
           {
@@ -150,11 +152,11 @@ module Git
             :blobs => @blobs
           }
         end
-      
+
     end
-  
+
     class Commit < AbstractObject
-      
+
       def initialize(base, sha, init = nil)
         super(base, sha)
         @tree = nil
@@ -166,48 +168,48 @@ module Git
           set_commit(init)
         end
       end
-      
+
       def message
         check_commit
         @message
       end
-      
+
       def name
         @base.lib.namerev(sha)
       end
-      
+
       def gtree
         check_commit
         Tree.new(@base, @tree)
       end
-      
+
       def parent
         parents.first
       end
-      
+
       # array of all parent commits
       def parents
         check_commit
-        @parents        
+        @parents
       end
-      
+
       # git author
-      def author     
+      def author
         check_commit
         @author
       end
-      
+
       def author_date
         author.date
       end
-      
+
       # git author
       def committer
         check_commit
         @committer
       end
-      
-      def committer_date 
+
+      def committer_date
         committer.date
       end
       alias_method :date, :committer_date
@@ -215,7 +217,7 @@ module Git
       def diff_parent
         diff(parent)
       end
-      
+
       def set_commit(data)
         @sha ||= data['sha']
         @committer = Git::Author.new(data['committer'])
@@ -224,26 +226,26 @@ module Git
         @parents = data['parent'].map{ |sha| Git::Object::Commit.new(@base, sha) }
         @message = data['message'].chomp
       end
-      
+
       def commit?
         true
       end
 
       private
-  
+
         # see if this object has been initialized and do so if not
         def check_commit
           return if @tree
-          
+
           data = @base.lib.commit_data(@objectish)
           set_commit(data)
         end
-      
+
     end
-  
+
     class Tag < AbstractObject
       attr_accessor :name
-      
+
       def initialize(base, sha, name)
         super(base, sha)
         @name = name
@@ -259,7 +261,7 @@ module Git
         check_tag()
         return @message
       end
-      
+
       def tag?
         true
       end
@@ -274,7 +276,7 @@ module Git
       def check_tag
         return if @loaded
 
-        if !self.annotated? 
+        if !self.annotated?
           @message = @tagger = nil
         else
           tdata = @base.lib.tag_data(@name)
@@ -284,29 +286,29 @@ module Git
 
         @loaded = true
       end
-        
+
     end
-    
+
     # if we're calling this, we don't know what type it is yet
     # so this is our little factory method
     def self.new(base, objectish, type = nil, is_tag = false)
       if is_tag
         sha = base.lib.tag_sha(objectish)
         if sha == ''
-          raise Git::GitTagNameDoesNotExist.new(objectish)
+          raise Git::UnexpectedResultError.new("Tag '#{objectish}' does not exist.")
         end
         return Git::Object::Tag.new(base, sha, objectish)
       end
-      
+
       type ||= base.lib.object_type(objectish)
       klass =
         case type
-        when /blob/   then Blob   
+        when /blob/   then Blob
         when /commit/ then Commit
         when /tree/   then Tree
         end
       klass.new(base, objectish)
     end
-    
+
   end
 end

data/lib/git/status.rb

@@ -1,6 +1,12 @@
 module Git
+  # The status class gets the status of a git repository
   #
-  # A class for git status
+  # This identifies which files have been modified, added, or deleted from the
+  # worktree. Untracked files are also identified.
+  #
+  # The Status object is an Enumerable that contains StatusFile objects.
+  #
+  # @api public
   #
   class Status
     include Enumerable
@@ -31,7 +37,6 @@ module Git
       changed.member?(file)
     end
 
-    #
     # Returns an Enumerable containing files that have been added.
     # File path starts at git base directory
     #
@@ -40,8 +45,8 @@ module Git
       @files.select { |_k, f| f.type == 'A' }
     end
 
-    #
     # Determines whether the given file has been added to the repository
+    #
     # File path starts at git base directory
     #
     # @param file [String] The name of the file.
@@ -126,9 +131,63 @@ module Git
 
     # subclass that does heavy lifting
     class StatusFile
-      attr_accessor :path, :type, :stage, :untracked
-      attr_accessor :mode_index, :mode_repo
-      attr_accessor :sha_index, :sha_repo
+      # @!attribute [r] path
+      #   The path of the file relative to the project root directory
+      #   @return [String]
+      attr_accessor :path
+
+      # @!attribute [r] type
+      #   The type of change
+      #
+      #   * 'M': modified
+      #   * 'A': added
+      #   * 'D': deleted
+      #   * nil: ???
+      #
+      #   @return [String]
+      attr_accessor :type
+
+      # @!attribute [r] mode_index
+      #   The mode of the file in the index
+      #   @return [String]
+      #   @example 100644
+      #
+      attr_accessor :mode_index
+
+      # @!attribute [r] mode_repo
+      #   The mode of the file in the repo
+      #   @return [String]
+      #   @example 100644
+      #
+      attr_accessor :mode_repo
+
+      # @!attribute [r] sha_index
+      #   The sha of the file in the index
+      #   @return [String]
+      #   @example 123456
+      #
+      attr_accessor :sha_index
+
+      # @!attribute [r] sha_repo
+      #   The sha of the file in the repo
+      #   @return [String]
+      #   @example 123456
+      attr_accessor :sha_repo
+
+      # @!attribute [r] untracked
+      #   Whether the file is untracked
+      #   @return [Boolean]
+      attr_accessor :untracked
+
+      # @!attribute [r] stage
+      #   The stage of the file
+      #
+      #   * '0': the unmerged state
+      #   * '1': the common ancestor (or original) version
+      #   * '2': "our version" from the current branch head
+      #   * '3': "their version" from the other branch head
+      #   @return [String]
+      attr_accessor :stage
 
       def initialize(base, hash)
         @base = base
@@ -158,10 +217,19 @@ module Git
     private
 
     def construct_status
+      # Lists all files in the index and the worktree
+      # git ls-files --stage
+      # { file => { path: file, mode_index: '100644', sha_index: 'dd4fc23', stage: '0' } }
       @files = @base.lib.ls_files
 
+      # Lists files in the worktree that are not in the index
+      # Add untracked files to @files
       fetch_untracked
+
+      # Lists files that are different between the index vs. the worktree
       fetch_modified
+
+      # Lists files that are different between the repo HEAD vs. the worktree
       fetch_added
 
       @files.each do |k, file_hash|
@@ -170,28 +238,30 @@ module Git
     end
 
     def fetch_untracked
-      ignore = @base.lib.ignored_files
-
-      root_dir = @base.dir.path
-      Dir.glob('**/*', File::FNM_DOTMATCH, base: root_dir) do |file|
-        next if @files[file] || File.directory?(File.join(root_dir, file)) ||
-                ignore.include?(file) || file =~ %r{^.git\/.+}
-
+      # git ls-files --others --exclude-standard, chdir: @git_work_dir)
+      # { file => { path: file, untracked: true } }
+      @base.lib.untracked_files.each do |file|
         @files[file] = { path: file, untracked: true }
       end
     end
 
     def fetch_modified
-      # find modified in tree
+      # Files changed between the index vs. the worktree
+      # git diff-files
+      # { file => { path: file, type: 'M', mode_index: '100644', mode_repo: '100644', sha_index: '0000000', :sha_repo: '52c6c4e' } }
       @base.lib.diff_files.each do |path, data|
         @files[path] ? @files[path].merge!(data) : @files[path] = data
       end
     end
 
     def fetch_added
-      # find added but not committed - new files
+      unless @base.lib.empty?
+      # Files changed between the repo HEAD vs. the worktree
+      # git diff-index HEAD
+      # { file => { path: file, type: 'M', mode_index: '100644', mode_repo: '100644', sha_index: '0000000', :sha_repo: '52c6c4e' } }
       @base.lib.diff_index('HEAD').each do |path, data|
-        @files[path] ? @files[path].merge!(data) : @files[path] = data
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
       end
     end
   end

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='2.0.0.pre3'
+  VERSION='2.0.1'
 end

data/lib/git.rb

@@ -1,22 +1,21 @@
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'active_support'
+require 'active_support/deprecation'
+
+module Git
+  Deprecation = ActiveSupport::Deprecation.new('3.0', 'Git')
+end
 
 require 'git/author'
 require 'git/base'
 require 'git/branch'
 require 'git/branches'
-require 'git/command_line_error'
 require 'git/command_line_result'
 require 'git/command_line'
 require 'git/config'
 require 'git/diff'
 require 'git/encoding_utils'
-require 'git/error'
+require 'git/errors'
 require 'git/escaped_path'
-require 'git/failed_error'
-require 'git/git_execute_error'
 require 'git/index'
 require 'git/lib'
 require 'git/log'
@@ -24,11 +23,9 @@ require 'git/object'
 require 'git/path'
 require 'git/remote'
 require 'git/repository'
-require 'git/signaled_error'
 require 'git/status'
 require 'git/stash'
 require 'git/stashes'
-require 'git/timeout_error'
 require 'git/url'
 require 'git/version'
 require 'git/working_directory'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.1
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: create_github_release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -167,18 +195,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/stale.yml"
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".github/workflows/continuous_integration.yml"
+- ".github/workflows/experimental_continuous_integration.yml"
 - ".gitignore"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dockerfile.changelog-rs
 - Gemfile
-- ISSUE_TEMPLATE.md
 - LICENSE
 - MAINTAINERS.md
-- PULL_REQUEST_TEMPLATE.md
 - README.md
 - RELEASING.md
 - Rakefile
@@ -186,19 +213,15 @@ files:
 - lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb
-- lib/git/base/factory.rb
 - lib/git/branch.rb
 - lib/git/branches.rb
 - lib/git/command_line.rb
-- lib/git/command_line_error.rb
 - lib/git/command_line_result.rb
 - lib/git/config.rb
 - lib/git/diff.rb
 - lib/git/encoding_utils.rb
-- lib/git/error.rb
+- lib/git/errors.rb
 - lib/git/escaped_path.rb
-- lib/git/failed_error.rb
-- lib/git/git_execute_error.rb
 - lib/git/index.rb
 - lib/git/lib.rb
 - lib/git/log.rb
@@ -206,11 +229,9 @@ files:
 - lib/git/path.rb
 - lib/git/remote.rb
 - lib/git/repository.rb
-- lib/git/signaled_error.rb
 - lib/git/stash.rb
 - lib/git/stashes.rb
 - lib/git/status.rb
-- lib/git/timeout_error.rb
 - lib/git/url.rb
 - lib/git/version.rb
 - lib/git/working_directory.rb
@@ -222,8 +243,8 @@ licenses:
 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/2.0.0.pre3/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/2.0.0.pre3
+  changelog_uri: https://rubydoc.info/gems/git/2.0.1/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/2.0.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -240,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 2.28.0 or greater
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories

data/.github/stale.yml

@@ -1,25 +0,0 @@
-# Probot: Stale
-# https://github.com/probot/stale
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-
-# Number of days of inactivity before a stale issue is closed
-# Set to false to disable. If disabled, issues still need to be closed
-# manually, but will remain marked as stale.
-daysUntilClose: false
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-
-# Label to use when marking an issue as stale
-staleLabel: stale
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  A friendly reminder that this issue had no activity for 60 days.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false