opal-rspec 0.8.0 → 1.0.0.alpha1

data/diff-lcs/upstream/spec/lcs_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Diff::LCS::Internals, ".lcs" do
+  include Diff::LCS::SpecHelper::Matchers
+
+  it "returns a meaningful LCS array with (seq1, seq2)" do
+    res = Diff::LCS::Internals.lcs(seq1, seq2)
+    # The result of the LCS (less the +nil+ values) must be as long as the
+    # correct result.
+    expect(res.compact.size).to eq(correct_lcs.size)
+    expect(res).to correctly_map_sequence(seq1).to_other_sequence(seq2)
+
+    # Compact these transformations and they should be the correct LCS.
+    x_seq1 = (0...res.size).map { |ix| res[ix] ? seq1[ix] : nil }.compact
+    x_seq2 = (0...res.size).map { |ix| res[ix] ? seq2[res[ix]] : nil }.compact
+
+    expect(x_seq1).to eq(correct_lcs)
+    expect(x_seq2).to eq(correct_lcs)
+  end
+
+  it "returns all indexes with (hello, hello)" do
+    expect(Diff::LCS::Internals.lcs(hello, hello)).to \
+      eq((0...hello.size).to_a)
+  end
+
+  it "returns all indexes with (hello_ary, hello_ary)" do
+    expect(Diff::LCS::Internals.lcs(hello_ary, hello_ary)).to \
+      eq((0...hello_ary.size).to_a)
+  end
+end
+
+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)
+    expect(res).to eq(correct_lcs)
+    expect(res.compact).to eq(res)
+  end
+
+  it "is transitive" do
+    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)
+  end
+
+  it "returns hello_ary with (hello_ary, hello_ary)" do
+    expect(Diff::LCS.LCS(hello_ary, hello_ary)).to eq(hello_ary)
+  end
+end

data/diff-lcs/upstream/spec/ldiff_spec.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "bin/ldiff" do
+  include CaptureSubprocessIO
+
+  # standard:disable Style/HashSyntax
+  fixtures = [
+    {:name => "output.diff", :left => "aX", :right => "bXaX"},
+    {:name => "output.diff.chef", :left => "old-chef", :right => "new-chef"},
+    {:name => "output.diff.chef2", :left => "old-chef2", :right => "new-chef2"}
+  ].product([nil, "-e", "-f", "-c", "-u"]).map { |(fixture, flag)|
+    fixture = fixture.dup
+    fixture[:flag] = flag
+    fixture
+  }
+  # standard:enable Style/HashSyntax
+
+  def self.test_ldiff(fixture)
+    desc = [
+      fixture[:flag],
+      "spec/fixtures/#{fixture[:left]}",
+      "spec/fixtures/#{fixture[:right]}",
+      "#",
+      "=>",
+      "spec/fixtures/ldiff/#{fixture[:name]}#{fixture[:flag]}"
+    ].join(" ")
+
+    it desc do
+      expect(run_ldiff(fixture)).to eq(read_fixture(fixture))
+    end
+  end
+
+  fixtures.each do |fixture|
+    test_ldiff(fixture)
+  end
+
+  def read_fixture(options)
+    fixture = options.fetch(:name)
+    flag = options.fetch(:flag)
+    name = "spec/fixtures/ldiff/#{fixture}#{flag}"
+    data = IO.__send__(IO.respond_to?(:binread) ? :binread : :read, name)
+    clean_data(data, flag)
+  end
+
+  def clean_data(data, flag)
+    data =
+      case flag
+      when "-c", "-u"
+        clean_output_timestamp(data)
+      else
+        data
+      end
+    data.gsub(/\r\n?/, "\n")
+  end
+
+  def clean_output_timestamp(data)
+    data.gsub(
+      %r{
+        ^
+        [-+*]{3}
+        \s*
+        spec/fixtures/(\S+)
+        \s*
+        \d{4}-\d\d-\d\d
+        \s*
+        \d\d:\d\d:\d\d(?:\.\d+)
+        \s*
+        (?:[-+]\d{4}|Z)
+      }x,
+      '*** spec/fixtures/\1	0000-00-00 :00 =>:00 =>00.000000000 -0000'
+    )
+  end
+
+  def run_ldiff(options)
+    flag = options.fetch(:flag)
+    left = options.fetch(:left)
+    right = options.fetch(:right)
+
+    stdout, stderr = capture_subprocess_io do
+      system("ruby -Ilib bin/ldiff #{flag} spec/fixtures/#{left} spec/fixtures/#{right}")
+    end
+
+    expect(stderr).to be_empty if RUBY_VERSION >= "1.9"
+    expect(stdout).not_to be_empty
+    clean_data(stdout, flag)
+  end
+end

data/diff-lcs/upstream/spec/patch_spec.rb

@@ -0,0 +1,416 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Diff::LCS.patch" do
+  include Diff::LCS::SpecHelper::Matchers
+
+  shared_examples "patch sequences correctly" do
+    it "correctly patches left-to-right (patch autodiscovery)" do
+      expect(Diff::LCS.patch(s1, patch_set)).to eq(s2)
+    end
+
+    it "correctly patches left-to-right (explicit patch)" do
+      expect(Diff::LCS.patch(s1, patch_set, :patch)).to eq(s2)
+      expect(Diff::LCS.patch!(s1, patch_set)).to eq(s2)
+    end
+
+    it "correctly patches right-to-left (unpatch autodiscovery)" do
+      expect(Diff::LCS.patch(s2, patch_set)).to eq(s1)
+    end
+
+    it "correctly patches right-to-left (explicit unpatch)" do
+      expect(Diff::LCS.patch(s2, patch_set, :unpatch)).to eq(s1)
+      expect(Diff::LCS.unpatch!(s2, patch_set)).to eq(s1)
+    end
+  end
+
+  describe "using a Diff::LCS.diff patchset" do
+    describe "an empty patchset returns the source" do
+      it "works on a string (hello)" do
+        diff = Diff::LCS.diff(hello, hello)
+        expect(Diff::LCS.patch(hello, diff)).to eq(hello)
+      end
+
+      it "works on an array %W(h e l l o)" do
+        diff = Diff::LCS.diff(hello_ary, hello_ary)
+        expect(Diff::LCS.patch(hello_ary, diff)).to eq(hello_ary)
+      end
+    end
+
+    describe "with default diff callbacks (DiffCallbacks)" do
+      describe "forward (s1 -> s2)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq1 }
+          let(:s2) { seq2 }
+          let(:patch_set) { Diff::LCS.diff(seq1, seq2) }
+        end
+      end
+
+      describe "reverse (s2 -> s1)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq2 }
+          let(:s2) { seq1 }
+          let(:patch_set) { Diff::LCS.diff(seq2, seq1) }
+        end
+      end
+    end
+
+    describe "with context diff callbacks (ContextDiffCallbacks)" do
+      describe "forward (s1 -> s2)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq1 }
+          let(:s2) { seq2 }
+          let(:patch_set) {
+            Diff::LCS.diff(seq1, seq2, Diff::LCS::ContextDiffCallbacks)
+          }
+        end
+      end
+
+      describe "reverse (s2 -> s1)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq2 }
+          let(:s2) { seq1 }
+          let(:patch_set) {
+            Diff::LCS.diff(seq2, seq1, Diff::LCS::ContextDiffCallbacks)
+          }
+        end
+      end
+    end
+
+    describe "with sdiff callbacks (SDiffCallbacks)" do
+      describe "forward (s1 -> s2)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq1 }
+          let(:s2) { seq2 }
+          let(:patch_set) {
+            Diff::LCS.diff(seq1, seq2, Diff::LCS::SDiffCallbacks)
+          }
+        end
+      end
+
+      describe "reverse (s2 -> s1)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq2 }
+          let(:s2) { seq1 }
+          let(:patch_set) {
+            Diff::LCS.diff(seq2, seq1, Diff::LCS::SDiffCallbacks)
+          }
+        end
+      end
+    end
+  end
+
+  describe "using a Diff::LCS.sdiff patchset" do
+    describe "an empty patchset returns the source" do
+      it "works on a string (hello)" do
+        expect(Diff::LCS.patch(hello, Diff::LCS.sdiff(hello, hello))).to eq(hello)
+      end
+
+      it "works on an array %W(h e l l o)" do
+        expect(Diff::LCS.patch(hello_ary, Diff::LCS.sdiff(hello_ary, hello_ary))).to eq(hello_ary)
+      end
+    end
+
+    describe "with default diff callbacks (DiffCallbacks)" do
+      describe "forward (s1 -> s2)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq1 }
+          let(:s2) { seq2 }
+          let(:patch_set) {
+            Diff::LCS.sdiff(seq1, seq2, Diff::LCS::DiffCallbacks)
+          }
+        end
+      end
+
+      describe "reverse (s2 -> s1)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq2 }
+          let(:s2) { seq1 }
+          let(:patch_set) {
+            Diff::LCS.sdiff(seq2, seq1, Diff::LCS::DiffCallbacks)
+          }
+        end
+      end
+    end
+
+    describe "with context diff callbacks (DiffCallbacks)" do
+      describe "forward (s1 -> s2)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq1 }
+          let(:s2) { seq2 }
+          let(:patch_set) {
+            Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextDiffCallbacks)
+          }
+        end
+      end
+
+      describe "reverse (s2 -> s1)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq2 }
+          let(:s2) { seq1 }
+          let(:patch_set) {
+            Diff::LCS.sdiff(seq2, seq1, Diff::LCS::ContextDiffCallbacks)
+          }
+        end
+      end
+    end
+
+    describe "with sdiff callbacks (SDiffCallbacks)" do
+      describe "forward (s1 -> s2)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq1 }
+          let(:s2) { seq2 }
+          let(:patch_set) { Diff::LCS.sdiff(seq1, seq2) }
+        end
+      end
+
+      describe "reverse (s2 -> s1)" do
+        it_has_behavior "patch sequences correctly" do
+          let(:s1) { seq2 }
+          let(:s2) { seq1 }
+          let(:patch_set) { Diff::LCS.sdiff(seq2, seq1) }
+        end
+      end
+    end
+  end
+
+  # Note: because of the error in autodiscovery ("does not autodiscover s1
+  # to s2 patches"), this cannot use the "patch sequences correctly" shared
+  # set. Once the bug in autodiscovery is fixed, this can be converted as
+  # above.
+  describe "fix bug 891: patchsets do not contain the last equal part" do
+    before :each do
+      @s1 = %w[a b c d   e f g h i j k] # rubocop:disable Layout/SpaceInsideArrayPercentLiteral
+      @s2 = %w[a b c d D e f g h i j k]
+    end
+
+    describe "using Diff::LCS.diff with default diff callbacks" do
+      before :each do
+        @patch_set_s1_s2 = Diff::LCS.diff(@s1, @s2)
+        @patch_set_s2_s1 = Diff::LCS.diff(@s2, @s1)
+      end
+
+      it "autodiscovers s1 to s2 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s1_s2)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s2_s1)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 the left-to-right patches" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1)).to eq(@s1)
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2)).to eq(@s1)
+      end
+
+      it "correctly patches left-to-right (explicit patch)" do
+        expect(Diff::LCS.patch(@s1, @patch_set_s1_s2, :patch)).to eq(@s2)
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1, :patch)).to eq(@s1)
+        expect(Diff::LCS.patch!(@s1, @patch_set_s1_s2)).to eq(@s2)
+        expect(Diff::LCS.patch!(@s2, @patch_set_s2_s1)).to eq(@s1)
+      end
+
+      it "correctly patches right-to-left (explicit unpatch)" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2, :unpatch)).to eq(@s1)
+        expect(Diff::LCS.patch(@s1, @patch_set_s2_s1, :unpatch)).to eq(@s2)
+        expect(Diff::LCS.unpatch!(@s2, @patch_set_s1_s2)).to eq(@s1)
+        expect(Diff::LCS.unpatch!(@s1, @patch_set_s2_s1)).to eq(@s2)
+      end
+    end
+
+    describe "using Diff::LCS.diff with context diff callbacks" do
+      before :each do
+        @patch_set_s1_s2 = Diff::LCS.diff(@s1, @s2, Diff::LCS::ContextDiffCallbacks)
+        @patch_set_s2_s1 = Diff::LCS.diff(@s2, @s1, Diff::LCS::ContextDiffCallbacks)
+      end
+
+      it "autodiscovers s1 to s2 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s1_s2)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s2_s1)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 the left-to-right patches" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1)).to eq(@s1)
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2)).to eq(@s1)
+      end
+
+      it "correctly patches left-to-right (explicit patch)" do
+        expect(Diff::LCS.patch(@s1, @patch_set_s1_s2, :patch)).to eq(@s2)
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1, :patch)).to eq(@s1)
+        expect(Diff::LCS.patch!(@s1, @patch_set_s1_s2)).to eq(@s2)
+        expect(Diff::LCS.patch!(@s2, @patch_set_s2_s1)).to eq(@s1)
+      end
+
+      it "correctly patches right-to-left (explicit unpatch)" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2, :unpatch)).to eq(@s1)
+        expect(Diff::LCS.patch(@s1, @patch_set_s2_s1, :unpatch)).to eq(@s2)
+        expect(Diff::LCS.unpatch!(@s2, @patch_set_s1_s2)).to eq(@s1)
+        expect(Diff::LCS.unpatch!(@s1, @patch_set_s2_s1)).to eq(@s2)
+      end
+    end
+
+    describe "using Diff::LCS.diff with sdiff callbacks" do
+      before(:each) do
+        @patch_set_s1_s2 = Diff::LCS.diff(@s1, @s2, Diff::LCS::SDiffCallbacks)
+        @patch_set_s2_s1 = Diff::LCS.diff(@s2, @s1, Diff::LCS::SDiffCallbacks)
+      end
+
+      it "autodiscovers s1 to s2 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s1_s2)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s2_s1)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 the left-to-right patches" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1)).to eq(@s1)
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2)).to eq(@s1)
+      end
+
+      it "correctly patches left-to-right (explicit patch)" do
+        expect(Diff::LCS.patch(@s1, @patch_set_s1_s2, :patch)).to eq(@s2)
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1, :patch)).to eq(@s1)
+        expect(Diff::LCS.patch!(@s1, @patch_set_s1_s2)).to eq(@s2)
+        expect(Diff::LCS.patch!(@s2, @patch_set_s2_s1)).to eq(@s1)
+      end
+
+      it "correctly patches right-to-left (explicit unpatch)" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2, :unpatch)).to eq(@s1)
+        expect(Diff::LCS.patch(@s1, @patch_set_s2_s1, :unpatch)).to eq(@s2)
+        expect(Diff::LCS.unpatch!(@s2, @patch_set_s1_s2)).to eq(@s1)
+        expect(Diff::LCS.unpatch!(@s1, @patch_set_s2_s1)).to eq(@s2)
+      end
+    end
+
+    describe "using Diff::LCS.sdiff with default sdiff callbacks" do
+      before(:each) do
+        @patch_set_s1_s2 = Diff::LCS.sdiff(@s1, @s2)
+        @patch_set_s2_s1 = Diff::LCS.sdiff(@s2, @s1)
+      end
+
+      it "autodiscovers s1 to s2 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s1_s2)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s2_s1)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 the left-to-right patches" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1)).to eq(@s1)
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2)).to eq(@s1)
+      end
+
+      it "correctly patches left-to-right (explicit patch)" do
+        expect(Diff::LCS.patch(@s1, @patch_set_s1_s2, :patch)).to eq(@s2)
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1, :patch)).to eq(@s1)
+        expect(Diff::LCS.patch!(@s1, @patch_set_s1_s2)).to eq(@s2)
+        expect(Diff::LCS.patch!(@s2, @patch_set_s2_s1)).to eq(@s1)
+      end
+
+      it "correctly patches right-to-left (explicit unpatch)" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2, :unpatch)).to eq(@s1)
+        expect(Diff::LCS.patch(@s1, @patch_set_s2_s1, :unpatch)).to eq(@s2)
+        expect(Diff::LCS.unpatch!(@s2, @patch_set_s1_s2)).to eq(@s1)
+        expect(Diff::LCS.unpatch!(@s1, @patch_set_s2_s1)).to eq(@s2)
+      end
+    end
+
+    describe "using Diff::LCS.sdiff with context diff callbacks" do
+      before(:each) do
+        @patch_set_s1_s2 = Diff::LCS.sdiff(@s1, @s2, Diff::LCS::ContextDiffCallbacks)
+        @patch_set_s2_s1 = Diff::LCS.sdiff(@s2, @s1, Diff::LCS::ContextDiffCallbacks)
+      end
+
+      it "autodiscovers s1 to s2 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s1_s2)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s2_s1)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 the left-to-right patches" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1)).to eq(@s1)
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2)).to eq(@s1)
+      end
+
+      it "correctly patches left-to-right (explicit patch)" do
+        expect(Diff::LCS.patch(@s1, @patch_set_s1_s2, :patch)).to eq(@s2)
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1, :patch)).to eq(@s1)
+        expect(Diff::LCS.patch!(@s1, @patch_set_s1_s2)).to eq(@s2)
+        expect(Diff::LCS.patch!(@s2, @patch_set_s2_s1)).to eq(@s1)
+      end
+
+      it "correctly patches right-to-left (explicit unpatch)" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2, :unpatch)).to eq(@s1)
+        expect(Diff::LCS.patch(@s1, @patch_set_s2_s1, :unpatch)).to eq(@s2)
+        expect(Diff::LCS.unpatch!(@s2, @patch_set_s1_s2)).to eq(@s1)
+        expect(Diff::LCS.unpatch!(@s1, @patch_set_s2_s1)).to eq(@s2)
+      end
+    end
+
+    describe "using Diff::LCS.sdiff with default diff callbacks" do
+      before(:each) do
+        @patch_set_s1_s2 = Diff::LCS.sdiff(@s1, @s2, Diff::LCS::DiffCallbacks)
+        @patch_set_s2_s1 = Diff::LCS.sdiff(@s2, @s1, Diff::LCS::DiffCallbacks)
+      end
+
+      it "autodiscovers s1 to s2 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s1_s2)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 patches" do
+        expect do
+          expect(Diff::LCS.patch(@s1, @patch_set_s2_s1)).to eq(@s2)
+        end.to_not raise_error
+      end
+
+      it "autodiscovers s2 to s1 the left-to-right patches" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1)).to eq(@s1)
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2)).to eq(@s1)
+      end
+
+      it "correctly patches left-to-right (explicit patch)" do
+        expect(Diff::LCS.patch(@s1, @patch_set_s1_s2, :patch)).to eq(@s2)
+        expect(Diff::LCS.patch(@s2, @patch_set_s2_s1, :patch)).to eq(@s1)
+        expect(Diff::LCS.patch!(@s1, @patch_set_s1_s2)).to eq(@s2)
+        expect(Diff::LCS.patch!(@s2, @patch_set_s2_s1)).to eq(@s1)
+      end
+
+      it "correctly patches right-to-left (explicit unpatch)" do
+        expect(Diff::LCS.patch(@s2, @patch_set_s1_s2, :unpatch)).to eq(@s1)
+        expect(Diff::LCS.patch(@s1, @patch_set_s2_s1, :unpatch)).to eq(@s2)
+        expect(Diff::LCS.unpatch!(@s2, @patch_set_s1_s2)).to eq(@s1)
+        expect(Diff::LCS.unpatch!(@s1, @patch_set_s2_s1)).to eq(@s2)
+      end
+    end
+  end
+end