graph 1.0.0 → 1.1.0

data/.autotest

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 
 require 'autotest/restart'
+require 'autotest/rcov'
 
 # Autotest.add_hook :initialize do |at|
 #   at.extra_files << "../some/external/dependency.rb"

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.0 / 2009-04-16
+
+* 3 minor enhancements:
+
+  * Don't run dot if type is nil
+  * Provide a command plugin for RubyGems, `gem graph`
+  * YAY tests
+
 === 1.0.0 / 2009-03-27
 
 * 1 major enhancement

data/Manifest.txt

@@ -4,8 +4,11 @@ Manifest.txt
 README.txt
 Rakefile
 bin/graph
+lib/dep_analyzer.rb
 lib/freebsd_analyzer.rb
 lib/graph.rb
 lib/macports_analyzer.rb
+lib/rubygems/commands/graph_command.rb
 lib/rubygems_analyzer.rb
+lib/rubygems_plugin.rb
 test/test_graph.rb

data/bin/graph

@@ -1,145 +1,5 @@
 #!/usr/bin/env ruby -w
 
-require 'graph'
-require 'set'
-require 'tsort'
-
-class Cache
-  def initialize(cache, timeout=24)
-    @cache = cache
-    @timeout = timeout
-  end
-
-  def cache(id, timeout=@timeout)
-    Dir.mkdir @cache unless test ?d, @cache
-    path = File.join @cache, id
-
-    age = test(?f, path) ? (Time.now - test( ?M, path )) / 3600 : -1
-
-    if age >= 0 and timeout > age then
-      warn "from cache" if $DEBUG
-      data = File.read(path)
-    else
-      warn "NOT from cache (#{age} hours old)" if $DEBUG
-      data = yield
-      File.open(path, "w") do |f|
-        f.write data
-      end
-    end
-    return data
-  end
-end
-
-class Set
-  def push *v
-    v.each do |o|
-      add(o)
-    end
-  end
-end
-
-class Hash
-  include TSort
-
-  alias tsort_each_node each_key
-
-  def tsort_each_child(node, &block)
-    fetch(node).each(&block)
-  end
-
-  def minvert
-    r = Hash.new { |h,k| h[k] = [] }
-    invert.each do |keys, val|
-      keys.each do |key|
-        r[key] << val
-      end
-    end
-    r.each do |k,v|
-      r[k] = v.sort
-    end
-    r
-  end
-
-  def transitive
-    r = Hash.new { |h,k| h[k] = [] }
-    each do |k,v|
-      r[k].push(*t(k))
-    end
-    r
-  end
-
-  def t(k)
-    r = Set.new
-    self[k].each do |v|
-      r.push(v, *t(v))
-    end
-    r.to_a.sort
-  end
-end
-
-class DepAnalyzer < Cache
-  def initialize
-    super ".#{self.class}.cache"
-  end
-
-  def run
-    g = Graph.new
-    ports = {}
-    installed.each do |port|
-      ports[port] = nil
-    end
-
-    old = {}
-    outdated.each do |port|
-      old[port] = nil
-    end
-
-    all_ports = ports.keys
-
-    ports.each_key do |port|
-      deps = self.deps(port)
-      # remove things that don't intersect with installed list
-      deps -= (deps - all_ports)
-      deps.each do |dep|
-        g[port] << dep
-      end
-      ports[port] = deps
-    end
-
-    indies = ports.keys - ports.minvert.keys
-    indies.each do |k|
-      g.attribs[k] << "color = blue"
-    end
-    old.each do |k,v|
-      if indies.include? k then
-        g.attribs[k] << "color = purple4"
-      else
-        g.attribs[k] << "color = red"
-      end
-    end
-
-    puts "Looks like you can nuke:\n\t#{indies.join("\n\t")}"
-
-    unless ARGV.empty? then
-      ARGV.each do |pkg|
-        hits = ports.transitive[pkg]
-        sorted = ports.tsort.reverse
-        topo = [pkg] + sorted.select { |o| hits.include? o }
-        prune = ports.dup
-        topo.each do |k|
-          prune.delete(k)
-        end
-        topo -= prune.values.flatten.uniq
-
-        puts topo.join(' ')
-      end
-    end
-
-    g.save "#{self.class}"
-    system "open #{self.class}.png"
-  end
-end
-
 type     = (ARGV.shift || "macports")
 
 require "#{type}_analyzer"

data/lib/dep_analyzer.rb

@@ -0,0 +1,140 @@
+require 'graph'
+require 'set'
+require 'tsort'
+
+class Cache
+  def initialize(cache, timeout=24)
+    @cache = cache
+    @timeout = timeout
+  end
+
+  def cache(id, timeout=@timeout)
+    Dir.mkdir @cache unless test ?d, @cache
+    path = File.join @cache, id
+
+    age = test(?f, path) ? (Time.now - test( ?M, path )) / 3600 : -1
+
+    if age >= 0 and timeout > age then
+      warn "from cache" if $DEBUG
+      data = File.read(path)
+    else
+      warn "NOT from cache (#{age} hours old)" if $DEBUG
+      data = yield
+      File.open(path, "w") do |f|
+        f.write data
+      end
+    end
+    return data
+  end
+end
+
+class Set
+  def push *v
+    v.each do |o|
+      add(o)
+    end
+  end
+end
+
+class Hash
+  include TSort
+
+  alias tsort_each_node each_key
+
+  def tsort_each_child(node, &block)
+    fetch(node).each(&block)
+  end
+
+  def minvert
+    r = Hash.new { |h,k| h[k] = [] }
+    invert.each do |keys, val|
+      keys.each do |key|
+        r[key] << val
+      end
+    end
+    r.each do |k,v|
+      r[k] = v.sort
+    end
+    r
+  end
+
+  def transitive
+    r = Hash.new { |h,k| h[k] = [] }
+    each do |k,v|
+      r[k].push(*t(k))
+    end
+    r
+  end
+
+  def t(k)
+    r = Set.new
+    self[k].each do |v|
+      r.push(v, *t(v))
+    end
+    r.to_a.sort
+  end
+end
+
+class DepAnalyzer < Cache
+  def initialize
+    super ".#{self.class}.cache"
+  end
+
+  def run(argv = ARGV)
+    g = Graph.new
+    ports = {}
+    installed.each do |port|
+      ports[port] = nil
+    end
+
+    old = {}
+    outdated.each do |port|
+      old[port] = nil
+    end
+
+    all_ports = ports.keys
+
+    ports.each_key do |port|
+      deps = self.deps(port)
+      # remove things that don't intersect with installed list
+      deps -= (deps - all_ports)
+      deps.each do |dep|
+        g[port] << dep
+      end
+      ports[port] = deps
+    end
+
+    indies = ports.keys - ports.minvert.keys
+    indies.each do |k|
+      g.attribs[k] << "color = blue"
+    end
+    old.each do |k,v|
+      if indies.include? k then
+        g.attribs[k] << "color = purple4"
+      else
+        g.attribs[k] << "color = red"
+      end
+    end
+
+    puts "Looks like you can nuke:\n\t#{indies.join("\n\t")}"
+
+    unless argv.empty? then
+      argv.each do |pkg|
+        hits = ports.transitive[pkg]
+        sorted = ports.tsort.reverse
+        topo = [pkg] + sorted.select { |o| hits.include? o }
+        prune = ports.dup
+        topo.each do |k|
+          prune.delete(k)
+        end
+        topo -= prune.values.flatten.uniq
+
+        puts topo.join(' ')
+      end
+    end
+
+    g.save "#{self.class}"
+    system "open #{self.class}.png"
+  end
+end
+

data/lib/freebsd_analyzer.rb

@@ -1,3 +1,5 @@
+require 'dep_analyzer'
+
 class FreebsdAnalyzer < DepAnalyzer
   def installed
     # don't cache so it updates every delete

data/lib/graph.rb

@@ -1,7 +1,7 @@
 #!/usr/local/bin/ruby -w
 
 class Graph < Hash
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 
   attr_reader :attribs
   attr_reader :prefix
@@ -10,10 +10,10 @@ class Graph < Hash
 
   def initialize
     super { |h,k| h[k] = [] }
-    @prefix = []
+    @prefix  = []
+    @order   = []
     @attribs = Hash.new { |h,k| h[k] = [] }
-    @edge = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = [] } }
-    @order = []
+    @edge    = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = [] } }
   end
 
   def []= key, val
@@ -65,25 +65,29 @@ class Graph < Hash
     result = []
     result << "digraph absent"
     result << "  {"
+
     @prefix.each do |line|
-      result << line
+      result << "    #{line};"
     end
+
     @attribs.sort.each do |node, attribs|
-      result << "    #{node.inspect} [ #{attribs.join ','} ]"
+      result << "    #{node.inspect} [ #{attribs.join ','} ];"
     end
+
     each_pair do |from, to|
       edge = @edge[from][to].join ", "
       edge = " [ #{edge} ]" unless edge.empty?
       result << "    #{from.inspect} -> #{to.inspect}#{edge};"
     end
+
     result << "  }"
     result.join "\n"
   end
 
   def save path, type="png"
     File.open "#{path}.dot", "w" do |f|
-      f.puts self.to_s
+      f.write self.to_s
     end
-    system "dot -T#{type} #{path}.dot > #{path}.#{type}"
+    system "dot -T#{type} #{path}.dot > #{path}.#{type}" if type
   end
 end

data/lib/macports_analyzer.rb

@@ -1,3 +1,5 @@
+require 'dep_analyzer'
+
 class MacportsAnalyzer < DepAnalyzer
   def installed
     # don't cache so it updates every delete

data/lib/rubygems/commands/graph_command.rb

@@ -0,0 +1,17 @@
+require 'rubygems/command'
+require 'rubygems_analyzer'
+
+class Gem::Commands::GraphCommand < Gem::Command
+
+  def initialize
+    super 'graph', 'Graph dependency relationships of installed gems'
+  end
+
+  def execute
+    RubygemsAnalyzer.new.run options[:args]
+
+    say "Graph saved to:\n\tRubygemsAnalyzer.png"
+  end
+
+end
+

data/lib/rubygems_analyzer.rb

@@ -1,3 +1,5 @@
+require 'dep_analyzer'
+
 class RubygemsAnalyzer < DepAnalyzer
   def installed
     require 'rubygems'

data/lib/rubygems_plugin.rb

@@ -0,0 +1,4 @@
+require 'rubygems/command_manager'
+
+Gem::CommandManager.instance.register_command :graph
+

data/test/test_graph.rb

@@ -1,8 +1,98 @@
 require "test/unit"
+require "tmpdir"
 require "graph"
 
 class TestGraph < Test::Unit::TestCase
-  def test_sanity
-    flunk "write tests or I will kneecap you"
+  def setup
+    @graph = Graph.new
+    @graph["a"] << "b"
+  end
+
+  def test_to_s_empty
+    assert_equal util_dot, Graph.new.to_s
+  end
+
+  def test_delete
+    assert_equal %w(b), @graph.delete("a")
+    assert_equal [], @graph.order
+  end
+
+  def test_filter_size
+    @graph.filter_size 2
+    assert @graph.empty?
+  end
+
+  def test_invert
+    @graph["a"] << "c"
+    invert = @graph.invert
+    assert_equal %w(a), invert["b"]
+    assert_equal %w(a), invert["c"]
+  end
+
+  def test_keys_by_count
+    @graph["a"] << "c"
+    @graph["d"] << "e" << "f" << "g"
+    assert_equal %w(d a), @graph.keys_by_count
+  end
+
+  def test_order
+    assert_equal %w(a), @graph.order
+  end
+
+  def test_save
+    util_save "png"
+  end
+
+  def test_save_nil
+    util_save nil
+  end
+
+  def test_to_s
+    expected = util_dot '"a" -> "b"'
+    assert_equal expected, @graph.to_s
+
+    @graph["a"] << "c"
+
+    expected = util_dot '"a" -> "b"', '"a" -> "c"'
+    assert_equal expected, @graph.to_s
+  end
+
+  def test_to_s_prefix
+    @graph.prefix << "blah"
+    @graph["a"] << "c"
+
+    expected = util_dot('blah', '"a" -> "b"', '"a" -> "c"')
+    assert_equal expected, @graph.to_s
+  end
+
+  def test_to_s_attrib
+    @graph.attribs["a"] << "color = blue"
+    @graph["a"] << "c"
+
+    expected = util_dot('"a" [ color = blue ]', '"a" -> "b"', '"a" -> "c"')
+    assert_equal expected, @graph.to_s
+  end
+
+  def util_dot(*lines)
+    lines = lines.map { |l| "    #{l};" }.join("\n")
+    "digraph absent\n  {\n#{lines}\n  }".sub(/\n\n/, "\n")
+  end
+
+  def util_save type
+    path = File.join(Dir.tmpdir, "blah.#{$$}")
+
+    $x = nil
+
+    def @graph.system(*args)
+      $x = args
+    end
+
+    @graph.save(path, type)
+
+    assert_equal @graph.to_s, File.read("#{path}.dot")
+    expected = ["dot -T#{type} #{path}.dot > #{path}.png"] if type
+    assert_equal expected, $x
+  ensure
+    File.unlink path rescue nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2009-03-31 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,9 +41,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.0
+        version: 1.12.2
     version: 
-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.  It ships with plugins to graph dependencies and status of installed rubygems, mac ports, and freebsd ports, coloring leaf nodes blue, outdated nodes red, and outdated leaf nodes purple (red+blue).
+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.
+  
+  It ships with plugins to graph dependencies and status of installed
+  rubygems, mac ports, and freebsd ports, coloring leaf nodes blue,
+  outdated nodes red, and outdated leaf nodes purple (red+blue).
 email: 
 - ryand-ruby@zenspider.com
 executables: 
@@ -61,13 +67,18 @@ files:
 - README.txt
 - Rakefile
 - bin/graph
+- lib/dep_analyzer.rb
 - lib/freebsd_analyzer.rb
 - lib/graph.rb
 - lib/macports_analyzer.rb
+- lib/rubygems/commands/graph_command.rb
 - lib/rubygems_analyzer.rb
+- lib/rubygems_plugin.rb
 - test/test_graph.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/seattlerb
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -89,9 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format
 test_files: 
 - test/test_graph.rb