udiff 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a27ebf3406c05f249c900c3c2ffad8473ab48c39a768e14246d7d5f4c8ebd4
-  data.tar.gz: 5550f665f2bfd0533e60be40fef3f764fe72244e85c1cd10628f2f5bd2116890
+  metadata.gz: e18cdaccdf54e1f73c844d4d7bd98f5bec6607ea305717d1add7841315fef145
+  data.tar.gz: bbdd0bbcd99ac0ef3f715ede13cc7d90258a0de050392a857f2503a1acedec16
 SHA512:
-  metadata.gz: 01a7163b270071880ee6f4e550b70e737f891011efff3331c8e6cbc95e051bd667da30474744240887cb3ca31bbf363f444ce82b283bad3441716e3749676ac2
-  data.tar.gz: cfe719370e4f07846e93957be09bcbd176208009c59a49bae94ff5135788aa6ca1d1568a5e4b7d965acc1a2bc796aa22d00620d511aa16d1a681afbae6530c15
+  metadata.gz: afaac65708b052338b1eff55688cde62f8e1ff78d19fd436957c9388248582201040a80255aa89bbbfb649706c9d3f0cd42f585c35b1a8171732e03079ed8681
+  data.tar.gz: 2f56bb6d86439a5a506fafa1e8afe77ae84ffc9cd8b00b20e535156b5b0d4d4b6dc2f4ab75c3f2619e058c5b2bfbb4ea7d72bc3f1d071e473ab030a78772242a

data/README.md

@@ -1,6 +1,7 @@
 # udiff
 
 [![CI](https://github.com/winebarrel/udiff/actions/workflows/ci.yml/badge.svg)](https://github.com/winebarrel/udiff/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/udiff.svg)](https://badge.fury.io/rb/udiff)
 
 Pure Ruby unified diff library. No external dependencies, no shelling out to `diff`.
 
@@ -58,3 +59,11 @@ Produces ANSI-colored output:
 # Show 1 line of context instead of the default 3
 puts Udiff::Diff.new(a, b, context: 1).to_s
 ```
+
+### With diff info headers
+
+By default, file headers (`--- a` / `+++ b`) and hunk headers (`@@ ... @@`) are not included. To include them:
+
+```ruby
+puts Udiff::Diff.new(a, b, include_diff_info: true).to_s
+```

data/lib/udiff/diff.rb

@@ -12,10 +12,11 @@ module Udiff
       reset: "\033[0m"
     }.freeze
 
-    def initialize(string1, string2, context: DEFAULT_CONTEXT)
+    def initialize(string1, string2, context: DEFAULT_CONTEXT, include_diff_info: false)
       @lines1 = split_lines(string1)
       @lines2 = split_lines(string2)
       @context = context
+      @include_diff_info = include_diff_info
     end
 
     def to_s(format = :text)
@@ -24,10 +25,12 @@ module Udiff
       return "" if hunks.empty?
 
       out = +""
-      out << colorize("--- a", :header, format) << "\n"
-      out << colorize("+++ b", :header, format) << "\n"
+      if @include_diff_info
+        out << colorize("--- a", :header, format) << "\n"
+        out << colorize("+++ b", :header, format) << "\n"
+      end
       hunks.each do |hunk|
-        out << format_hunk(hunk, format)
+        out << format_hunk(hunk, format, @include_diff_info)
       end
       out
     end
@@ -199,7 +202,7 @@ module Udiff
       "#{code}#{text}#{ANSI_COLORS[:reset]}"
     end
 
-    def format_hunk(hunk, format)
+    def format_hunk(hunk, format, include_diff_info)
       old_start = hunk[:old_start] + 1
       new_start = hunk[:new_start] + 1
       old_count = 0
@@ -222,8 +225,12 @@ module Udiff
         end
       end
 
-      header = colorize("@@ -#{old_start},#{old_count} +#{new_start},#{new_count} @@", :hunk_header, format)
-      "#{header}\n#{lines.join}"
+      if include_diff_info
+        header = colorize("@@ -#{old_start},#{old_count} +#{new_start},#{new_count} @@", :hunk_header, format)
+        "#{header}\n#{lines.join}"
+      else
+        lines.join
+      end
     end
 
     def ensure_newline(line)

data/lib/udiff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Udiff
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udiff
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - winebarrel