activesambaldap 0.0.8 → 0.0.9
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +21 -0
- data/NEWS.en +1 -1
- data/NEWS.ja +1 -1
- data/README.en +12 -8
- data/README.ja +6 -3
- data/Rakefile +27 -121
- data/lib/active_samba_ldap.rb +1 -1
- data/lib/active_samba_ldap/get_text_support.rb +1 -1
- data/lib/active_samba_ldap/version.rb +1 -1
- data/license/lgpl-2.1.txt +165 -0
- data/po/ja/active-samba-ldap.po +2 -2
- data/test/run-test.rb +3 -3
- metadata +145 -277
- data/bin/asl-groupadd.help +0 -16
- data/bin/asl-groupdel.help +0 -13
- data/bin/asl-groupmod.help +0 -19
- data/bin/asl-groupshow.help +0 -11
- data/bin/asl-passwd.help +0 -15
- data/bin/asl-populate.help +0 -28
- data/bin/asl-purge.help +0 -11
- data/bin/asl-samba-computeradd.help +0 -13
- data/bin/asl-samba-groupadd.help +0 -11
- data/bin/asl-samba-groupdel.help +0 -11
- data/bin/asl-samba-groupmod.help +0 -15
- data/bin/asl-samba-useradd.help +0 -13
- data/bin/asl-samba-userdel.help +0 -11
- data/bin/asl-samba-usermod.help +0 -15
- data/bin/asl-useradd.help +0 -49
- data/bin/asl-userdel.help +0 -18
- data/bin/asl-usermod.help +0 -47
- data/bin/asl-usershow.help +0 -11
- data/data/locale/ja/LC_MESSAGES/active-samba-ldap.mo +0 -0
- data/example/asl-admin/README +0 -243
- data/example/asl-admin/Rakefile +0 -10
- data/example/asl-admin/app/controllers/application_controller.rb +0 -10
- data/example/asl-admin/app/controllers/samba_controller.rb +0 -12
- data/example/asl-admin/app/helpers/application_helper.rb +0 -3
- data/example/asl-admin/app/helpers/samba_helper.rb +0 -2
- data/example/asl-admin/app/models/computer.rb +0 -3
- data/example/asl-admin/app/models/dc.rb +0 -3
- data/example/asl-admin/app/models/group.rb +0 -3
- data/example/asl-admin/app/models/idmap.rb +0 -3
- data/example/asl-admin/app/models/ou.rb +0 -3
- data/example/asl-admin/app/models/unix_id_pool.rb +0 -3
- data/example/asl-admin/app/models/user.rb +0 -3
- data/example/asl-admin/app/views/samba/index.html.erb +0 -17
- data/example/asl-admin/app/views/samba/populate.html.erb +0 -15
- data/example/asl-admin/app/views/samba/purge.html.erb +0 -10
- data/example/asl-admin/config/boot.rb +0 -110
- data/example/asl-admin/config/database.yml +0 -22
- data/example/asl-admin/config/environment.rb +0 -48
- data/example/asl-admin/config/environments/development.rb +0 -17
- data/example/asl-admin/config/environments/production.rb +0 -28
- data/example/asl-admin/config/environments/test.rb +0 -28
- data/example/asl-admin/config/initializers/backtrace_silencers.rb +0 -7
- data/example/asl-admin/config/initializers/inflections.rb +0 -10
- data/example/asl-admin/config/initializers/mime_types.rb +0 -5
- data/example/asl-admin/config/initializers/new_rails_defaults.rb +0 -19
- data/example/asl-admin/config/initializers/session_store.rb +0 -15
- data/example/asl-admin/config/ldap.yml.sample +0 -24
- data/example/asl-admin/config/locales/en.yml +0 -5
- data/example/asl-admin/config/routes.rb +0 -43
- data/example/asl-admin/log/test.log +0 -5
- data/example/asl-admin/public/404.html +0 -30
- data/example/asl-admin/public/422.html +0 -30
- data/example/asl-admin/public/500.html +0 -30
- data/example/asl-admin/public/favicon.ico +0 -0
- data/example/asl-admin/public/images/rails.png +0 -0
- data/example/asl-admin/public/index.html +0 -275
- data/example/asl-admin/public/javascripts/application.js +0 -2
- data/example/asl-admin/public/javascripts/controls.js +0 -963
- data/example/asl-admin/public/javascripts/dragdrop.js +0 -973
- data/example/asl-admin/public/javascripts/effects.js +0 -1128
- data/example/asl-admin/public/javascripts/prototype.js +0 -4320
- data/example/asl-admin/public/robots.txt +0 -5
- data/example/asl-admin/script/about +0 -4
- data/example/asl-admin/script/console +0 -3
- data/example/asl-admin/script/dbconsole +0 -3
- data/example/asl-admin/script/destroy +0 -3
- data/example/asl-admin/script/generate +0 -3
- data/example/asl-admin/script/performance/benchmarker +0 -3
- data/example/asl-admin/script/performance/profiler +0 -3
- data/example/asl-admin/script/plugin +0 -3
- data/example/asl-admin/script/runner +0 -3
- data/example/asl-admin/script/server +0 -3
- data/example/asl-admin/test/performance/browsing_test.rb +0 -9
- data/example/asl-admin/test/test_helper.rb +0 -38
- data/po/active-samba-ldap.pot +0 -463
- data/rails_generators/scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb +0 -28
- data/rails_generators/scaffold_active_samba_ldap/templates/computer.rb +0 -3
- data/rails_generators/scaffold_active_samba_ldap/templates/dc.rb +0 -3
- data/rails_generators/scaffold_active_samba_ldap/templates/group.rb +0 -3
- data/rails_generators/scaffold_active_samba_ldap/templates/idmap.rb +0 -3
- data/rails_generators/scaffold_active_samba_ldap/templates/ldap.yml +0 -24
- data/rails_generators/scaffold_active_samba_ldap/templates/ou.rb +0 -3
- data/rails_generators/scaffold_active_samba_ldap/templates/samba_controller.rb +0 -12
- data/rails_generators/scaffold_active_samba_ldap/templates/samba_helper.rb +0 -2
- data/rails_generators/scaffold_active_samba_ldap/templates/samba_index.html.erb +0 -17
- data/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.html.erb +0 -15
- data/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.html.erb +0 -10
- data/rails_generators/scaffold_active_samba_ldap/templates/unix_id_pool.rb +0 -3
- data/rails_generators/scaffold_active_samba_ldap/templates/user.rb +0 -3
- data/setup.rb +0 -1585
- data/test-unit/History.txt +0 -107
- data/test-unit/README.txt +0 -52
- data/test-unit/Rakefile +0 -40
- data/test-unit/TODO +0 -5
- data/test-unit/bin/testrb +0 -5
- data/test-unit/lib/test/unit.rb +0 -342
- data/test-unit/lib/test/unit/assertionfailederror.rb +0 -14
- data/test-unit/lib/test/unit/assertions.rb +0 -1149
- data/test-unit/lib/test/unit/attribute.rb +0 -125
- data/test-unit/lib/test/unit/autorunner.rb +0 -344
- data/test-unit/lib/test/unit/collector.rb +0 -43
- data/test-unit/lib/test/unit/collector/descendant.rb +0 -23
- data/test-unit/lib/test/unit/collector/dir.rb +0 -108
- data/test-unit/lib/test/unit/collector/load.rb +0 -137
- data/test-unit/lib/test/unit/collector/objectspace.rb +0 -34
- data/test-unit/lib/test/unit/color-scheme.rb +0 -90
- data/test-unit/lib/test/unit/color.rb +0 -96
- data/test-unit/lib/test/unit/diff.rb +0 -538
- data/test-unit/lib/test/unit/error.rb +0 -126
- data/test-unit/lib/test/unit/exceptionhandler.rb +0 -39
- data/test-unit/lib/test/unit/failure.rb +0 -110
- data/test-unit/lib/test/unit/fixture.rb +0 -176
- data/test-unit/lib/test/unit/notification.rb +0 -125
- data/test-unit/lib/test/unit/omission.rb +0 -143
- data/test-unit/lib/test/unit/pending.rb +0 -146
- data/test-unit/lib/test/unit/priority.rb +0 -181
- data/test-unit/lib/test/unit/runner/console.rb +0 -52
- data/test-unit/lib/test/unit/runner/emacs.rb +0 -8
- data/test-unit/lib/test/unit/runner/tap.rb +0 -8
- data/test-unit/lib/test/unit/testcase.rb +0 -425
- data/test-unit/lib/test/unit/testresult.rb +0 -89
- data/test-unit/lib/test/unit/testsuite.rb +0 -110
- data/test-unit/lib/test/unit/ui/console/outputlevel.rb +0 -14
- data/test-unit/lib/test/unit/ui/console/testrunner.rb +0 -278
- data/test-unit/lib/test/unit/ui/emacs/testrunner.rb +0 -49
- data/test-unit/lib/test/unit/ui/tap/testrunner.rb +0 -92
- data/test-unit/lib/test/unit/ui/testrunner.rb +0 -20
- data/test-unit/lib/test/unit/ui/testrunnermediator.rb +0 -77
- data/test-unit/lib/test/unit/ui/testrunnerutilities.rb +0 -41
- data/test-unit/lib/test/unit/util/backtracefilter.rb +0 -41
- data/test-unit/lib/test/unit/util/method-owner-finder.rb +0 -28
- data/test-unit/lib/test/unit/util/observable.rb +0 -90
- data/test-unit/lib/test/unit/util/procwrapper.rb +0 -48
- data/test-unit/lib/test/unit/version.rb +0 -7
- data/test-unit/sample/adder.rb +0 -13
- data/test-unit/sample/subtracter.rb +0 -12
- data/test-unit/sample/tc_adder.rb +0 -18
- data/test-unit/sample/tc_subtracter.rb +0 -18
- data/test-unit/sample/test_user.rb +0 -22
- data/test-unit/sample/ts_examples.rb +0 -7
- data/test-unit/test/collector/test-descendant.rb +0 -135
- data/test-unit/test/collector/test-load.rb +0 -329
- data/test-unit/test/collector/test_dir.rb +0 -406
- data/test-unit/test/collector/test_objectspace.rb +0 -98
- data/test-unit/test/run-test.rb +0 -13
- data/test-unit/test/test-attribute.rb +0 -86
- data/test-unit/test/test-color-scheme.rb +0 -60
- data/test-unit/test/test-color.rb +0 -47
- data/test-unit/test/test-diff.rb +0 -477
- data/test-unit/test/test-emacs-runner.rb +0 -60
- data/test-unit/test/test-fixture.rb +0 -287
- data/test-unit/test/test-notification.rb +0 -33
- data/test-unit/test/test-omission.rb +0 -81
- data/test-unit/test/test-pending.rb +0 -70
- data/test-unit/test/test-priority.rb +0 -119
- data/test-unit/test/test-testcase.rb +0 -507
- data/test-unit/test/test_assertions.rb +0 -1082
- data/test-unit/test/test_error.rb +0 -26
- data/test-unit/test/test_failure.rb +0 -33
- data/test-unit/test/test_testresult.rb +0 -113
- data/test-unit/test/test_testsuite.rb +0 -129
- data/test-unit/test/testunit-test-util.rb +0 -14
- data/test-unit/test/ui/test_testrunmediator.rb +0 -20
- data/test-unit/test/util/test-method-owner-finder.rb +0 -38
- data/test-unit/test/util/test_backtracefilter.rb +0 -41
- data/test-unit/test/util/test_observable.rb +0 -102
- data/test-unit/test/util/test_procwrapper.rb +0 -36
@@ -1,538 +0,0 @@
|
|
1
|
-
# port of Python's difflib.
|
2
|
-
|
3
|
-
module Test
|
4
|
-
module Unit
|
5
|
-
module Diff
|
6
|
-
class SequenceMatcher
|
7
|
-
def initialize(from, to, &junk_predicate)
|
8
|
-
@from = from
|
9
|
-
@to = to
|
10
|
-
@junk_predicate = junk_predicate
|
11
|
-
update_to_indexes
|
12
|
-
end
|
13
|
-
|
14
|
-
def longest_match(from_start, from_end, to_start, to_end)
|
15
|
-
best_info = find_best_match_position(from_start, from_end,
|
16
|
-
to_start, to_end)
|
17
|
-
unless @junks.empty?
|
18
|
-
args = [from_start, from_end, to_start, to_end]
|
19
|
-
best_info = adjust_best_info_with_junk_predicate(false, best_info,
|
20
|
-
*args)
|
21
|
-
best_info = adjust_best_info_with_junk_predicate(true, best_info,
|
22
|
-
*args)
|
23
|
-
end
|
24
|
-
|
25
|
-
best_info
|
26
|
-
end
|
27
|
-
|
28
|
-
def blocks
|
29
|
-
@blocks ||= compute_blocks
|
30
|
-
end
|
31
|
-
|
32
|
-
def operations
|
33
|
-
@operations ||= compute_operations
|
34
|
-
end
|
35
|
-
|
36
|
-
def grouped_operations(context_size=nil)
|
37
|
-
context_size ||= 3
|
38
|
-
_operations = operations
|
39
|
-
_operations = [[:equal, 0, 0, 0, 0]] if _operations.empty?
|
40
|
-
expand_edge_equal_operations!(_operations, context_size)
|
41
|
-
|
42
|
-
group_window = context_size * 2
|
43
|
-
groups = []
|
44
|
-
group = []
|
45
|
-
_operations.each do |tag, from_start, from_end, to_start, to_end|
|
46
|
-
if tag == :equal and from_end - from_start > group_window
|
47
|
-
group << [tag,
|
48
|
-
from_start,
|
49
|
-
[from_end, from_start + context_size].min,
|
50
|
-
to_start,
|
51
|
-
[to_end, to_start + context_size].min]
|
52
|
-
groups << group
|
53
|
-
group = []
|
54
|
-
from_start = [from_start, from_end - context_size].max
|
55
|
-
to_start = [to_start, to_end - context_size].max
|
56
|
-
end
|
57
|
-
group << [tag, from_start, from_end, to_start, to_end]
|
58
|
-
end
|
59
|
-
groups << group unless group.empty?
|
60
|
-
groups
|
61
|
-
end
|
62
|
-
|
63
|
-
def ratio
|
64
|
-
@ratio ||= compute_ratio
|
65
|
-
end
|
66
|
-
|
67
|
-
private
|
68
|
-
def update_to_indexes
|
69
|
-
@to_indexes = {}
|
70
|
-
@junks = {}
|
71
|
-
if @to.is_a?(String)
|
72
|
-
each = " "[0].is_a?(Integer) ? :each_byte : :each_char
|
73
|
-
else
|
74
|
-
each = :each
|
75
|
-
end
|
76
|
-
i = 0
|
77
|
-
@to.send(each) do |item|
|
78
|
-
@to_indexes[item] ||= []
|
79
|
-
@to_indexes[item] << i
|
80
|
-
i += 1
|
81
|
-
end
|
82
|
-
|
83
|
-
return if @junk_predicate.nil?
|
84
|
-
@to_indexes = @to_indexes.reject do |key, value|
|
85
|
-
junk = @junk_predicate.call(key)
|
86
|
-
@junks[key] = true if junk
|
87
|
-
junk
|
88
|
-
end
|
89
|
-
end
|
90
|
-
|
91
|
-
def find_best_match_position(from_start, from_end, to_start, to_end)
|
92
|
-
best_from, best_to, best_size = from_start, to_start, 0
|
93
|
-
sizes = {}
|
94
|
-
from_start.upto(from_end) do |from_index|
|
95
|
-
_sizes = {}
|
96
|
-
(@to_indexes[@from[from_index]] || []).each do |to_index|
|
97
|
-
next if to_index < to_start
|
98
|
-
break if to_index > to_end
|
99
|
-
size = _sizes[to_index] = (sizes[to_index - 1] || 0) + 1
|
100
|
-
if size > best_size
|
101
|
-
best_from = from_index - size + 1
|
102
|
-
best_to = to_index - size + 1
|
103
|
-
best_size = size
|
104
|
-
end
|
105
|
-
end
|
106
|
-
sizes = _sizes
|
107
|
-
end
|
108
|
-
[best_from, best_to, best_size]
|
109
|
-
end
|
110
|
-
|
111
|
-
def adjust_best_info_with_junk_predicate(should_junk, best_info,
|
112
|
-
from_start, from_end,
|
113
|
-
to_start, to_end)
|
114
|
-
best_from, best_to, best_size = best_info
|
115
|
-
while best_from > from_start and best_to > to_start and
|
116
|
-
(should_junk ?
|
117
|
-
@junks.has_key?(@to[best_to - 1]) :
|
118
|
-
!@junks.has_key?(@to[best_to - 1])) and
|
119
|
-
@from[best_from - 1] == @to[best_to - 1]
|
120
|
-
best_from -= 1
|
121
|
-
best_to -= 1
|
122
|
-
best_size += 1
|
123
|
-
end
|
124
|
-
|
125
|
-
while best_from + best_size < from_end and
|
126
|
-
best_to + best_size < to_end and
|
127
|
-
(should_junk ?
|
128
|
-
@junks.has_key?(@to[best_to + best_size]) :
|
129
|
-
!@junks.has_key?(@to[best_to + best_size])) and
|
130
|
-
@from[best_from + best_size] == @to[best_to + best_size]
|
131
|
-
best_size += 1
|
132
|
-
end
|
133
|
-
|
134
|
-
[best_from, best_to, best_size]
|
135
|
-
end
|
136
|
-
|
137
|
-
def matches
|
138
|
-
@matches ||= compute_matches
|
139
|
-
end
|
140
|
-
|
141
|
-
def compute_matches
|
142
|
-
matches = []
|
143
|
-
queue = [[0, @from.size, 0, @to.size]]
|
144
|
-
until queue.empty?
|
145
|
-
from_start, from_end, to_start, to_end = queue.pop
|
146
|
-
match = longest_match(from_start, from_end - 1, to_start, to_end - 1)
|
147
|
-
match_from_index, match_to_index, size = match
|
148
|
-
unless size.zero?
|
149
|
-
if from_start < match_from_index and
|
150
|
-
to_start < match_to_index
|
151
|
-
queue.push([from_start, match_from_index,
|
152
|
-
to_start, match_to_index])
|
153
|
-
end
|
154
|
-
matches << match
|
155
|
-
if match_from_index + size < from_end and
|
156
|
-
match_to_index + size < to_end
|
157
|
-
queue.push([match_from_index + size, from_end,
|
158
|
-
match_to_index + size, to_end])
|
159
|
-
end
|
160
|
-
end
|
161
|
-
end
|
162
|
-
matches.sort_by do |(from_index, to_index, match_size)|
|
163
|
-
from_index
|
164
|
-
end
|
165
|
-
end
|
166
|
-
|
167
|
-
def compute_blocks
|
168
|
-
blocks = []
|
169
|
-
current_from_index = current_to_index = current_size = 0
|
170
|
-
matches.each do |from_index, to_index, size|
|
171
|
-
if current_from_index + current_size == from_index and
|
172
|
-
current_to_index + current_size == to_index
|
173
|
-
current_size += size
|
174
|
-
else
|
175
|
-
unless current_size.zero?
|
176
|
-
blocks << [current_from_index, current_to_index, current_size]
|
177
|
-
end
|
178
|
-
current_from_index = from_index
|
179
|
-
current_to_index = to_index
|
180
|
-
current_size = size
|
181
|
-
end
|
182
|
-
end
|
183
|
-
unless current_size.zero?
|
184
|
-
blocks << [current_from_index, current_to_index, current_size]
|
185
|
-
end
|
186
|
-
|
187
|
-
blocks << [@from.size, @to.size, 0]
|
188
|
-
blocks
|
189
|
-
end
|
190
|
-
|
191
|
-
def compute_operations
|
192
|
-
from_index = to_index = 0
|
193
|
-
operations = []
|
194
|
-
blocks.each do |match_from_index, match_to_index, size|
|
195
|
-
tag = determine_tag(from_index, to_index,
|
196
|
-
match_from_index, match_to_index)
|
197
|
-
if tag != :equal
|
198
|
-
operations << [tag,
|
199
|
-
from_index, match_from_index,
|
200
|
-
to_index, match_to_index]
|
201
|
-
end
|
202
|
-
|
203
|
-
from_index, to_index = match_from_index + size, match_to_index + size
|
204
|
-
if size > 0
|
205
|
-
operations << [:equal,
|
206
|
-
match_from_index, from_index,
|
207
|
-
match_to_index, to_index]
|
208
|
-
end
|
209
|
-
end
|
210
|
-
operations
|
211
|
-
end
|
212
|
-
|
213
|
-
def compute_ratio
|
214
|
-
matches = blocks.inject(0) {|result, block| result + block[-1]}
|
215
|
-
length = @from.length + @to.length
|
216
|
-
if length.zero?
|
217
|
-
1.0
|
218
|
-
else
|
219
|
-
2.0 * matches / length
|
220
|
-
end
|
221
|
-
end
|
222
|
-
|
223
|
-
def determine_tag(from_index, to_index,
|
224
|
-
match_from_index, match_to_index)
|
225
|
-
if from_index < match_from_index and to_index < match_to_index
|
226
|
-
:replace
|
227
|
-
elsif from_index < match_from_index
|
228
|
-
:delete
|
229
|
-
elsif to_index < match_to_index
|
230
|
-
:insert
|
231
|
-
else
|
232
|
-
:equal
|
233
|
-
end
|
234
|
-
end
|
235
|
-
|
236
|
-
def expand_edge_equal_operations!(_operations, context_size)
|
237
|
-
tag, from_start, from_end, to_start, to_end = _operations[0]
|
238
|
-
if tag == :equal
|
239
|
-
_operations[0] = [tag,
|
240
|
-
[from_start, from_end - context_size].max,
|
241
|
-
from_end,
|
242
|
-
[to_start, to_end - context_size].max,
|
243
|
-
to_end]
|
244
|
-
end
|
245
|
-
|
246
|
-
tag, from_start, from_end, to_start, to_end = _operations[-1]
|
247
|
-
if tag == :equal
|
248
|
-
_operations[-1] = [tag,
|
249
|
-
from_start,
|
250
|
-
[from_end, from_start + context_size].min,
|
251
|
-
to_start,
|
252
|
-
[to_end, to_start + context_size].min]
|
253
|
-
end
|
254
|
-
end
|
255
|
-
end
|
256
|
-
|
257
|
-
class Differ
|
258
|
-
def initialize(from, to)
|
259
|
-
@from = from
|
260
|
-
@to = to
|
261
|
-
end
|
262
|
-
|
263
|
-
private
|
264
|
-
def tag(mark, contents)
|
265
|
-
contents.collect {|content| "#{mark}#{content}"}
|
266
|
-
end
|
267
|
-
end
|
268
|
-
|
269
|
-
class ReadableDiffer < Differ
|
270
|
-
def diff(options={})
|
271
|
-
result = []
|
272
|
-
matcher = SequenceMatcher.new(@from, @to)
|
273
|
-
matcher.operations.each do |args|
|
274
|
-
tag, from_start, from_end, to_start, to_end = args
|
275
|
-
case tag
|
276
|
-
when :replace
|
277
|
-
result.concat(diff_lines(from_start, from_end, to_start, to_end))
|
278
|
-
when :delete
|
279
|
-
result.concat(tag_deleted(@from[from_start...from_end]))
|
280
|
-
when :insert
|
281
|
-
result.concat(tag_inserted(@to[to_start...to_end]))
|
282
|
-
when :equal
|
283
|
-
result.concat(tag_equal(@from[from_start...from_end]))
|
284
|
-
else
|
285
|
-
raise "unknown tag: #{tag}"
|
286
|
-
end
|
287
|
-
end
|
288
|
-
result
|
289
|
-
end
|
290
|
-
|
291
|
-
private
|
292
|
-
def tag_deleted(contents)
|
293
|
-
tag("- ", contents)
|
294
|
-
end
|
295
|
-
|
296
|
-
def tag_inserted(contents)
|
297
|
-
tag("+ ", contents)
|
298
|
-
end
|
299
|
-
|
300
|
-
def tag_equal(contents)
|
301
|
-
tag(" ", contents)
|
302
|
-
end
|
303
|
-
|
304
|
-
def tag_difference(contents)
|
305
|
-
tag("? ", contents)
|
306
|
-
end
|
307
|
-
|
308
|
-
def find_diff_line_info(from_start, from_end, to_start, to_end)
|
309
|
-
best_ratio = 0.74
|
310
|
-
from_equal_index = to_equal_index = nil
|
311
|
-
from_best_index = to_best_index = nil
|
312
|
-
|
313
|
-
to_start.upto(to_end - 1) do |to_index|
|
314
|
-
from_start.upto(from_end - 1) do |from_index|
|
315
|
-
if @from[from_index] == @to[to_index]
|
316
|
-
from_equal_index ||= from_index
|
317
|
-
to_equal_index ||= to_index
|
318
|
-
next
|
319
|
-
end
|
320
|
-
|
321
|
-
matcher = SequenceMatcher.new(@from[from_index], @to[to_index],
|
322
|
-
&method(:space_character?))
|
323
|
-
if matcher.ratio > best_ratio
|
324
|
-
best_ratio = matcher.ratio
|
325
|
-
from_best_index = from_index
|
326
|
-
to_best_index = to_index
|
327
|
-
end
|
328
|
-
end
|
329
|
-
end
|
330
|
-
|
331
|
-
[best_ratio,
|
332
|
-
from_equal_index, to_equal_index,
|
333
|
-
from_best_index, to_best_index]
|
334
|
-
end
|
335
|
-
|
336
|
-
def diff_lines(from_start, from_end, to_start, to_end)
|
337
|
-
cut_off = 0.75
|
338
|
-
|
339
|
-
info = find_diff_line_info(from_start, from_end, to_start, to_end)
|
340
|
-
best_ratio, from_equal_index, to_equal_index, *info = info
|
341
|
-
from_best_index, to_best_index = info
|
342
|
-
|
343
|
-
if best_ratio < cut_off
|
344
|
-
if from_equal_index.nil?
|
345
|
-
tagged_from = tag_deleted(@from[from_start...from_end])
|
346
|
-
tagged_to = tag_inserted(@to[to_start...to_end])
|
347
|
-
if to_end - to_start < from_end - from_start
|
348
|
-
return tagged_to + tagged_from
|
349
|
-
else
|
350
|
-
return tagged_from + tagged_to
|
351
|
-
end
|
352
|
-
end
|
353
|
-
from_best_index = from_equal_index
|
354
|
-
to_best_index = to_equal_index
|
355
|
-
best_ratio = 1.0
|
356
|
-
end
|
357
|
-
|
358
|
-
_diff_lines(from_start, from_best_index, to_start, to_best_index) +
|
359
|
-
diff_line(@from[from_best_index], @to[to_best_index]) +
|
360
|
-
_diff_lines(from_best_index + 1, from_end, to_best_index + 1, to_end)
|
361
|
-
end
|
362
|
-
|
363
|
-
def _diff_lines(from_start, from_end, to_start, to_end)
|
364
|
-
if from_start < from_end
|
365
|
-
if to_start < to_end
|
366
|
-
diff_lines(from_start, from_end, to_start, to_end)
|
367
|
-
else
|
368
|
-
tag_deleted(@from[from_start...from_end])
|
369
|
-
end
|
370
|
-
else
|
371
|
-
tag_inserted(@to[to_start...to_end])
|
372
|
-
end
|
373
|
-
end
|
374
|
-
|
375
|
-
def diff_line(from_line, to_line)
|
376
|
-
from_tags = ""
|
377
|
-
to_tags = ""
|
378
|
-
matcher = SequenceMatcher.new(from_line, to_line,
|
379
|
-
&method(:space_character?))
|
380
|
-
operations = matcher.operations
|
381
|
-
operations.each do |tag, from_start, from_end, to_start, to_end|
|
382
|
-
from_length = from_end - from_start
|
383
|
-
to_length = to_end - to_start
|
384
|
-
case tag
|
385
|
-
when :replace
|
386
|
-
from_tags << "^" * from_length
|
387
|
-
to_tags << "^" * to_length
|
388
|
-
when :delete
|
389
|
-
from_tags << "-" * from_length
|
390
|
-
when :insert
|
391
|
-
to_tags << "+" * to_length
|
392
|
-
when :equal
|
393
|
-
from_tags << " " * from_length
|
394
|
-
to_tags << " " * to_length
|
395
|
-
else
|
396
|
-
raise "unknown tag: #{tag}"
|
397
|
-
end
|
398
|
-
end
|
399
|
-
format_diff_point(from_line, to_line, from_tags, to_tags)
|
400
|
-
end
|
401
|
-
|
402
|
-
def format_diff_point(from_line, to_line, from_tags, to_tags)
|
403
|
-
common = [n_leading_characters(from_line, ?\t),
|
404
|
-
n_leading_characters(to_line, ?\t)].min
|
405
|
-
common = [common,
|
406
|
-
n_leading_characters(from_tags[0, common], " "[0])].min
|
407
|
-
from_tags = from_tags[common..-1].rstrip
|
408
|
-
to_tags = to_tags[common..-1].rstrip
|
409
|
-
|
410
|
-
result = tag_deleted([from_line])
|
411
|
-
unless from_tags.empty?
|
412
|
-
result.concat(tag_difference(["#{"\t" * common}#{from_tags}"]))
|
413
|
-
end
|
414
|
-
result.concat(tag_inserted([to_line]))
|
415
|
-
unless to_tags.empty?
|
416
|
-
result.concat(tag_difference(["#{"\t" * common}#{to_tags}"]))
|
417
|
-
end
|
418
|
-
result
|
419
|
-
end
|
420
|
-
|
421
|
-
def n_leading_characters(string, character)
|
422
|
-
n = 0
|
423
|
-
while string[n] == character
|
424
|
-
n += 1
|
425
|
-
end
|
426
|
-
n
|
427
|
-
end
|
428
|
-
|
429
|
-
def space_character?(character)
|
430
|
-
[" "[0], "\t"[0]].include?(character)
|
431
|
-
end
|
432
|
-
end
|
433
|
-
|
434
|
-
class UnifiedDiffer < Differ
|
435
|
-
def diff(options={})
|
436
|
-
groups = SequenceMatcher.new(@from, @to).grouped_operations
|
437
|
-
return [] if groups.empty?
|
438
|
-
return [] if same_content?(groups)
|
439
|
-
|
440
|
-
show_context = options[:show_context]
|
441
|
-
show_context = true if show_context.nil?
|
442
|
-
result = ["--- #{options[:from_label]}".rstrip,
|
443
|
-
"+++ #{options[:to_label]}".rstrip]
|
444
|
-
groups.each do |operations|
|
445
|
-
result << format_summary(operations, show_context)
|
446
|
-
operations.each do |args|
|
447
|
-
operation_tag, from_start, from_end, to_start, to_end = args
|
448
|
-
case operation_tag
|
449
|
-
when :replace
|
450
|
-
result.concat(tag("-", @from[from_start...from_end]))
|
451
|
-
result.concat(tag("+", @to[to_start...to_end]))
|
452
|
-
when :delete
|
453
|
-
result.concat(tag("-", @from[from_start...from_end]))
|
454
|
-
when :insert
|
455
|
-
result.concat(tag("+", @to[to_start...to_end]))
|
456
|
-
when :equal
|
457
|
-
result.concat(tag(" ", @from[from_start...from_end]))
|
458
|
-
end
|
459
|
-
end
|
460
|
-
end
|
461
|
-
result
|
462
|
-
end
|
463
|
-
|
464
|
-
private
|
465
|
-
def same_content?(groups)
|
466
|
-
return false if groups.size != 1
|
467
|
-
group = groups[0]
|
468
|
-
return false if group.size != 1
|
469
|
-
tag, from_start, from_end, to_start, to_end = group[0]
|
470
|
-
|
471
|
-
tag == :equal and [from_start, from_end] == [to_start, to_end]
|
472
|
-
end
|
473
|
-
|
474
|
-
def format_summary(operations, show_context)
|
475
|
-
_, first_from_start, _, first_to_start, _ = operations[0]
|
476
|
-
_, _, last_from_end, _, last_to_end = operations[-1]
|
477
|
-
summary = "@@ -%d,%d +%d,%d @@" % [first_from_start + 1,
|
478
|
-
last_from_end - first_from_start,
|
479
|
-
first_to_start + 1,
|
480
|
-
last_to_end - first_to_start,]
|
481
|
-
if show_context
|
482
|
-
interesting_line = find_interesting_line(first_from_start,
|
483
|
-
first_to_start,
|
484
|
-
:define_line?)
|
485
|
-
summary << " #{interesting_line}" if interesting_line
|
486
|
-
end
|
487
|
-
summary
|
488
|
-
end
|
489
|
-
|
490
|
-
def find_interesting_line(from_start, to_start, predicate)
|
491
|
-
from_index = from_start
|
492
|
-
to_index = to_start
|
493
|
-
while from_index >= 0 or to_index >= 0
|
494
|
-
[@from[from_index], @to[to_index]].each do |line|
|
495
|
-
return line if line and send(predicate, line)
|
496
|
-
end
|
497
|
-
|
498
|
-
from_index -= 1
|
499
|
-
to_index -= 1
|
500
|
-
end
|
501
|
-
nil
|
502
|
-
end
|
503
|
-
|
504
|
-
def define_line?(line)
|
505
|
-
/\A(?:[_a-zA-Z$]|\s*(?:class|module|def)\b)/ =~ line
|
506
|
-
end
|
507
|
-
end
|
508
|
-
|
509
|
-
module_function
|
510
|
-
def need_fold?(diff)
|
511
|
-
/^[-+].{79}/ =~ diff
|
512
|
-
end
|
513
|
-
|
514
|
-
def fold(string)
|
515
|
-
string.split(/\r?\n/).collect do |line|
|
516
|
-
line.gsub(/(.{78})/, "\\1\n")
|
517
|
-
end.join("\n")
|
518
|
-
end
|
519
|
-
|
520
|
-
def folded_readable(from, to, options={})
|
521
|
-
readable(fold(from), fold(to), options)
|
522
|
-
end
|
523
|
-
|
524
|
-
def readable(from, to, options={})
|
525
|
-
diff(ReadableDiffer, from, to, options)
|
526
|
-
end
|
527
|
-
|
528
|
-
def unified(from, to, options={})
|
529
|
-
diff(UnifiedDiffer, from, to, options)
|
530
|
-
end
|
531
|
-
|
532
|
-
def diff(differ_class, from, to, options={})
|
533
|
-
differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
|
534
|
-
differ.diff(options).join("\n")
|
535
|
-
end
|
536
|
-
end
|
537
|
-
end
|
538
|
-
end
|