graph 1.1.0 → 1.2.0

data/.autotest

@@ -3,22 +3,6 @@
 require 'autotest/restart'
 require 'autotest/rcov'
 
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end
+Autotest.add_hook :initialize do |at|
+  at.testlib = "minitest/autorun"
+end

data/History.txt

@@ -1,3 +1,23 @@
+=== 1.2.0 / 2010-03-30
+
+* 10 minor enhancements:
+
+  * Added rake_analyzer.rb to help visualize rake dependencies. YAY!
+  * Added #boxes to convert all nodes to boxes.
+  * Added #global_attrib to set attribs on all nodes.
+  * Added #nodes to return all nodes (even if not part of from-edge).
+  * Added #normalize to remove duplicate edges.
+  * Added #orient to set graph orientation.
+  * Added #rotate as LR alias to #orient.
+  * Added full rdoc for Graph.
+  * Switched to minitest.
+  * Updated Hoe setup.
+
+* 2 bug fixes:
+
+  * Fixed inherited #clear to ensure ivars cleared as well.
+  * Fixed scanner to work with new macports deps output
+
 === 1.1.0 / 2009-04-16
 
 * 3 minor enhancements:

data/Manifest.txt

@@ -8,6 +8,7 @@ lib/dep_analyzer.rb
 lib/freebsd_analyzer.rb
 lib/graph.rb
 lib/macports_analyzer.rb
+lib/rake_analyzer.rb
 lib/rubygems/commands/graph_command.rb
 lib/rubygems_analyzer.rb
 lib/rubygems_plugin.rb

data/Rakefile

@@ -4,9 +4,12 @@ require 'rubygems'
 require 'hoe'
 require './lib/graph.rb'
 
-Hoe.new('graph', Graph::VERSION) do |p|
-  p.rubyforge_name = 'seattlerb'
-  p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+Hoe.plugin :seattlerb
+
+Hoe.spec 'graph' do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
+
+  self.rubyforge_name = 'seattlerb'
 end
 
 # vim: syntax=Ruby

data/lib/dep_analyzer.rb

@@ -116,7 +116,7 @@ class DepAnalyzer < Cache
       end
     end
 
-    puts "Looks like you can nuke:\n\t#{indies.join("\n\t")}"
+    puts "Looks like you can nuke:\n\t#{indies.sort.join("\n\t")}"
 
     unless argv.empty? then
       argv.each do |pkg|

data/lib/graph.rb

@@ -1,38 +1,106 @@
 #!/usr/local/bin/ruby -w
 
+##
+# Graph is a type of hash that outputs in graphviz's dot format.
+
 class Graph < Hash
-  VERSION = '1.1.0'
+  VERSION = '1.2.0' # :nodoc:
+
+  ##
+  # A Hash of arrays of attributes for each node. Eg:
+  #
+  #   graph.attribs["a"] << "color = red"
+  #
+  # Will color node "a" red.
 
   attr_reader :attribs
-  attr_reader :prefix
+
+  ##
+  # An array of the order of traversal / definition of the nodes.
+  #
+  # You (generally) should leave this alone.
+
   attr_reader :order
-  attr_reader :edge
 
-  def initialize
-    super { |h,k| h[k] = [] }
-    @prefix  = []
-    @order   = []
-    @attribs = Hash.new { |h,k| h[k] = [] }
-    @edge    = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = [] } }
-  end
+  ##
+  # An array of attributes to add to the front of the graph source. Eg:
+  #
+  #   graph.prefix << "ratio = 1.5"
 
-  def []= key, val
+  attr_reader :prefix
+
+  ##
+  # A Hash of a Hashes of Arrays of attributes for an edge. Eg:
+  #
+  #   graph.edge["a"]["b"] << "color = blue"
+  #
+  # Will color the edge between a and b blue.
+
+  attr_reader :edge
+
+  def []= key, val # :nodoc:
     @order << key unless self.has_key? key
     super
   end
 
-  def delete key
-    @order.delete key
+  def clear # :nodoc:
     super
+    @prefix.clear
+    @order.clear
+    @attribs.clear
+    @edge.clear
   end
 
-  def filter_size minimum
-    counts.each do |node, count|
-      next unless count < minimum
-      delete node
+  ##
+  # Return all nodes (aka the set of all keys and values).
+
+  def nodes
+    (keys + values).flatten.uniq
+  end
+
+  ##
+  # A convenience method to set every node to be a box. Especially
+  # good for longer text nodes.
+
+  def boxes
+    prefix << "node [ shape = box ]"
+  end
+
+  ##
+  # A convenience method to set an attribute on all nodes.
+
+  def global_attrib attrib
+    nodes.each do |key|
+      attribs[key] << attrib
     end
   end
 
+  ##
+  # Returns a Hash with a count of the outgoing edges for each node.
+
+  def counts
+    result = Hash.new 0
+    each_pair do |from, to|
+      result[from] += 1
+    end
+    result
+  end
+
+  def delete key # :nodoc:
+    @order.delete key
+    # TODO: prolly needs to go clean up attribs
+    super
+  end
+
+  ##
+  # Overrides Hash#each_pair to go over each _edge_. Eg:
+  #
+  #   g["a"] << "b"
+  #   g["a"] << "b"
+  #   g.each_pair { |from, to| ... }
+  #
+  # goes over a -> b *twice*.
+
   def each_pair
     @order.each do |from|
       self[from].each do |to|
@@ -41,6 +109,27 @@ class Graph < Hash
     end
   end
 
+  ##
+  # Deletes nodes that have less than minimum number of outgoing edges.
+
+  def filter_size minimum
+    counts.each do |node, count|
+      next unless count < minimum
+      delete node
+    end
+  end
+
+  def initialize # :nodoc:
+    super { |h,k| h[k] = [] }
+    @prefix  = []
+    @order   = []
+    @attribs = Hash.new { |h,k| h[k] = [] }
+    @edge    = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = [] } }
+  end
+
+  ##
+  # Creates a new Graph whose edges point the other direction.
+
   def invert
     result = self.class.new
     each_pair do |from, to|
@@ -49,18 +138,50 @@ class Graph < Hash
     result
   end
 
-  def counts
-    result = Hash.new 0
-    each_pair do |from, to|
-      result[from] += 1
-    end
-    result
-  end
+  ##
+  # Returns a list of keys sorted by number of outgoing edges.
 
   def keys_by_count
     counts.sort_by { |key, count| -count }.map {|key, count| key }
   end
 
+  ##
+  # Specify the orientation of the graph. Defaults to the graphviz default "TB".
+
+  def orient dir = "TB"
+    prefix << "rankdir = #{dir}"
+  end
+
+  ##
+  # Really just an alias for #orient but with "LR" as the default value.
+
+  def rotate dir = "LR"
+    orient dir
+  end
+
+  ##
+  # Remove all duplicate edges.
+
+  def normalize
+    each do |k,v|
+      v.uniq!
+    end
+  end
+
+  ##
+  # Saves out both a dot file to path and an image for the specified type.
+  # Specify type as nil to skip exporting an image.
+
+  def save path, type="png"
+    File.open "#{path}.dot", "w" do |f|
+      f.write self.to_s
+    end
+    system "dot -T#{type} #{path}.dot > #{path}.#{type}" if type
+  end
+
+  ##
+  # Outputs a graphviz graph.
+
   def to_s
     result = []
     result << "digraph absent"
@@ -83,11 +204,4 @@ class Graph < Hash
     result << "  }"
     result.join "\n"
   end
-
-  def save path, type="png"
-    File.open "#{path}.dot", "w" do |f|
-      f.write self.to_s
-    end
-    system "dot -T#{type} #{path}.dot > #{path}.#{type}" if type
-  end
 end

data/lib/macports_analyzer.rb

@@ -16,6 +16,6 @@ class MacportsAnalyzer < DepAnalyzer
   def deps port
     cache("#{port}.deps") {
       `port deps #{port}`
-    }.scan(/^\t(\S+)$/).flatten
+    }.scan(/Dependencies:\s*(.+)$/).join(', ').split(/, /)
   end
 end

data/lib/rake_analyzer.rb

@@ -0,0 +1,31 @@
+require 'dep_analyzer'
+
+class RakeAnalyzer < DepAnalyzer
+  def run
+    require 'graph'
+    g = Graph.new
+    g.rotate
+
+    current = nil
+    `rake -P -s`.each_line do |line|
+      case line
+      when /^rake (.+)/
+        name = $1
+        # current = (name =~ /pkg/) ? nil : name
+        current = name
+        g[current] if current # force the node to exist, in case of a leaf
+      when /^\s+(.+)/
+        dep = $1
+        next if current =~ /pkg/ and File.file? dep
+        g[current] << dep if current
+      else
+        warn "unparsed: #{line.chomp}"
+      end
+    end
+
+
+    g.boxes
+    g.save "#{self.class}"
+    system "open #{self.class}.png"
+  end
+end

data/test/test_graph.rb

@@ -1,15 +1,43 @@
-require "test/unit"
+require "minitest/autorun"
 require "tmpdir"
 require "graph"
 
-class TestGraph < Test::Unit::TestCase
+class TestGraph < MiniTest::Unit::TestCase
   def setup
     @graph = Graph.new
     @graph["a"] << "b"
   end
 
-  def test_to_s_empty
-    assert_equal util_dot, Graph.new.to_s
+  def test_boxes
+    expected = util_dot('"a" -> "b"')
+    assert_equal expected, @graph.to_s
+
+    @graph.boxes
+
+    expected = util_dot('node [ shape = box ]',
+                        '"a" -> "b"')
+    assert_equal expected, @graph.to_s
+  end
+
+  def test_clear
+    @graph.clear
+
+    assert_empty @graph.prefix,  "prefix"
+    assert_empty @graph.order,   "order"
+    assert_empty @graph.attribs, "attribs"
+    assert_empty @graph.edge,    "edge"
+  end
+
+  def test_counts
+    expect = { "a" => 1, }
+    assert_equal expect, @graph.counts
+
+    @graph["a"] << "b"
+    @graph["a"] << "c"
+    @graph["b"] << "c"
+
+    expect = { "a" => 3, "b" => 1, }
+    assert_equal expect, @graph.counts
   end
 
   def test_delete
@@ -22,6 +50,18 @@ class TestGraph < Test::Unit::TestCase
     assert @graph.empty?
   end
 
+  def test_global_attrib
+    expected = util_dot('"a" -> "b"')
+    assert_equal expected, @graph.to_s
+
+    @graph.global_attrib "color = blue"
+
+    expected = util_dot('"a" [ color = blue ]',
+                        '"b" [ color = blue ]',
+                        '"a" -> "b"')
+    assert_equal expected, @graph.to_s
+  end
+
   def test_invert
     @graph["a"] << "c"
     invert = @graph.invert
@@ -35,10 +75,52 @@ class TestGraph < Test::Unit::TestCase
     assert_equal %w(d a), @graph.keys_by_count
   end
 
+  def test_nodes
+    assert_equal %w(a),   @graph.keys.sort
+    assert_equal %w(a b), @graph.nodes.sort
+  end
+
+  def test_normalize
+    @graph.clear
+    @graph["a"] << "b" << "b" << "b" # 3 edges from a to b
+
+    expect = { "a" => %w(b b b) }
+    assert_equal expect, @graph
+
+    @graph.normalize                 # clear all but one edge
+
+    expect = { "a" => %w(b) }
+    assert_equal expect, @graph
+  end
+
+  def test_orient
+    @graph.orient "blah"
+
+    assert_equal ["rankdir = blah"], @graph.prefix
+  end
+
+  def test_orient_default
+    @graph.orient
+
+    assert_equal ["rankdir = TB"], @graph.prefix
+  end
+
   def test_order
     assert_equal %w(a), @graph.order
   end
 
+  def test_rotate
+    @graph.rotate "blah"
+
+    assert_equal ["rankdir = blah"], @graph.prefix
+  end
+
+  def test_rotate_default
+    @graph.rotate
+
+    assert_equal ["rankdir = LR"], @graph.prefix
+  end
+
   def test_save
     util_save "png"
   end
@@ -57,19 +139,23 @@ class TestGraph < Test::Unit::TestCase
     assert_equal expected, @graph.to_s
   end
 
-  def test_to_s_prefix
-    @graph.prefix << "blah"
+  def test_to_s_attrib
+    @graph.attribs["a"] << "color = blue"
     @graph["a"] << "c"
 
-    expected = util_dot('blah', '"a" -> "b"', '"a" -> "c"')
+    expected = util_dot('"a" [ color = blue ]', '"a" -> "b"', '"a" -> "c"')
     assert_equal expected, @graph.to_s
   end
 
-  def test_to_s_attrib
-    @graph.attribs["a"] << "color = blue"
+  def test_to_s_empty
+    assert_equal util_dot, Graph.new.to_s
+  end
+
+  def test_to_s_prefix
+    @graph.prefix << "blah"
     @graph["a"] << "c"
 
-    expected = util_dot('"a" [ color = blue ]', '"a" -> "b"', '"a" -> "c"')
+    expected = util_dot('blah', '"a" -> "b"', '"a" -> "c"')
     assert_equal expected, @graph.to_s
   end
 

metadata

@@ -1,48 +1,64 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
-  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
-  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
-  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
-  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
-  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
-  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
-  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
-  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id003
 description: |-
   Graph is a type of hash that outputs in graphviz's dot format. It
   comes with a command-line interface that is easily pluggable.
@@ -71,6 +87,7 @@ files:
 - lib/freebsd_analyzer.rb
 - lib/graph.rb
 - lib/macports_analyzer.rb
+- lib/rake_analyzer.rb
 - lib/rubygems/commands/graph_command.rb
 - lib/rubygems_analyzer.rb
 - lib/rubygems_plugin.rb
@@ -89,18 +106,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format

data.tar.gz.sig

@@ -1 +0,0 @@
-I�[‹	�"O����V��+o�!Q�d�fc"7�sj��_�Piu�_,��w��y�m���pO��!L��ެ���T��"Akv�Ӛ�v�v