archimate-diff 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +22 -0
  3. data/.projectile +18 -0
  4. data/.rubocop.yml +13 -0
  5. data/.travis.yml +4 -0
  6. data/.yardocs +15 -0
  7. data/Gemfile +5 -0
  8. data/Guardfile +27 -0
  9. data/LICENSE +201 -0
  10. data/README.md +94 -0
  11. data/Rakefile +29 -0
  12. data/archimate-diff.gemspec +51 -0
  13. data/exe/archidiff +7 -0
  14. data/exe/archidiff-summary +7 -0
  15. data/exe/archimerge +7 -0
  16. data/exe/fmtxml +7 -0
  17. data/lib/archimate-diff.rb +33 -0
  18. data/lib/archimate/diff/archimate_array_reference.rb +113 -0
  19. data/lib/archimate/diff/archimate_identified_node_reference.rb +41 -0
  20. data/lib/archimate/diff/archimate_node_attribute_reference.rb +70 -0
  21. data/lib/archimate/diff/archimate_node_reference.rb +80 -0
  22. data/lib/archimate/diff/change.rb +49 -0
  23. data/lib/archimate/diff/cli/conflict_resolver.rb +41 -0
  24. data/lib/archimate/diff/cli/diff.rb +33 -0
  25. data/lib/archimate/diff/cli/diff_summary.rb +103 -0
  26. data/lib/archimate/diff/cli/merge.rb +51 -0
  27. data/lib/archimate/diff/cli/merger.rb +111 -0
  28. data/lib/archimate/diff/conflict.rb +31 -0
  29. data/lib/archimate/diff/conflicts.rb +89 -0
  30. data/lib/archimate/diff/conflicts/base_conflict.rb +53 -0
  31. data/lib/archimate/diff/conflicts/deleted_items_child_updated_conflict.rb +30 -0
  32. data/lib/archimate/diff/conflicts/deleted_items_referenced_conflict.rb +63 -0
  33. data/lib/archimate/diff/conflicts/path_conflict.rb +51 -0
  34. data/lib/archimate/diff/delete.rb +41 -0
  35. data/lib/archimate/diff/difference.rb +113 -0
  36. data/lib/archimate/diff/insert.rb +43 -0
  37. data/lib/archimate/diff/merge.rb +70 -0
  38. data/lib/archimate/diff/move.rb +51 -0
  39. data/lib/archimate/diff/version.rb +6 -0
  40. metadata +453 -0
@@ -0,0 +1,51 @@
1
+ # frozen_string_literal: true
2
+ module Archimate
3
+ module Diff
4
+ class Move < Difference
5
+ using DataModel::DiffablePrimitive
6
+ using DataModel::DiffableArray
7
+
8
+ # Create a new Move difference
9
+ #
10
+ # @param target [Archimate::Diff::ArchimateNodeReference] reference to
11
+ # ArchimateNode that was changed
12
+ # @param changed_from [Archimate::Diff::ArchimateNodeReference] Element
13
+ # that was changed
14
+ def initialize(target, changed_from)
15
+ super(target, changed_from)
16
+ end
17
+
18
+ def to_s
19
+ # Note - the explicit to_s is required to access the DiffableArray
20
+ # implementation if the parent is an Array.
21
+ "#{diff_type} #{changed_from.parent&.to_s} #{Color.color(target.to_s, :change)} moved to #{target.array_index}"
22
+ end
23
+
24
+ # TODO: patch is a better name than apply
25
+ def apply(to_model)
26
+ unless to_model.is_a?(DataModel::Model)
27
+ throw(
28
+ TypeError,
29
+ "Expected a Archimate::DataModel::Model, was a #{to_model.class}"
30
+ )
31
+ end
32
+ target.move(to_model, changed_from)
33
+ to_model
34
+ end
35
+
36
+ def move?
37
+ true
38
+ end
39
+
40
+ def kind
41
+ "Move"
42
+ end
43
+
44
+ private
45
+
46
+ def diff_type
47
+ Color.color('MOVE:', :move)
48
+ end
49
+ end
50
+ end
51
+ end
@@ -0,0 +1,6 @@
1
+ # frozen_string_literal: true
2
+ module Archimate
3
+ module Diff
4
+ VERSION = "0.1.0"
5
+ end
6
+ end
metadata ADDED
@@ -0,0 +1,453 @@
1
+ --- !ruby/object:Gem::Specification
2
+ name: archimate-diff
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.1.0
5
+ platform: ruby
6
+ authors:
7
+ - Mark Morga
8
+ autorequire:
9
+ bindir: exe
10
+ cert_chain: []
11
+ date: 2017-10-18 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: archimate
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: '1.1'
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '1.1'
27
+ - !ruby/object:Gem::Dependency
28
+ name: nokogiri
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '1.6'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '1.6'
41
+ - !ruby/object:Gem::Dependency
42
+ name: thor
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '0.19'
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '0.19'
55
+ - !ruby/object:Gem::Dependency
56
+ name: highline
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '1.7'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '1.7'
69
+ - !ruby/object:Gem::Dependency
70
+ name: ruby-progressbar
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: 1.8.1
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: 1.8.1
83
+ - !ruby/object:Gem::Dependency
84
+ name: parallel
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: '1.11'
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: '1.11'
97
+ - !ruby/object:Gem::Dependency
98
+ name: bundler
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: rake
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - ">="
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
+ type: :development
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ">="
123
+ - !ruby/object:Gem::Version
124
+ version: '0'
125
+ - !ruby/object:Gem::Dependency
126
+ name: minitest
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - ">="
130
+ - !ruby/object:Gem::Version
131
+ version: '0'
132
+ type: :development
133
+ prerelease: false
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ version: '0'
139
+ - !ruby/object:Gem::Dependency
140
+ name: minitest-matchers
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ type: :development
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ">="
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
153
+ - !ruby/object:Gem::Dependency
154
+ name: minitest-color
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ">="
158
+ - !ruby/object:Gem::Version
159
+ version: '0'
160
+ type: :development
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ">="
165
+ - !ruby/object:Gem::Version
166
+ version: '0'
167
+ - !ruby/object:Gem::Dependency
168
+ name: minitest-profile
169
+ requirement: !ruby/object:Gem::Requirement
170
+ requirements:
171
+ - - ">="
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ type: :development
175
+ prerelease: false
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - ">="
179
+ - !ruby/object:Gem::Version
180
+ version: '0'
181
+ - !ruby/object:Gem::Dependency
182
+ name: pry
183
+ requirement: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - ">="
186
+ - !ruby/object:Gem::Version
187
+ version: '0'
188
+ type: :development
189
+ prerelease: false
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - ">="
193
+ - !ruby/object:Gem::Version
194
+ version: '0'
195
+ - !ruby/object:Gem::Dependency
196
+ name: pry-byebug
197
+ requirement: !ruby/object:Gem::Requirement
198
+ requirements:
199
+ - - ">="
200
+ - !ruby/object:Gem::Version
201
+ version: '0'
202
+ type: :development
203
+ prerelease: false
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - ">="
207
+ - !ruby/object:Gem::Version
208
+ version: '0'
209
+ - !ruby/object:Gem::Dependency
210
+ name: guard
211
+ requirement: !ruby/object:Gem::Requirement
212
+ requirements:
213
+ - - ">="
214
+ - !ruby/object:Gem::Version
215
+ version: '0'
216
+ type: :development
217
+ prerelease: false
218
+ version_requirements: !ruby/object:Gem::Requirement
219
+ requirements:
220
+ - - ">="
221
+ - !ruby/object:Gem::Version
222
+ version: '0'
223
+ - !ruby/object:Gem::Dependency
224
+ name: guard-minitest
225
+ requirement: !ruby/object:Gem::Requirement
226
+ requirements:
227
+ - - ">="
228
+ - !ruby/object:Gem::Version
229
+ version: '0'
230
+ type: :development
231
+ prerelease: false
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ requirements:
234
+ - - ">="
235
+ - !ruby/object:Gem::Version
236
+ version: '0'
237
+ - !ruby/object:Gem::Dependency
238
+ name: guard-bundler
239
+ requirement: !ruby/object:Gem::Requirement
240
+ requirements:
241
+ - - ">="
242
+ - !ruby/object:Gem::Version
243
+ version: '0'
244
+ type: :development
245
+ prerelease: false
246
+ version_requirements: !ruby/object:Gem::Requirement
247
+ requirements:
248
+ - - ">="
249
+ - !ruby/object:Gem::Version
250
+ version: '0'
251
+ - !ruby/object:Gem::Dependency
252
+ name: ruby-prof
253
+ requirement: !ruby/object:Gem::Requirement
254
+ requirements:
255
+ - - ">="
256
+ - !ruby/object:Gem::Version
257
+ version: '0'
258
+ type: :development
259
+ prerelease: false
260
+ version_requirements: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - ">="
263
+ - !ruby/object:Gem::Version
264
+ version: '0'
265
+ - !ruby/object:Gem::Dependency
266
+ name: simplecov
267
+ requirement: !ruby/object:Gem::Requirement
268
+ requirements:
269
+ - - ">="
270
+ - !ruby/object:Gem::Version
271
+ version: '0'
272
+ type: :development
273
+ prerelease: false
274
+ version_requirements: !ruby/object:Gem::Requirement
275
+ requirements:
276
+ - - ">="
277
+ - !ruby/object:Gem::Version
278
+ version: '0'
279
+ - !ruby/object:Gem::Dependency
280
+ name: simplecov-json
281
+ requirement: !ruby/object:Gem::Requirement
282
+ requirements:
283
+ - - ">="
284
+ - !ruby/object:Gem::Version
285
+ version: '0'
286
+ type: :development
287
+ prerelease: false
288
+ version_requirements: !ruby/object:Gem::Requirement
289
+ requirements:
290
+ - - ">="
291
+ - !ruby/object:Gem::Version
292
+ version: '0'
293
+ - !ruby/object:Gem::Dependency
294
+ name: kramdown
295
+ requirement: !ruby/object:Gem::Requirement
296
+ requirements:
297
+ - - ">="
298
+ - !ruby/object:Gem::Version
299
+ version: '0'
300
+ type: :development
301
+ prerelease: false
302
+ version_requirements: !ruby/object:Gem::Requirement
303
+ requirements:
304
+ - - ">="
305
+ - !ruby/object:Gem::Version
306
+ version: '0'
307
+ - !ruby/object:Gem::Dependency
308
+ name: yard
309
+ requirement: !ruby/object:Gem::Requirement
310
+ requirements:
311
+ - - ">="
312
+ - !ruby/object:Gem::Version
313
+ version: '0'
314
+ type: :development
315
+ prerelease: false
316
+ version_requirements: !ruby/object:Gem::Requirement
317
+ requirements:
318
+ - - ">="
319
+ - !ruby/object:Gem::Version
320
+ version: '0'
321
+ - !ruby/object:Gem::Dependency
322
+ name: guard-ctags-bundler
323
+ requirement: !ruby/object:Gem::Requirement
324
+ requirements:
325
+ - - ">="
326
+ - !ruby/object:Gem::Version
327
+ version: '0'
328
+ type: :development
329
+ prerelease: false
330
+ version_requirements: !ruby/object:Gem::Requirement
331
+ requirements:
332
+ - - ">="
333
+ - !ruby/object:Gem::Version
334
+ version: '0'
335
+ - !ruby/object:Gem::Dependency
336
+ name: faker
337
+ requirement: !ruby/object:Gem::Requirement
338
+ requirements:
339
+ - - ">="
340
+ - !ruby/object:Gem::Version
341
+ version: '0'
342
+ type: :development
343
+ prerelease: false
344
+ version_requirements: !ruby/object:Gem::Requirement
345
+ requirements:
346
+ - - ">="
347
+ - !ruby/object:Gem::Version
348
+ version: '0'
349
+ - !ruby/object:Gem::Dependency
350
+ name: rsense
351
+ requirement: !ruby/object:Gem::Requirement
352
+ requirements:
353
+ - - ">="
354
+ - !ruby/object:Gem::Version
355
+ version: '0'
356
+ type: :development
357
+ prerelease: false
358
+ version_requirements: !ruby/object:Gem::Requirement
359
+ requirements:
360
+ - - ">="
361
+ - !ruby/object:Gem::Version
362
+ version: '0'
363
+ - !ruby/object:Gem::Dependency
364
+ name: awesome_print
365
+ requirement: !ruby/object:Gem::Requirement
366
+ requirements:
367
+ - - ">="
368
+ - !ruby/object:Gem::Version
369
+ version: '0'
370
+ type: :development
371
+ prerelease: false
372
+ version_requirements: !ruby/object:Gem::Requirement
373
+ requirements:
374
+ - - ">="
375
+ - !ruby/object:Gem::Version
376
+ version: '0'
377
+ description: A collection of tools to diff and merge ArchiMate files
378
+ email:
379
+ - markmorga@gmail.com
380
+ - mmorga@rackspace.com
381
+ executables:
382
+ - archidiff
383
+ - archidiff-summary
384
+ - archimerge
385
+ - fmtxml
386
+ extensions: []
387
+ extra_rdoc_files: []
388
+ files:
389
+ - ".gitignore"
390
+ - ".projectile"
391
+ - ".rubocop.yml"
392
+ - ".travis.yml"
393
+ - ".yardocs"
394
+ - Gemfile
395
+ - Guardfile
396
+ - LICENSE
397
+ - README.md
398
+ - Rakefile
399
+ - archimate-diff.gemspec
400
+ - bin/console
401
+ - bin/setup
402
+ - exe/archidiff
403
+ - exe/archidiff-summary
404
+ - exe/archimerge
405
+ - exe/fmtxml
406
+ - lib/archimate-diff.rb
407
+ - lib/archimate/diff/archimate_array_reference.rb
408
+ - lib/archimate/diff/archimate_identified_node_reference.rb
409
+ - lib/archimate/diff/archimate_node_attribute_reference.rb
410
+ - lib/archimate/diff/archimate_node_reference.rb
411
+ - lib/archimate/diff/change.rb
412
+ - lib/archimate/diff/cli/conflict_resolver.rb
413
+ - lib/archimate/diff/cli/diff.rb
414
+ - lib/archimate/diff/cli/diff_summary.rb
415
+ - lib/archimate/diff/cli/merge.rb
416
+ - lib/archimate/diff/cli/merger.rb
417
+ - lib/archimate/diff/conflict.rb
418
+ - lib/archimate/diff/conflicts.rb
419
+ - lib/archimate/diff/conflicts/base_conflict.rb
420
+ - lib/archimate/diff/conflicts/deleted_items_child_updated_conflict.rb
421
+ - lib/archimate/diff/conflicts/deleted_items_referenced_conflict.rb
422
+ - lib/archimate/diff/conflicts/path_conflict.rb
423
+ - lib/archimate/diff/delete.rb
424
+ - lib/archimate/diff/difference.rb
425
+ - lib/archimate/diff/insert.rb
426
+ - lib/archimate/diff/merge.rb
427
+ - lib/archimate/diff/move.rb
428
+ - lib/archimate/diff/version.rb
429
+ homepage: http://github.com/mmorga/archimate-diff
430
+ licenses: []
431
+ metadata:
432
+ yard.run: yri
433
+ post_install_message:
434
+ rdoc_options: []
435
+ require_paths:
436
+ - lib
437
+ required_ruby_version: !ruby/object:Gem::Requirement
438
+ requirements:
439
+ - - ">="
440
+ - !ruby/object:Gem::Version
441
+ version: 2.3.0
442
+ required_rubygems_version: !ruby/object:Gem::Requirement
443
+ requirements:
444
+ - - ">="
445
+ - !ruby/object:Gem::Version
446
+ version: '0'
447
+ requirements: []
448
+ rubyforge_project:
449
+ rubygems_version: 2.6.13
450
+ signing_key:
451
+ specification_version: 4
452
+ summary: Archimate-Diff Tools
453
+ test_files: []