github_diff_parser 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34f38b28e0e403ba84d95e805bd2a0f97da47d1567893f527f99835b1ce4b87
-  data.tar.gz: 6eba918c1307b5dd51e48e942041cfa96a0a18f1c438bfde385b88b55b6fc4b7
+  metadata.gz: 6bbbd5c441839124ce3eeb13013dfc941bc6bfda629c3245b0a1bd635acfc0b6
+  data.tar.gz: 8e4432858065cdf8aeee7516d7cf220381ed312b801434f31ab80cb0cefe2e6c
 SHA512:
-  metadata.gz: 34e0ac9ef75f79799cd3eec754e520fe828ba9408c706d6de8bf6c42a728ce79998e1c2305aec4a89f08bf760cee1e8964695e45325643d92c2f6460b42ac684
-  data.tar.gz: 8ec23e1cde869fe9ad809717d0b7e19290fed6edcb7fc47c4d00fc05eb20bfc2139f0f7e3dec6937810927f2e2e0bf506947b9270cf4251ea4dee8976b06fc61
+  metadata.gz: 419ac34a1e4ceb31c909fa1e5d17f886fb53cbc3d3024272de7eb9676e6f5c834315eec0c6066415282fc4da847a770364fe78d1f097000301618ef5f11f436a
+  data.tar.gz: a9272715bc0593ca15662852a7a83b1d2aad2619414ce975905ed424330719f9ef5a103c777b4d7b6c8f3615b43fc05b6e29f017b3e59679a7d605927bb45b08

data/.rubocop.yml

@@ -4,6 +4,8 @@ inherit_gem:
 AllCops:
   NewCops: disable
   SuggestExtensions: false
+  Exclude:
+    - "test/data/**/*"
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## [1.1.1] - 2024-2-21
+### Fixed
+- `GithubDiffParser::Diff#new_mode?` and ``GithubDiffParser::Diff#deleted_mode?` would raise
+  an error with this kind of diff:
+
+  ```diff
+  diff --git a/blabla.rb b/app/my_file.rb
+  similarity index 100%
+  rename from blabla.rb
+  rename to app/my_file.rb
+  ```
+
+## [1.1.0] - 2024-2-21
+### Added
+- Github Diff Parser parses the permissions bits and you now have have access to various method
+  such as:
+  - `GithubDiffParser::Diff#normal_file?` when the bits are 100644
+  - `GithubDiffParser::Diff#executable?` when the bits are 107555
+  - `GithubDiffParser::Diff#symlink?` when the bits are 120000
+- Introduce `GithubDiffParser::Diff#symlink_source`. When the diff applies to a symbolic link, `symlink_source` will
+  return the path to where the symbolic link points to.
+- Introduce `GithubDiffParser::Diff#apply`, a simple implementation of `git apply`.
+- Introduce `GithubDiffParser::Diff#revert`, a simple implementation of `git apply -R`.
+
+### Fixed
+- `GithubDiffParser::Line#content` didn't include `\n` (if the line had one).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_diff_parser (1.0.0)
+    github_diff_parser (1.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/github_diff_parser/diff.rb

@@ -2,6 +2,8 @@
 
 module GithubDiffParser
   class Diff
+    Mode = Struct.new(:operation, :bits)
+
     # @return [String] (see #initialize)
     attr_reader :previous_filename
 
@@ -20,7 +22,10 @@ module GithubDiffParser
     attr_reader :new_index
 
     # @private
-    attr_writer :file_mode, :previous_index, :new_index
+    attr_writer :previous_index, :new_index
+
+    # @private
+    attr_accessor :mode
 
     # @param previous_filename [String] the original filename. Represented by "diff --git /a filename"
     # @param new_filename [String]      the new filename. Represented by "diff --git /b filename"
@@ -73,7 +78,7 @@ module GithubDiffParser
     #
     # @return [Boolean]
     def deleted_mode?
-      @file_mode == "deleted"
+      @mode&.operation == "deleted"
     end
 
     # Check if this Diff is set to new mode.
@@ -89,7 +94,7 @@ module GithubDiffParser
     #
     # @return [Boolean]
     def new_mode?
-      @file_mode == "new"
+      @mode&.operation == "new"
     end
 
     # Check if this Diff is set to rename mode.
@@ -105,6 +110,29 @@ module GithubDiffParser
       previous_filename != new_filename
     end
 
+    # @return [Boolean] True if this diff applies to a regular file.
+    def normal_file?
+      @mode&.bits == "100644"
+    end
+
+    # @return [Boolean] True if this diff applies to an executable.
+    def executable?
+      @mode&.bits == "100755"
+    end
+
+    # @return [Boolean] True if this diff applies to a symlink.
+    def symlink?
+      @mode&.bits == "120000"
+    end
+
+    # @return [String] The source of the symlink
+    # @raise If this diff doesn't apply to a symlink
+    def symlink_source
+      raise(Error, "This diff doen't apply to a symbolic link") unless symlink?
+
+      lines.first.content
+    end
+
     # A utility method that returns the current number of a line who might not be present in the diff.
     # This is useful if you need to keep track of the updated line numbers in a file for every changes.
     #
@@ -124,6 +152,48 @@ module GithubDiffParser
       end
     end
 
+    # A naive implementation of `$ git apply`.
+    #
+    # @param previous_content [String] The previous content related to this diff.
+    # @return [String] The content after applying this diff to the `previous_content`.
+    def apply(previous_content)
+      lines = previous_content.lines
+      offset = 0
+
+      self.lines.each do |line|
+        if line.addition?
+          lines.insert(line.current_number - 1, line.content)
+          offset += 1
+        elsif line.deletion?
+          lines.delete_at(line.previous_number - 1 + offset)
+          offset -= 1
+        end
+      end
+
+      lines.join
+    end
+
+    # A naive implementation of `$ git apply -R`.
+    #
+    # @param current_content [String] The current content related to this diff.
+    # @return [String] The content after reverting this diff to the `current_content`.
+    def revert(current_content)
+      lines = current_content.lines
+      offset = 0
+
+      self.lines.each do |line|
+        if line.addition?
+          lines.delete_at(line.current_number - 1 + offset)
+          offset -= 1
+        elsif line.deletion?
+          lines.insert(line.previous_number - 1, line.content)
+          offset += 1
+        end
+      end
+
+      lines.join
+    end
+
     private
 
     # Check if a line was shifted. A line is considered shifted if its number is superior to the first hunk's start

data/lib/github_diff_parser/parser.rb

@@ -28,6 +28,8 @@ module GithubDiffParser
           add_hunk_to_diff(Regexp.last_match)
         when Regexes::LINE_DIFF
           add_line_to_hunk(Regexp.last_match)
+        when Regexes::NO_NEWLINE_AT_EOF
+          @current_diff.lines.last.content.sub!(/\n$/, "")
         end
       end
 
@@ -57,6 +59,7 @@ module GithubDiffParser
 
       @current_diff.previous_index = match_data[:previous_index]
       @current_diff.new_index = match_data[:new_index]
+      @current_diff.mode ||= Diff::Mode.new("modified", match_data[:bits])
     end
 
     # Called when encountering a `new file mode 100644` or `delete file mode 100644` in the Git Diff output.
@@ -67,7 +70,7 @@ module GithubDiffParser
     def process_diff_file_mode(match_data)
       validate_diff
 
-      @current_diff.file_mode = match_data[:file_mode]
+      @current_diff.mode = Diff::Mode.new(match_data[:file_mode], match_data[:bits])
     end
 
     # Called when encountering a `@@ -0,0 +1,10 @@` in the Git Diff output.

data/lib/github_diff_parser/regexes.rb

@@ -33,7 +33,8 @@ module GithubDiffParser
       index\s                                          # Match 'index '
       (?<previous_index>[a-z0-9]+)                     # Match and capture alphanumerical chars
       ..                                               # Match '..' literally
-      (?<new_index>[a-z0-9]+)                          # Match and captuer alphanumerical chars
+      (?<new_index>[a-z0-9]+)\s                        # Match and capture alphanumerical chars
+      (?<bits>\d+)?                                    # Optionaly capture the mode bits
     }x
 
     # This Regexp is used to match the header containing the original filename.
@@ -88,7 +89,7 @@ module GithubDiffParser
     MODE_HEADER = %r{
       \A                                               # Start of line
       (?<file_mode>new|deleted)                        # Match 'new' or 'deleted' and capture the group
-      \sfile\smode\s\d+                                # Match ' file mode 100655'
+      \sfile\smode\s(?<bits>\d+)                       # Match ' file mode 100655' and capture the "100655" part
       \Z                                               # End of line
     }x
 
@@ -170,8 +171,10 @@ module GithubDiffParser
         |                                              # OR
         \s                                             # Match empty space ' ' (Considered as a contextual line)
       )                                                # End of named group
-      (?<line>.*)                                      # Match the content of the line itself
+      (?<line>.*\n?)                                   # Match the content of the line itself
       \Z                                               # End of line
     }x
+
+    NO_NEWLINE_AT_EOF = /\/
   end
 end

data/lib/github_diff_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GithubDiffParser
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end

data/lib/github_diff_parser.rb

@@ -3,6 +3,7 @@
 require_relative "github_diff_parser/version"
 
 module GithubDiffParser
+  Error = Class.new(StandardError)
   InvalidDiff = Class.new(ArgumentError)
 
   autoload :Parser,  "github_diff_parser/parser"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_diff_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Edouard CHIN
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: A Ruby Gem to parse unified git diff output.