depviz 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ada6d7a48c5f347acc4eab8947406b53d1b01966809b6fedb1ba7a7367c573
-  data.tar.gz: 8d4bc6609bd75a80b5f57f2f734b76d5f28a503b045947e43c08799375fc88cf
+  metadata.gz: dce62cfb73633debf25de501d335336bda15d3ecdc77d8f781b444d5677773ab
+  data.tar.gz: b55d6679b1b84c5226300fb63daaf8970aba542273d94546273c66f1cb3837c1
 SHA512:
-  metadata.gz: 6dc83fc3c3743fd1fb3c91023a574da6c49a7c29114c47717d2d5f1bab50c5c5f3034d45882d93b951167e06d5598ea302a051eaa986f648885905acb10b8081
-  data.tar.gz: d457c0dc75540fb146b5403c34df33ff38bc0a4de1d9dfb2dc16fbb86513dc93a8c692be4973718a34295954c70165ec9a9df70621a11cde0ccb8c37a45a04f6
+  metadata.gz: ce40cb2e3764138131d09a05c569ec84967a78a24694419b4704a153fef1d1821640289174e854fa7040a4d4e364d8aad8a9ad3e34648689c5ec705b7f1ad924
+  data.tar.gz: 47d6b94ce2a706c47b3cc1eacda2a158e358bba79963413125440e10d0851f7b977c32781e275164effd10df46149b674a8e006fa7d3720194f598336f9cb6ba

data/lib/depviz.rb

@@ -27,14 +27,38 @@ class DepViz
       a = LineTree.new(@s).to_doc.root.xpath('//' + @name)
       puts 'dep: a: ' + a.inspect if @debug
       
+      enclose = ->(a) do
+        a.length > 1 ? [a.first] << enclose.call(a[1..-1]) : a
+      end
+            
       a2 = a.map do |x|
         puts '  dependencies x: ' + x.inspect if @debug
-        x.backtrack.to_s.split('/')[1..-1]
+        enclose.call x.backtrack.to_s.split('/')[1..-1]
       end
+      
       puts 'a2: ' + a2.inspect if @debug
       
-      s = a2.map {|x| x.map.with_index {|y,i| '  ' * i + y }.join("\n")}\
-          .join("\n")
+      # group the items in order to merge branches with the same parent
+      a3 = a2.group_by(&:first)
+      a4 = a3.map {|x| [x.first] + x.last.map(&:last)}      
+            
+      treeize = ->(obj, indent=-2) do
+
+        if obj.is_a? Array then
+          
+          r = obj.map {|x| treeize.call(x, indent+1)}.join("\n")
+          puts 'r: ' + r.inspect if @debug
+          r
+
+        else
+
+          '  ' * indent + obj
+
+        end
+      end      
+      
+      s = treeize.call(a4)
+      
       puts 'child s: ' + s.inspect if @debug
 
       dv3 = DepViz.new()
@@ -43,6 +67,8 @@ class DepViz
       
     end
     
+    # returns a DepViz document
+    #
     def reverse_dependencies()
 
       a = LineTree.new(@s, root: @root).to_doc.root.xpath('//' + @name)
@@ -67,9 +93,8 @@ class DepViz
 <?polyrex schema='items[type]/item[label]' delimiter =' # '?>
 type: digraph
 
-    "
-        
-    build(s)    
+    "      
+    @s = build(s)    
     
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depviz
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMTIxMTkyMzE2WhcN
-  MTkwMTIxMTkyMzE2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ3L67
-  8183BAMBswfY/06QuC63URRc8KHhoCfFC+3DE5h+bSycpUnu4lJ44QvFi1fycMmm
-  2HchCK0cLDX9ZxOqSO4YJWmh99TmA8nvqIDfe0hFx5Zcrn/b6SdKaUOxv6rWpvPw
-  OfF3YjaHkeAvgar0xYvagUKESSKLr0Pbc/a7gJKaVZkHJFbnoyEguLYut6OpEEPP
-  M78+Mtai/tFbVRwhDmid2BHZS57+4kTXFuA4UqePNVyXt8mrtic1vgNKbsQ0nSbJ
-  t9QgEaqEAGSCkFye6b+dx8WVgq0MAchgQ2tvQhifzqRqtmEOhzf0785yKxNEHsDt
-  F49kONjTsDQXtJd5AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFGsQrpJ6RZLNIpwQeKMZLs8ZbFFaMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAGT7n8qvDZb8tAeB600O
-  a054HpBNHLJ/HxbMyv+gE2n7yDg3D4sR2X6ekQVW8Rg6emZAhDWa+dREHzL2j+dp
-  hU13ewBbz3Oh2+M7+AsLWlp6lB1CwJ/HBaC7ePq2ijbDd8OpJaTRCDh/ICH6vkfm
-  otS5scbDgYhQ2MmW2beylEznx9C+GhixFVcxWIDikknpEUvoOYoJalM0a8x5I7JG
-  R/eJT/8JSL1Sz0ywBXzMSh8mBjYP5EkovU82TyiYbg0kJ7PSNIM2vb0x/VAO9LCY
-  TCqBEF2WnZz6KeKywr1qQSkgenmZJAIRJf6Yc2GlE/o9rTHz+kWZGg9ZvB3AU6qZ
-  2QY=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNjAzMDk1MzQ0WhcN
+  MjAwNjAyMDk1MzQ0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCRYbn1
+  Fxt/3nQfM/79qO2UuuUlR3kCV5irj0biTNxf4JtjzVV8yrXziAAeISrFHyuYEtic
+  i9MttV6DEW8TImuGj6f6Oqlw/A/RzzQjn7GtcL1d7neBK9W1J3KgJ1JXvrTIdyWv
+  5PzQccRu1BWJBA1oLn0mU9/wfanuIpJv9Vbb9JkD+KVNltBwu3umDrxlLx7Sswyb
+  bVa3paStxaUQ68Czk2En37NGi4Fklm9B0vA0MQIAbk6SzJam2DW4Q3kY0xD8XW+M
+  OHu7kWa2fWZgNyJ8HKKuoSHoEUX1hQi8RLhl6RCd7XMvgHOcXz/RkpEslo2y7JL8
+  I6j0hgWreGD+2UX0/It/YGxP4ZuYURSLo3b51VCxG/ZucXap9q9fdL9yo0Q04La3
+  RdiwYfK8yT01Q2aka10FDm/pP3X3eAStU3j3OBIi5fOkmstRcVfwlZo3G+oKiSCN
+  jYa/SWlgplC2QYFV82wkl30HLoLTXQfOnMzcDqGwPrJs6uAHI+tN7pqWy2kCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUDZKHaZW1
+  sIg3/fJWq3G53WHv2rAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAeBSpoASLXnbaBavcGV4U5cFztowi8X7A36mKQErU
+  M9WO2rSA1tKXRPCgbIXxDOjfSvIeElIOiCt3pOxUoh6hOdW74NJrouhE3SD+SaSD
+  2DA9KfXiX1mX95ab0fZkdDQgMGFaaoO1FUl36iSsZFU07dBVEYJAn5qm4UjQpJw3
+  7Zyr65t7l+gKktE7SK7Lz8bNcP+z7axdilCst21q0J3u0gEye917Xo/O53nzDNFY
+  FOnC3DQL7rPfXbHvtUh/pdI0VxYHqEbvAm7yU8MtknlBiDLDomSUGTqMRLXHzMDm
+  LY3ynRaBjiMdQYyXTDZMtrEiPBiWA3kiX0LSJmrVlHBUz+QCncMTvisHBndUgTqk
+  49JLHdNSx+oB1JJWVUYG3mdKOvfmmdoGOi1tno8iO7x7Q2k3Sq/h4ePeVvkQJhyG
+  zoPaOSt4xoowKqommO0RHQimrbPQWds1bnkTc//n7y6ALRc9fqvN/8MJHf0wpUja
+  dsRU+5pPlIOwJbnDyYzEZrS9
   -----END CERTIFICATE-----
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxgraphviz
@@ -56,42 +61,42 @@ dependencies:
   name: dependency_builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: xml_to_sliml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -118,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Generates a complete dependency tree from disparate dependencies to an SVG