archimate 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d98d20973c7268d804376fe63248509ea6662bf
-  data.tar.gz: 6ddcef82a97dc8e058f019dce7d538c35adaa497
+  metadata.gz: bb777d171110c638d84d1e51687d52cde0fa7270
+  data.tar.gz: 262cdd92904cbe280e73f21cf55082221621f4da
 SHA512:
-  metadata.gz: 766a85383a078953542061dac6b70525e7c7ddb1d6ba0b61731334b9361c40c2729c152be883588b4dad4103769e8a0dea505c4355237e9645e73757cdcbed92
-  data.tar.gz: 04d325efc533cca88bf77a4d169e9b29b205d6db9026b0d33fed2b198d197b91cbd2eb10950b38c7808bb0a5b7d9b34435e51369a22971bafd439fa01a58a93b
+  metadata.gz: 7b432f2cf362430029f3a15446e0173ebcbedf7d6aac18ffde1b4ef9d280eba8f454e283a2ad511eeb4724b15501a0a1c8c831034cab80328c31b6fdcc8b780d
+  data.tar.gz: 29d7c8bf731ea8bc755b15e3282efadfd38ec14ca1d1a8bdde9b649ce15e5326c5f90e21a64742d03f01e1c1e1d20f9181a34a0c78c00bc3663bf5b8e72ec24f

data/README.md

@@ -32,57 +32,10 @@ command        | description
 `archimate convert ARCHIFILE` | Convert the incoming file to the desired type
 `archimate dedupe ARCHIFILE` | de-duplicate elements in Archi file
 `archimate map ARCHIFILE` | *EXPERIMENTAL:* Produce a map of diagram links to a diagram
-`archimate merge ARCHIFILE1 ARCHIFILE2` | *EXPERIMENTAL:*Merge two archimate files
 `archimate project ARCHIFILE PROJECTFILE` | *EXPERIMENTAL:*Synchronize an Archi file and an MSProject XML file
 `archimate svg ARCHIFILE` | Produce semantically meaningful SVG files from an Archi file
 `archimate lint ARCHIFILE` | Produce a report of warnings and issues in the Archi file
 
-### archidiff & archimerge
-
-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.
-
-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.
-
-```
-[difftool "archidiff"]
-    cmd = {PATH_TO_ARCHIDIFF}/archidiff $LOCAL $REMOTE
-
-[difftool "archidiff-summary"]
-    cmd = {PATH_TO_ARCHIDIFF}/archidiff-summary $LOCAL $REMOTE
-
-[mergetool "archimerge"]
-	cmd = {PATH_TO_ARCHIDIFF}/archimerge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
-	trustExitCode = false
-```
-
-Then to use the tool for diffing you can do this:
-
-```sh
-git difftool --tool archidiff 833cbb7 HEAD  -- path_to/my.archimate
-```
-
-or to see a summary of what changed between versions:
-
-```sh
-git difftool --tool archidiff-summary 833cbb7 HEAD  -- path_to/my.archimate
-```
-
-Finally, if you have a merge conflict, you can use archimerge to help make the merge sane:
-
-```sh
-git mergetool --tool archimerge -- path_to/my.archimate
-```
-
-### fmtxml
-
-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.
-
-```
-[diff "archimate"]
-    textconv = fmtxml
-    cachetextconv = true
-```
-
 ## Development
 
 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.

data/lib/archimate.rb

@@ -19,15 +19,10 @@ module Archimate
   module Cli
     autoload :Archi, 'archimate/cli/archi'
     autoload :Cleanup, 'archimate/cli/cleanup'
-    autoload :ConflictResolver, 'archimate/cli/conflict_resolver'
     autoload :Convert, 'archimate/cli/convert'
-    autoload :Diff, 'archimate/cli/diff'
-    autoload :DiffSummary, 'archimate/cli/diff_summary'
     autoload :Duper, 'archimate/cli/duper'
     autoload :Lint, 'archimate/cli/lint'
     autoload :Mapper, 'archimate/cli/mapper'
-    autoload :Merge, 'archimate/cli/merge'
-    autoload :Merger, 'archimate/cli/merger'
     autoload :Stats, 'archimate/cli/stats'
     autoload :Svger, 'archimate/cli/svger'
   end
@@ -86,12 +81,6 @@ module Archimate
   require "archimate/logging"
   require "archimate/color"
   require 'archimate/data_model'
-  require 'archimate/diff'
-
-  # Computes the set of differences between base and remote models
-  def self.diff(base, remote)
-    base.diff(remote)
-  end
 
   # Reads the given file and returns the Archimate model
   #

data/lib/archimate/cli/archi.rb

@@ -47,14 +47,6 @@ module Archimate
         ).map
       end
 
-      desc "merge ARCHIFILE1 ARCHIFILE2", "EXPERIMENTAL: Merge two archimate files"
-      option :output,
-             aliases: :o,
-             desc: "Write output to FILE instead of stdout."
-      def merge(archifile1, archifile2)
-        Archimate::Cli::Merger.new.merge_files(archifile1, archifile2)
-      end
-
       desc "svg -o OUTPUTDIR ARCHIFILE", "IN DEVELOPMENT: Produce semantically meaningful SVG files from an Archi file"
       option :output,
              aliases: :o,

data/lib/archimate/data_model/diffable_array.rb

@@ -32,72 +32,72 @@ module Archimate
           false
         end
 
-        def diff(other)
-          raise TypeError, "Expected other #{other.class} to be of type #{self.class}" unless other.is_a?(self.class)
-          raise "Well Hell other #{other.path} in_model is nil" if other.in_model.nil?
-          raise "Well Hell my path `#{path}` in_model is nil" if in_model.nil?
-
-          result = []
-          remaining_content = Array.new(self) # TODO: I want a copy of the array, not a deep clone
-          other_enum = other.each_with_index
-
-          loop do
-            if other_enum.peek[0] == remaining_content[0]
-              other_enum.next
-              remaining_content.shift
-            elsif items_are_changed?(other, other_enum, remaining_content)
-              result.concat(compute_item_changes(other, other_enum, self, remaining_content[0]))
-              remaining_content.shift
-              other_enum.next
-            elsif !remaining_content.empty? && !other.smart_include?(remaining_content[0])
-              result << Diff::Delete.new(Diff::ArchimateArrayReference.new(self, smart_find(remaining_content[0])))
-              remaining_content.shift
-            elsif !smart_include?(other_enum.peek[0])
-              result << Diff::Insert.new(Diff::ArchimateArrayReference.new(other, other_enum.next[1]))
-            elsif smart_include?(other_enum.peek[0])
-              result << Diff::Move.new(
-                Diff::ArchimateArrayReference.new(other, other_enum.peek[1]),
-                Diff::ArchimateArrayReference.new(self, smart_find(other_enum.peek[0]))
-              )
-              remaining_item_idx = remaining_content.smart_find(other_enum.peek[0])
-              if remaining_item_idx
-                result.concat(compute_item_changes(other, other_enum, self, remaining_content[remaining_item_idx]))
-                remaining_content.delete_at(remaining_item_idx) if remaining_content.smart_include?(other_enum.peek[0])
-              end
-              other_enum.next
-            else
-              raise "Unhandled diff case for remaining_content: #{remaining_content[0]} and #{other_enum.peek[0]}"
-            end
-          end
-
-          result.concat(
-            remaining_content
-              .reject { |item| other.include?(item) }
-              .map do |item|
-                Diff::Delete.new(Diff::ArchimateArrayReference.new(self, find_index(item)))
-              end
-          )
-        end
+        # def diff(other)
+        #   raise TypeError, "Expected other #{other.class} to be of type #{self.class}" unless other.is_a?(self.class)
+        #   raise "Well Hell other #{other.path} in_model is nil" if other.in_model.nil?
+        #   raise "Well Hell my path `#{path}` in_model is nil" if in_model.nil?
+
+        #   result = []
+        #   remaining_content = Array.new(self) # TODO: I want a copy of the array, not a deep clone
+        #   other_enum = other.each_with_index
+
+        #   loop do
+        #     if other_enum.peek[0] == remaining_content[0]
+        #       other_enum.next
+        #       remaining_content.shift
+        #     elsif items_are_changed?(other, other_enum, remaining_content)
+        #       result.concat(compute_item_changes(other, other_enum, self, remaining_content[0]))
+        #       remaining_content.shift
+        #       other_enum.next
+        #     elsif !remaining_content.empty? && !other.smart_include?(remaining_content[0])
+        #       result << Diff::Delete.new(Diff::ArchimateArrayReference.new(self, smart_find(remaining_content[0])))
+        #       remaining_content.shift
+        #     elsif !smart_include?(other_enum.peek[0])
+        #       result << Diff::Insert.new(Diff::ArchimateArrayReference.new(other, other_enum.next[1]))
+        #     elsif smart_include?(other_enum.peek[0])
+        #       result << Diff::Move.new(
+        #         Diff::ArchimateArrayReference.new(other, other_enum.peek[1]),
+        #         Diff::ArchimateArrayReference.new(self, smart_find(other_enum.peek[0]))
+        #       )
+        #       remaining_item_idx = remaining_content.smart_find(other_enum.peek[0])
+        #       if remaining_item_idx
+        #         result.concat(compute_item_changes(other, other_enum, self, remaining_content[remaining_item_idx]))
+        #         remaining_content.delete_at(remaining_item_idx) if remaining_content.smart_include?(other_enum.peek[0])
+        #       end
+        #       other_enum.next
+        #     else
+        #       raise "Unhandled diff case for remaining_content: #{remaining_content[0]} and #{other_enum.peek[0]}"
+        #     end
+        #   end
+
+        #   result.concat(
+        #     remaining_content
+        #       .reject { |item| other.include?(item) }
+        #       .map do |item|
+        #         Diff::Delete.new(Diff::ArchimateArrayReference.new(self, find_index(item)))
+        #       end
+        #   )
+        # end
 
         # TODO: This may not continue to live here. Only used by testing.
-        def patch(diffs)
-          # TODO: Beware, order of diffs could break patching at the moment.
-          Array(diffs).each do |diff|
-            case diff
-            when Diff::Delete
-              delete_at(smart_find(diff.target.value))
-            when Diff::Insert
-              insert(diff.target.array_index, diff.target.value)
-            when Diff::Change
-              self[smart_find(diff.changed_from.value)] = diff.target.value
-            when Diff::Move
-              insert(diff.target.array_index, delete_at(smart_find(diff.target.value)))
-            else
-              raise "Unexpected diff type: #{diff.class}"
-            end
-          end
-          self
-        end
+        # def patch(diffs)
+        #   # TODO: Beware, order of diffs could break patching at the moment.
+        #   Array(diffs).each do |diff|
+        #     case diff
+        #     when Diff::Delete
+        #       delete_at(smart_find(diff.target.value))
+        #     when Diff::Insert
+        #       insert(diff.target.array_index, diff.target.value)
+        #     when Diff::Change
+        #       self[smart_find(diff.changed_from.value)] = diff.target.value
+        #     when Diff::Move
+        #       insert(diff.target.array_index, delete_at(smart_find(diff.target.value)))
+        #     else
+        #       raise "Unexpected diff type: #{diff.class}"
+        #     end
+        #   end
+        #   self
+        # end
 
         def items_are_changed?(other, other_enum, remaining)
           !remaining.empty? &&

data/lib/archimate/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Archimate
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archimate
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Mark Morga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -379,11 +379,7 @@ email:
 - markmorga@gmail.com
 - mmorga@rackspace.com
 executables:
-- archidiff
-- archidiff-summary
 - archimate
-- archimerge
-- fmtxml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -402,23 +398,14 @@ files:
 - bin/archimate
 - bin/console
 - bin/setup
-- exe/archidiff
-- exe/archidiff-summary
 - exe/archimate
-- exe/archimerge
-- exe/fmtxml
 - lib/archimate.rb
 - lib/archimate/cli/archi.rb
 - lib/archimate/cli/cleanup.rb
-- lib/archimate/cli/conflict_resolver.rb
 - lib/archimate/cli/convert.rb
-- lib/archimate/cli/diff.rb
-- lib/archimate/cli/diff_summary.rb
 - lib/archimate/cli/duper.rb
 - lib/archimate/cli/lint.rb
 - lib/archimate/cli/mapper.rb
-- lib/archimate/cli/merge.rb
-- lib/archimate/cli/merger.rb
 - lib/archimate/cli/stats.rb
 - lib/archimate/cli/svger.rb
 - lib/archimate/color.rb
@@ -458,23 +445,6 @@ files:
 - lib/archimate/data_model/view_concept.rb
 - lib/archimate/data_model/view_node.rb
 - lib/archimate/data_model/viewpoint.rb
-- lib/archimate/diff.rb
-- lib/archimate/diff/archimate_array_reference.rb
-- lib/archimate/diff/archimate_identified_node_reference.rb
-- lib/archimate/diff/archimate_node_attribute_reference.rb
-- lib/archimate/diff/archimate_node_reference.rb
-- lib/archimate/diff/change.rb
-- lib/archimate/diff/conflict.rb
-- lib/archimate/diff/conflicts.rb
-- lib/archimate/diff/conflicts/base_conflict.rb
-- lib/archimate/diff/conflicts/deleted_items_child_updated_conflict.rb
-- lib/archimate/diff/conflicts/deleted_items_referenced_conflict.rb
-- lib/archimate/diff/conflicts/path_conflict.rb
-- lib/archimate/diff/delete.rb
-- lib/archimate/diff/difference.rb
-- lib/archimate/diff/insert.rb
-- lib/archimate/diff/merge.rb
-- lib/archimate/diff/move.rb
 - lib/archimate/export/csv_export.rb
 - lib/archimate/export/cypher.rb
 - lib/archimate/export/graph_ml.rb

data/exe/archidiff

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby -w
-# frozen_string_literal: true
-
-require "rubygems"
-require "archimate"
-
-Archimate::Cli::Diff.diff(ARGV[0], ARGV[1], Archimate::AIO.new)

data/exe/archidiff-summary

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby -w
-# frozen_string_literal: true
-
-require "rubygems"
-require "archimate"
-
-Archimate::Cli::DiffSummary.diff(ARGV[0], ARGV[1])

data/exe/archimerge

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby -w
-# frozen_string_literal: true
-
-require "rubygems"
-require "archimate"
-
-Archimate::Cli::Merge.merge(ARGV[0], ARGV[1], ARGV[2], ARGV[3])

data/exe/fmtxml

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "archimate"
-
-Archimate::Cli::XmlTextconv.new(ARGV[0])

data/lib/archimate/cli/conflict_resolver.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require "highline"
-
-module Archimate
-  module Cli
-    class ConflictResolver
-      def initialize
-        @config = Config.instance
-        # TODO: pull the stdin/stdout from the app config
-        @hl = HighLine.new(STDIN, STDOUT)
-      end
-
-      # TODO: this implementation has much to be written
-      def resolve(conflict)
-        return [] unless @config.interactive
-        base_local_diffs = conflict.base_local_diffs
-        base_remote_diffs = conflict.base_remote_diffs
-        choice = @hl.choose do |menu|
-          menu.prompt = conflict
-          menu.choice(:local, text: base_local_diffs.map(&:to_s).join("\n\t\t"))
-          menu.choice(:remote, text: base_remote_diffs.map(&:to_s).join("\n\t\t"))
-          # menu.choice(:neither, help: "Don't choose either set of diffs")
-          # menu.choice(:edit, help: "Edit the diffs (coming soon)")
-          # menu.choice(:quit, help: "I'm in over my head. Just stop!")
-          menu.select_by = :index_or_name
-        end
-        case choice
-        when :local
-          base_local_diffs
-        when :remote
-          base_remote_diffs
-        else
-          error "Unexpected choice #{choice.inspect}."
-        end
-      end
-    end
-  end
-end

data/lib/archimate/cli/diff.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-module Archimate
-  module Cli
-    class Diff
-      attr_reader :local, :remote
-
-      def self.diff(local_file, remote_file)
-        local = Archimate.read(local_file)
-        remote = Archimate.read(remote_file)
-
-        my_diff = Diff.new(local, remote)
-        my_diff.diff
-      end
-
-      def initialize(local, remote)
-        @local = local
-        @remote = remote
-      end
-
-      def diff
-        diffs = Archimate.diff(local, remote)
-
-        diffs.each { |d| puts d }
-
-        puts "\n\n#{diffs.size} Differences"
-
-        diffs
-      end
-    end
-  end
-end

data/lib/archimate/cli/diff_summary.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-require 'forwardable'
-
-module Archimate
-  module Cli
-    class DiffSummary
-      using DataModel::DiffableArray
-      using DataModel::DiffablePrimitive
-
-      DIFF_KINDS = %w(Delete Change Insert).freeze
-
-      attr_reader :local, :remote
-
-      def self.diff(local_file, remote_file, options = { verbose: true })
-        logger.info "Reading #{local_file}"
-        local = Archimate.read(local_file)
-        logger.info "Reading #{remote_file}"
-        remote = Archimate.read(remote_file)
-
-        my_diff = DiffSummary.new(local, remote)
-        my_diff.diff
-      end
-
-      def initialize(local, remote)
-        @local = local
-        @remote = remote
-        @summary = Hash.new { |hash, key| hash[key] = Hash.new { |k_hash, k_key| k_hash[k_key] = 0 } }
-      end
-
-      def diff
-        logger.info "Calculating differences"
-        diffs = Archimate.diff(local, remote)
-
-        puts Color.color("Summary of differences", :headline)
-        puts "\n"
-
-        summary_element_diffs = diffs.group_by { |diff| diff.summary_element.class.to_s.split("::").last }
-        summarize_elements summary_element_diffs["Element"]
-        summarize "Organization", summary_element_diffs["Organization"]
-        summarize "Relationship", summary_element_diffs["Relationship"]
-        summarize_diagrams summary_element_diffs["Diagram"]
-
-        puts "Total Diffs: #{diffs.size}"
-      end
-
-      def summarize(title, diffs)
-        return if diffs.nil? || diffs.empty?
-        by_kind = diffs_by_kind(diffs)
-
-        puts color(title)
-        DIFF_KINDS.each do |kind|
-          puts format("  #{color(kind)}: #{by_kind[kind]&.size}") if by_kind.key?(kind)
-        end
-      end
-
-      def diffs_by_kind(diffs)
-        diffs
-          .group_by(&:summary_element)
-          .each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |(summary_element, element_diffs), a|
-          top_level_diff = element_diffs.find { |diff| summary_element == diff.target.value }
-          if top_level_diff
-            a[top_level_diff.kind] << summary_element
-          else
-            a["Change"] << summary_element
-          end
-        end
-      end
-
-      def summarize_elements(diffs)
-        return if diffs.nil? || diffs.empty?
-        puts Color.color("Elements", :headline)
-        by_layer = diffs.group_by { |diff| diff.summary_element.layer }
-        summarize "Business", by_layer["Business"]
-        summarize "Application", by_layer["Application"]
-        summarize "Technology", by_layer["Technology"]
-        summarize "Motivation", by_layer["Motivation"]
-        summarize "Implementation and Migration", by_layer["Implementation and Migration"]
-        summarize "Connectors", by_layer["Connectors"]
-      end
-
-      def summarize_diagrams(diffs)
-        return if diffs.nil? || diffs.empty?
-        puts Color.color("Diagrams", :headline)
-
-        by_kind = diffs_by_kind(diffs)
-        %w(Delete Change Insert).each do |kind|
-          next unless by_kind.key?(kind)
-          diagram_names = by_kind[kind].uniq.map(&:name)
-          puts "  #{color(kind)}"
-          # TODO: make this magic number an option
-          diagram_names[0..14].each { |diagram_name| puts "    #{diagram_name}" }
-          puts "    ... and #{diagram_names.size - 15} more" if diagram_names.size > 15
-        end
-      end
-
-      def color(kind)
-        Color.color(kind, kind)
-      end
-    end
-  end
-end