diff-lcs 1.5.0 → 1.5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/Contributing.md +2 -0
  3. data/History.md +86 -55
  4. data/License.md +6 -4
  5. data/Rakefile +36 -27
  6. data/bin/htmldiff +4 -4
  7. data/lib/diff/lcs/array.rb +1 -1
  8. data/lib/diff/lcs/backports.rb +2 -2
  9. data/lib/diff/lcs/block.rb +4 -4
  10. data/lib/diff/lcs/callbacks.rb +9 -7
  11. data/lib/diff/lcs/change.rb +19 -19
  12. data/lib/diff/lcs/htmldiff.rb +24 -16
  13. data/lib/diff/lcs/hunk.rb +35 -30
  14. data/lib/diff/lcs/internals.rb +17 -17
  15. data/lib/diff/lcs/ldiff.rb +37 -35
  16. data/lib/diff/lcs.rb +57 -55
  17. data/lib/diff-lcs.rb +1 -1
  18. data/spec/change_spec.rb +50 -50
  19. data/spec/diff_spec.rb +14 -14
  20. data/spec/hunk_spec.rb +19 -19
  21. data/spec/issues_spec.rb +48 -42
  22. data/spec/lcs_spec.rb +11 -11
  23. data/spec/ldiff_spec.rb +13 -11
  24. data/spec/patch_spec.rb +84 -84
  25. data/spec/sdiff_spec.rb +111 -109
  26. data/spec/spec_helper.rb +76 -74
  27. data/spec/traverse_balanced_spec.rb +191 -189
  28. data/spec/traverse_sequences_spec.rb +31 -31
  29. metadata +28 -21
data/spec/traverse_sequences_spec.rb CHANGED
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spec_helper'
3
+ require "spec_helper"
4
4
 
5
- describe 'Diff::LCS.traverse_sequences' do
6
- describe 'callback with no finishers' do
7
- describe 'over (seq1, seq2)' do
5
+ describe "Diff::LCS.traverse_sequences" do
6
+ describe "callback with no finishers" do
7
+ describe "over (seq1, seq2)" do
8
8
  before(:each) do
9
9
  @callback_s1_s2 = simple_callback_no_finishers
10
10
  Diff::LCS.traverse_sequences(seq1, seq2, @callback_s1_s2)
@@ -13,27 +13,27 @@ describe 'Diff::LCS.traverse_sequences' do
13
13
  Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
14
14
  end
15
15
 
16
- it 'has the correct LCS result on left-matches' do
16
+ it "has the correct LCS result on left-matches" do
17
17
  expect(@callback_s1_s2.matched_a).to eq(correct_lcs)
18
18
  expect(@callback_s2_s1.matched_a).to eq(correct_lcs)
19
19
  end
20
20
 
21
- it 'has the correct LCS result on right-matches' do
21
+ it "has the correct LCS result on right-matches" do
22
22
  expect(@callback_s1_s2.matched_b).to eq(correct_lcs)
23
23
  expect(@callback_s2_s1.matched_b).to eq(correct_lcs)
24
24
  end
25
25
 
26
- it 'has the correct skipped sequences with the left sequence' do
26
+ it "has the correct skipped sequences with the left sequence" do
27
27
  expect(@callback_s1_s2.discards_a).to eq(skipped_seq1)
28
28
  expect(@callback_s2_s1.discards_a).to eq(skipped_seq2)
29
29
  end
30
30
 
31
- it 'has the correct skipped sequences with the right sequence' do
31
+ it "has the correct skipped sequences with the right sequence" do
32
32
  expect(@callback_s1_s2.discards_b).to eq(skipped_seq2)
33
33
  expect(@callback_s2_s1.discards_b).to eq(skipped_seq1)
34
34
  end
35
35
 
36
- it 'does not have anything done markers from the left or right sequences' do
36
+ it "does not have anything done markers from the left or right sequences" do
37
37
  expect(@callback_s1_s2.done_a).to be_empty
38
38
  expect(@callback_s1_s2.done_b).to be_empty
39
39
  expect(@callback_s2_s1.done_a).to be_empty
@@ -41,64 +41,64 @@ describe 'Diff::LCS.traverse_sequences' do
41
41
  end
42
42
  end
43
43
 
44
- describe 'over (hello, hello)' do
44
+ describe "over (hello, hello)" do
45
45
  before(:each) do
46
46
  @callback = simple_callback_no_finishers
47
47
  Diff::LCS.traverse_sequences(hello, hello, @callback)
48
48
  end
49
49
 
50
- it 'has the correct LCS result on left-matches' do
51
- expect(@callback.matched_a).to eq(hello.split(//))
50
+ it "has the correct LCS result on left-matches" do
51
+ expect(@callback.matched_a).to eq(hello.chars)
52
52
  end
53
53
 
54
- it 'has the correct LCS result on right-matches' do
55
- expect(@callback.matched_b).to eq(hello.split(//))
54
+ it "has the correct LCS result on right-matches" do
55
+ expect(@callback.matched_b).to eq(hello.chars)
56
56
  end
57
57
 
58
- it 'has the correct skipped sequences with the left sequence', :only => true do
58
+ it "has the correct skipped sequences with the left sequence" do
59
59
  expect(@callback.discards_a).to be_empty
60
60
  end
61
61
 
62
- it 'has the correct skipped sequences with the right sequence' do
62
+ it "has the correct skipped sequences with the right sequence" do
63
63
  expect(@callback.discards_b).to be_empty
64
64
  end
65
65
 
66
- it 'does not have anything done markers from the left or right sequences' do
66
+ it "does not have anything done markers from the left or right sequences" do
67
67
  expect(@callback.done_a).to be_empty
68
68
  expect(@callback.done_b).to be_empty
69
69
  end
70
70
  end
71
71
 
72
- describe 'over (hello_ary, hello_ary)' do
72
+ describe "over (hello_ary, hello_ary)" do
73
73
  before(:each) do
74
74
  @callback = simple_callback_no_finishers
75
75
  Diff::LCS.traverse_sequences(hello_ary, hello_ary, @callback)
76
76
  end
77
77
 
78
- it 'has the correct LCS result on left-matches' do
78
+ it "has the correct LCS result on left-matches" do
79
79
  expect(@callback.matched_a).to eq(hello_ary)
80
80
  end
81
81
 
82
- it 'has the correct LCS result on right-matches' do
82
+ it "has the correct LCS result on right-matches" do
83
83
  expect(@callback.matched_b).to eq(hello_ary)
84
84
  end
85
85
 
86
- it 'has the correct skipped sequences with the left sequence' do
86
+ it "has the correct skipped sequences with the left sequence" do
87
87
  expect(@callback.discards_a).to be_empty
88
88
  end
89
89
 
90
- it 'has the correct skipped sequences with the right sequence' do
90
+ it "has the correct skipped sequences with the right sequence" do
91
91
  expect(@callback.discards_b).to be_empty
92
92
  end
93
93
 
94
- it 'does not have anything done markers from the left or right sequences' do
94
+ it "does not have anything done markers from the left or right sequences" do
95
95
  expect(@callback.done_a).to be_empty
96
96
  expect(@callback.done_b).to be_empty
97
97
  end
98
98
  end
99
99
  end
100
100
 
101
- describe 'callback with finisher' do
101
+ describe "callback with finisher" do
102
102
  before(:each) do
103
103
  @callback_s1_s2 = simple_callback
104
104
  Diff::LCS.traverse_sequences(seq1, seq2, @callback_s1_s2)
@@ -106,32 +106,32 @@ describe 'Diff::LCS.traverse_sequences' do
106
106
  Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
107
107
  end
108
108
 
109
- it 'has the correct LCS result on left-matches' do
109
+ it "has the correct LCS result on left-matches" do
110
110
  expect(@callback_s1_s2.matched_a).to eq(correct_lcs)
111
111
  expect(@callback_s2_s1.matched_a).to eq(correct_lcs)
112
112
  end
113
113
 
114
- it 'has the correct LCS result on right-matches' do
114
+ it "has the correct LCS result on right-matches" do
115
115
  expect(@callback_s1_s2.matched_b).to eq(correct_lcs)
116
116
  expect(@callback_s2_s1.matched_b).to eq(correct_lcs)
117
117
  end
118
118
 
119
- it 'has the correct skipped sequences for the left sequence' do
119
+ it "has the correct skipped sequences for the left sequence" do
120
120
  expect(@callback_s1_s2.discards_a).to eq(skipped_seq1)
121
121
  expect(@callback_s2_s1.discards_a).to eq(skipped_seq2)
122
122
  end
123
123
 
124
- it 'has the correct skipped sequences for the right sequence' do
124
+ it "has the correct skipped sequences for the right sequence" do
125
125
  expect(@callback_s1_s2.discards_b).to eq(skipped_seq2)
126
126
  expect(@callback_s2_s1.discards_b).to eq(skipped_seq1)
127
127
  end
128
128
 
129
- it 'has done markers differently-sized sequences' do
130
- expect(@callback_s1_s2.done_a).to eq([['p', 9, 't', 11]])
129
+ it "has done markers differently-sized sequences" do
130
+ expect(@callback_s1_s2.done_a).to eq([["p", 9, "t", 11]])
131
131
  expect(@callback_s1_s2.done_b).to be_empty
132
132
 
133
133
  expect(@callback_s2_s1.done_a).to be_empty
134
- expect(@callback_s2_s1.done_b).to eq([['t', 11, 'p', 9]])
134
+ expect(@callback_s2_s1.done_b).to eq([["t", 11, "p", 9]])
135
135
  end
136
136
  end
137
137
  end
metadata CHANGED
@@ -1,15 +1,35 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: diff-lcs
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Austin Ziegler
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-23 00:00:00.000000000 Z
11
+ date: 2024-01-31 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: hoe
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: '3.0'
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '5'
23
+ type: :development
24
+ prerelease: false
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ requirements:
27
+ - - ">="
28
+ - !ruby/object:Gem::Version
29
+ version: '3.0'
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '5'
13
33
  - !ruby/object:Gem::Dependency
14
34
  name: hoe-doofus
15
35
  requirement: !ruby/object:Gem::Requirement
@@ -39,19 +59,19 @@ dependencies:
39
59
  - !ruby/object:Gem::Version
40
60
  version: '1.1'
41
61
  - !ruby/object:Gem::Dependency
42
- name: hoe-git
62
+ name: hoe-git2
43
63
  requirement: !ruby/object:Gem::Requirement
44
64
  requirements:
45
65
  - - "~>"
46
66
  - !ruby/object:Gem::Version
47
- version: '1.6'
67
+ version: '1.7'
48
68
  type: :development
49
69
  prerelease: false
50
70
  version_requirements: !ruby/object:Gem::Requirement
51
71
  requirements:
52
72
  - - "~>"
53
73
  - !ruby/object:Gem::Version
54
- version: '1.6'
74
+ version: '1.7'
55
75
  - !ruby/object:Gem::Dependency
56
76
  name: hoe-rubygems
57
77
  requirement: !ruby/object:Gem::Requirement
@@ -126,20 +146,6 @@ dependencies:
126
146
  - - "<"
127
147
  - !ruby/object:Gem::Version
128
148
  version: '7'
129
- - !ruby/object:Gem::Dependency
130
- name: hoe
131
- requirement: !ruby/object:Gem::Requirement
132
- requirements:
133
- - - "~>"
134
- - !ruby/object:Gem::Version
135
- version: '3.23'
136
- type: :development
137
- prerelease: false
138
- version_requirements: !ruby/object:Gem::Requirement
139
- requirements:
140
- - - "~>"
141
- - !ruby/object:Gem::Version
142
- version: '3.23'
143
149
  description: |-
144
150
  Diff::LCS computes the difference between two Enumerable sequences using the
145
151
  McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
@@ -233,11 +239,12 @@ homepage: https://github.com/halostatue/diff-lcs
233
239
  licenses:
234
240
  - MIT
235
241
  - Artistic-2.0
236
- - GPL-2.0+
242
+ - GPL-2.0-or-later
237
243
  metadata:
238
244
  homepage_uri: https://github.com/halostatue/diff-lcs
239
245
  source_code_uri: https://github.com/halostatue/diff-lcs
240
246
  bug_tracker_uri: https://github.com/halostatue/diff-lcs/issues
247
+ rubygems_mfa_required: 'true'
241
248
  post_install_message:
242
249
  rdoc_options:
243
250
  - "--main"
@@ -255,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
255
262
  - !ruby/object:Gem::Version
256
263
  version: '0'
257
264
  requirements: []
258
- rubygems_version: 3.1.6
265
+ rubygems_version: 3.5.3
259
266
  signing_key:
260
267
  specification_version: 4
261
268
  summary: Diff::LCS computes the difference between two Enumerable sequences using