yargi 0.1.0 → 0.1.1

data/CONTRIBUTE

@@ -0,0 +1,11 @@
+= Contribute
+
+You are welcome to contribute to this graph implementation. Useful links are:
+
+[http://rubyforge.org/projects/yargi/] 
+  Rubyforge project, issue manager, forum, etc. Ideas and questions are welcome. 
+  Don't hesitate to send me an e-mail if I don't answer quickly.
+[http://github.com/blambeau/yargi/tree/master] 
+  Sources are on github. Fork the thing there to submit contributions. Particularly
+  welcome: documentation reviewers, bug fixes (we love tests to prove bugs), 
+  efficiency patches, useful graph algorithms, etc.

data/README

@@ -5,7 +5,7 @@ Yargi is Yet Another (Ruby) Graph Implementation: we all have implemented a grap
 in almost every language that we use, probably many times. The reason is probably that each 
 implementation has its own design decisions that makes the data-structure well-designed for
 the task at hand, or not. Below are the main design decisions made by Yargi; this way you can
-easily see if it fits your needs.
+easily see if Yargi fits your needs.
 
 [Digraph, Vertex and Edge] Unlike {RGL}[http://rubyforge.org/projects/rgl/], Yargi implements
                            graph components through concrete classes, not modules (that is, in 

data/examples/fs2dot.dot

@@ -0,0 +1,50 @@
+digraph G {
+  graph[rankdir="LR"]
+  V0 [fontsize="16" shape="folder" style="filled" fillcolor="cornsilk2" file="/Users/blambeau/work/chefbe/devel/yargi" width="1.6" label="yargi" height="0.4" fontname="Arial"]
+  V1 [fontsize="16" shape="box" fontcolor="white" style="filled, rounded" fillcolor="gray25" file="/Users/blambeau/work/chefbe/devel/yargi/CONTRIBUTE" width="1.6" label="CONTRIBUTE (0 kb)" height="0.4" fontname="Arial"]
+  V2 [fontsize="16" shape="folder" style="filled" fillcolor="white" file="/Users/blambeau/work/chefbe/devel/yargi/doc" width="1.6" label="doc" height="0.4" fontname="Arial"]
+  V3 [fontsize="16" shape="folder" fontcolor="black" style="filled" fillcolor="gold" file="/Users/blambeau/work/chefbe/devel/yargi/examples" width="1.6" label="examples" height="0.4" fontname="Arial"]
+  V4 [fontsize="16" shape="box" style="filled, rounded" file="/Users/blambeau/work/chefbe/devel/yargi/examples/fs2dot.dot" width="1.6" label="fs2dot.dot (5 kb)" height="0.4" fontname="Arial"]
+  V5 [fontsize="16" shape="box" style="filled, rounded" file="/Users/blambeau/work/chefbe/devel/yargi/examples/fs2dot.gif" width="1.6" label="fs2dot.gif (42 kb)" height="0.4" fontname="Arial"]
+  V6 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/examples/fs2dot.rb" width="1.6" label="fs2dot.rb (1 kb)" height="0.4" fontname="Arial"]
+  V7 [fontsize="16" shape="folder" fontcolor="black" style="filled" fillcolor="gold" file="/Users/blambeau/work/chefbe/devel/yargi/lib" width="1.6" label="lib" height="0.4" fontname="Arial"]
+  V8 [fontsize="16" shape="folder" fontcolor="black" style="filled" fillcolor="gold" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi" width="1.6" label="yargi" height="0.4" fontname="Arial"]
+  V9 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/digraph.rb" width="1.6" label="digraph.rb (9 kb)" height="0.4" fontname="Arial"]
+  V10 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/digraph_edge.rb" width="1.6" label="digraph_edge.rb (2 kb)" height="0.4" fontname="Arial"]
+  V11 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/digraph_vertex.rb" width="1.6" label="digraph_vertex.rb (2 kb)" height="0.4" fontname="Arial"]
+  V12 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/edge_set.rb" width="1.6" label="edge_set.rb (0 kb)" height="0.4" fontname="Arial"]
+  V13 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/element_set.rb" width="1.6" label="element_set.rb (4 kb)" height="0.4" fontname="Arial"]
+  V14 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/markable.rb" width="1.6" label="markable.rb (1 kb)" height="0.4" fontname="Arial"]
+  V15 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/predicate.rb" width="1.6" label="predicate.rb (4 kb)" height="0.4" fontname="Arial"]
+  V16 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi/vertex_set.rb" width="1.6" label="vertex_set.rb (1 kb)" height="0.4" fontname="Arial"]
+  V17 [fontsize="16" shape="parallelogram" fontcolor="white" style="filled, rounded" fillcolor="blue4" file="/Users/blambeau/work/chefbe/devel/yargi/lib/yargi.rb" width="1.6" label="yargi.rb (0 kb)" height="0.4" fontname="Arial"]
+  V18 [fontsize="16" shape="box" fontcolor="white" style="filled, rounded" fillcolor="gray25" file="/Users/blambeau/work/chefbe/devel/yargi/LICENCE" width="1.6" label="LICENCE (1 kb)" height="0.4" fontname="Arial"]
+  V19 [fontsize="16" shape="folder" style="filled" fillcolor="cornsilk2" file="/Users/blambeau/work/chefbe/devel/yargi/pkg" width="1.6" label="pkg" height="0.4" fontname="Arial"]
+  V20 [fontsize="16" shape="box3d" style="filled, rounded" fillcolor="gold" file="/Users/blambeau/work/chefbe/devel/yargi/pkg/yargi-0.1.0.gem" width="1.6" label="yargi-0.1.0.gem (91 kb)" height="0.4" fontname="Arial"]
+  V21 [fontsize="16" shape="box" style="filled, rounded" file="/Users/blambeau/work/chefbe/devel/yargi/Rakefile" width="1.6" label="Rakefile (1 kb)" height="0.4" fontname="Arial"]
+  V22 [fontsize="16" shape="box" fontcolor="white" style="filled, rounded" fillcolor="gray25" file="/Users/blambeau/work/chefbe/devel/yargi/README" width="1.6" label="README (5 kb)" height="0.4" fontname="Arial"]
+  V23 [fontsize="16" shape="folder" style="filled" fillcolor="white" file="/Users/blambeau/work/chefbe/devel/yargi/test" width="1.6" label="test" height="0.4" fontname="Arial"]
+  V3 -> V4 []
+  V3 -> V5 []
+  V3 -> V6 []
+  V8 -> V9 []
+  V8 -> V10 []
+  V8 -> V11 []
+  V8 -> V12 []
+  V8 -> V13 []
+  V8 -> V14 []
+  V8 -> V15 []
+  V8 -> V16 []
+  V7 -> V8 []
+  V7 -> V17 []
+  V19 -> V20 []
+  V0 -> V1 []
+  V0 -> V2 []
+  V0 -> V3 []
+  V0 -> V7 []
+  V0 -> V18 []
+  V0 -> V19 []
+  V0 -> V21 []
+  V0 -> V22 []
+  V0 -> V23 []
+}

data/examples/fs2dot.rb

@@ -0,0 +1,57 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'yargi'
+
+module DirVertex; end
+module FileVertex; end
+
+# Recursively create vertices and edges in the graph
+def build_graph(dir, graph, parent)
+  return if /test|doc$/ =~ dir
+  subnodes = Dir["#{dir}/*"].collect do |f|
+    is_dir = File.directory?(f)
+    vertex = graph.add_vertex(is_dir ? DirVertex : FileVertex, {:file => f})
+    build_graph(f, graph, vertex) if is_dir
+    vertex
+  end
+  graph.connect(parent, subnodes)
+end
+
+# Starts the creation
+dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+graph = Yargi::Digraph.new
+root = graph.add_vertex(DirVertex, {:file => dir})
+build_graph(dir, graph, root)
+
+# Add dot attributes
+graph.add_marks(:rankdir => 'LR')
+graph.vertices.add_marks(
+  :shape => :box, :width => 1.6, :height => 0.4,
+  :fontname => 'Arial', :fontsize => '16'
+)
+
+graph.vertices(DirVertex).add_marks(:shape => 'folder', :style => "filled", :fillcolor => 'cornsilk2') do |v|
+  {:label => "#{File.basename(v.file)}"}
+end
+graph.vertices(DirVertex){|v| v.out_edges.empty?}.add_marks(:fillcolor => 'white')
+
+graph.vertices(FileVertex).add_marks(:style => "filled, rounded") do |v|
+  weight = File.size(v.file)/1024
+  {:label => "#{File.basename(v.file)} (#{weight} kb)"}
+end
+graph.vertices(FileVertex){|v| /\.gem$/ =~ v.file}.add_marks(
+  :shape => 'box3d', :fillcolor => 'gold'
+)
+graph.vertices(FileVertex){|v| /^[A-Z]+ (.*)$/ =~ v.label}.add_marks(
+  :fillcolor => 'gray25', :fontcolor => 'white'
+)
+graph.vertices(FileVertex){|v| /\.rb (.*)$/ =~ v.label}.add_marks(
+  :shape => 'parallelogram', :fillcolor => 'blue4', :fontcolor => 'white'
+)
+graph.vertices(FileVertex){|v| /\.rb (.*)$/ =~ v.label}.in_adjacent.add_marks do |v|
+  {:fillcolor => 'gold', :fontcolor => 'black'}
+end
+ 
+# Save it
+File.open(File.join(File.dirname(__FILE__), 'fs2dot.dot'), 'w') do |f|
+  f << graph.to_dot
+end

data/lib/yargi.rb

@@ -3,7 +3,7 @@ require 'yargi/predicate'
 module Yargi
   
   # Current Yargi version
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
   
   # When _what_ is not nil, converts it to a predicate (typically a module).
   # Otherwise, a block is expected, which is converted to a LambdaPredicate.

data/lib/yargi/digraph.rb

@@ -201,6 +201,7 @@ module Yargi
       # TODO: some values must be encoded (backquoting and the like)
       buffer = ""
       hash.each_pair do |k,v|
+        buffer << " " unless buffer.empty?
         buffer << "#{k}=\"#{v}\""
       end
       buffer

data/test/yargi/README-example.dot

@@ -1,10 +1,10 @@
 digraph G {
   graph[]
-  V0 [shape="circle"label=""]
-  V1 [shape="circle"label=""]
-  V2 [shape="circle"label=""]
-  V3 [shape="circle"label=""]
-  V4 [shape="circle"label=""]
+  V0 [shape="circle" label=""]
+  V1 [shape="circle" label=""]
+  V2 [shape="circle" label=""]
+  V3 [shape="circle" label=""]
+  V4 [shape="circle" label=""]
   V0 -> V0 [label="From 0 to 0"]
   V0 -> V1 [label="From 0 to 1"]
   V0 -> V2 [label="From 0 to 2"]

data/test/yargi/source-sink.dot

@@ -1,15 +1,15 @@
 digraph G {
   graph[]
-  V0 [label=""shape="diamond"fixedsize="true"width="0.5"]
-  V1 [label=""shape="diamond"fixedsize="true"width="0.5"]
-  V2 [label=""shape="diamond"fixedsize="true"width="0.5"]
-  V3 [label=""shape="diamond"fixedsize="true"width="0.5"]
-  V4 [label=""shape="diamond"fixedsize="true"width="0.5"]
-  V5 [label=""shape="doublecircle"fixedsize="true"width="0.5"]
-  V6 [label=""shape="doublecircle"fixedsize="true"width="0.5"]
-  V7 [label=""shape="doublecircle"fixedsize="true"width="0.5"]
-  V8 [label=""shape="doublecircle"fixedsize="true"width="0.5"]
-  V9 [label=""shape="doublecircle"fixedsize="true"width="0.5"]
+  V0 [label="" shape="diamond" fixedsize="true" width="0.5"]
+  V1 [label="" shape="diamond" fixedsize="true" width="0.5"]
+  V2 [label="" shape="diamond" fixedsize="true" width="0.5"]
+  V3 [label="" shape="diamond" fixedsize="true" width="0.5"]
+  V4 [label="" shape="diamond" fixedsize="true" width="0.5"]
+  V5 [label="" shape="doublecircle" fixedsize="true" width="0.5"]
+  V6 [label="" shape="doublecircle" fixedsize="true" width="0.5"]
+  V7 [label="" shape="doublecircle" fixedsize="true" width="0.5"]
+  V8 [label="" shape="doublecircle" fixedsize="true" width="0.5"]
+  V9 [label="" shape="doublecircle" fixedsize="true" width="0.5"]
   V0 -> V5 [label="from 0 to 5"]
   V0 -> V6 [label="from 0 to 6"]
   V0 -> V7 [label="from 0 to 7"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yargi
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bernard Lambeau
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 - LICENCE
+- CONTRIBUTE
 files: 
 - lib/yargi
 - lib/yargi/digraph.rb
@@ -49,8 +50,12 @@ files:
 - test/yargi/source-sink.gif
 - test/yargi/star.dot
 - test/yargi/vertex_set_test.rb
+- examples/fs2dot.dot
+- examples/fs2dot.gif
+- examples/fs2dot.rb
 - README
 - LICENCE
+- CONTRIBUTE
 has_rdoc: true
 homepage: https://code.chefbe.net/
 post_install_message: