github_diff_parser 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bbbd5c441839124ce3eeb13013dfc941bc6bfda629c3245b0a1bd635acfc0b6
-  data.tar.gz: 8e4432858065cdf8aeee7516d7cf220381ed312b801434f31ab80cb0cefe2e6c
+  metadata.gz: f18e9f0c51f8db6051b7abb37f64f3e5c7a99c3fb207884530255d885a883d70
+  data.tar.gz: 38642e3746220a8dfc3eb7664495088dee7d69164aa884436d46a39a0f75e79f
 SHA512:
-  metadata.gz: 419ac34a1e4ceb31c909fa1e5d17f886fb53cbc3d3024272de7eb9676e6f5c834315eec0c6066415282fc4da847a770364fe78d1f097000301618ef5f11f436a
-  data.tar.gz: a9272715bc0593ca15662852a7a83b1d2aad2619414ce975905ed424330719f9ef5a103c777b4d7b6c8f3615b43fc05b6e29f017b3e59679a7d605927bb45b08
+  metadata.gz: 166abca2249d6fc2c1f3b841863d1f08c5d37651ee8a9dbd84796e8401ac56d0ee5973fa5feaf9e53fce557d3efa270e418d5b046cdfa57e8f9b2d568288f87a
+  data.tar.gz: 7b126d8024109a587db870c35d27ac3fce0ef2563d52c8068f7e2223c13bb872397f0361693ef7a415c510548784f40546e89b3a1f2956921d12973aa370b097

data/CHANGELOG.md

@@ -6,6 +6,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [1.3.0] - 2025-1-8
+### Removed
+
+- Remove support for Ruby 3.0. The minimum version to use this gem is Ruby 3.1.
+
+## [1.2.0] - 2024-9-2
+### Added
+- Added `GithubDiffParser::Hunk#context` which returns the context of the hunk.
+  In this example, it would return "def blabla"
+  ```diff
+  @@ +1,6 -1,18 def blabla
+  ```
+
+- Added `GithubDiffParser::Hunk#previous_line_count` which returns the prevous line count in a hunk.
+  In this example, it would return 6.
+  ```diff
+  @@ +1,6 -1,18 def blabla
+  ```
+
+- Added `GithubDiffParser::Hunk#new_line_count` which returns the prevous line count in a hunk.
+  In this example, it would return 18.
+  ```diff
+  @@ +1,6 -1,18 def blabla
+  ```
+
+### Fixed
+- `GithubDiffParser::Diff#previous_line_number_is_now` could return a wrong value
+  for the line number 1 in a file.
+
 ## [1.1.1] - 2024-2-21
 ### Fixed
 - `GithubDiffParser::Diff#new_mode?` and ``GithubDiffParser::Diff#deleted_mode?` would raise

data/Gemfile.lock

@@ -1,42 +1,40 @@
 PATH
   remote: .
   specs:
-    github_diff_parser (1.1.1)
+    github_diff_parser (1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     byebug (11.1.3)
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitest (5.18.1)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    minitest (5.25.1)
+    parallel (1.26.3)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rubocop (1.53.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rubocop (1.66.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-shopify (2.14.0)
+    rubocop-ast (1.32.1)
+      parser (>= 3.3.1.0)
+    rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   x86_64-darwin-20

data/lib/github_diff_parser/diff.rb

@@ -47,8 +47,8 @@ module GithubDiffParser
     #
     # @example Representation of the previous_lino_start and new_lino_start in a Git Diff
     #   @@ -6,5 +6,6 @@ def test1 # => The first 6 is the previous_lino_start, the second is the new_lino_start
-    def add_hunk(previous_lino_start, new_lino_start)
-      hunks << Hunk.new(previous_lino_start, new_lino_start)
+    def add_hunk(previous_lino_start, new_lino_start, context)
+      hunks << Hunk.new(previous_lino_start, new_lino_start, context)
     end
 
     # Add a line belonging to the previously processed Git Hunk.
@@ -140,7 +140,7 @@ module GithubDiffParser
     #
     # @return [Integer]
     def previous_line_number_is_now(line_number)
-      return line_number unless line_shifted?(line_number)
+      return line_number if line_unchanged?(line_number)
 
       applicable_hunk = last_applicable_hunk_for_line(line_number)
       line = applicable_hunk.find_previous_line(line_number)
@@ -196,16 +196,13 @@ module GithubDiffParser
 
     private
 
-    # Check if a line was shifted. A line is considered shifted if its number is superior to the first hunk's start
-    # range.
-    #
     # @param line_number [Integer]
     #
     # @return [Boolean]
-    def line_shifted?(line_number)
+    def line_unchanged?(line_number)
       first_hunk = hunks.first
 
-      line_number > first_hunk.new_file_start_line
+      line_number < first_hunk.new_file_start_line
     end
 
     # Find the last hunk that shifts the line. We need the last because we know it's the one that will shift the line

data/lib/github_diff_parser/hunk.rb

@@ -11,14 +11,19 @@ module GithubDiffParser
     # @return [Integer] (see #initialize)
     attr_reader :new_file_start_line
 
+    # @return [String] (see #initialize)
+    attr_reader :context
+
     # @param previous_file_start_line [String] the starting line number of the hunk for the original file
     # @param new_file_start_line [String] the starting line number of the hunk for the new file
+    # @param context [String]
     #
     # @example Representation of the previous_file_start_line and new_file_start_line in a Git Diff
     #   @@ -6,5 +6,6 @@ def test1 # => The first 6 is the previous_file_start_line the second is the new_file_start_line
-    def initialize(previous_file_start_line, new_file_start_line)
+    def initialize(previous_file_start_line, new_file_start_line, context)
       @previous_file_start_line = Integer(previous_file_start_line)
       @new_file_start_line = Integer(new_file_start_line)
+      @context = context
       @lines = []
     end
 
@@ -82,5 +87,23 @@ module GithubDiffParser
     def find_current_line(line_number)
       lines.find { |line| line.current_number == line_number }
     end
+
+    # The number of lines in the previous version.
+    #
+    # @example
+    #   "@@ +3,4 -3,8 @@" This would return "4"
+    #   "@@ +3 -3 @@"     This would return "1"
+    def previous_line_count
+      contextual_lines.count + deletion_lines.count
+    end
+
+    # The number of lines in the new version.
+    #
+    # @example
+    #   "@@ +3,4 -3,8 @@" This would return "8"
+    #   "@@ +3 -3 @@"     This would return "1"
+    def new_line_count
+      contextual_lines.count + addition_lines.count
+    end
   end
 end

data/lib/github_diff_parser/parser.rb

@@ -81,7 +81,7 @@ module GithubDiffParser
     def add_hunk_to_diff(match_data)
       validate_diff
 
-      @current_diff.add_hunk(match_data[:previous_lino_start], match_data[:new_lino_start])
+      @current_diff.add_hunk(match_data[:previous_lino_start], match_data[:new_lino_start], match_data[:context])
     end
 
     # Called when encountering a `-text` or `+text` or ` text` in the Git Diff output.

data/lib/github_diff_parser/regexes.rb

@@ -115,7 +115,7 @@ module GithubDiffParser
       @@\s                                             # Match '@@ '
       -(?<previous_lino_start>\d+)(,\d+)?\s            # Match '-1,11 ' or match '-1 ' and capture the '1' part
       \+(?<new_lino_start>\d+)(,\d+)?\s                # Match '+1,34 ' or match '+1 ' and capture the '1' part
-      @@.*                                             # Match '@@ Any text'
+      @@\s?(?<context>.*)                              # Match '@@ Any text' and capture the 'Any text' part
       \Z                                               # End of line
     }x
 

data/lib/github_diff_parser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_diff_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Edouard CHIN
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -78,14 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A Ruby Gem to parse unified git diff output.