riffdiff 0.9.8 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c8550e8dbeef2ce61955d6c4d377e3d178fb790
-  data.tar.gz: 36fbdc8ccd7a5c1581d9ed1645e4983b6971416e
+  metadata.gz: 3b5b2351ff935d40977928f7b2801b10d671aae4
+  data.tar.gz: 04dedc13f58a3c7a47f3c0e413aa5303f0c17e4a
 SHA512:
-  metadata.gz: 531762353008a5fa72c629dacbed075462d630dbecbfafc2c94d2aaa82c57575ce3cf0a34f1f4881aa37a8500e67a38113e58bff74eee34db5b4a6c75873b550
-  data.tar.gz: b5ed8570458f7d8eba116eddb9d717cb1368dccbd5de481923336c78814edb01375f112da430ee6ccbc90009e370e88e9e52a9e7faaa46bd6531ec3e24f00799
+  metadata.gz: 6eb0d6cf89082c982896513fc25531f4cbcced1c07c8d61a7aead5bb66a3d60b50662ee0f7e9c2a92425ca2a72e70cf9db1e47935cc75be646349606e7ff66ed
+  data.tar.gz: 560d7da69123f98f074164d0ca1981dd0cba57c7047f93df24da26997f3d4a07f3497be0ebac09dc0c4e7750cc4a12dd32ccff55ea8f954395725b735a756ed2

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+Gemfile.lock

data/Gemfile

@@ -1,5 +1,2 @@
 source 'https://rubygems.org'
-
-gem 'rspec', '~> 3.0'
-gem 'diff-lcs', '~> 1.2.5'
-gem 'slop', '~> 4.1.0'
+gemspec

data/README.md

@@ -23,9 +23,9 @@ Optionally followed by...
 ... to make git show refined diffs by default.
 
 # TODO
-* Think about how to visualize one line changing to itself with a
-  comma at the end plus a bunch of entirely new lines. Think of a
-  constant array getting one or more extra members.
+* When highlighting an added comma at the end of a line, followed by some added
+lines, remove the leading + from the first line and don't color it. We should
+still show the comma in reverse video though.
 * Think about highlighting whitespace errors like Git does
 * Think about how to visualize an added line break together with some
 indentation on the following line.
@@ -33,9 +33,6 @@ indentation on the following line.
 the REVERSE vs reversed() lines highlighted.
 * Do "git show 2ac5b06" and think about what rule we should use to
 highlight all of both "some" and "one or".
-* Do "git show -b 77c8f77" and think about what rule we should use to
-  highlight the leading spaces of the "+  refined" and "+  page" lines
-  at the end of the file.
 * Make sure we highlight the output of "git log -p" properly. If we
 get something unexpected, maybe just go back to :initial?
 * Make sure we highlight the output of "git show --stat" properly
@@ -108,3 +105,18 @@ optionally deploy as well.
 * Make a first public release
 * Running from a git clone should work even if Riff is installed
 globally on the system.
+* Do `git show 0f5dd84` and think about how to visualize one line
+  changing to itself with a comma at the end plus a bunch of entirely
+  new lines. Think of a constant array getting one or more extra
+  members.
+* Do "git show -b 77c8f77" and think about what rule we should use to
+  highlight the leading spaces of the "+  refined" and "+  page" lines
+  at the end of the file.
+* Don't use --dirty for the gemspec version
+* Rakefile: Refuse to package dirty sources
+* Remove .bundler/config from git
+* Remove bundler binstubs from Git
+* Make sure we can:
+  * test dirty sources
+  * not package dirty sources
+  * package clean sources, dependencies not verified

data/Rakefile

@@ -1,5 +1,10 @@
 require 'rspec/core/rake_task'
 
+$LOAD_PATH.unshift File.join(__dir__, 'lib')
+require 'version'
+
+include Version
+
 task default: :spec
 desc 'Run the unit tests (default)'
 task spec: [:deps]
@@ -9,9 +14,7 @@ end
 
 desc 'Create a .gem package'
 task package: [:spec] do
-  git_description = `git describe --dirty`.chomp
-  fail 'Cannot package when there are uncommitted sources' if
-    git_description.end_with? 'dirty'
+  fail 'Cannot package when there are uncommitted sources' if dirty?
 
   system('rm -f *.gem ; gem build riffdiff.gemspec') || fail
 end

data/lib/refiner.rb

@@ -62,7 +62,7 @@ class Refiner
     return true
   end
 
-  def initialize(old, new)
+  def try_highlight(old, new)
     old_highlights = Set.new
     new_highlights = Set.new
     if should_highlight?(old, new)
@@ -73,6 +73,34 @@ class Refiner
       censor_highlights(old, new, old_highlights, new_highlights)
     end
 
+    return old_highlights, new_highlights
+  end
+
+  def try_highlight_initial_lines(old, new)
+    old_line_count = old.lines.count
+    new_line_count = new.lines.count
+    if old_line_count == new_line_count
+      return Set.new, Set.new
+    end
+
+    min_line_count = [old_line_count, new_line_count].min
+    if min_line_count == 0
+      return Set.new, Set.new
+    end
+
+    # Truncate old and new so they have the same number of lines
+    old = old.lines[0..(min_line_count - 1)].join
+    new = new.lines[0..(min_line_count - 1)].join
+
+    return try_highlight(old, new)
+  end
+
+  def initialize(old, new)
+    old_highlights, new_highlights = try_highlight(old, new)
+    if old_highlights.size == 0 && new_highlights.size == 0
+      old_highlights, new_highlights = try_highlight_initial_lines(old, new)
+    end
+
     @refined_old = DiffString.new('-', RED)
     old.each_char.with_index do |char, index|
       @refined_old.add(char, old_highlights.include?(index))

data/lib/version.rb

@@ -2,8 +2,9 @@ require 'English'
 
 # Methods for finding out the Riff version
 module Version
-  def git_version
-    version = `cd #{__dir__} ; git describe --dirty 2> /dev/null`.chomp
+  def git_version(dirty)
+    dirty_flag = dirty ? '--dirty' : ''
+    version = `cd #{__dir__} ; git describe #{dirty_flag} 2> /dev/null`.chomp
     if $CHILD_STATUS.success?
       return version
     else
@@ -31,9 +32,17 @@ module Version
   end
 
   def version
-    semantic_git_version = semantify_git_version(git_version)
+    semantic_git_version = semantify_git_version(git_version(false))
     return semantic_git_version unless semantic_git_version.nil?
 
     return rubygems_version
   end
+
+  def semantic_version
+    return semantify_git_version(git_version(false))
+  end
+
+  def dirty?
+    return git_version(true).include?('-dirty')
+  end
 end

data/riffdiff.gemspec

@@ -1,11 +1,11 @@
-$LOAD_PATH.unshift File.join(File.absolute_path(__dir__), 'lib')
+$LOAD_PATH.unshift File.join(__dir__, 'lib')
 require 'version'
 
 Gem::Specification.new do |s|
   extend Version
 
   s.name        = 'riffdiff'
-  s.version     = semantify_git_version(git_version)
+  s.version     = semantic_version
   s.summary     = 'A diff highlighter showing what parts of lines have changed'
   s.description = %{== Riff
 Riff is a wrapper around diff that highlights not only which lines have changed,
@@ -33,4 +33,13 @@ refined.
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = ['riff']
   s.require_paths = ['lib']
+
+  # Development is done on 2.0, and we're using at least __dir__ which requires
+  # Ruby 2.0.
+  s.required_ruby_version = '~> 2.0'
+
+  s.add_development_dependency 'rspec', '~> 3.0'
+
+  s.add_runtime_dependency 'diff-lcs', '~> 1.2.5'
+  s.add_runtime_dependency 'slop', '~> 4.1.0'
 end

data/spec/refiner_spec.rb

@@ -99,6 +99,38 @@ RSpec.describe Refiner, '#new' do
     end
   end
 
+  context %(with one line turning into many) do
+    refiner = Refiner.new("abcde\n",
+                          "abcde,\n" \
+                          "fffff,\n" \
+                          "ggggg\n")
+
+    it %(highlights the comma on the first line, but not the two extra lines) do
+      expect(refiner.refined_old.to_s).to eq(
+        %(#{RED}-abcde#{RESET}\n))
+      expect(refiner.refined_new.to_s).to eq(
+        %(#{GREEN}+abcde#{reversed(',')}\n) +
+        %(#{GREEN}+fffff,\n) +
+        %(#{GREEN}+ggggg#{RESET}\n))
+    end
+  end
+
+  context %(with many lines turning into one) do
+    refiner = Refiner.new("abcde,\n" \
+                          "fffff,\n" \
+                          "ggggg\n",
+                          "abcde\n")
+
+    it %(highlights the first removed comma, but not the two removed lines) do
+      expect(refiner.refined_old.to_s).to eq(
+        %(#{RED}-abcde#{reversed(',')}\n) +
+        %(#{RED}-fffff,\n) +
+        %(#{RED}-ggggg#{RESET}\n))
+      expect(refiner.refined_new.to_s).to eq(
+        %(#{GREEN}+abcde#{RESET}\n))
+    end
+  end
+
   context %(with large input) do
     # A Refiner that fails if trying to collect highlights
     class NonHighlightingRefiner < Refiner

data/spec/version_spec.rb

@@ -38,6 +38,6 @@ end
 
 RSpec.describe Version, '#git_version' do
   it "doesn't end in a newline" do
-    expect(git_version).to(eq(git_version.chomp))
+    expect(git_version(false)).to(eq(git_version(false).chomp))
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: riffdiff
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.22
 platform: ruby
 authors:
 - Johan Walles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
-dependencies: []
+date: 2015-06-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 description: |
   == Riff
   Riff is a wrapper around diff that highlights not only which lines have changed,
@@ -33,20 +75,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".bundle/config"
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/benchmark
-- bin/bundler
-- bin/htmldiff
-- bin/ldiff
 - bin/riff
-- bin/rspec
 - lib/colors.rb
 - lib/diff_string.rb
 - lib/options.rb
@@ -73,9 +109,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_BIN: bin

data/Gemfile.lock

@@ -1,26 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    slop (4.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  diff-lcs (~> 1.2.5)
-  rspec (~> 3.0)
-  slop (~> 4.1.0)

data/bin/bundler

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('bundler', 'bundler')

data/bin/htmldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/rspec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'rspec')