graph 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.0.1 / 2011-02-18
+
+* 2 minor enhancements:
+
+  * Slightly improved output.
+  * Refactored Node and Edgue under Thingy.
+
+* 2 bug fixes:
+
+  * Expanded out subcall to rake to include current load path
+  * Use the rake from the calling ruby process as the invoking process
+
 === 2.0.0 / 2010-12-24
 
 * 1 major enhancement:

data/README.txt

@@ -12,6 +12,15 @@ rubygems, rake tasks, homebrew ports, mac ports, and freebsd ports,
 coloring leaf nodes blue, outdated nodes red, and outdated leaf nodes
 purple (red+blue).
 
+OSX quick tip: 
+
+    % sudo gem install graph
+    % sudo brew install graphviz
+    % gem unpack graph
+    % cd graph*
+    % rake gallery
+    % open gallery/*.png
+
 == FEATURES/PROBLEMS:
 
 * Very clean DSL interface and API.

data/lib/graph.rb

@@ -1,11 +1,13 @@
 #!/usr/local/bin/ruby -w
 
+require "enumerator"
+
 ##
 # Graph models directed graphs and subgraphs and outputs in graphviz's
 # dot format.
 
 class Graph
-  VERSION = "2.0.0" # :nodoc:
+  VERSION = "2.0.1" # :nodoc:
 
   LIGHT_COLORS = %w(gray lightblue lightcyan lightgray lightpink
                     lightslategray lightsteelblue white)
@@ -228,7 +230,7 @@ class Graph
 
   def save path, type = nil
     File.open "#{path}.dot", "w" do |f|
-      f.write self.to_s
+      f.puts self.to_s
     end
     system "dot -T#{type} #{path}.dot > #{path}.#{type}" if type
   end
@@ -282,7 +284,7 @@ class Graph
     end
 
     nodes.each do |name, node|
-      result << "    #{node};" if graph or not node.attributes.empty?
+      result << "    #{node};" if graph or node.attributes?
     end
 
     edges.each do |from, deps|
@@ -332,35 +334,58 @@ class Graph
     end
   end
 
-  ##
-  # An edge in a graph.
-
-  class Edge < Struct.new :graph, :from, :to, :attributes
-
-    ##
-    # Create a new edge in +graph+ from +from+ to +to+.
+  class Thingy < Struct.new :graph, :attributes
+    def initialize graph
+      super graph, []
+    end
 
-    def initialize graph, from, to
-      super graph, from, to, []
+    def initialize_copy other # :nodoc:
+      super
+      self.attributes = other.attributes.dup
     end
 
     ##
-    # Shortcut method to set the label attribute on an edge.
+    # Shortcut method to set the label attribute.
 
     def label name
+      attributes.reject! { |s| s =~ /^label =/ }
       attributes << "label = \"#{name}\""
       self
     end
 
+    ##
+    # Does this thing have attributes?
+
+    def attributes?
+      not self.attributes.empty?
+    end
+  end
+
+  ##
+  # An edge in a graph.
+
+  class Edge < Thingy
+
+    attr_accessor :from, :to
+
+    ##
+    # Create a new edge in +graph+ from +from+ to +to+.
+
+    def initialize graph, from, to
+      super graph
+      self.from = from
+      self.to = to
+    end
+
     ##
     # Returns the edge in dot syntax.
 
     def to_s
       fromto = "%p -> %p" % [from.name, to.name]
-      if attributes.empty? then
-        fromto
-      else
+      if self.attributes? then
         "%-20s [ %-20s ]" % [fromto, attributes.join(',')]
+      else
+        fromto
       end
     end
   end
@@ -368,20 +393,16 @@ class Graph
   ##
   # Nodes in the graph.
 
-  class Node < Struct.new :graph, :name, :attributes
+  class Node < Thingy
+
+    attr_accessor :name
 
     ##
     # Create a new Node. Takes a parent graph and a name.
 
     def initialize graph, name
-      super graph, name, []
-    end
-
-    ##
-    # Shortcut method to set the node's label.
-
-    def label name
-      attributes << "label = #{name.inspect}"
+      super graph
+      self.name = name
     end
 
     ##
@@ -406,10 +427,10 @@ class Graph
     # Returns the node in dot syntax.
 
     def to_s
-      if attributes.empty? then
-        "#{name.inspect}"
-      else
+      if self.attributes? then
         "%-20p [ %-20s ]" % [name, attributes.join(',')]
+      else
+        "#{name.inspect}"
       end
     end
   end

data/lib/rake_analyzer.rb

@@ -7,7 +7,9 @@ class RakeAnalyzer < DepAnalyzer
       boxes
 
       current = nil
-      `rake -P -s`.each_line do |line|
+      rake = Gem.bin_path('rake', 'rake') rescue 'rake'
+
+      `#{Gem.ruby} -I#{$:.join File::PATH_SEPARATOR} -S #{rake} -P -s`.each_line do |line|
         case line
         when /^rake (.+)/
           name = $1

data/test/test_graph.rb

@@ -206,7 +206,7 @@ g_s = "subgraph subgraph
 
     graph.save(path, type)
 
-    assert_equal graph.to_s, File.read("#{path}.dot")
+    assert_equal graph.to_s + "\n", File.read("#{path}.dot")
     expected = ["dot -T#{type} #{path}.dot > #{path}.png"] if type
     assert_equal expected, $x
   ensure

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -35,35 +36,39 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-12-24 00:00:00 -08:00
+date: 2011-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id002
 description: |-
@@ -74,6 +79,15 @@ description: |-
   rubygems, rake tasks, homebrew ports, mac ports, and freebsd ports,
   coloring leaf nodes blue, outdated nodes red, and outdated leaf nodes
   purple (red+blue).
+  
+  OSX quick tip: 
+  
+      % sudo gem install graph
+      % sudo brew install graphviz
+      % gem unpack graph
+      % cd graph*
+      % rake gallery
+      % open gallery/*.png
 email: 
 - ryand-ruby@zenspider.com
 executables: 
@@ -106,6 +120,7 @@ files:
 - lib/rubygems_analyzer.rb
 - lib/rubygems_plugin.rb
 - test/test_graph.rb
+- .gemtest
 has_rdoc: true
 homepage: http://rubyforge.org/projects/seattlerb
 licenses: []
@@ -117,23 +132,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format