archimate-diff 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
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,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 846e805830e36b7475bb2e553d7f7cbbe9b36bfd
4
+ data.tar.gz: 6ffbea2a292781e2be93ce9db71619f681ccba12
5
+ SHA512:
6
+ metadata.gz: ac8616b2980bfc36b497d50102b524f4005b97e5214525d2e29cc651c5d3f04c7c1ea773dae48dce5444d0cc41049d3c982c39b5a6aad41b95c113edc0e14d07
7
+ data.tar.gz: 8bca40b86b05f50aad03566f8d5cff07005d7b012721259796dc5bfc7807ee532b981bae57a12bf68cd23b0bd0e679bad655212ceff090969ec8636b30f866ad
@@ -0,0 +1,22 @@
1
+ /.bundle/
2
+ /.ruby-version
3
+ /.yardoc
4
+ /_yardoc/
5
+ /bin/
6
+ /coverage/
7
+ /db/
8
+ /doc/
9
+ /generated/
10
+ /pkg/
11
+ /spec/reports/
12
+ /tmp/
13
+ /vendor/
14
+ .DS_Store
15
+ *.tags
16
+ tags
17
+ .srclib-cache/
18
+ *.sublime-*
19
+ .byebug_history
20
+ *.xlsx
21
+ Gemfile.lock
22
+ .codeintel/
@@ -0,0 +1,18 @@
1
+ -/.bundle
2
+ -/.ruby-version
3
+ -/.yardoc
4
+ -/_yardoc
5
+ -/bin
6
+ -/coverage
7
+ -/db
8
+ -/doc
9
+ -/generated
10
+ -/pkg
11
+ -/spec/reports
12
+ -/tmp
13
+ -/vendor
14
+ -.DS_Store
15
+ -/.srclib-cache
16
+ -*.sublime-project
17
+ -*.sublime-workspace
18
+
@@ -0,0 +1,13 @@
1
+
2
+ StringLiterals:
3
+ Enabled: false
4
+ # EnforcedStyle: double_quotes
5
+
6
+ LineLength:
7
+ Max: 120
8
+
9
+ Style/Documentation:
10
+ Enabled: false
11
+
12
+ AllCops:
13
+ TargetRubyVersion: 2.3
@@ -0,0 +1,4 @@
1
+ language: ruby
2
+ rvm:
3
+ - 2.3.1
4
+ before_install: gem install bundler -v 1.14.5
@@ -0,0 +1,15 @@
1
+ --charset utf-8
2
+ --readme README.md
3
+ --markup markdown
4
+ --markup-provider kramdown
5
+ --template-path yard
6
+ --default-return ""
7
+ --title "Archimate-Diff Documentation"
8
+ --query 'object.type != :classvariable'
9
+ --query 'object.type != :constant || @api && @api.text == "public"'
10
+ --hide-void-return
11
+ --protected
12
+ --no-private
13
+ --no-highlight
14
+ -
15
+ LICENSE
data/Gemfile ADDED
@@ -0,0 +1,5 @@
1
+ # frozen_string_literal: true
2
+ source 'https://rubygems.org'
3
+
4
+ # Specify your gem's dependencies in archimate-diff.gemspec
5
+ gemspec
@@ -0,0 +1,27 @@
1
+ # frozen_string_literal: true
2
+ ## Uncomment and set this to only include directories you want to watch
3
+ # directories %w(app lib config test spec features) \
4
+ # .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
5
+ ENV['TEST_ENV'] = 'guard'
6
+
7
+ guard :bundler do
8
+ require 'guard/bundler'
9
+ require 'guard/bundler/verify'
10
+ helper = Guard::Bundler::Verify.new
11
+
12
+ files = ['Gemfile']
13
+ files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
14
+
15
+ # Assume files are symlinked from somewhere
16
+ files.each { |file| watch(helper.real_path(file)) }
17
+ end
18
+
19
+ guard :minitest, all_after_pass: true do
20
+ # with Minitest::Unit
21
+ watch(%r{^test/(.*)\/?(.*)_test\.rb$})
22
+ watch(%r{^lib/(.*/)?([^/]+)\.rb$}) { |m| "test/#{m[1]}#{m[2]}_test.rb" }
23
+ watch(%r{^test/test_helper\.rb$}) { 'test' }
24
+ watch(%r{^test/examples/factories\.rb$}) { 'test' }
25
+ watch(%r{^lib/archimate/data_model.rb$}) { 'test' }
26
+ watch(%r{^lib/archimate.rb$}) { 'test' }
27
+ end
data/LICENSE ADDED
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "{}"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright {yyyy} {name of copyright owner}
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
@@ -0,0 +1,94 @@
1
+ # Archimate
2
+
3
+ [![Build Status](https://travis-ci.org/mmorga/archi-tools-rb.svg?branch=master)](https://travis-ci.org/mmorga/archi-tools-rb)
4
+
5
+ I also have included some Ruby code that plays with the `.archimate` file format produces by [Archi](http://archimatetool.com/) to produce useful output.
6
+
7
+ ## Installation
8
+
9
+ Add this line to your application's Gemfile:
10
+
11
+ ```ruby
12
+ gem 'archimate'
13
+ ```
14
+
15
+ And then execute:
16
+
17
+ $ bundle
18
+
19
+ Or install it yourself as:
20
+
21
+ $ gem install archimate
22
+
23
+ ## Usage
24
+
25
+ ### archimate
26
+
27
+ The example scripts are (some are planned):
28
+
29
+ command | description
30
+ ------------- | -----------
31
+ `archimate help [COMMAND]` | Describe available commands or one specific command
32
+ `archimate convert ARCHIFILE` | Convert the incoming file to the desired type
33
+ `archimate dedupe ARCHIFILE` | de-duplicate elements in Archi file
34
+ `archimate map ARCHIFILE` | *EXPERIMENTAL:* Produce a map of diagram links to a diagram
35
+ `archimate merge ARCHIFILE1 ARCHIFILE2` | *EXPERIMENTAL:*Merge two archimate files
36
+ `archimate project ARCHIFILE PROJECTFILE` | *EXPERIMENTAL:*Synchronize an Archi file and an MSProject XML file
37
+ `archimate svg ARCHIFILE` | Produce semantically meaningful SVG files from an Archi file
38
+ `archimate lint ARCHIFILE` | Produce a report of warnings and issues in the Archi file
39
+
40
+ ### archidiff & archimerge
41
+
42
+ Archidiff is a set of tools to help with versioning an `.archimate` file from Archi in a version control system (like git). Eventually I want to provide diff and (3-way) merge tools that understand how *Archi* files are structured and avoid problems that happen when multiple people collaborate on a model.
43
+
44
+ To enable using these from the command line git, add these lines to your `~/.gitconfig` replacing `{PATH_TO_ARCHIDIFF}` with the path to the archidiff binaries.
45
+
46
+ ```
47
+ [difftool "archidiff"]
48
+ cmd = {PATH_TO_ARCHIDIFF}/archidiff $LOCAL $REMOTE
49
+
50
+ [difftool "archidiff-summary"]
51
+ cmd = {PATH_TO_ARCHIDIFF}/archidiff-summary $LOCAL $REMOTE
52
+
53
+ [mergetool "archimerge"]
54
+ cmd = {PATH_TO_ARCHIDIFF}/archimerge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
55
+ trustExitCode = false
56
+ ```
57
+
58
+ Then to use the tool for diffing you can do this:
59
+
60
+ ```sh
61
+ git difftool --tool archidiff 833cbb7 HEAD -- path_to/my.archimate
62
+ ```
63
+
64
+ or to see a summary of what changed between versions:
65
+
66
+ ```sh
67
+ git difftool --tool archidiff-summary 833cbb7 HEAD -- path_to/my.archimate
68
+ ```
69
+
70
+ Finally, if you have a merge conflict, you can use archimerge to help make the merge sane:
71
+
72
+ ```sh
73
+ git mergetool --tool archimerge -- path_to/my.archimate
74
+ ```
75
+
76
+ ### fmtxml
77
+
78
+ Can be used as a `textconv` filter in .gitconfig to pre-format files for better diff use (for visual scanning). You'd set this up in your `$HOME/.gitconfig` file like this.
79
+
80
+ ```
81
+ [diff "archimate"]
82
+ textconv = fmtxml
83
+ cachetextconv = true
84
+ ```
85
+
86
+ ## Development
87
+
88
+ After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
89
+
90
+ To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
91
+
92
+ ## Contributing
93
+
94
+ Bug reports and pull requests are welcome on GitHub at https://github.com/mmorga/archi-tools-rb.
@@ -0,0 +1,29 @@
1
+ # frozen_string_literal: true
2
+ require "bundler/gem_tasks"
3
+ require "rake/testtask"
4
+ require "yard"
5
+
6
+ Rake::TestTask.new(:test) do |t|
7
+ t.libs << "test"
8
+ t.libs << "lib"
9
+ t.test_files = FileList['test/**/*_test.rb']
10
+ end
11
+
12
+ YARD::Rake::YardocTask.new do |t|
13
+ t.options += ['--title', "YARD #{YARD::VERSION} Documentation"]
14
+ end
15
+
16
+ namespace :yard do
17
+ desc "List all undocumented methods and classes."
18
+ task :undocumented do
19
+ command = 'yard --list --query '
20
+ command << '"object.docstring.blank? && '
21
+ command << '!(object.type == :method && object.is_alias?)"'
22
+ sh command
23
+ end
24
+ end
25
+
26
+ desc "Generate documentation incrementally"
27
+ task(:redoc) { sh "yard -c" }
28
+
29
+ task default: :test