diff-lcs 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c970551b0fef2c712a6dbdc87453ecbd383a6c5b69f0c1e20e7525a9f4d1ef
-  data.tar.gz: 6a46ef91155a305417163c3e92503b567e47bf69413e697101b613ed8665c016
+  metadata.gz: 3aa8c326a9b00349dc45116d256c9424b59dfcc86209c2104c8e37fe3f4f2b7e
+  data.tar.gz: c322b671558bfa75c6dd01c000d433b87021bbd8fc66047042f0386366600533
 SHA512:
-  metadata.gz: 9612854483a3dc37cab0f7ec561d23c4ff2c4d190c4d526c18ae45de8c42a2b48f4809fc7da78de524703a7424b7bfd128bb6705424ffa8c139d7a8a59eea10f
-  data.tar.gz: 16586385ffdfd194afd04f1da73ba3b358b7f324f3dfa5c76b8d37e4ffee0eff257ae7c718d85164d02130c9424b04b130521f87dc4d812d9426bbba6806dfd2
+  metadata.gz: e4411d9509d05782ae5bd1a0ec75d684de3060a7722858b08075502b1719c52e7bc65931fb913d650b804bc5b0927a894514edeff907b173c1f66464e5a76454
+  data.tar.gz: 1a73c4dff58592cbf20a4bbf42493bc9dec4a02b728e6d07f6315cbdb25f1ce43fd39defff7d2799da31c759b4f7f2411e9d0c9be4a72adc4c84a38d28a7d909

data/History.md

@@ -1,5 +1,19 @@
 # History
 
+## 1.4.3 / 2020-06-29
+
+- Fixed several issues with the 1.4 on Rubies older than 2.0. Some of this was
+  providing useful shim functions to Hoe 3.x (which dropped these older
+  Rubies a while ago). Specifically:
+
+  - Removed Array#lazy from a method in Diff::LCS::Hunk.
+  - Changed some unit tests to use old-style Symbol-keyed hashes.
+  - Changed some unit test helper functions to no longer use keyword
+    parameters, but only a trailing options hash.
+  - Made the use of `psych` dependent on `RUBY_VERSION >= 1.9`.
+
+  Resolves [#63][].
+
 ## 1.4.2 / 2020-06-23
 
 - Camille Drapier fixed a small issue with RuboCop configuration. [#59][]
@@ -261,3 +275,4 @@
 [#59]: https://github.com/halostatue/diff-lcs/pull/59
 [#60]: https://github.com/halostatue/diff-lcs/issues/60
 [#61]: https://github.com/halostatue/diff-lcs/pull/61
+[#63]: https://github.com/halostatue/diff-lcs/issues/63

data/README.rdoc

@@ -12,14 +12,15 @@ 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 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.
+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.
+
+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.
 
 == Synopsis
 

data/Rakefile

@@ -6,10 +6,27 @@ require 'hoe'
 
 Hoe.plugin :bundler
 Hoe.plugin :doofus
-Hoe.plugin :email unless ENV['CI'] or ENV['TRAVIS']
 Hoe.plugin :gemspec2
 Hoe.plugin :git
-Hoe.plugin :travis
+
+if RUBY_VERSION < '1.9'
+  class Array
+    def to_h
+      Hash[*self.flatten(1)]
+    end
+  end
+
+  class Gem::Specification
+    def metadata=(*)
+    end
+  end
+
+  class Object
+    def caller_locations(*)
+      []
+    end
+  end
+end
 
 _spec = Hoe.spec 'diff-lcs' do
   developer('Austin Ziegler', 'halostatue@gmail.com')

data/lib/diff/lcs.rb

@@ -49,7 +49,7 @@ module Diff; end unless defined? Diff # rubocop:disable Style/Documentation
 #          a x b y c z p d q
 #    a b c a x b y c z
 module Diff::LCS
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end
 
 require 'diff/lcs/callbacks'

data/lib/diff/lcs/hunk.rb

@@ -20,7 +20,7 @@ class Diff::LCS::Hunk
     before = after = file_length_difference
     after += @blocks[0].diff_size
     @file_length_difference = after # The caller must get this manually
-    @max_diff_size = @blocks.lazy.map { |e| e.diff_size }.max
+    @max_diff_size = @blocks.map { |e| e.diff_size }.max
 
     # Save the start & end of each array. If the array doesn't exist (e.g.,
     # we're only adding items in this block), then figure out the line

data/spec/ldiff_spec.rb

@@ -10,10 +10,10 @@ RSpec.describe 'bin/ldiff' do
   let(:output_diff_e) { read_fixture('-e') }
   let(:output_diff_f) { read_fixture('-f') }
   let(:output_diff_u) { read_fixture('-u') }
-  let(:output_diff_chef) { read_fixture('-u', base: 'output.diff.chef') }
+  let(:output_diff_chef) { read_fixture('-u', :base => 'output.diff.chef') }
 
   specify do
-    expect(run_ldiff('-u', left: 'old-chef', right: 'new-chef')).to eq(output_diff_chef)
+    expect(run_ldiff('-u', :left => 'old-chef', :right => 'new-chef')).to eq(output_diff_chef)
   end
 
   specify do
@@ -36,8 +36,11 @@ RSpec.describe 'bin/ldiff' do
     expect(run_ldiff('-u')).to eq(output_diff_u)
   end
 
-  def read_fixture(flag = nil, base: 'output.diff')
-    clean_data(IO.binread("spec/fixtures/ldiff/#{base}#{flag}"), flag)
+  def read_fixture(flag = nil, options = {})
+    base = options.fetch(:base, 'output.diff')
+    name = "spec/fixtures/ldiff/#{base}#{flag}"
+    data = IO.__send__(IO.respond_to?(:binread) ? :binread : :read, name)
+    clean_data(data, flag)
   end
 
   def clean_data(data, flag)
@@ -69,11 +72,14 @@ RSpec.describe 'bin/ldiff' do
     )
   end
 
-  def run_ldiff(flag = nil, left: 'aX', right: 'bXaX')
+  def run_ldiff(flag = nil, options = {})
+    left = options.fetch(:left, 'aX')
+    right = options.fetch(:right, 'bXaX')
     stdout, stderr = capture_subprocess_io do
       system("ruby -Ilib bin/ldiff #{flag} spec/fixtures/#{left} spec/fixtures/#{right}")
     end
-    expect(stderr).to be_empty
+
+    expect(stderr).to be_empty if RUBY_VERSION >= '1.9'
     expect(stdout).not_to be_empty
     clean_data(stdout, flag)
   end

data/spec/spec_helper.rb

@@ -2,7 +2,9 @@
 
 require 'rubygems'
 require 'pathname'
-require 'psych'
+
+require 'psych' if RUBY_VERSION >= '1.9'
+
 
 if ENV['COVERAGE']
   require 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
@@ -139,14 +139,15 @@ description: |-
   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: