diff-lcs 1.4.1 → 1.5.0

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@
 
 require 'rubygems'
 require 'pathname'
-require 'psych'
+
+require 'psych' if RUBY_VERSION >= '1.9'
 
 if ENV['COVERAGE']
   require 'simplecov'
@@ -27,7 +28,7 @@ if ENV['COVERAGE']
   }
 
   SimpleCov.start do
-    formatter SimpleCov::Formatter::MultiFormatter[*formatters]
+    formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
   end
 end
 
@@ -43,30 +44,31 @@ module CaptureSubprocessIO
   end
 
   def capture_subprocess_io
-    _synchronize do
-      begin
-        require 'tempfile'
+    _synchronize { _capture_subprocess_io { yield } }
+  end
 
-        captured_stdout, captured_stderr = Tempfile.new('out'), Tempfile.new('err')
+  def _capture_subprocess_io
+    require 'tempfile'
 
-        orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
-        $stdout.reopen captured_stdout
-        $stderr.reopen captured_stderr
+    captured_stdout, captured_stderr = Tempfile.new('out'), Tempfile.new('err')
 
-        yield
+    orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
+    $stdout.reopen captured_stdout
+    $stderr.reopen captured_stderr
 
-        $stdout.rewind
-        $stderr.rewind
+    yield
 
-        return captured_stdout.read, captured_stderr.read
-      ensure
-        captured_stdout.unlink
-        captured_stderr.unlink
-        $stdout.reopen orig_stdout
-        $stderr.reopen orig_stderr
-      end
-    end
+    $stdout.rewind
+    $stderr.rewind
+
+    [captured_stdout.read, captured_stderr.read]
+  ensure
+    captured_stdout.unlink
+    captured_stderr.unlink
+    $stdout.reopen orig_stdout
+    $stderr.reopen orig_stderr
   end
+  private :_capture_subprocess_io
 end
 
 require 'diff-lcs'
@@ -121,8 +123,8 @@ module Diff::LCS::SpecHelper
       ],
       [
         ['-',  8, 'n'],
-        ['-',  9, 'p'],
         ['+',  9, 'r'],
+        ['-',  9, 'p'],
         ['+', 10, 's'],
         ['+', 11, 't']
       ]
@@ -146,10 +148,10 @@ module Diff::LCS::SpecHelper
       ],
       [
         ['-',  9, 'r'],
-        ['-', 10, 's'],
         ['+',  8, 'n'],
-        ['-', 11, 't'],
-        ['+',  9, 'p']
+        ['-', 10, 's'],
+        ['+',  9, 'p'],
+        ['-', 11, 't']
       ]
     ]
   end
@@ -286,7 +288,6 @@ module Diff::LCS::SpecHelper
       end
 
       def finished_b(event)
-        p 'called #finished_b'
         @done_b << [
           event.old_element, event.old_position,
           event.new_element, event.new_position

data/spec/traverse_sequences_spec.rb

@@ -127,13 +127,11 @@ describe 'Diff::LCS.traverse_sequences' do
     end
 
     it 'has done markers differently-sized sequences' do
-      expect(@callback_s1_s2.done_a).to eq([['p', 9, 's', 10]])
+      expect(@callback_s1_s2.done_a).to eq([['p', 9, 't', 11]])
       expect(@callback_s1_s2.done_b).to be_empty
 
-      # 20110731 I don't yet understand why this particular behaviour
-      # isn't transitive.
       expect(@callback_s2_s1.done_a).to be_empty
-      expect(@callback_s2_s1.done_b).to be_empty
+      expect(@callback_s2_s1.done_b).to eq([['t', 11, 'p', 9]])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
@@ -112,41 +112,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '3.23'
 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, providing a simple extension that allows for
-  Diff::LCS::Change objects to be treated implicitly as arrays. Ruby versions
-  below 2.5 are soft-deprecated.
+  This is release 1.4.3, providing a simple extension that allows for
+  Diff::LCS::Change objects to be treated implicitly as arrays and fixes a
+  number of formatting issues.
 
-  This means that older versions are no longer part of the CI test suite. If any
-  changes have been introduced that break those versions, bug reports and patches
-  will be accepted, but it will be up to the reporter to verify any fixes prior
-  to release. A future release will completely break compatibility.
+  Ruby versions below 2.5 are soft-deprecated, which means that older versions
+  are no longer part of the CI test suite. If any changes have been introduced
+  that break those versions, bug reports and patches will be accepted, but it
+  will be up to the reporter to verify any fixes prior to release. The next
+  major release will completely break compatibility.
 email:
 - halostatue@gmail.com
 executables:
@@ -171,7 +178,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- autotest/discover.rb
 - bin/htmldiff
 - bin/ldiff
 - docs/COPYING.txt
@@ -199,6 +205,21 @@ files:
 - spec/fixtures/ldiff/output.diff-e
 - spec/fixtures/ldiff/output.diff-f
 - spec/fixtures/ldiff/output.diff-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/new-chef
+- spec/fixtures/new-chef2
+- spec/fixtures/old-chef
+- spec/fixtures/old-chef2
 - spec/hunk_spec.rb
 - spec/issues_spec.rb
 - spec/lcs_spec.rb
@@ -234,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Diff::LCS computes the difference between two Enumerable sequences using

data/autotest/discover.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Autotest.add_discovery { 'rspec2' }