graph 2.0.1 → 2.1.0

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.1.0 / 2011-05-26
+
+* 3 minor enhancements:
+
+  * If bin/graph isn't given a type, list them and exit.
+  * Updated RubygemsAnalyzer to work with new API.
+  * `graph` command no longer defaults to any analyzer.
+
+* 2 bug fixes:
+
+  * Escape newlines in labels. (rohitn)
+  * Refactored all saving code to bin/graph for clarity.
+
 === 2.0.1 / 2011-02-18
 
 * 2 minor enhancements:

data/bin/graph

@@ -3,12 +3,24 @@
 $o ||= false
 $d ||= false
 
-type     = (ARGV.shift || "macports")
+type = ARGV.shift
+unless type then
+  require "rubygems"
+
+  hits = Gem.find_files("*_analyzer.rb").map { |s|
+    File.basename s, "_analyzer.rb"
+  } - %w(dep)
+
+  abort "#{File.basename $0}: Need a type: #{hits.join(", ")}"
+end
 
 require "#{type}_analyzer"
 
-klass    = Object.const_get "#{type.capitalize}Analyzer"
+name     = "#{type.capitalize}Analyzer"
+klass    = Object.const_get name
 analyzer = klass.new
-analyzer.run
+graph    = analyzer.run
+
+graph.save name, $d ? nil : "png"
 
-system "open #{type.capitalize}Analyzer.#{$d ? "dot" : "png"}" if $o
+system "open #{name}.#{$d ? "dot" : "png"}" if $o

data/lib/dep_analyzer.rb

@@ -160,7 +160,7 @@ class DepAnalyzer < Cache
       end
     end
 
-    g.save "#{self.class}", "png"
+    g
   end
 
   def setup

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.0.1" # :nodoc:
+  VERSION = "2.1.0" # :nodoc:
 
   LIGHT_COLORS = %w(gray lightblue lightcyan lightgray lightpink
                     lightslategray lightsteelblue white)
@@ -197,7 +197,7 @@ class Graph
   # Shortcut method to set the graph's label. Usually used with subgraphs.
 
   def label name
-    graph_attribs << "label = \"#{name}\""
+    graph_attribs << "label = \"#{name.gsub(/\n/, '\n')}\""
   end
 
   ##
@@ -349,7 +349,7 @@ class Graph
 
     def label name
       attributes.reject! { |s| s =~ /^label =/ }
-      attributes << "label = \"#{name}\""
+      attributes << "label = \"#{name.gsub(/\n/, '\n')}\""
       self
     end
 

data/lib/rake_analyzer.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require 'dep_analyzer'
 
 class RakeAnalyzer < DepAnalyzer
@@ -8,8 +9,9 @@ class RakeAnalyzer < DepAnalyzer
 
       current = nil
       rake = Gem.bin_path('rake', 'rake') rescue 'rake'
+      path = $:.join File::PATH_SEPARATOR
 
-      `#{Gem.ruby} -I#{$:.join File::PATH_SEPARATOR} -S #{rake} -P -s`.each_line do |line|
+      `#{Gem.ruby} -I#{path} -S #{rake} -P -s`.each_line do |line|
         case line
         when /^rake (.+)/
           name = $1
@@ -23,8 +25,6 @@ class RakeAnalyzer < DepAnalyzer
           warn "unparsed: #{line.chomp}"
         end
       end
-
-      save "RakeAnalyzer", "png"
     end
   end
 end

data/lib/rubygems/commands/graph_command.rb

@@ -8,7 +8,8 @@ class Gem::Commands::GraphCommand < Gem::Command
   end
 
   def execute
-    RubygemsAnalyzer.new.run options[:args]
+    g = RubygemsAnalyzer.new.run options[:args]
+    g.save "RubygemsAnalyzer", "png"
 
     say "Graph saved to:\n\tRubygemsAnalyzer.png"
   end

data/lib/rubygems_analyzer.rb

@@ -12,17 +12,18 @@ class RubygemsAnalyzer < DepAnalyzer
   def installed
     # don't cache so it updates every delete
     puts "scanning installed rubygems"
-    Gem.source_index.gems.values.map { |gem| gem.name }.sort
+    Gem::Specification.map(&:name).sort
   end
 
   def outdated
     # don't cache so it updates every delete
     puts "scanning outdated rubygems"
-    Gem.source_index.outdated.sort
+    Gem::Specification.outdated.sort
   end
 
-  def deps gem
-    Gem.source_index.find_name(gem).first.dependencies.map { |dep| dep.name }
+  def deps gem_name
+    gem = Gem::Specification.find_by_name gem_name
+    gem.dependencies
   end
 
   def decorate
@@ -31,7 +32,7 @@ class RubygemsAnalyzer < DepAnalyzer
     installed = self.installed
 
     installed.each do |gem|
-      deps = Gem.source_index.find_name(gem).first.dependencies
+      deps = self.deps gem
 
       deps.each do |dep|
         next if dep.type == :runtime

data/test/test_graph.rb

@@ -82,6 +82,12 @@ class TestGraph < MiniTest::Unit::TestCase
     assert_graph graph, 'label = "blah"', '"a" -> "b"'
   end
 
+  def test_label_newline
+    graph.label "blah\nblah"
+
+    assert_graph graph, 'label = "blah\\nblah"', '"a" -> "b"'
+  end
+
   def test_left_shift
     subgraph = Graph.new "blah"
 
@@ -283,6 +289,12 @@ class TestNode < MiniTest::Unit::TestCase
     assert_equal ["label = \"blah\""], n.attributes
   end
 
+  def test_label_newline
+    n.label "blah\nblah"
+
+    assert_equal ["label = \"blah\\nblah\""], n.attributes
+  end
+
   def test_to_s
     assert_equal '"n"', n.to_s
   end
@@ -309,6 +321,12 @@ class TestEdge < MiniTest::Unit::TestCase
     assert_equal ["label = \"blah\""], e.attributes
   end
 
+  def test_label_newline
+    e.label "blah\nblah"
+
+    assert_equal ["label = \"blah\\nblah\""], e.attributes
+  end
+
   def test_to_s
     assert_equal '"a" -> "b"', e.to_s
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,8 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-02-18 00:00:00 -08:00
-default_executable: 
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -50,9 +49,9 @@ dependencies:
         hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 2
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,12 +62,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 35
         segments: 
         - 2
         - 9
-        - 1
-        version: 2.9.1
+        - 4
+        version: 2.9.4
   type: :development
   version_requirements: *id002
 description: |-
@@ -121,7 +120,6 @@ files:
 - lib/rubygems_plugin.rb
 - test/test_graph.rb
 - .gemtest
-has_rdoc: true
 homepage: http://rubyforge.org/projects/seattlerb
 licenses: []
 
@@ -152,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.4.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format