riffdiff 1.0.32 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a903c564f968253a85a9e511353e4bea5cdb53e2
-  data.tar.gz: f6348bd244e212c8c63239f7534c16eb8854e453
+  metadata.gz: bcb6d863874cfd88533c0efabba5b2b475fab716
+  data.tar.gz: 907345ad32b196b83ed2287cfe77e4c65b6747ce
 SHA512:
-  metadata.gz: 073ae0437959a08a2c62fa0e44ec1f49f828b06ee9b900648bf6b030ce6fe2c33fc6a3c46dc666a85be829a9a7e530a550082be5809bae1fe0d4d895dd25aa14
-  data.tar.gz: 4e35509f4eefd273ae0dc218798cc8f22bfe1bd6dd8eba4369b9bce8135f09c531e8aba18b212c70dfbd45e7e7aedd7b5933479e25c1f5526a98997a30374192
+  metadata.gz: 3f3ca9298aa7fbf023c80b5326b77911ca5dcc0c9d09b52bbd43d3d54ecd064c78ae9326ea42376f49415e0807ac0b549ab005f34e05c8c3fead907b252fcee8
+  data.tar.gz: 266d9594e38e8ec4254eddab4fc697a6f1a265d3b3e32a85260fef146a47b16b4c71fb179d55ff9b7993c52f3259b5529ab478c19dc2502edbd29c75b7c242f2

data/README.md

@@ -128,3 +128,4 @@ globally on the system.
     * 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`
+* Handle plain non-git diff files

data/lib/riff.rb

@@ -9,6 +9,7 @@ require 'diff_string'
 class Riff
   DIFF_HEADER = /^diff /
   DIFF_HUNK_HEADER = /^@@ /
+  DIFF_REPLACED_FILE_HEADER = /^---/
 
   DIFF_ADDED = /^\+(.*)/
   DIFF_REMOVED = /^-(.*)/
@@ -38,6 +39,8 @@ class Riff
   def handle_initial_line(line)
     if line =~ DIFF_HEADER
       @state = :diff_header
+    elsif line =~ DIFF_REPLACED_FILE_HEADER
+      @state = :diff_header
     end
   end
 

data/spec/plain.diff

@@ -0,0 +1,24 @@
+--- srvadmin~7.1.0-1/openmanage/oma/ini/omcli.ini       2012-08-03 08:13:20.000000000 -0600
++++ /etc/opt/dell/srvadmin/openmanage/oma/ini/omcli.ini 2012-10-29 02:46:45.993168082 -0600
+@@ -63,8 +63,8 @@
+ recovery=sngl,cdll,sysclp
+ shutdown=sngl,cdll,sysclp
+ thrmshutdown=sngl,cdll,sysclp
+-summary=mult,oma,common,Summary.xsl,cdll,sysclp,cdll,chaclp,cdll,ssclp
+-version=mult,oma,cli,Summary.xsl,cdll,sysclp,cdll,ssclp
++summary=mult,oma,common,Summary.xsl,cdll,sysclp,cdll,chaclp
++version=mult,oma,cli,Summary.xsl,cdll,sysclp
+ validate=sngl,cdll,sysclp
+ progress=sngl,cdll,sysclp
+ [omreport chassis]
+@@ -146,8 +146,8 @@
+ recovery=sngl,cdll,sysclp
+ shutdown=sngl,cdll,sysclp
+ thrmshutdown=sngl,cdll,sysclp
+-summary=mult,oma,common,Summary.xsl,cdll,sysclp,cdll,chaclp,cdll,ssclp
+-version=mult,oma,cli,Summary.xsl,cdll,sysclp,cdll,ssclp
++summary=mult,oma,common,Summary.xsl,cdll,sysclp,cdll,chaclp
++version=mult,oma,cli,Summary.xsl,cdll,sysclp
+ validate=sngl,cdll,sysclp
+ progress=sngl,cdll,sysclp
+ [omreport mainsystem]t mainsystem]

data/spec/riff_spec.rb

@@ -42,4 +42,26 @@ RSpec.describe Riff, '#handle_diff_line' do
           .split("\n", -1))
     end
   end
+
+  context 'Plain non-git diff output' do
+    highlighted =
+      Riff.new.do_stream(
+        File.open(File.join(__dir__, 'plain.diff')))
+
+    it 'starts with a bold line' do
+      expect(highlighted).to start_with("#{BOLD}---")
+    end
+
+    it 'contains a cyan @@ line' do
+      expect(highlighted).to include("\n#{CYAN}@@ ")
+    end
+
+    it 'contains a red - line' do
+      expect(highlighted).to include("\n#{RED}-")
+    end
+
+    it 'contains a green + line' do
+      expect(highlighted).to include("\n#{GREEN}+")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riffdiff
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.36
 platform: ruby
 authors:
 - Johan Walles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,6 +124,7 @@ files:
 - spec/colors_spec.rb
 - spec/diff_string_spec.rb
 - spec/no-newline-at-eof-context.diff
+- spec/plain.diff
 - spec/refiner_spec.rb
 - spec/removed-newline-at-eof.diff
 - spec/riff_spec.rb
@@ -157,6 +158,7 @@ test_files:
 - spec/colors_spec.rb
 - spec/diff_string_spec.rb
 - spec/no-newline-at-eof-context.diff
+- spec/plain.diff
 - spec/refiner_spec.rb
 - spec/removed-newline-at-eof.diff
 - spec/riff_spec.rb