diff-lcs 1.6.1 → 2.0.0.beta.1

data/licenses/dco.txt

@@ -0,0 +1,34 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.

data/spec/hunk_spec.rb

@@ -56,17 +56,6 @@ if String.method_defined?(:encoding)
       expect(hunk.diff(:old)).to eq(expected)
     end
 
-    it "produces a reverse ed diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^ +/, "").encode("UTF-16LE").chomp
-        c1
-        Tu a un carte avec {count} items
-        .
-
-      EXPECTED
-
-      expect(hunk.diff(:reverse_ed)).to eq(expected)
-    end
-
     context "with empty first data set" do
       let(:old_data) { [] }
 

data/spec/lcs_spec.rb

@@ -31,26 +31,26 @@ describe Diff::LCS::Internals, ".lcs" do
   end
 end
 
-describe Diff::LCS, ".LCS" do
+describe Diff::LCS, ".lcs" do
   include Diff::LCS::SpecHelper::Matchers
 
-  it "returns the correct compacted values from Diff::LCS.LCS" do
-    res = Diff::LCS.LCS(seq1, seq2)
+  it "returns the correct compacted values from Diff::LCS.lcs" do
+    res = Diff::LCS.lcs(seq1, seq2)
     expect(res).to eq(correct_lcs)
     expect(res.compact).to eq(res)
   end
 
   it "is transitive" do
-    res = Diff::LCS.LCS(seq2, seq1)
+    res = Diff::LCS.lcs(seq2, seq1)
     expect(res).to eq(correct_lcs)
     expect(res.compact).to eq(res)
   end
 
   it "returns %W(h e l l o) with (hello, hello)" do
-    expect(Diff::LCS.LCS(hello, hello)).to eq(hello.chars)
+    expect(Diff::LCS.lcs(hello, hello)).to eq(hello.chars)
   end
 
   it "returns hello_ary with (hello_ary, hello_ary)" do
-    expect(Diff::LCS.LCS(hello_ary, hello_ary)).to eq(hello_ary)
+    expect(Diff::LCS.lcs(hello_ary, hello_ary)).to eq(hello_ary)
   end
 end

data/spec/ldiff_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe "bin/ldiff" do
     {:name => "diff.bin2", :left => "file1.bin", :right => "file2.bin", :diff => 1},
     {:name => "diff.chef", :left => "old-chef", :right => "new-chef", :diff => 1},
     {:name => "diff.chef2", :left => "old-chef2", :right => "new-chef2", :diff => 1}
-  ].product([nil, "-e", "-f", "-c", "-u"]).map { |(fixture, flag)|
+  ].product([nil, "-c", "-u"]).map { |(fixture, flag)|
     fixture = fixture.dup
     fixture[:flag] = flag
     fixture

data/spec/spec_helper.rb

@@ -5,24 +5,22 @@ require "pathname"
 
 require "psych" if RUBY_VERSION >= "1.9"
 
-if ENV["COVERAGE"]
-  require "simplecov"
-  require "simplecov-lcov"
+require "simplecov"
+require "simplecov-lcov"
 
-  SimpleCov::Formatter::LcovFormatter.config do |config|
-    config.report_with_single_file = true
-    config.lcov_file_name = "lcov.info"
-  end
+SimpleCov::Formatter::LcovFormatter.config do |config|
+  config.report_with_single_file = true
+  config.lcov_file_name = "lcov.info"
+end
 
-  SimpleCov.start "test_frameworks" do
-    enable_coverage :branch
-    primary_coverage :branch
-    formatter SimpleCov::Formatter::MultiFormatter.new([
-      SimpleCov::Formatter::HTMLFormatter,
-      SimpleCov::Formatter::LcovFormatter,
-      SimpleCov::Formatter::SimpleFormatter
-    ])
-  end
+SimpleCov.start "test_frameworks" do
+  enable_coverage :branch
+  primary_coverage :branch
+  formatter SimpleCov::Formatter::MultiFormatter.new([
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter,
+    SimpleCov::Formatter::SimpleFormatter
+  ])
 end
 
 file = Pathname.new(__FILE__).expand_path

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Austin Ziegler
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
@@ -29,28 +29,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: hoe-rubygems
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,12 +103,82 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+- !ruby/object:Gem::Dependency
+  name: standard-thread_safety
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fasterer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: |-
   Diff::LCS computes the difference between two Enumerable sequences using the
   McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
   to create a simple HTML diff output format and a standard diff-like tool.
 
-  This is release 1.4.3, providing a simple extension that allows for
+  This is release 1.6.1, providing a simple extension that allows for
   Diff::LCS::Change objects to be treated implicitly as arrays and fixes a number
   of formatting issues.
 
@@ -128,7 +190,6 @@ description: |-
 email:
 - halostatue@gmail.com
 executables:
-- htmldiff
 - ldiff
 extensions: []
 extra_rdoc_files:
@@ -140,10 +201,10 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 - SECURITY.md
-- docs/COPYING.txt
-- docs/artistic.txt
+- licenses/COPYING.txt
+- licenses/artistic.txt
+- licenses/dco.txt
 files:
-- ".rspec"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -153,24 +214,21 @@ files:
 - README.md
 - Rakefile
 - SECURITY.md
-- bin/htmldiff
 - bin/ldiff
-- docs/COPYING.txt
-- docs/artistic.txt
 - lib/diff-lcs.rb
 - lib/diff/lcs.rb
 - lib/diff/lcs/array.rb
-- lib/diff/lcs/backports.rb
 - lib/diff/lcs/block.rb
 - lib/diff/lcs/callbacks.rb
 - lib/diff/lcs/change.rb
-- lib/diff/lcs/htmldiff.rb
 - lib/diff/lcs/hunk.rb
 - lib/diff/lcs/internals.rb
 - lib/diff/lcs/ldiff.rb
 - lib/diff/lcs/string.rb
 - lib/diff/lcs/version.rb
-- mise.toml
+- licenses/COPYING.txt
+- licenses/artistic.txt
+- licenses/dco.txt
 - spec/change_spec.rb
 - spec/diff_spec.rb
 - spec/fixtures/123_x
@@ -196,8 +254,6 @@ files:
 - spec/fixtures/ldiff/error.diff.missing_new_line2-f
 - spec/fixtures/ldiff/output.diff
 - spec/fixtures/ldiff/output.diff-c
-- spec/fixtures/ldiff/output.diff-e
-- spec/fixtures/ldiff/output.diff-f
 - spec/fixtures/ldiff/output.diff-u
 - spec/fixtures/ldiff/output.diff.bin1
 - spec/fixtures/ldiff/output.diff.bin1-c
@@ -211,14 +267,10 @@ files:
 - spec/fixtures/ldiff/output.diff.bin2-u
 - spec/fixtures/ldiff/output.diff.chef
 - spec/fixtures/ldiff/output.diff.chef-c
-- spec/fixtures/ldiff/output.diff.chef-e
-- spec/fixtures/ldiff/output.diff.chef-f
 - spec/fixtures/ldiff/output.diff.chef-u
 - spec/fixtures/ldiff/output.diff.chef2
 - spec/fixtures/ldiff/output.diff.chef2-c
 - spec/fixtures/ldiff/output.diff.chef2-d
-- spec/fixtures/ldiff/output.diff.chef2-e
-- spec/fixtures/ldiff/output.diff.chef2-f
 - spec/fixtures/ldiff/output.diff.chef2-u
 - spec/fixtures/ldiff/output.diff.empty.vs.four_lines
 - spec/fixtures/ldiff/output.diff.empty.vs.four_lines-c
@@ -278,14 +330,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.8'
+      version: 3.2.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Diff::LCS computes the difference between two Enumerable sequences using
   the McIlroy-Hunt longest common subsequence (LCS) algorithm

data/.rspec

@@ -1 +0,0 @@
---colour

data/bin/htmldiff

@@ -1,35 +0,0 @@
-#! /usr/bin/env ruby -w
-# frozen_string_literal: true
-
-require "diff/lcs"
-require "diff/lcs/htmldiff"
-
-begin
-  require "text/format"
-rescue LoadError
-  Diff::LCS::HTMLDiff.can_expand_tabs = false
-end
-
-if ARGV.size < 2 or ARGV.size > 3
-  warn "usage: #{File.basename($0)} old new [output.html]"
-  warn "       #{File.basename($0)} old new > output.html"
-  exit 127
-end
-
-left = IO.read(ARGV[0]).split($/)
-right = IO.read(ARGV[1]).split($/)
-
-options = { :title => "diff #{ARGV[0]} #{ARGV[1]}" }
-
-htmldiff = Diff::LCS::HTMLDiff.new(left, right, options)
-
-if ARGV[2]
-  File.open(ARGV[2], "w") do |f|
-    htmldiff.options[:output] = f
-    htmldiff.run
-  end
-else
-  htmldiff.run
-end
-
-# vim: ft=ruby

data/lib/diff/lcs/backports.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-unless 0.respond_to?(:positive?)
-  class Fixnum # standard:disable Lint/UnifiedInteger
-    def positive?
-      self > 0
-    end
-  end
-end

data/lib/diff/lcs/htmldiff.rb

@@ -1,160 +0,0 @@
-# frozen_string_literal: true
-
-require "cgi"
-
-# Produce a simple HTML diff view.
-class Diff::LCS::HTMLDiff
-  class << self
-    # standard:disable ThreadSafety/ClassAndModuleAttributes
-    attr_accessor :can_expand_tabs # :nodoc:
-    # standard:enable ThreadSafety/ClassAndModuleAttributes
-  end
-  self.can_expand_tabs = true
-
-  class Callbacks # :nodoc:
-    attr_accessor :output
-    attr_accessor :match_class
-    attr_accessor :only_a_class
-    attr_accessor :only_b_class
-
-    def initialize(output, options = {})
-      @output = output
-      options ||= {}
-
-      @match_class = options[:match_class] || "match"
-      @only_a_class = options[:only_a_class] || "only_a"
-      @only_b_class = options[:only_b_class] || "only_b"
-    end
-
-    def htmlize(element, css_class)
-      element = "&nbsp;" if element.empty?
-      %(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
-    end
-    private :htmlize
-
-    # This will be called with both lines are the same
-    def match(event)
-      @output << htmlize(event.old_element, :match_class)
-    end
-
-    # This will be called when there is a line in A that isn't in B
-    def discard_a(event)
-      @output << htmlize(event.old_element, :only_a_class)
-    end
-
-    # This will be called when there is a line in B that isn't in A
-    def discard_b(event)
-      @output << htmlize(event.new_element, :only_b_class)
-    end
-  end
-
-  # standard:disable Style/HashSyntax
-  DEFAULT_OPTIONS = {
-    :expand_tabs => nil,
-    :output => nil,
-    :css => nil,
-    :title => nil
-  }.freeze
-  # standard:enable Style/HashSyntax
-
-  # standard:disable Layout/HeredocIndentation
-  DEFAULT_CSS = <<-CSS
-body { margin: 0; }
-.diff
-{
-  border: 1px solid black;
-  margin: 1em 2em;
-}
-p
-{
-  margin-left: 2em;
-}
-pre
-{
-  padding-left: 1em;
-  margin: 0;
-  font-family: Inconsolata, Consolas, Lucida, Courier, monospaced;
-	white-space: pre;
-}
-.match { }
-.only_a
-{
-  background-color: #fdd;
-  color: red;
-  text-decoration: line-through;
-}
-.only_b
-{
-  background-color: #ddf;
-  color: blue;
-  border-left: 3px solid blue
-}
-h1 { margin-left: 2em; }
-  CSS
-  # standard:enable Layout/HeredocIndentation
-
-  def initialize(left, right, options = nil)
-    @left = left
-    @right = right
-    @options = options
-
-    @options = DEFAULT_OPTIONS.dup if @options.nil?
-  end
-
-  def verify_options
-    @options[:expand_tabs] ||= 4
-    @options[:expand_tabs] = 4 if @options[:expand_tabs].negative?
-
-    @options[:output] ||= $stdout
-
-    @options[:css] ||= DEFAULT_CSS.dup
-
-    @options[:title] ||= "diff"
-  end
-  private :verify_options
-
-  attr_reader :options
-
-  def run
-    verify_options
-
-    if @options[:expand_tabs].positive? && self.class.can_expand_tabs
-      formatter = Text::Format.new
-      formatter.tabstop = @options[:expand_tabs]
-
-      @left.map! { |line| formatter.expand(line.chomp) }
-      @right.map! { |line| formatter.expand(line.chomp) }
-    end
-
-    @left.map! { |line| CGI.escapeHTML(line.chomp) }
-    @right.map! { |line| CGI.escapeHTML(line.chomp) }
-
-    # standard:disable Layout/HeredocIndentation
-    @options[:output] << <<-OUTPUT
-<html>
-  <head>
-    <title>#{@options[:title]}</title>
-    <style type="text/css">
-    #{@options[:css]}
-    </style>
-  </head>
-  <body>
-    <h1>#{@options[:title]}</h1>
-    <p>Legend: <span class="only_a">Only in Old</span>&nbsp;
-    <span class="only_b">Only in New</span></p>
-    <div class="diff">
-    OUTPUT
-    # standard:enable Layout/HeredocIndentation
-
-    callbacks = Callbacks.new(@options[:output])
-    Diff::LCS.traverse_sequences(@left, @right, callbacks)
-
-    # standard:disable Layout/HeredocIndentation
-    @options[:output] << <<-OUTPUT
-    </div>
-  </body>
-</html>
-    OUTPUT
-    # standard:enable Layout/HeredocIndentation
-  end
-end

data/mise.toml

@@ -1,5 +0,0 @@
-[tools]
-ruby = "3.4"
-
-[env]
-MAINTENANCE = "true"

data/spec/fixtures/ldiff/output.diff-e

@@ -1,3 +0,0 @@
-1c
-bXaX
-.

data/spec/fixtures/ldiff/output.diff-f

@@ -1,3 +0,0 @@
-c1
-bXaX
-.

data/spec/fixtures/ldiff/output.diff.chef-e

@@ -1,3 +0,0 @@
-3c
-  "description": "lo"
-.

data/spec/fixtures/ldiff/output.diff.chef-f

@@ -1,3 +0,0 @@
-c3
-  "description": "lo"
-.

data/spec/fixtures/ldiff/output.diff.chef2-e

@@ -1,7 +0,0 @@
-14a
-recipe[o::new]
-recipe[p::new]
-recipe[q::new]
-recipe[r::new]
-.
-2d

data/spec/fixtures/ldiff/output.diff.chef2-f

@@ -1,7 +0,0 @@
-d2
-a14
-recipe[o::new]
-recipe[p::new]
-recipe[q::new]
-recipe[r::new]
-.