git_diff 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3b41b08c6a9dccc59f7a462cdcdb68e5b1cfaec
-  data.tar.gz: 366a324e52d933f22147093c90d8844d4af34710
+SHA256:
+  metadata.gz: 52a2071ba28b2a0703fabec01c2c4f50c3eae657255a096b5603fcc7cffa8381
+  data.tar.gz: c888271d5001095ab3dcae18cf209bc03eb0251d57e2d528deb9873cc3a66d02
 SHA512:
-  metadata.gz: bb7a0f39886899976aeb0a98aedd8ffbb7588a61177072dd77c082ee14b72a11ebb30908af0d7d99ac5e50eb9db1e3a9d46cd9dfbfdae657020ba7a885f33309
-  data.tar.gz: 7d0e155533df7ef127f9c1769b7f81e281cba163c22dc72af5b8a1f0fe845aa3d21e2368712c4c383d96ff8cd68762303b2d99ed7b91af680a07c12e7e5e4670
+  metadata.gz: a145f66c6c8345883093adef62a6bdbde48d5475ee41923bd523f5f7d8f471cc3c8637a89eb4b2003749488c32f2dfffc0a4d78f9f395e259770386fd6f00739
+  data.tar.gz: 323ad1908b9f757c36185ec943e31f1620185d0b0b8052d5e8cf6680dd4ac8dc9e4204f88d6f32615458c0282154d250909f10b83988933c7c34f5eca1c7590c

data/.rubocop.yml

@@ -0,0 +1,46 @@
+AllCops:
+  Include:
+    - "**/*.rb"
+    - "*.gemspec"
+    - "Gemfile"
+    - "Rakefile"
+  TargetRubyVersion: 2.5
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/GuardClause:
+  MinBodyLength: 60
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+
+
+
+
+

data/.travis.yml

@@ -1,4 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+before_install:
+  - gem update --system
+  - gem install bundler
+script:
+  - bundle exec rake

data/Gemfile

@@ -1,4 +1,6 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in git_diff.gemspec
 gemspec

data/README.md

@@ -9,7 +9,7 @@ A Ruby library for parsing the unified diff format generated with `git diff`
 
 Add this line to your application's Gemfile:
 
-    gem 'git_diff', git: 'https://github.com/anolson/git_diff.git'
+    gem 'git_diff'
 
 And then execute:
 

data/Rakefile

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rubocop/rake_task"
 
 Rake::TestTask.new do |t|
   t.libs << "lib"
@@ -7,4 +10,6 @@ Rake::TestTask.new do |t|
   t.pattern = "test/**/*_test.rb"
 end
 
-task :default => :test
+RuboCop::RakeTask.new
+
+task default: %i[rubocop test]

data/git_diff.gemspec

@@ -1,21 +1,23 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'git_diff/version'
+require "git_diff/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "git_diff"
   spec.version       = GitDiff::VERSION
   spec.authors       = ["Andrew Olson"]
-  spec.email         = ["aolson@geezeo.com"]
-  spec.summary       = %q{A Ruby library for parsing git diffs.}
+  spec.email         = ["anolson@gmail.com"]
+  spec.summary       = "A Ruby library for parsing git diffs."
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files`.split($RS)
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop", "~> 0.74.0"
 end

data/lib/git_diff.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 require "git_diff/stats_collector"
@@ -20,4 +22,4 @@ module GitDiff
     parser.parse
     parser.diff
   end
-end
+end

data/lib/git_diff/diff.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module GitDiff
   class Diff
-    attr_reader :files, :stats
+    attr_reader :files
 
     def initialize
       @files = []
@@ -35,4 +37,4 @@ module GitDiff
       current_file << line
     end
   end
-end
+end

data/lib/git_diff/file.rb

@@ -1,22 +1,28 @@
+# frozen_string_literal: true
+
 module GitDiff
   class File
-
-    attr_reader :a_path, :a_blob, :b_path, :b_blob, :b_mode, :hunks
+    attr_reader :a_path, :a_blob, :b_path, :b_blob, :b_mode, :hunks, :binary
 
     def self.from_string(string)
-      if /^diff --git/.match(string)
-        File.new
+      if path_info = %r{^diff --git(?: a/(\S+))?(?: b/(\S+))?}.match(string)
+        File.new(
+          a_path: path_info.captures[0] || "/dev/null",
+          b_path: path_info.captures[1] || "/dev/null"
+        )
       end
     end
 
-    def initialize
+    def initialize(a_path: "/dev/null", b_path: "/dev/null")
       @hunks = []
+      @a_path = a_path
+      @b_path = b_path
     end
 
     def <<(string)
       return if extract_diff_meta_data(string)
 
-      if(range_info = RangeInfo.from_string(string))
+      if (range_info = RangeInfo.from_string(string))
         add_hunk Hunk.new(range_info)
       else
         append_to_current_hunk string
@@ -38,6 +44,7 @@ module GitDiff
     def add_hunk(hunk)
       self.current_hunk = hunk
       hunks << current_hunk
+      @binary = false
     end
 
     def append_to_current_hunk(string)
@@ -45,21 +52,39 @@ module GitDiff
     end
 
     def extract_diff_meta_data(string)
-      case
-      when a_path_info = /^[-]{3} \/dev\/null(.*)$/.match(string)
+      if a_path_info = %r{^[-]{3} /dev/null(.*)$}.match(string)
         @a_path = "/dev/null"
-      when a_path_info = /^[-]{3} a\/(.*)$/.match(string)
+      elsif a_path_info = %r{^[-]{3} "?a/(.*)$}.match(string)
         @a_path = a_path_info[1]
-      when b_path_info = /^[+]{3} \/dev\/null(.*)$/.match(string)
+      elsif b_path_info = %r{^[+]{3} /dev/null(.*)$}.match(string)
         @b_path = "/dev/null"
-      when b_path_info = /^[+]{3} b\/(.*)$/.match(string)
+      elsif b_path_info = %r{^[+]{3} "?b/(.*)$}.match(string)
         @b_path = b_path_info[1]
-      when blob_info = /^index ([0-9A-Fa-f]+)\.\.([0-9A-Fa-f]+) ?(.+)?$/.match(string)
+      elsif blob_info = /^index ([0-9A-Fa-f]+)\.\.([0-9A-Fa-f]+) ?(.+)?$/.match(string)
         @a_blob, @b_blob, @b_mode = *blob_info.captures
-      when /^new file mode [0-9]{6}$/.match(string)
+      elsif /^new file mode [0-9]{6}$/.match(string)
         @a_path = "/dev/null"
-      when /^deleted file mode [0-9]{6}$/.match(string)
+      elsif /^deleted file mode [0-9]{6}$/.match(string)
         @b_path = "/dev/null"
+      elsif mode_info = /^(old|new) mode ([0-9]{6})$/.match(string)
+        if mode_info.captures[0] == "old"
+          @a_mode = mode_info.captures[1]
+        else
+          @b_mode = mode_info.captures[1]
+        end
+      elsif copy_rename_info = /^(copy|rename) (from|to) (.*)$/.match(string)
+        if copy_rename_info.captures[1] == "from"
+          @a_path = copy_rename_info.captures[2]
+        else
+          @b_path = copy_rename_info.captures[2]
+        end
+      elsif binary_info = %r{^Binary files (?:/dev/null|"?a/(.*)) and (?:/dev/null|"?b/(.*)) differ$}.match(string)
+        @binary = true
+        @a_path ||= binary_info[1] || "/dev/null"
+        @b_path ||= binary_info[2] || "/dev/null"
+      elsif /^similarity/.match(string)
+        # trash
+        true
       end
     end
   end

data/lib/git_diff/hunk.rb

@@ -1,12 +1,9 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 module GitDiff
   class Hunk
-    include Enumerable
-    extend Forwardable
-
-    def_delegators :lines, :each
-
     attr_reader :lines, :range_info
 
     def initialize(range_info)
@@ -39,4 +36,4 @@ module GitDiff
       @line_number_calculation ||= LineNumberCalculation.new(initial_line_number)
     end
   end
-end
+end

data/lib/git_diff/line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "git_diff/line/context"
 require "git_diff/line/addition"
 require "git_diff/line/deletion"
@@ -19,4 +21,4 @@ module GitDiff
     end
     extend ClassMethods
   end
-end
+end

data/lib/git_diff/line/addition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   module Line
     class Addition < Context
@@ -10,4 +12,4 @@ module GitDiff
       end
     end
   end
-end
+end

data/lib/git_diff/line/context.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module GitDiff
   module Line
     class Context
       attr_reader :content, :line_number
 
-      def initialize(content, line_number=nil)
+      def initialize(content, line_number = nil)
         @content = content
         @line_number = line_number
       end

data/lib/git_diff/line/deletion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   module Line
     class Deletion < Context
@@ -10,4 +12,4 @@ module GitDiff
       end
     end
   end
-end
+end

data/lib/git_diff/line_number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   class LineNumber
     attr_reader :left, :right
@@ -39,4 +41,4 @@ module GitDiff
       [left, right]
     end
   end
-end
+end

data/lib/git_diff/line_number_calculation.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module GitDiff
   class LineNumberCalculation
-
     attr_reader :current
 
     def initialize(line_number)
@@ -19,4 +20,4 @@ module GitDiff
       end
     end
   end
-end
+end

data/lib/git_diff/line_number_range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   class LineNumberRange
     attr_reader :start, :number_of_lines
@@ -6,7 +8,7 @@ module GitDiff
       new(*string.split(","))
     end
 
-    def initialize(start = 0, number_of_lines = 0)
+    def initialize(start = 0, number_of_lines = 1)
       @start = start.to_i
       @number_of_lines = number_of_lines.to_i
     end
@@ -15,4 +17,4 @@ module GitDiff
       "#{type}#{start},#{number_of_lines}"
     end
   end
-end
+end

data/lib/git_diff/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   class Parser
     attr_reader :string, :diff

data/lib/git_diff/range_info.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module GitDiff
   class RangeInfo
     attr_reader :original_range, :new_range, :header
 
     module ClassMethods
       def from_string(string)
-        if(range_data = extract_hunk_range_data(string))
+        if (range_data = extract_hunk_range_data(string))
           new(*range_data.captures)
         end
       end

data/lib/git_diff/stats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   class Stats
     attr_reader :number_of_additions, :number_of_lines, :number_of_deletions
@@ -15,4 +17,4 @@ module GitDiff
       end
     end
   end
-end
+end

data/lib/git_diff/stats_calculator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   class StatsCalculator
     attr_reader :collector
@@ -28,4 +30,4 @@ module GitDiff
       Array(collector.collect)
     end
   end
-end
+end

data/lib/git_diff/stats_collector.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "git_diff/stats_collector/hunk"
-require "git_diff/stats_collector/rollup"
+require "git_diff/stats_collector/rollup"

data/lib/git_diff/stats_collector/hunk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   module StatsCollector
     class Hunk
@@ -33,9 +35,5 @@ module GitDiff
         hunk.lines
       end
     end
-
   end
 end
-
-
-

data/lib/git_diff/stats_collector/rollup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
   module StatsCollector
     class StatsCollector::Rollup
@@ -8,7 +10,7 @@ module GitDiff
       end
 
       def collect
-        collection.map { |item| item.stats }
+        collection.map(&:stats)
       end
     end
   end

data/lib/git_diff/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitDiff
-  VERSION = "0.3.0"
+  VERSION = "0.4.3"
 end

data/test/{diff_file_test.rb → file_test.rb}

@@ -1,7 +1,8 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class DiffFileTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class DiffFileTest < Minitest::Test
   def setup
     @file = GitDiff::File.new
   end
@@ -45,8 +46,8 @@ class DiffFileTest < MiniTest::Unit::TestCase
     @file << "       io = StringIO.new(text)"
     @file << "       objects = []"
     @file << "       while line = io.gets"
-    @file << "-        sha, type, size = line.split(" ", 3)"
-    @file << "+        sha, type, size = line.split(" ", 3) #wut"
+    @file << "-        sha, type, size = line.split(' ', 3)"
+    @file << "+        sha, type, size = line.split(' ', 3) #wut"
     @file << "         parser = BATCH_PARSERS[type]"
     @file << "         if type == 'missing' || !parser"
     @file << "           io.seek(size.to_i + 1, IO::SEEK_CUR)"
@@ -56,5 +57,4 @@ class DiffFileTest < MiniTest::Unit::TestCase
     assert_equal 1, @file.stats.number_of_additions
     assert_equal 1, @file.stats.number_of_deletions
   end
-
-end
+end

data/test/git_diff_test.rb

@@ -1,51 +1,52 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class GitDiffTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class GitDiffTest < Minitest::Test
   def setup
-    string = <<-'DIFF'
-diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
-index 403ea33..dd4b590 100644
---- a/lib/grit/commit.rb
-+++ b/lib/grit/commit.rb
-@@ -27,6 +27,7 @@
-
-       lines = info.split("\n")
-       tree = lines.shift.split(' ', 2).last
-+
-       parents = []
-       parents << lines.shift[7..-1] while lines.first[0, 6] == 'parent'
-       author,    authored_date  = Grit::Commit.actor(lines.shift)
-diff --git a/lib/grit/new_file.rb b/lib/grit/new_file.rb
-new file mode 100644
-index 0000000..24f83d1
---- /dev/null
-+++ b/lib/grit/new_file.rb
-@@ -0,0 +1 @@
-+#
-diff --git a/grit/old_file.rb b/grit/old_file.rb
-deleted file mode 100644
-index ba6b733..0000000
---- a/lib/grit/old_file.rb
-+++ /dev/null
-@@ -1 +0,0 @@
--#
-diff --git a/lib/grit/repo.rb b/lib/grit/repo.rb
-index 033b446..0e2d140 100644
---- a/lib/grit/repo.rb
-+++ b/lib/grit/repo.rb
-@@ -180,7 +180,7 @@ module Grit
-       io = StringIO.new(text)
-       objects = []
-       while line = io.gets
--        sha, type, size = line.split(" ", 3)
-+        sha, type, size = line.split(" ", 3) #wut
-         parser = BATCH_PARSERS[type]
-         if type == 'missing' || !parser
-           io.seek(size.to_i + 1, IO::SEEK_CUR)
+    string = <<~'DIFF'
+      diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
+      index 403ea33..dd4b590 100644
+      --- a/lib/grit/commit.rb
+      +++ b/lib/grit/commit.rb
+      @@ -27,6 +27,7 @@
+
+             lines = info.split("\n")
+             tree = lines.shift.split(' ', 2).last
+      +
+             parents = []
+             parents << lines.shift[7..-1] while lines.first[0, 6] == 'parent'
+             author,    authored_date  = Grit::Commit.actor(lines.shift)
+      diff --git a/lib/grit/new_file.rb b/lib/grit/new_file.rb
+      new file mode 100644
+      index 0000000..24f83d1
+      --- /dev/null
+      +++ b/lib/grit/new_file.rb
+      @@ -0,0 +1 @@
+      +#
+      diff --git a/grit/old_file.rb b/grit/old_file.rb
+      deleted file mode 100644
+      index ba6b733..0000000
+      --- a/lib/grit/old_file.rb
+      +++ /dev/null
+      @@ -1 +0,0 @@
+      -#
+      diff --git a/lib/grit/repo.rb b/lib/grit/repo.rb
+      index 033b446..0e2d140 100644
+      --- a/lib/grit/repo.rb
+      +++ b/lib/grit/repo.rb
+      @@ -180,7 +180,7 @@ module Grit
+             io = StringIO.new(text)
+             objects = []
+             while line = io.gets
+      -        sha, type, size = line.split(" ", 3)
+      +        sha, type, size = line.split(" ", 3) #wut
+               parser = BATCH_PARSERS[type]
+               if type == 'missing' || !parser
+                 io.seek(size.to_i + 1, IO::SEEK_CUR)
     DIFF
 
-    @diff = GitDiff::from_string(string)
+    @diff = GitDiff.from_string(string)
   end
 
   def first_diff_file
@@ -108,24 +109,94 @@ index 033b446..0e2d140 100644
     second_hunk = last_diff_file.hunks.first
 
     assert_equal [
-      [27,27],
-      [28,28],
-      [29,29],
-      [nil,30],
-      [30,31],
-      [31,32],
-      [32,33]
-      ], first_hunk.lines.map { |line| line.line_number.pair }
+      [27, 27],
+      [28, 28],
+      [29, 29],
+      [nil, 30],
+      [30, 31],
+      [31, 32],
+      [32, 33]
+    ], (first_hunk.lines.map { |line| line.line_number.pair })
 
     assert_equal [
-      [180,180],
-      [181,181],
-      [182,182],
-      [183,nil],
-      [nil,183],
-      [184,184],
-      [185,185],
-      [186,186]
-      ], second_hunk.lines.map { |line| line.line_number.pair }
+      [180, 180],
+      [181, 181],
+      [182, 182],
+      [183, nil],
+      [nil, 183],
+      [184, 184],
+      [185, 185],
+      [186, 186]
+    ], (second_hunk.lines.map { |line| line.line_number.pair })
+  end
+
+  def test_binary_file_diff
+    diff = GitDiff.from_string 'diff --git a/app/assets/bin.eot b/app/assets/bin.eot
+new file mode 100644
+index 0000000..2cbab9c
+Binary files /dev/null and b/app/assets/bin.eot differ'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert file.binary
+    assert_equal "/dev/null", file.a_path
+    assert_equal "app/assets/bin.eot", file.b_path
+  end
+
+  def test_perm_change_diff
+    diff = GitDiff.from_string 'diff --git a/bin/setup b/bin/setup
+old mode 100644
+new mode 100755'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert_equal 0, file.hunks.count
+
+    assert_equal "bin/setup", file.a_path
+    assert_equal "bin/setup", file.b_path
+  end
+
+  def test_rename_diff
+    diff = GitDiff.from_string 'diff --git a/lib/path1/my_file.rb b/lib/path2/my_file2.rb
+similarity index 100%
+rename from lib/path1/my_file.rb
+rename to lib/path2/my_file2.rb'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert_equal 0, file.hunks.count
+
+    assert_equal "lib/path1/my_file.rb", file.a_path
+    assert_equal "lib/path2/my_file2.rb", file.b_path
+  end
+
+  def test_copy_diff
+    diff = GitDiff.from_string 'diff --git a/lib/path1/my_file.rb b/lib/path2/my_file2.rb
+similarity index 100%
+copy from lib/path1/my_file.rb
+copy to lib/path2/my_file2.rb'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert_equal 0, file.hunks.count
+
+    assert_equal "lib/path1/my_file.rb", file.a_path
+    assert_equal "lib/path2/my_file2.rb", file.b_path
   end
 end

data/test/hunk_test.rb

@@ -1,7 +1,8 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class HunkTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class HunkTest < Minitest::Test
   def setup
     @range_info = GitDiff::RangeInfo.new("180,7", "180,7", "module Grit")
     @hunk = GitDiff::Hunk.new(@range_info)
@@ -24,4 +25,4 @@ class HunkTest < MiniTest::Unit::TestCase
 
     assert_equal 1, @hunk.stats.number_of_deletions
   end
-end
+end

data/test/line/addition_test.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
-class AdditionTest < MiniTest::Unit::TestCase
+class AdditionTest < Minitest::Test
   def setup
     @addition = GitDiff::Line::Addition.new("+ addition")
   end
@@ -12,4 +14,4 @@ class AdditionTest < MiniTest::Unit::TestCase
   def test_deletion_is_false
     refute @addition.deletion?
   end
-end
+end

data/test/line/context_test.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
-class ContextTest < MiniTest::Unit::TestCase
+class ContextTest < Minitest::Test
   def setup
-    @line_number = GitDiff::LineNumber.new(0,0)
+    @line_number = GitDiff::LineNumber.new(0, 0)
     @content = "some content"
     @context = GitDiff::Line::Context.new(@content, @line_number)
   end
@@ -18,4 +20,4 @@ class ContextTest < MiniTest::Unit::TestCase
   def test_to_s_returns_the_content
     assert_equal @content, @context.to_s
   end
-end
+end

data/test/line/deletion_test.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
-class DeletionTest < MiniTest::Unit::TestCase
+class DeletionTest < Minitest::Test
   def setup
     @deletion = GitDiff::Line::Deletion.new("- deletion")
   end
@@ -12,4 +14,4 @@ class DeletionTest < MiniTest::Unit::TestCase
   def test_deletion_is_true
     assert @deletion.deletion?
   end
-end
+end

data/test/line_number_calculation_test.rb

@@ -1,7 +1,8 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class LineNumberCalculationTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class LineNumberCalculationTest < Minitest::Test
   def setup
     @line_number = GitDiff::LineNumber.new(0, 0)
     @line_number_calculation = GitDiff::LineNumberCalculation.new(@line_number)
@@ -31,4 +32,4 @@ class LineNumberCalculationTest < MiniTest::Unit::TestCase
     assert_equal 1, @line_number_calculation.current.left
     assert_equal 1, @line_number_calculation.current.right
   end
-end
+end

data/test/line_number_range_test.rb

@@ -1,24 +1,32 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class LineNumberRangeTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class LineNumberRangeTest < Minitest::Test
   def test_from_string_with_empty_string
     range = GitDiff::LineNumberRange.from_string("")
 
     assert_equal 0, range.start
-    assert_equal 0, range.number_of_lines
+    assert_equal 1, range.number_of_lines
   end
 
-  def test_from_string_with_empty_string
+  def test_from_string_with_not_empty_string
     range = GitDiff::LineNumberRange.from_string("180,7")
 
     assert_equal 180, range.start
     assert_equal 7, range.number_of_lines
   end
 
+  def test_from_string_with_start_no_count
+    range = GitDiff::LineNumberRange.from_string("180")
+
+    assert_equal 180, range.start
+    assert_equal 1, range.number_of_lines
+  end
+
   def test_to_s
     range = GitDiff::LineNumberRange.from_string("180,7")
 
     assert_equal "+180,7", range.to_s(:+)
   end
-end
+end

data/test/line_number_test.rb

@@ -1,9 +1,10 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class LineNumberTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class LineNumberTest < Minitest::Test
   def setup
-    @line_number = GitDiff::LineNumber.new(0,0)
+    @line_number = GitDiff::LineNumber.new(0, 0)
   end
 
   def test_increment_left
@@ -25,6 +26,6 @@ class LineNumberTest < MiniTest::Unit::TestCase
   end
 
   def test_pair
-    assert_equal [0,0], @line_number.pair
+    assert_equal [0, 0], @line_number.pair
   end
-end
+end

data/test/line_test.rb

@@ -1,12 +1,12 @@
-require "test_helper"
+# frozen_string_literal: true
 
-class LineTest < MiniTest::Unit::TestCase
+require "test_helper"
 
+class LineTest < Minitest::Test
   def setup
     @line_number = GitDiff::LineNumber.new(0, 0)
   end
 
-
   def test_from_string_with_addition
     addition = GitDiff::Line.from_string("+ addition")
 
@@ -27,4 +27,4 @@ class LineTest < MiniTest::Unit::TestCase
     refute_nil context
     assert_instance_of GitDiff::Line::Context, context
   end
-end
+end

data/test/range_info_test.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
-class RangeInfoTest < MiniTest::Unit::TestCase
+class RangeInfoTest < Minitest::Test
   def setup
     @range_info = GitDiff::RangeInfo.new("180,7", "180,7", "module Grit")
   end

data/test/stats_calculator_test.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class Collector
-
   def collect
     GitDiff::Stats.new(
       number_of_lines: number_of_lines,
@@ -25,7 +26,7 @@ class Collector
   end
 end
 
-class StatsCalculatorTest < MiniTest::Unit::TestCase
+class StatsCalculatorTest < Minitest::Test
   def setup
     collector = Collector.new
 
@@ -44,4 +45,4 @@ class StatsCalculatorTest < MiniTest::Unit::TestCase
   def test_total_number_additions_is_the_sum_of_all_the_lines
     assert_equal 24, @stats.number_of_lines
   end
-end
+end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "minitest/autorun"
 require "minitest/pride"
-require "git_diff"
+require "git_diff"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Andrew Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,17 +52,31 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
 description: 
 email:
-- aolson@geezeo.com
+- anolson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -73,7 +101,7 @@ files:
 - lib/git_diff/stats_collector/rollup.rb
 - lib/git_diff/stats_rollup.rb
 - lib/git_diff/version.rb
-- test/diff_file_test.rb
+- test/file_test.rb
 - test/git_diff_test.rb
 - test/hunk_test.rb
 - test/line/addition_test.rb
@@ -105,13 +133,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby library for parsing git diffs.
 test_files:
-- test/diff_file_test.rb
+- test/file_test.rb
 - test/git_diff_test.rb
 - test/hunk_test.rb
 - test/line/addition_test.rb
@@ -124,4 +151,3 @@ test_files:
 - test/range_info_test.rb
 - test/stats_calculator_test.rb
 - test/test_helper.rb
-has_rdoc: