graph 2.8.2 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 574ca778f479293c4fb24c185b89154f57704c82
-  data.tar.gz: e33fba3e10c00412b59b70f28bb35176bda1200c
+SHA256:
+  metadata.gz: 1055526ebd41492464e5cdb5693539baceb8874bb1e3ad4905bc63c3fe7e5495
+  data.tar.gz: 2475dbbf5c778e9a907d1e7aabd3acb6166207200331b2607367f9f83e59a56b
 SHA512:
-  metadata.gz: 3b6f02a139e1b6d7b587800d2f49901175f05fcdf83ddbbf365d7e0564160d4ffeed72dedcf4ce063f66b4e1222dd03cb47f1d8730bd802c16c1b98bc1761ae6
-  data.tar.gz: a4a6a9c7762e7f70f7a5a932765f52a52b54b79f532e6f6991fd0395ca6a2b647104e59757d6dc94f0bf972a114a3b3b8d299770ace10b8d9c517099a2031315
+  metadata.gz: ab1262055c9050c8316b80d72f8d725152f89d7fe343bfa46b99f9c09b00d358f3b0566e18c7fae71d6fc8e660e8c6a8355067671d72ed34ac7b6f00111c376d
+  data.tar.gz: 7cbcc998dbce3f28551f407b10b06411f437d6bbf5f352b4a0bfc93b2414a3aebdb0ec3f06dc0bbb4afe769cb56c98e6a6b32f771bf853f5e713cb089ba7d562

data.tar.gz.sig

@@ -1,3 +1 @@
-M�K�����������y��M����4ِ����&�N��G�c��]�UA�ڈeS+���
-U�5X8��
(�qgs{2�?+?3��n�5�_���
-�����+�'�~�^�9��fhn�r7�h&��[b����`�q/�Dy�j�x�\}ȩ�7���fP��(0�<��b]\e�H�
+7!��ܕea��GrnYw��M%Hğ��f�f����g���8��.�=V�qB)�/*źA`�W/2f���u��B�����i�ڮ%j��Y�e�T!S%�G��[�u�4�Wi�N���V�9ֱT���#@��ߞ�6�H|i}~:`_��gԀ��;���a��Ѳ�,�p���‰��/8v8��4�0dk����wT<�T�l�\�)%� Y1���6'j��J��lT*/�"Ǫ������C�H�[�nT1D �����

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.9.0 / 2019-09-24
+
+* 3 minor enhancements:
+
+  * Added ability to specify command to run on save. (tanalab2)
+  * Added bg_<name> and fill_<name> methods for all colors.
+  * Added bgcolor shortcut method.
+
+* 1 bug fix:
+
+  * Normalized all attribute value quoting.
+
 === 2.8.2 / 2016-10-09
 
 * 2 bug fixes:

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.8.2" # :nodoc:
+  VERSION = "2.9.0" # :nodoc:
 
   # :stopdoc:
 
@@ -66,6 +66,8 @@ class Graph
 
   (BOLD_COLORS + LIGHT_COLORS).each do |name|
     define_method(name) { color name }
+    define_method("bg_#{name}") { bgcolor name }
+    define_method("fill_#{name}") { fillcolor name }
   end
 
   SHAPES.each do |name|
@@ -222,7 +224,7 @@ class Graph
   # Shortcut method to create and set the graph to use a colorscheme.
 
   def colorscheme name, n = nil
-    self.scheme = Attribute.new "colorscheme = #{name}#{n}"
+    self.scheme = Attribute.new "colorscheme = %p" % ["#{name}#{n}"]
     max = COLOR_SCHEME_MAX[name.to_sym]
 
     node_attribs << scheme if max
@@ -272,7 +274,14 @@ class Graph
   # Shortcut method to create a new fillcolor Attribute instance.
 
   def fillcolor n
-    Attribute.new "fillcolor = #{n}"
+    Attribute.new "fillcolor = %p" % [n]
+  end
+
+  ##
+  # Shortcut method to create a new fillcolor Attribute instance.
+
+  def bgcolor n
+    Attribute.new "bgcolor = %p" % [n]
   end
 
   ##
@@ -280,7 +289,7 @@ class Graph
   # pass in both the name and an optional font size.
 
   def font name
-    Attribute.new "fontname = #{name.inspect}"
+    Attribute.new "fontname = %p" % [name]
   end
 
   ##
@@ -333,26 +342,27 @@ class Graph
   ##
   # Saves out both a dot file to path and an image for the specified type.
   # Specify type as nil to skip exporting an image.
+  # Specify cmd as the command name like "neato" to use a command other than "dot".
 
-  def save path, type = nil
+  def save path, type = nil, cmd = "dot"
     File.open "#{path}.dot", "w" do |f|
       f.puts self.to_s
     end
-    system "dot -T#{type} #{path}.dot > #{path}.#{type}" if type
+    system "#{cmd} -T#{type} #{path}.dot > #{path}.#{type}" if type
   end
 
   ##
   # Shortcut method to create a new shape Attribute instance.
 
   def shape shape
-    Attribute.new "shape = #{shape}"
+    Attribute.new "shape = %p" % [shape]
   end
 
   ##
   # Shortcut method to create a new style Attribute instance.
 
   def style name
-    Attribute.new "style = #{name}"
+    Attribute.new "style = %p" % [name]
   end
 
   ##

data/test/test_graph.rb

@@ -14,6 +14,9 @@ class TestGraph < Minitest::Test
 
   def assert_attribute k, v, a
     assert_kind_of Graph::Attribute, a
+
+    v = v.dump if String === v
+
     assert_equal "#{k} = #{v}", a.attr
   end
 
@@ -33,7 +36,7 @@ class TestGraph < Minitest::Test
 
     graph.boxes
 
-    assert_graph graph, 'node [ shape = box ]', '"a" -> "b"'
+    assert_graph graph, 'node [ shape = "box" ]', '"a" -> "b"'
   end
 
   def test_colorscheme
@@ -57,13 +60,13 @@ class TestGraph < Minitest::Test
   end
 
   def test_font
-    assert_attribute "fontname", '"blah"', graph.font("blah")
+    assert_attribute "fontname", "blah", graph.font("blah")
   end
 
   def test_font_size
     # cheating... but I didn't want to write a more complex assertion
-    assert_attribute "fontname", '"blah"', graph.font("blah")
-    assert_attribute "fontsize", '12',     graph.fontsize(12)
+    assert_attribute "fontname", "blah", graph.font("blah")
+    assert_attribute "fontsize", 12,     graph.fontsize(12)
   end
 
   def test_digraph
@@ -208,6 +211,10 @@ class TestGraph < Minitest::Test
     assert_save nil
   end
 
+  def test_save_cmd
+    assert_save "png", "neato"
+  end
+
   def test_shape
     assert_attribute "shape", "blah", graph.shape("blah")
   end
@@ -287,7 +294,7 @@ g_s = "subgraph \"subgraph\"
                  '"a" -> "b"')
   end
 
-  def assert_save type
+  def assert_save type, cmd = "dot"
     path = File.join(Dir.tmpdir, "blah.#{$$}")
 
     actual = expected = false
@@ -297,10 +304,10 @@ g_s = "subgraph \"subgraph\"
       actual = args
     end
 
-    graph.save(path, type)
+    graph.save(path, type, cmd)
 
     assert_equal graph.to_s + "\n", File.read("#{path}.dot")
-    expected = ["dot -T#{type} #{path}.dot > #{path}.png"] if type
+    expected = ["#{cmd} -T#{type} #{path}.dot > #{path}.png"] if type
     assert_equal expected, actual
   ensure
     File.unlink path rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.9.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,46 +20,51 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
+  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
+  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
+  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
+  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
+  UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.18'
 description: "Graph is a type of hash that outputs in graphviz's dot format. It\ncomes
   with a command-line interface that is easily pluggable.\n\nIt ships with plugins
   to graph dependencies and status of installed\nrubygems, rake tasks, homebrew ports,
@@ -77,7 +82,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
-- .autotest
+- ".autotest"
 - History.txt
 - Manifest.txt
 - README.txt
@@ -105,23 +110,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Graph is a type of hash that outputs in graphviz's dot format

metadata.gz.sig

@@ -1,5 +1,2 @@
-4�
q~%�E�@�Ȑ����K���]��N�d��tKe�
-��:c< ���R��P�_�PSTm��\�[\���×N��tC���1�{�9+
-��2�
-o�p1Ǒj;T�wKh?mY�q2i���jX�Օ
-at�I�-�{��Ld�w�}c�j"��Ao=�H��K/����Ѳ�9�$�,2O��ӂ��o�HKLթB;Nxa;�M��ȷA�{��J��{�&�0#v�)����F�	.��7ՆW��
+�5RQ0u~�S�m��Cֹ�k{,��.ƍ���C�5�H�$�
ߨKT<V2Z��mT ��!ҹ㷺�/H����I��i'��Lb�ir���	�ji�LQ̺fL��F�/��={�I��!t\0R
+p�u�OMS��