git_diff_parser 2.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c2645c17bdb3a03e0e5e682b09bec26ec55e4c7f
-  data.tar.gz: db74ad832ed897a054f903325b1371ca2855c651
+SHA256:
+  metadata.gz: 986edf351b61fb5ffee66918df85a9b36f769a58dc1acac0fa8932cd3039e745
+  data.tar.gz: f287924bf315d0542fa6e2cb3b6cb115fde3320c9fc84bab7299ad135daadaa4
 SHA512:
-  metadata.gz: 2da9a469671eff3420da2e260d4310d6be027e1404f0d2f823208b5eb182b2d0a129483533becaff71e88928d4f41b6849da77adea9d46e780f5cd069a0c38db
-  data.tar.gz: e21000998d0d4a425c3da28ddeaa166c8ec57752578e5eed797182068250d0563841fba289061735a01dddb6b79da1e8a2ef5e1bfe020bc2746b634bbf8317e5
+  metadata.gz: a7dd831db0671683540cb4c073499229fef3e4c9033f236121d7ddfcebd8f4c91439d1a5cb84b2fe491cbf3b642fbc85f1cbb7e0e4f0ac35220df4058b7c9105
+  data.tar.gz: 222af9d5750d2e15bbbbf273a0c64ebac75702dd37495cd52981c36f02f651f9f21b197321064cfdf1098b6141fdd0b0dec0bdeb7c1d30b056efe84b3753c442

data/.github/workflows/ci.yaml

@@ -0,0 +1,28 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.6, 2.7, '3.0', head]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /node_modules/
+/package-lock.json

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in git_diff_parser.gemspec
 gemspec
-gem 'byebug' if RUBY_VERSION >= '2.0.0'
+gem 'byebug'
 gem 'pry'
 gem 'rubocop'
 gem 'yard'

data/changelog.md

@@ -1,3 +1,34 @@
+# [4.0.0](https://github.com/packsaddle/ruby-git_diff_parser/compare/v3.2.0...v4.0.0) (2021-11-04)
+
+### BREAKING CHANGES
+
+* **patch:** Fix changed_lines number calculation ([30bfcf5](https://github.com/packsaddle/ruby-git_diff_parser/commit/30bfcf5)) [#336](https://github.com/packsaddle/ruby-git_diff_parser/pull/336)
+
+
+<a name="3.2.0"></a>
+# [3.2.0](https://github.com/packsaddle/ruby-git_diff_parser/compare/v3.1.0...v3.2.0) (2019-03-13)
+
+### Fixes
+
+* **patches:** Fix trailing whitespace issue in filename parsing ([d679ad1](https://github.com/packsaddle/ruby-git_diff_parser/commit/d679ad1))
+
+
+<a name="3.1.0"></a>
+# [3.1.0](https://github.com/packsaddle/ruby-git_diff_parser/compare/v3.0.0...v3.1.0) (2017-07-05)
+
+### Features
+
+* **patch:** Added Patch#removed_lines method ([9acc263](https://github.com/packsaddle/ruby-git_diff_parser/commit/9acc263))
+
+
+<a name="3.0.0"></a>
+# [3.0.0](https://github.com/packsaddle/ruby-git_diff_parser/compare/v2.3.0...v3.0.0) (2017-06-22)
+
+### Features
+
+* **patches:** convert non UTF-8 string to avoid invalid UTF-8 sequence errors ([a8f87bd](https://github.com/packsaddle/ruby-git_diff_parser/commit/a8f87bd))
+
+
 <a name="2.3.0"></a>
 # [2.3.0](https://github.com/packsaddle/ruby-git_diff_parser/compare/v2.2.0...v2.3.0) (2016-05-12)
 

data/lib/git_diff_parser/patch.rb

@@ -3,7 +3,9 @@ module GitDiffParser
   class Patch
     RANGE_INFORMATION_LINE = /^@@ .+\+(?<line_number>\d+),/
     MODIFIED_LINE = /^\+(?!\+|\+)/
+    REMOVED_LINE = /^[-]/
     NOT_REMOVED_LINE = /^[^-]/
+    NO_NEWLINE_MESSAGE = /^\$/
 
     attr_accessor :file, :body, :secure_hash
     # @!attribute [rw] file
@@ -60,6 +62,8 @@ module GitDiffParser
         case content
         when RANGE_INFORMATION_LINE
           line_number = Regexp.last_match[:line_number].to_i
+        when NO_NEWLINE_MESSAGE
+          # nop
         when MODIFIED_LINE
           line = Line.new(
             content: content,
@@ -76,6 +80,28 @@ module GitDiffParser
       end
     end
 
+    # @return [Array<Line>] removed lines
+    def removed_lines
+      line_number = 0
+
+      lines.each_with_index.inject([]) do |lines, (content, patch_position)|
+        case content
+        when RANGE_INFORMATION_LINE
+          line_number = Regexp.last_match[:line_number].to_i
+        when REMOVED_LINE
+          line = Line.new(
+            content: content,
+            number: line_number,
+            patch_position: patch_position
+          )
+          lines << line
+          line_number += 1
+        end
+
+        lines
+      end
+    end
+
     # @return [Array<Integer>] changed line numbers
     def changed_line_numbers
       changed_lines.map(&:number)

data/lib/git_diff_parser/patches.rb

@@ -18,7 +18,7 @@ module GitDiffParser
       line_count = lines.count
       parsed = new
       lines.each_with_index do |line, count|
-        case line.chomp
+        case parsed.scrub_string(line.chomp)
         when /^diff/
           unless patch.empty?
             parsed << Patch.new(patch.join("\n") + "\n", file: file_name)
@@ -28,7 +28,7 @@ module GitDiffParser
           body = false
         when /^\-\-\-/
         when %r{^\+\+\+ b/(?<file_name>.*)}
-          file_name = Regexp.last_match[:file_name]
+          file_name = Regexp.last_match[:file_name].rstrip
           body = true
         when /^(?<body>[\ @\+\-\\].*)/
           patch << Regexp.last_match[:body] if body
@@ -42,6 +42,15 @@ module GitDiffParser
       parsed
     end
 
+    # @return [String]
+    def scrub_string(line)
+      if RUBY_VERSION >= '2.1'
+        line.scrub
+      else
+        line.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+      end
+    end
+
     # @return [Patches<Patch>]
     def initialize(*args)
       super Array.new(*args)

data/lib/git_diff_parser/version.rb

@@ -1,3 +1,3 @@
 module GitDiffParser
-  VERSION = '2.3.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "conventional-changelog-cli": "^1.2.0",
-    "npm-check-updates": "^2.2.3",
+    "conventional-changelog-cli": "^2.0.0",
+    "npm-check-updates": "^11.0.0",
     "urijs": "^1.16.1"
   },
   "scripts": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_diff_parser
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,11 +60,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".conventional-changelog.context.js"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".tachikoma.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -101,10 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Parse `git diff` into patches and lines.
 test_files: []
-has_rdoc: 

data/.travis.yml

@@ -1,18 +0,0 @@
-language: "ruby"
-sudo: false
-rvm:
-  - "1.9"
-  - "2.0"
-  - "2.1.10"
-  - "2.2.5"
-  - "2.3.1"
-  - "ruby-head"
-matrix:
-  allow_failures:
-    - rvm: "ruby-head"
-before_install:
-  - "gem update bundler"
-  - "bin/setup"
-notifications:
-  email:
-    - ogataken@gmail.com