gf-treevisitor 0.0.6 → 0.0.8

data/README.rdoc

@@ -1,21 +1,40 @@
-= dirtree.rb / tree visitor lib
+= tree.rb / tree visitor library
 
-<pre>dirtree.rb</pre> is a 'clone' of tree unix command. 
-It is based on lib tree visitor.
++dirtree.rb+ is a 'clone' of tree unix command. It is based on lib tree visitor.
 
 Tree visitor is an implementation of visitor design pattern.
 
+ # $ tree.rb lib
+ # lib
+ #  |  | treevisitor.rb
+ #  |-treevisitor
+ #  |  | abs_node.rb
+ #  |  | dir_processor.rb
+ #  |  | dir_tree_walker.rb
+ #  |  | leaf_node.rb
+ #  |  | tree_node.rb
+ #  |  | tree_node_visitor.rb
+ #  |- |-cli
+ #  |- |    cli_tree.rb
+ #  |- |-visitors
+ #  |- |    print_node_visitor2.rb
+ #  |- |    build_dir_tree_visitor.rb
+ #  |- |    print_dir_tree_visitor.rb
+ #  |- |    block_tree_node_visitor.rb
+ #  |- |    flat_print_tree_node_visitors.rb
+ #  |- |    print_tree_node_visitor.rb
+ #  |- |    depth_tree_node_visitor.rb
+ #  |- |    clone_tree_node_visitor.rb
+ #  |- |    callback_tree_node_visitor.rb
+ #  |- |    callback_tree_node_visitor2.rb
+
 == REQUIREMENTS:
 
-* utilizza la libreria abstract di kwartz
+* require abstract gem
 
 == INSTALL:
 
-sudo gem install tree_visitor
-
-or
-
-sudo gem install gf-tree_visitor -s gems.github.com
+To install +sudo gem install treevisitor+ or +sudo gem install gf-treevisitor -s http://gems.github.com+
 
 == Copyright
 

data/VERSION

@@ -0,0 +1 @@
+0.0.8

data/bin/{dirtree.rb → tree.rb}

@@ -1,13 +1,9 @@
 #!/usr/bin/env ruby
 #
-# Piccolo wrapper per richiamare il programma
-# clidirtree
-#
+# Wrapper for the class CliTree
 
 $TREEVISITOR_HOME = File.expand_path( File.join( File.dirname( __FILE__), ".." ) )
 $:.unshift( File.join($TREEVISITOR_HOME, "lib" ) )
 
-require "treevisitor/cli/cli_dir_tree"
-
-CliDirTree.run
-exit
+require "treevisitor/cli/cli_tree"
+CliTree.run

data/lib/{gf_utility → gf_utilities}/file_utilities.rb

@@ -12,7 +12,7 @@ def recursive_run( dir, &block )
 end
 
 def copy_dir( indir, outdir, re )
-  if not File.directory?()
+  if not File.directory?(indir)
     raise "#{indir} is not a directory"
   end
   if not File.directory?( outdir )

data/lib/{gf_utility → gf_utilities}/kwartzhelper.rb

@@ -9,6 +9,14 @@ rescue LoadError
   abort 'kwartz gem required!!'
 end
 
+
+# ruby 1.9
+# cambiare alla linea 73 kwartz/main.rb la linea seguente:
+# return @_option_table.find { |row| row[1] == key }
+# con
+# return @_option_table.find { |row| row[1][0] == key[0] }
+
+
 #
 # kwartz utility
 # template_dir: directory containing kwartz template

data/lib/gf_utilities/md5.rb

@@ -0,0 +1,24 @@
+#
+# calculate md5 of big files, found on usenet
+#
+
+if RUBY_VERSION =~ /1\.8/
+  # stdlib
+  require 'md5'
+else
+  # stdlib
+  require 'digest/md5'
+  include Digest
+end
+
+class MD5
+  def self.file(file)
+    File.open(file, "rb") do |f|
+      res = self.new
+      while (data = f.read(4096))
+        res << data
+      end
+      res
+    end
+  end
+end

data/lib/treevisitor.rb

@@ -1,3 +1,3 @@
 class TreeVisitor
-  VERSION = '0.0.1'
+  VERSION = '0.0.8'
 end

data/lib/treevisitor/cli/{cli_dir_tree.rb → cli_tree.rb}

@@ -1,14 +1,16 @@
 # stdlib
 require 'optparse'
 
-# common
+# treevisitor
+require 'treevisitor'
 require 'treevisitor/dir_tree_walker'
-require 'treevisitor/build_dir_treevisitor'
+require 'treevisitor/visitors/build_dir_tree_visitor'
+require 'treevisitor/visitors/print_dir_tree_visitor'
 
 #
 #
 #
-class CliDirTree
+class CliTree
 
   def self.run
     self.new.parse_args( ARGV )
@@ -19,15 +21,33 @@ class CliDirTree
     options = { :verbose => true, :force => false, :algo => 'build' }
 
     opts = OptionParser.new
-    opts.banner = "Usage: example.rb [options]"
+    opts.banner = "Usage: tree.rb [options] [directory]"
     
     opts.separator ""
-    opts.separator "programma per testare la classe DirProcessor"
-    opts.separator "Inserire il nome della directory da cui costuire il tree"
+    opts.separator "list contents of directories in a tree-like format"
+    opts.separator "this is a clone of tree unix command written in ruby"
     
     opts.separator ""
-    opts.separator "opzioni: "
+    opts.separator "options: "
     
+    opts.on("-h", "--help", "Show this message") do
+      puts opts
+      return 0
+    end
+
+    opts.on("--version", "Show the version") do
+      puts "tree.rb version #{TreeVisitor::VERSION}"
+      return 0
+    end
+
+    opts.on("-a", "All file are listed") do |v|
+      options[:all_files] = true
+    end
+
+    opts.on("-d", "List directories only") do |v|
+      options[:only_directories] = true
+    end
+
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       options[:verbose] = v
     end
@@ -36,17 +56,11 @@ class CliDirTree
       options[:verbose] = false
     end
     
-    opts.on("-h", "--help", "Show this message") do
-      puts opts
-      exit
-    end
-
-
     algos = %w[build visit]
     algo_aliases = { "b" => "build", "v" => "visit" }
 
     algo_list = (algo_aliases.keys + algos).join(',')
-    opts.on("-a", "--algo ALGO", algos, algo_aliases, "Select algo","  (#{algo_list})") do |algo|
+    opts.on("--algo ALGO", algos, algo_aliases, "Select algo","  (#{algo_list})") do |algo|
       options[:algo] = algo
     end
 
@@ -63,17 +77,22 @@ class CliDirTree
     dirname = rest[0]
     dirname = File.expand_path( dirname )
 
-    puts "reading : #{dirname}"
+    # puts "reading : #{dirname}"
 
     dtw = DirTreeWalker.new( dirname )
-    dtw.add_ignore_dir( ".svn" )
-    dtw.add_ignore_dir( "catalog_data" )
+    unless options[:all_files]
+      dtw.add_ignore_pattern(/^\.[^.]+/) # ignore all file starting with "."
+    end
+
+    dtw.visit_leaf = !options[:only_directories]
 
     case options[:algo]
     when 'build'
       visitor = BuildDirTreeVisitor.new
       dtw.run( visitor )
       puts visitor.root.to_str
+      puts 
+      puts "#{visitor.nr_directories} directories, #{visitor.nr_files} files"
     when 'visit'  
       visitor = PrintDirTreeVisitor.new
       dtw.run( visitor )

data/lib/treevisitor/dir_tree_walker.rb

@@ -1,3 +1,5 @@
+require 'treevisitor/visitors/block_tree_node_visitor'
+
 class DirTreeWalker
 
   def initialize( dirname )
@@ -7,9 +9,28 @@ class DirTreeWalker
     end
 
     @visitor = nil
+
+    #
+    # pattern
+    #
     @ignore_dir_patterns = []
-    @inspect_file_patterns = []
     @ignore_file_patterns = []
+
+    @inspect_file_patterns = []
+
+    #
+    # options
+    #
+
+    @visit_leaf = true
+  end
+
+  ##########################################################################
+  # Pattern
+  #
+  def add_ignore_pattern(pattern)
+    @ignore_dir_patterns << pattern
+    @ignore_file_patterns << pattern
   end
 
   def add_ignore_dir( pattern )
@@ -28,34 +49,25 @@ class DirTreeWalker
     @inspect_file_patterns << pattern
   end
 
+  ##########################################################################
+  # Options
+  
+  attr_accessor :visit_leaf
+
+  ##########################################################################
+
+
   def ignore_dir?( dirname )
-    basename = File.basename( dirname )
-    @ignore_dir_patterns.find{ |pattern|
-      basename == pattern
-    }
+    include?( @ignore_dir_patterns, File.basename( dirname ) )
   end
 
   def ignore_file?( filename )
-    basename = File.basename( filename )
-    @ignore_file_patterns.find{ |pattern|
-      if pattern.kind_of? Regexp
-        pattern =~ basename
-      else
-        pattern == basename
-      end
-    }
+    include?( @ignore_file_patterns, File.basename( filename ) )
   end
 
   def inspect_file?( filename )
     return true if @inspect_file_patterns.empty?
-    basename = File.basename( filename )
-    @inspect_file_patterns.find{ |pattern|
-      if pattern.kind_of? Regexp
-        pattern =~ basename
-      else
-        pattern == basename
-      end
-    }
+    include?( @inspect_file_patterns, File.basename( filename ) )
   end
 
   def run( treeNodeVisitor )
@@ -65,33 +77,38 @@ class DirTreeWalker
 
   private
 
+  def include?(patterns, basename)
+    # return false if the patters.empty?
+    patterns.find{ |pattern|
+      if pattern.respond_to?(:match) # or if pattern.kind_of? Regexp
+        pattern.match( basename )
+      else
+        basename == pattern
+      end
+    }
+  end
+
   #
   # recurse on other directories
   #
   # def process_directory( parentNode, dirname )
   def process_directory( dirname )
-    return if ignore_dir?( dirname )
-
     @visitor.enter_treeNode( dirname )
+    # return if ignore_dir?( dirname )
 
     Dir.entries( dirname ).each { |basename|
-      next if basename == "." or basename == ".."
+      next if basename == "." or basename == ".."  # ignore always "." and ".."
       pathname = File.join( dirname, basename )
 
       if File.directory?( pathname )
-
         # directory
-        if ! ignore_dir?( basename )
-          process_directory( pathname )
-        end
-
+        process_directory( pathname ) unless ignore_dir?( basename )
       else
-
-        # file
-        if inspect_file?( basename ) && ! ignore_file?( basename )
-          @visitor.visit_leafNode( pathname )
+        if @visit_leaf
+          if inspect_file?( basename ) && ! ignore_file?( basename )
+            @visitor.visit_leafNode( pathname )
+          end
         end
-
       end
     }
     @visitor.exit_treeNode( dirname )

data/lib/treevisitor/tree_node_visitor.rb

@@ -21,231 +21,11 @@ class TreeNodeVisitor
 
 end
 
-#
-# Utilizzo della classa astratta DirTreeProcessor
-# per chimare un blocco su tutti i TreeNode
-#
-class BlockTreeNodeVisitor
-  
-  def initialize( &action )
-    @block = action
-  end
- 
-  def enter_treeNode( treeNode )
-    @block.call( treeNode )
-  end
- 
-  def exit_treeNode( treeNode )
-  end
-  
-  def visit_leafNode( leafNode )
-    @block.call( leafNode )
-  end
-  
-end
-
-#
-# Utilizzo della classa astratta DirTreeProcessor
-# per stampare i nodi di un TreeNode
-#
-class FlatPrintTreeNodeVisitor < TreeNodeVisitor
-
-  def enter_treeNode( treeNode )
-    puts treeNode.name
-  end
-
-  def exit_treeNode( treeNode )
-  end
-
-  def visit_leafNode( leafNode )
-    puts leafNode.name
-  end
-
-end
-
-
-class PrintTreeNodeVisitor < TreeNodeVisitor
-
-  def initialize( *args )
-    super( *args )
-    @depth = 0
-  end
-
-  def visit_leafNode( leafNode )
-    str = ""
-    (0...@depth-1).step {
-      str << " |-"
-    }
-    str << " |  "
-    puts str + leafNode.name.to_s
-  end
-
-  def enter_treeNode( treeNode )
-
-    str = ""
-    (0...@depth).step {
-      str << " |-"
-    }
-
-    if @depth == 0
-      puts str + treeNode.name.to_s
-    else
-      puts str + treeNode.name.to_s
-    end
-    @depth += 1
-  end
-
-  def exit_treeNode( treeNode )
-    @depth -= 1
-  end
-end
-
-
-#
-#
-#
-class DepthTreeNodeVisitor < TreeNodeVisitor
-
-  attr_reader :depth
-  
-  def initialize
-    super
-    @depth = 0
-  end
-  
-  def enter_treeNode( treeNode )
-    @depth += 1
-  end
-
-  def exit_treeNode( treeNode )
-    @depth -= 1
-  end
 
-  def visit_leafNode( leafNode )
-  end
 
-end
-
-#
-# Esempio
-# Clona un TreeNode
-#
-class CloneTreeNodeVisitor < TreeNodeVisitor
-  
-  attr_reader :clonedRoot
-  
-  def initialize
-    super
-    @clonedRoot = nil
-    @stack = []
-  end
-  
-  def enter_treeNode( treeNode )
-    if @stack.empty?
-      clonedTreeNode = TreeNode.new( treeNode.name )
-      @clonedRoot = clonedTreeNode
-    else
-      clonedTreeNode = TreeNode.new( treeNode.name, @stack.last )
-    end
-    @stack.push( clonedTreeNode )
-  end
 
-  def exit_treeNode( treeNode )
-    @stack.pop
-  end
 
-  def visit_leafNode( leafNode )
-    clonedLeafNode = LeafNode.new( leafNode.name, @stack.last )
-  end
 
-end
 
-#
-# CallbackTreeNodeVisitor
-#
-class CallbackTreeNodeVisitor < TreeNodeVisitor
-  
-  def initialize( root = nil )
-    super()
-    @stack = []
-    @root = root
-    @stack.push( root ) if root
-    @action_enterTreeNode = nil
-    @action_visitLeafNode = nil
-  end
-  
-  def onEnterTreeNode( &action )
-    @action_enterTreeNode = action
-  end
-  
-  def onVisitLeafNode( &action )
-    @action_visitLeafNode = action
-  end
 
-  def enter_treeNode( treeNode )
-    parentNode = if @stack.empty? 
-                   nil
-                 else
-                   @stack.last
-                 end
-    @root = treeNode if @stack.empty?
-    @stack.push( treeNode ) 
-    @action_enterTreeNode.call( treeNode ) if @action_enterTreeNode
-  end
-
-  def exit_treeNode( treeNode )
-    @stack.pop
-  end
-
-  def visit_leafNode( leafNode )
-    parentNode = @stack.last
-    @action_visitLeafNode.call( leafNode ) if @action_visitLeafNode
-  end
-    
-end  
-  
-
-#
-# CallbackTreeNodeVisitor
-#
-class CallbackTreeNodeVisitor2 < TreeNodeVisitor
-  
-  attr_reader :root
-  
-  def initialize( root = nil )
-    super()
-    @stack = []
-    @root = root
-    @stack.push( root ) if root
-  end
-  
-  def onEnterTreeNode( &action )
-    @action_enterTreeNode = action
-  end
-  
-  def onVisitLeafNode( &action )
-    @action_visitLeafNode = action
-  end
-
-  def enter_treeNode( treeNode )
-    newParentNode = if @stack.empty? 
-                      nil
-                    else
-                      @stack.last
-                    end
-    newTreeNode = @action_enterTreeNode.call( treeNode, newParentNode )
-    @root = newTreeNode if @stack.empty?
-    @stack.push( newTreeNode ) 
-  end
-
-  def exit_treeNode( treeNode )
-    @stack.pop
-  end
-
-  def visit_leafNode( leafNode )
-    newParentNode = @stack.last
-    @action_visitLeafNode.call( leafNode, newParentNode )
-  end
-    
-end  
   

data/lib/treevisitor/visitors/block_tree_node_visitor.rb

@@ -0,0 +1,24 @@
+require 'treevisitor/tree_node_visitor.rb'
+
+#
+# Utilizzo della classa astratta DirTreeProcessor
+# per chimare un blocco su tutti i TreeNode
+#
+class BlockTreeNodeVisitor < TreeNodeVisitor
+
+  def initialize( &action )
+    @block = action
+  end
+
+  def enter_treeNode( treeNode )
+    @block.call( treeNode )
+  end
+
+  def exit_treeNode( treeNode )
+  end
+
+  def visit_leafNode( leafNode )
+    @block.call( leafNode )
+  end
+
+end

data/lib/treevisitor/{build_dir_tree_visitor.rb → visitors/build_dir_tree_visitor.rb}

@@ -11,11 +11,16 @@ require 'treevisitor/tree_node_visitor'
 class BuildDirTreeVisitor < TreeNodeVisitor
   
   attr_reader :root
+
+  attr_reader :nr_directories
+  attr_reader :nr_files
   
   def initialize
     super
     @root = nil
     @stack = []
+    @nr_directories = 0
+    @nr_files = 0
   end
   
   def enter_treeNode( pathname )
@@ -25,6 +30,7 @@ class BuildDirTreeVisitor < TreeNodeVisitor
     else
       treeNode = TreeNode.new( File.basename( pathname ), @stack.last )
     end
+    @nr_directories += 1
     @stack.push( treeNode )
   end
 
@@ -33,26 +39,8 @@ class BuildDirTreeVisitor < TreeNodeVisitor
   end
 
   def visit_leafNode( pathname )
+    @nr_files  += 1
     leafNode = LeafNode.new( File.basename(pathname), @stack.last )
   end
 
 end
-
-#
-# Utilizzo della classa astratta DirTreeProcessor
-# per stampare i nodi di un TreeNode
-#
-class PrintDirTreeVisitor < TreeNodeVisitor
-
-  def enter_treeNode( pathname )
-    puts pathname
-  end
-
-  def exit_treeNode( treeNode )
-  end
-
-  def visit_leafNode( pathname )
-    puts pathname
-  end
-
-end

data/lib/treevisitor/visitors/callback_tree_node_visitor.rb

@@ -0,0 +1,43 @@
+#
+# CallbackTreeNodeVisitor
+#
+class CallbackTreeNodeVisitor < TreeNodeVisitor
+
+  def initialize( root = nil )
+    super()
+    @stack = []
+    @root = root
+    @stack.push( root ) if root
+    @action_enterTreeNode = nil
+    @action_visitLeafNode = nil
+  end
+
+  def onEnterTreeNode( &action )
+    @action_enterTreeNode = action
+  end
+
+  def onVisitLeafNode( &action )
+    @action_visitLeafNode = action
+  end
+
+  def enter_treeNode( treeNode )
+    parentNode = if @stack.empty?
+                   nil
+                 else
+                   @stack.last
+                 end
+    @root = treeNode if @stack.empty?
+    @stack.push( treeNode )
+    @action_enterTreeNode.call( treeNode ) if @action_enterTreeNode
+  end
+
+  def exit_treeNode( treeNode )
+    @stack.pop
+  end
+
+  def visit_leafNode( leafNode )
+    parentNode = @stack.last
+    @action_visitLeafNode.call( leafNode ) if @action_visitLeafNode
+  end
+
+end

data/lib/treevisitor/visitors/callback_tree_node_visitor2.rb

@@ -0,0 +1,45 @@
+
+#
+# CallbackTreeNodeVisitor
+#
+class CallbackTreeNodeVisitor2 < TreeNodeVisitor
+
+  attr_reader :root
+
+  def initialize( root = nil )
+    super()
+    @stack = []
+    @root = root
+    @stack.push( root ) if root
+  end
+
+  def onEnterTreeNode( &action )
+    @action_enterTreeNode = action
+  end
+
+  def onVisitLeafNode( &action )
+    @action_visitLeafNode = action
+  end
+
+  def enter_treeNode( treeNode )
+    newParentNode = if @stack.empty?
+                      nil
+                    else
+                      @stack.last
+                    end
+    newTreeNode = @action_enterTreeNode.call( treeNode, newParentNode )
+    @root = newTreeNode if @stack.empty?
+    @stack.push( newTreeNode )
+  end
+
+  def exit_treeNode( treeNode )
+    @stack.pop
+  end
+
+  def visit_leafNode( leafNode )
+    newParentNode = @stack.last
+    @action_visitLeafNode.call( leafNode, newParentNode )
+  end
+
+end
+

data/lib/treevisitor/visitors/clone_tree_node_visitor.rb

@@ -0,0 +1,33 @@
+#
+# Esempio
+# Clona un TreeNode
+#
+class CloneTreeNodeVisitor < TreeNodeVisitor
+
+  attr_reader :clonedRoot
+
+  def initialize
+    super
+    @clonedRoot = nil
+    @stack = []
+  end
+
+  def enter_treeNode( treeNode )
+    if @stack.empty?
+      clonedTreeNode = TreeNode.new( treeNode.name )
+      @clonedRoot = clonedTreeNode
+    else
+      clonedTreeNode = TreeNode.new( treeNode.name, @stack.last )
+    end
+    @stack.push( clonedTreeNode )
+  end
+
+  def exit_treeNode( treeNode )
+    @stack.pop
+  end
+
+  def visit_leafNode( leafNode )
+    clonedLeafNode = LeafNode.new( leafNode.name, @stack.last )
+  end
+
+end

data/lib/treevisitor/visitors/depth_tree_node_visitor.rb

@@ -0,0 +1,24 @@
+#
+#
+#
+class DepthTreeNodeVisitor < TreeNodeVisitor
+
+  attr_reader :depth
+
+  def initialize
+    super
+    @depth = 0
+  end
+
+  def enter_treeNode( treeNode )
+    @depth += 1
+  end
+
+  def exit_treeNode( treeNode )
+    @depth -= 1
+  end
+
+  def visit_leafNode( leafNode )
+  end
+
+end

data/lib/treevisitor/visitors/flat_print_tree_node_visitors.rb

@@ -0,0 +1,18 @@
+#
+# Utilizzo della classa astratta DirTreeProcessor
+# per stampare i nodi di un TreeNode
+#
+class FlatPrintTreeNodeVisitor < TreeNodeVisitor
+
+  def enter_treeNode( treeNode )
+    puts treeNode.name
+  end
+
+  def exit_treeNode( treeNode )
+  end
+
+  def visit_leafNode( leafNode )
+    puts leafNode.name
+  end
+
+end

data/lib/treevisitor/visitors/print_dir_tree_visitor.rb

@@ -0,0 +1,18 @@
+#
+# Utilizzo della classa astratta DirTreeProcessor
+# per stampare i nodi di un TreeNode
+#
+class PrintDirTreeVisitor < TreeNodeVisitor
+
+  def enter_treeNode( pathname )
+    puts pathname
+  end
+
+  def exit_treeNode( treeNode )
+  end
+
+  def visit_leafNode( pathname )
+    puts pathname
+  end
+
+end

data/lib/treevisitor/visitors/print_tree_node_visitor.rb

@@ -0,0 +1,35 @@
+class PrintTreeNodeVisitor < TreeNodeVisitor
+
+  def initialize( *args )
+    super( *args )
+    @depth = 0
+  end
+
+  def visit_leafNode( leafNode )
+    str = ""
+    (0...@depth-1).step {
+      str << " |-"
+    }
+    str << " |  "
+    puts str + leafNode.name.to_s
+  end
+
+  def enter_treeNode( treeNode )
+
+    str = ""
+    (0...@depth).step {
+      str << " |-"
+    }
+
+    if @depth == 0
+      puts str + treeNode.name.to_s
+    else
+      puts str + treeNode.name.to_s
+    end
+    @depth += 1
+  end
+
+  def exit_treeNode( treeNode )
+    @depth -= 1
+  end
+end

data/test/{gf_utility → gf_utilities}/tc_kwartz.rb

@@ -1,17 +1,25 @@
 require File.join( File.dirname(__FILE__), "test_helper")
 
 require 'fileutils'
-require 'gf_utility/kwartzhelper'
 
-class TCDirProcessor < Test::Unit::TestCase
+class TCKwartz < Test::Unit::TestCase
 
   KWARTZ_TEST_DATA = File.join( $TREEVISITOR_HOME, "test_data", "gf_utility", "kwartz_test_data" )
 
   def test_simple
+
+    begin
+      require 'kwartz'
+    rescue LoadError
+      puts "WARNING kwartz_helper test not runned because kwartz is not present"
+      return
+    end
+
+    require 'gf_utilities/kwartzhelper'
     template_dir     = File.join( KWARTZ_TEST_DATA, "source" )
     template_out     = File.join( KWARTZ_TEST_DATA, "out" )
     kwartz_compile( template_dir, nil, template_out )
-    
+
     out_filename = File.join( KWARTZ_TEST_DATA, "out", "test1.rb" )
     assert File.exists?(out_filename)
     FileUtils.rm out_filename

data/test/gf_utilities/tc_md5.rb

@@ -0,0 +1,14 @@
+require File.join( File.dirname(__FILE__), "test_helper")
+
+require 'gf_utilities/md5.rb'
+
+class TCMD5 < Test::Unit::TestCase
+
+  TEST_FILE = File.join( $TREEVISITOR_HOME, "lib", "gf_utilities", "md5.rb" )
+
+  def test_simple_md5
+    file_name = File.join( TEST_FILE )
+    assert_equal "0cac752fb36269471d8265435ed99443", MD5.file( file_name ).to_s
+  end
+
+end

data/test/{gf_utility → gf_utilities}/tc_numeric.rb

@@ -1,6 +1,6 @@
 require File.join( File.dirname(__FILE__), "test_helper")
 
-require 'gf_utility/numeric.rb'
+require 'gf_utilities/numeric.rb'
 
 class TCNumeric < Test::Unit::TestCase
 

data/test/treevisitor/cli/tc_cli_tree.rb

@@ -0,0 +1,61 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+
+require 'treevisitor/cli/cli_tree'
+
+class TCCliTree < Test::Unit::TestCase
+
+  TEST_DIRECTORY = File.join( $TREEVISITOR_HOME, "test_data", "tree_visitor", "test_data" )
+
+  def test_help_message
+    out = with_stdout_captured do
+      args = %w{-h}
+      CliTree.new.parse_args(args)
+    end
+    assert out.start_with?("Usage:")
+  end
+
+  def test_version
+    out = with_stdout_captured do
+      args = %w{--version}
+      CliTree.new.parse_args(args)
+    end
+    version = File.open( File.join($TREEVISITOR_HOME, "VERSION") ).read
+    assert_match version, out
+  end
+
+  def test_directories_only
+    out = with_stdout_captured do
+      args = %w{-d}
+      args << TEST_DIRECTORY
+      CliTree.new.parse_args(args)
+    end
+    # puts out
+    assert_equal 6, out.split("\n").length
+
+    out = with_stdout_captured do
+      args = %w{-da}
+      args << TEST_DIRECTORY
+      CliTree.new.parse_args(args)
+    end
+    #puts out
+    assert_equal 7, out.split("\n").length
+  end
+
+  def test_all_files
+    out = with_stdout_captured do
+      args = %w{-a}
+      args << TEST_DIRECTORY
+      CliTree.new.parse_args(args)
+    end
+    # puts out
+    assert_equal 11, out.split("\n").length
+
+    out = with_stdout_captured do
+      args = []
+      args << TEST_DIRECTORY
+      CliTree.new.parse_args(args)
+    end
+    # puts out
+    assert_equal 9, out.split("\n").length
+  end
+end

data/test/treevisitor/tc_dir_processor.rb

@@ -3,8 +3,13 @@ require File.join(File.dirname(__FILE__), "test_helper")
 require 'treevisitor/dir_processor'
 
 class TCDirProcessor < Test::Unit::TestCase
+
+  TEST_DATA = File.join( $TREEVISITOR_HOME, "test_data", "tree_visitor", "test_data" )
+
   def test_simple
-    dp = DirProcessor.new($TEST_DATA) { |f| puts f }
+    files = []
+    dp = DirProcessor.new(TEST_DATA) { |f| files << f }
     dp.run
+    assert_equal 3, files.length
   end
 end

data/test/treevisitor/tc_dir_tree_walker.rb

@@ -5,26 +5,36 @@ require 'treevisitor/tree_node_visitor.rb'
 
 class TCDirTreeWalker < Test::Unit::TestCase
 
+  TEST_DIRECTORY = File.join( $TREEVISITOR_HOME, "test_data", "tree_visitor", "test_data" )
+
   def test_simple  
-    dir_tree_walker = DirTreeWalker.new( $TEST_DATA )
+    dir_tree_walker = DirTreeWalker.new( TEST_DIRECTORY )
     dir_tree_walker.add_ignore_dir( ".svn" )
 
     accumulator = []
     visitor = BlockTreeNodeVisitor.new { |pathname| accumulator << File.basename( pathname ) }
     dir_tree_walker.run( visitor )
-    assert_equal( 7, accumulator.length )
-    assert_equal( %w{ test_data dir.1 dir.1.2 file.1.2.1 file.1.1 dir.2 file.2.1 }, accumulator )
+    assert_equal( 9, accumulator.length )
+    assert_equal( %w{ test_data dir.1 dir.1.2 file.1.2.1 file.1.1 dir.2 file.2.1 .dir_with_dot dummy.txt}, accumulator )
   end
 
-  def test_ignore_dir
+  def test_ignore_function
     dtp = DirTreeWalker.new( "." )
 
-    dtp.add_ignore_dir(".xvpics")
-    dtp.add_ignore_dir(".thumbnails")
-    dtp.add_ignore_dir("catalog_data")
+    dtp.add_ignore_pattern(/^\./)
+    assert dtp.ignore_file?( ".thumbnails" )
+    assert dtp.ignore_dir?( ".thumbnails" )
+
+    dtp.add_ignore_dir("thumbnails")
+
+    assert dtp.ignore_dir?( ".thumbnails" ) 
+    assert dtp.ignore_dir?( "thumbnails" )
+    assert ! dtp.ignore_dir?( "pippo" )
+
+
+    dtp.add_ignore_file("xvpics")
 
-    assert( dtp.ignore_dir?( ".thumbnails" ) )
-    assert( ! dtp.ignore_dir?( "pippo" ) )
+    assert( dtp.ignore_file?( "xvpics" ) )
   end
 
 end

data/test/treevisitor/tc_tree_node_visitor.rb

@@ -2,6 +2,11 @@ require File.join(File.dirname(__FILE__), "test_helper")
 
 require 'treevisitor/tree_node.rb'
 require 'treevisitor/tree_node_visitor.rb'
+require 'treevisitor/visitors/block_tree_node_visitor'
+require 'treevisitor/visitors/callback_tree_node_visitor'
+require 'treevisitor/visitors/callback_tree_node_visitor2'
+require 'treevisitor/visitors/clone_tree_node_visitor'
+require 'treevisitor/visitors/depth_tree_node_visitor'
 
 class TCTreeNodeVisitor < Test::Unit::TestCase
 

data/test/treevisitor/test_helper.rb

@@ -5,6 +5,17 @@ test_dir = File.join($TREEVISITOR_HOME, "test" )
 $:.unshift lib_dir  unless $:.include?(lib_dir)
 $:.unshift test_dir unless $:.include?(test_dir)
 
-$TEST_DATA = File.join( $TREEVISITOR_HOME, "test_data", "tree_visitor", "test_data" )
-
 require 'test/unit'
+
+require "stringio"
+def with_stdout_captured
+  old_stdout = $stdout
+  out = StringIO.new
+  $stdout = out
+  begin
+    yield
+  ensure
+    $stdout = old_stdout
+  end
+  out.string
+end

data/test_data/gf_utility/kwartz_test_data/out.certified/dummy.txt

@@ -0,0 +1 @@
+So git create directory

data/test_data/gf_utility/kwartz_test_data/out/dummy.txt

@@ -0,0 +1 @@
+So git create directory

data/test_data/gf_utility/kwartz_test_data/source/test1.plogic

@@ -0,0 +1,16 @@
+/* The element which is marked by 'id="list1"' */
+#list1 {
+  logic: {
+    for member in @members
+      _stag           # start tag
+      _cont           # content
+      _etag           # end tag
+    end
+  }
+}
+
+/* The element which is marked by 'id="mark:item1"' */
+#item1 {
+  /* replace the content with value of a variable 'member' */
+  value: member;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gf-treevisitor
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors: 
 - gf
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -07:00
-default_executable: dirtree.rb
+date: 2009-05-30 00:00:00 -07:00
+default_executable: tree.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: abstract
@@ -25,28 +25,41 @@ dependencies:
 description: 
 email: giovanni.ferro@gmail.com
 executables: 
-- dirtree.rb
+- tree.rb
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
-- lib/gf_utility/file_utilities.rb
-- lib/gf_utility/kwartzhelper.rb
-- lib/gf_utility/md5.rb
-- lib/gf_utility/numeric.rb
+- VERSION
+- lib/gf_utilities/file_utilities.rb
+- lib/gf_utilities/kwartzhelper.rb
+- lib/gf_utilities/md5.rb
+- lib/gf_utilities/numeric.rb
 - lib/treevisitor.rb
 - lib/treevisitor/abs_node.rb
-- lib/treevisitor/build_dir_tree_visitor.rb
-- lib/treevisitor/cli/cli_dir_tree.rb
+- lib/treevisitor/cli/cli_tree.rb
 - lib/treevisitor/dir_processor.rb
 - lib/treevisitor/dir_tree_walker.rb
 - lib/treevisitor/leaf_node.rb
 - lib/treevisitor/tree_node.rb
 - lib/treevisitor/tree_node_visitor.rb
-- lib/treevisitor/visitor/print_node_visitor2.rb
+- lib/treevisitor/visitors/block_tree_node_visitor.rb
+- lib/treevisitor/visitors/build_dir_tree_visitor.rb
+- lib/treevisitor/visitors/callback_tree_node_visitor.rb
+- lib/treevisitor/visitors/callback_tree_node_visitor2.rb
+- lib/treevisitor/visitors/clone_tree_node_visitor.rb
+- lib/treevisitor/visitors/depth_tree_node_visitor.rb
+- lib/treevisitor/visitors/flat_print_tree_node_visitors.rb
+- lib/treevisitor/visitors/print_dir_tree_visitor.rb
+- lib/treevisitor/visitors/print_node_visitor2.rb
+- lib/treevisitor/visitors/print_tree_node_visitor.rb
+- test_data/gf_utility/kwartz_test_data/out.certified/dummy.txt
+- test_data/gf_utility/kwartz_test_data/out/dummy.txt
 - test_data/gf_utility/kwartz_test_data/source/test1.html
+- test_data/gf_utility/kwartz_test_data/source/test1.plogic
+- test_data/tree_visitor/test_data/.dir_with_dot/dummy.txt
 - test_data/tree_visitor/test_data/dir.1/dir.1.2/file.1.2.1
 - test_data/tree_visitor/test_data/dir.1/file.1.1
 - test_data/tree_visitor/test_data/dir.2/file.2.1
@@ -76,16 +89,16 @@ requirements: []
 rubyforge_project: treevisitor
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: implementation of visitor design pattern
 test_files: 
 - test/treevisitor/tc_dir_processor.rb
+- test/treevisitor/cli/tc_cli_tree.rb
 - test/treevisitor/tc_dir_tree_walker.rb
 - test/treevisitor/tc_tree_node.rb
 - test/treevisitor/tc_tree_node_visitor.rb
 - test/treevisitor/test_helper.rb
-- test/gf_utility/tc_md5.rb
-- test/gf_utility/tc_kwartz.rb
-- test/gf_utility/tc_numeric.rb
-- test/gf_utility/test_helper.rb
-- test/ts_treevisitor.rb
+- test/gf_utilities/tc_md5.rb
+- test/gf_utilities/tc_kwartz.rb
+- test/gf_utilities/tc_numeric.rb
+- test/gf_utilities/test_helper.rb

data/lib/gf_utility/md5.rb

@@ -1,17 +0,0 @@
-# stdlib
-require 'md5'
-
-#
-# calcola md5 di file grandi, copiata da usenet
-#
-class MD5
-  def self.file(file)
-    File.open(file, "rb") do |f|
-      res = self.new
-      while (data = f.read(4096))
-        res << data
-      end
-      res
-    end
-  end
-end

data/test/gf_utility/tc_md5.rb

@@ -1,14 +0,0 @@
-require File.join( File.dirname(__FILE__), "test_helper")
-
-require 'gf_utility/md5.rb'
-
-class TCMD5 < Test::Unit::TestCase
-
-  TEST_FILE = File.join( $TREEVISITOR_HOME, "lib", "treevisitor.rb" )
-
-  def test_simple_build
-    file_name = File.join( TEST_FILE )
-    MD5.file( file_name )
-  end
-
-end

data/test/ts_treevisitor.rb

@@ -1,16 +0,0 @@
-# stdlib
-require "test/unit"
-
-# common
-$TREEVISITOR_HOME = File.expand_path( File.join( File.dirname( __FILE__), "..") )
-$:.unshift( File.join($TREEVISITOR_HOME, "lib" ) )
-$:.unshift( File.join($TREEVISITOR_HOME, "test" ) )
-
-require "tree_visitor"
-
-require "gf_utility/tc_md5"
-
-require "treevisitor/tc_dir_processor"
-require "treevisitor/tc_dir_tree_walker"
-require "treevisitor/tc_tree_node"
-require "treevisitor/tc_tree_node_visitor"