riffdiff 1.0.20 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee5b9e6b9b78557a80e5b991f48673b90eeda880
-  data.tar.gz: 6a27e2bc22a0d7e47d9b414c1c9c1dbd7e2f0c62
+  metadata.gz: a903c564f968253a85a9e511353e4bea5cdb53e2
+  data.tar.gz: f6348bd244e212c8c63239f7534c16eb8854e453
 SHA512:
-  metadata.gz: b340f654f8ad84c341fb462da5dcbada725f4b64dadbce12cf38ee916d8a410df8ebe02b91db1d52e30ef0aad0e7c1a652721408d9b028f164a22398310870c4
-  data.tar.gz: e57adfa78061e38b062909dd49d976debe48fa2b0b286652113ba5c92db2a797711d5df8dce0187eecd9cef6def40e1711718271c8aac1c324173bd4c8d972ae
+  metadata.gz: 073ae0437959a08a2c62fa0e44ec1f49f828b06ee9b900648bf6b030ce6fe2c33fc6a3c46dc666a85be829a9a7e530a550082be5809bae1fe0d4d895dd25aa14
+  data.tar.gz: 4e35509f4eefd273ae0dc218798cc8f22bfe1bd6dd8eba4369b9bce8135f09c531e8aba18b212c70dfbd45e7e7aedd7b5933479e25c1f5526a98997a30374192

data/.rubocop.yml

@@ -40,3 +40,8 @@ Metrics/AbcSize:
 # Johan looked at some methods and concluded 7 is fine
 Metrics/CyclomaticComplexity:
   Max: 7
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  CountKeywordArgs: false

data/README.md

@@ -24,6 +24,10 @@ Optionally followed by...
 
 # TODO
 * Think about highlighting whitespace errors like Git does
+ * OK: Make DiffString.add() take a color as well
+ * Add a whitespace analysis pass to the Refiner
+ * Let the Refiner highlight whitespace errors among the added lines in reverse
+ red.
 * Think about how to visualize an added line break together with some
 indentation on the following line.
 * Do "git show 57f27da" and think about what rule we should use to get
@@ -122,3 +126,5 @@ globally on the system.
   still show the comma in reverse video though. Do this when:
     * One line is replaced by many
     * The diff contains only additions
+* When special highighting an expansion, highlight the added parts in green
+reverse, rather than black reverse. Testcase: `git show 7ea6877`

data/Rakefile

@@ -33,5 +33,8 @@ end
 
 desc 'Publish to rubygems.org'
 task publish: [:package] do
+  branch = git_branch
+  fail "Cannot publish from #{branch}, must be on master" if branch != 'master'
+
   system('gem push *.gem') || fail
 end

data/lib/colors.rb

@@ -6,6 +6,7 @@ module Colors
   CYAN = "#{ESC}[36m"
   GREEN = "#{ESC}[32m"
   RED = "#{ESC}[31m"
+  DEFAULT_COLOR = "#{ESC}[39m"
 
   REVERSE = "#{ESC}[7m"
   NOT_REVERSE = "#{ESC}[27m"

data/lib/diff_string.rb

@@ -9,22 +9,31 @@ class DiffString
 
   # Note that the color argument can be the empty string
   def initialize(prefix, color)
-    @reverse = false
     @prefix = prefix
-    @color = color
+    @base_color = color
+
     @string = ''
+
+    @reverse = false
+    @color = @base_color
+    @reset_color = color.empty? ? DEFAULT_COLOR : color
   end
 
-  def add(string, reverse)
+  # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/PerceivedComplexity
+  def add(string, reverse, color = '')
+    color = @reset_color if color.empty?
+
     if reverse && string == "\n"
-      add('↵', true)
+      add('↵', true, color)
       add("\n", false)
       return
     end
 
     if @string.empty?() || @string.end_with?("\n")
-      @string += @color
+      @string += @base_color
       @string += @prefix
+      @color = @reset_color
     end
 
     if reverse != @reverse
@@ -32,6 +41,11 @@ class DiffString
     end
     @reverse = reverse
 
+    if color != @color
+      @string += color
+    end
+    @color = color
+
     @string += string
   end
 
@@ -41,7 +55,7 @@ class DiffString
     string = @string
     string.chomp! if string.end_with? "\n"
 
-    suffix = @color.empty? ? '' : RESET
+    suffix = @base_color.empty? ? '' : RESET
     return string + suffix + "\n"
   end
 

data/lib/refiner.rb

@@ -95,10 +95,12 @@ class Refiner
     return try_highlight(old, new)
   end
 
-  def render_refinement(prefix, color, string, highlights, base_index = 0)
+  def render_refinement(prefix, color, string, highlights,
+                        base_index: 0, highlight_color: '')
     return_me = DiffString.new(prefix, color)
     string.each_char.with_index do |char, index|
-      return_me.add(char, highlights.include?(index + base_index))
+      highlight = highlights.include?(index + base_index)
+      return_me.add(char, highlight, highlight ? highlight_color : '')
     end
     return return_me.to_s
   end
@@ -132,13 +134,15 @@ class Refiner
 
     @refined_old = ''
 
-    refined_line_1 = render_refinement(' ', '', lines[0], new_highlights)
+    refined_line_1 =
+      render_refinement(' ', '', lines[0], new_highlights,
+                        highlight_color: GREEN)
 
     line_2_index_0 = lines[0].length
     refined_remaining_lines = render_refinement('+', GREEN,
                                                 lines[1..-1].join,
                                                 new_highlights,
-                                                line_2_index_0)
+                                                base_index: line_2_index_0)
 
     @refined_new = refined_line_1 + refined_remaining_lines
 

data/lib/version.rb

@@ -45,4 +45,13 @@ module Version
   def dirty?
     return git_version(true).include?('-dirty')
   end
+
+  def git_branch
+    git_result = `cd #{__dir__} ; git rev-parse --abbrev-ref HEAD 2> /dev/null`
+    if $CHILD_STATUS.success?
+      return git_result.chomp
+    else
+      return nil
+    end
+  end
 end

data/spec/diff_string_spec.rb

@@ -29,6 +29,113 @@ RSpec.describe DiffString, '#add' do
     end
   end
 
+  context 'single char special color, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', true, RED)
+    diff_string.add('3', false)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+1#{reversed("#{RED}2")}#{GREEN}3#{RESET}\n")
+    end
+  end
+
+  context 'double char special color, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', true, RED)
+    diff_string.add('x', true, RED)
+    diff_string.add('3', false)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+1#{reversed("#{RED}2x")}#{GREEN}3#{RESET}\n")
+    end
+  end
+
+  context 'special color at start, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', true, RED)
+    diff_string.add('2', false)
+    diff_string.add('3', false)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+#{reversed("#{RED}1")}#{GREEN}23#{RESET}\n")
+    end
+  end
+
+  context 'special color at end, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', false)
+    diff_string.add('3', true, RED)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+12#{reversed("#{RED}3")}#{GREEN}#{RESET}\n")
+    end
+  end
+
+  context 'special color before reverse, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', true, RED)
+    diff_string.add('3', true)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+1#{reversed("#{RED}2#{GREEN}3")}#{RESET}\n")
+    end
+  end
+
+  context 'special color after reverse, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', true)
+    diff_string.add('3', true, RED)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+1#{reversed("2#{RED}3")}#{GREEN}#{RESET}\n")
+    end
+  end
+
+  context 'special color at end of first line, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', true, RED)
+    diff_string.add("\n", false)
+    diff_string.add('3', false)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+1#{reversed("#{RED}2")}#{GREEN}\n#{GREEN}+3#{RESET}\n")
+    end
+  end
+
+  context 'special color before reversed newline, on green' do
+    diff_string = DiffString.new('+', GREEN)
+    diff_string.add('1', false)
+    diff_string.add('2', true, RED)
+    diff_string.add("\n", true)
+    diff_string.add('3', false)
+    diff_string.add("\n", false)
+
+    it 'renders correctly' do
+      expect(diff_string.to_s).to eq(
+        "#{GREEN}+1#{reversed("#{RED}2#{GREEN}↵")}\n#{GREEN}+3#{RESET}\n")
+    end
+  end
+
   context 'multiline' do
     it 'colors both lines' do
       diff_string = DiffString.new('+', GREEN)

data/spec/refiner_spec.rb

@@ -108,7 +108,7 @@ RSpec.describe Refiner, '#new' do
     it %(pretends first line is unchanged, but highlights comma) do
       expect(refiner.refined_old).to eq('')
       expect(refiner.refined_new).to eq(
-        %( abcde#{reversed(',')}\n) +
+        %( abcde#{reversed("#{GREEN},")}#{DEFAULT_COLOR}\n) +
         %(#{GREEN}+fffff,\n) +
         %(#{GREEN}+ggggg#{RESET}\n))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riffdiff
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.32
 platform: ruby
 authors:
 - Johan Walles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec