treevisitor 0.1.4 → 0.1.5

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 4
+:patch: 5
 :build: 

data/examples/directory_without_subdirectory.rb

@@ -0,0 +1,35 @@
+cwd = File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
+$:.unshift(cwd) unless $:.include?(cwd)
+require 'treevisitor'
+
+require 'ostruct'
+#
+# Find directory without subdirectories
+#
+class DirWithoutSubDir < TreeVisitor::TreeNodeVisitor
+
+  def initialize
+    super
+    @stack = []
+    @nr = 0
+  end
+
+  def enter_tree_node( pathname )
+    @nr += 1
+    info = OpenStruct.new(:nr => @nr, :pathname => pathname)
+    @stack.push( info )
+  end
+
+  def exit_tree_node( pathname )
+    info = @stack.pop
+    if info.nr == @nr
+      puts "leaf: #{pathname}"
+    end
+  end
+
+end
+
+dtw = TreeVisitor::DirTreeWalker.new( ".." )
+dtw.ignore /^\./
+dtw.visit_file=false
+dtw.run( DirWithoutSubDir.new )

data/lib/treevisitor/cli/cli_tree.rb

@@ -78,7 +78,7 @@ module TreeVisitor
         dtw.ignore(/^\.[^.]+/) # ignore all file starting with "."
       end
 
-      dtw.visit_leaf = !options[:only_directories]
+      dtw.visit_file = !options[:only_directories]
 
       case options[:algo]
       when 'build'
@@ -91,7 +91,7 @@ module TreeVisitor
         visitor = PrintDirTreeVisitor.new
         dtw.run( visitor )
       end
-      return 0
+      0
     end
 
   end

data/lib/treevisitor/dir_tree_walker.rb

@@ -9,26 +9,26 @@ module TreeVisitor
     #
     # @param [String] dirname the root of the tree (top level directory)
     #
-    def initialize( dirname )
+    def initialize(dirname)
       @dirname = dirname
-      unless File.directory?( dirname )
+      unless File.directory?(dirname)
         raise "#{dirname} is not a directory!"
       end
 
-      @visitor = nil
+      @visitor              = nil
 
       #
       # pattern
       #
-      @ignore_dir_patterns = []
+      @ignore_dir_patterns  = []
       @ignore_file_patterns = []
 
-      @match_file_patterns = []
+      @match_file_patterns  = []
 
       #
       # options
       #
-      @visit_leaf = true
+      @visit_file           = true
     end
 
     ##########################################################################
@@ -42,22 +42,25 @@ module TreeVisitor
     def ignore(pattern)
       @ignore_dir_patterns << pattern
       @ignore_file_patterns << pattern
+      self
     end
 
     #
     # Ignore a directory (Tree) matching pattern
     # @param [RegEx] pattern
     #
-    def ignore_dir( pattern )
+    def ignore_dir(pattern)
       @ignore_dir_patterns << pattern
+      self
     end
 
     #
     # Ignore a file (Leaf) matching pattern
     # @param [RegEx] pattern
     #
-    def ignore_file( pattern )
+    def ignore_file(pattern)
       @ignore_file_patterns << pattern
+      self
     end
 
     #
@@ -66,29 +69,29 @@ module TreeVisitor
     #
     # @param [RegEx] pattern
     #
-    def match( pattern )
+    def match(pattern)
       @match_file_patterns << pattern
+      self
     end
 
     ##########################################################################
     # Options
 
     #
-    # boh
+    # it is true to visit file
     #
-    attr_accessor :visit_leaf
+    attr_accessor :visit_file
 
     ##########################################################################
 
-
     #
     # Test directory ignore pattern
     #
     # @param [String] directory name
     # @return [boolean] if dirname match almost one pattern
     #
-    def ignore_dir?( dirname )
-      _include?( @ignore_dir_patterns, File.basename( dirname ) )
+    def ignore_dir?(dirname)
+      _include?(@ignore_dir_patterns, File.basename(dirname))
     end
 
     #
@@ -97,8 +100,8 @@ module TreeVisitor
     # @param [String] file name
     # @return [boolean] if filename match almost one pattern
     #
-    def ignore_file?( filename )
-      _include?( @ignore_file_patterns, File.basename( filename ) )
+    def ignore_file?(filename)
+      _include?(@ignore_file_patterns, File.basename(filename))
     end
 
     #
@@ -107,19 +110,20 @@ module TreeVisitor
     # @param [String] file name
     # @return [boolean] if filename match almost one pattern
     #
-    def match?( filename )
+    def match?(filename)
       return true if @match_file_patterns.empty?
-      _include?( @match_file_patterns, File.basename( filename ) )
+      _include?(@match_file_patterns, File.basename(filename))
     end
 
     #
     # Run the visitor through the directory tree
     #
-    # return the visitor
+    # @param [TreeNodeVisitor]
+    # @return [TreeNodeVisitor] the visitor
     #
-    def run( tree_node_visitor )
+    def run(tree_node_visitor)
       @visitor = tree_node_visitor
-      process_directory( File.expand_path( @dirname ) )
+      process_directory(File.expand_path(@dirname))
       tree_node_visitor
     end
 
@@ -127,9 +131,9 @@ module TreeVisitor
 
     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 )
+      patterns.find { |pattern|
+        if pattern.kind_of? Regexp
+          pattern.match(basename)
         else
           basename == pattern
         end
@@ -139,26 +143,23 @@ module TreeVisitor
     #
     # recurse on other directories
     #
-    def process_directory( dirname )
-      @visitor.enter_tree_node( dirname )
+    def process_directory(dirname)
+      @visitor.enter_tree_node(dirname)
       # return if ignore_dir?( dirname )
 
-      Dir.entries( dirname ).sort.each { |basename|
-        next if basename == "." or basename == ".."  # ignore always "." and ".."
-        pathname = File.join( dirname, basename )
+      Dir.entries(dirname).sort.each { |basename|
+        next if basename == "." or basename == ".." # ignore always "." and ".."
+        pathname = File.join(dirname, basename)
 
-        if File.directory?( pathname )
-          # directory
-          process_directory( pathname ) unless ignore_dir?( basename )
+        if File.directory?(pathname)
+          process_directory(pathname) unless ignore_dir?(basename)
         else
-          if @visit_leaf
-            if match?( basename ) && ! ignore_file?( basename )
-              @visitor.visit_leaf_node( pathname )
-            end
+          if !!@visit_file && match?(basename) && !ignore_file?(basename)
+            @visitor.visit_leaf_node(pathname)
           end
         end
       }
-      @visitor.exit_tree_node( dirname )
+      @visitor.exit_tree_node(dirname)
     end
   end
 end

data/lib/treevisitor/visitors/build_dir_tree_visitor.rb

@@ -50,4 +50,4 @@ module TreeVisitor
     end
 
   end
-end
+end # end module TreeVisitor

data/lib/treevisitor.rb

@@ -16,7 +16,6 @@ module TreeVisitor
   end
 end
 
-
 require "treevisitor/abs_node"
 require 'treevisitor/leaf_node'
 require 'treevisitor/tree_node_visitor.rb'

data/spec/spec_helper.rb

@@ -6,13 +6,11 @@ require 'treevisitor_cli'
 
 include TreeVisitor
 
-TEST_DIR = File.expand_path( File.join( File.dirname(__FILE__), "fixtures", "test_dir" ) )
-
+FIXTURES = File.expand_path( File.join( File.dirname(__FILE__), "fixtures" ) )
 
 # Spec::Runner.configure do |config|
 # end
 
-
 require 'test/unit'
 require "stringio"
 

data/spec/treevisitor/cli/cli_tree_spec.rb

@@ -16,32 +16,32 @@ describe CliTree do
       args = %w{--version}
       CliTree.new.parse_args(args)
     end
-    version = "0.1.4"
+    version = TreeVisitor.version
     out.should match version
   end
 
   it "should accepts switch -d (directories only)" do
     out = with_stdout_captured do
       args = %w{-d}
-      args << TEST_DIR
+      args << File.join(FIXTURES, "test_dir")
       CliTree.new.parse_args(args)
     end
-    # pp out
+    # puts out
     out.split("\n").length.should == 6
 
     out = with_stdout_captured do
       args = %w{-da}
-      args << TEST_DIR
+      args << File.join(FIXTURES, "test_dir")
       CliTree.new.parse_args(args)
     end
-    #puts out
+    # puts out
     out.split("\n").length.should == 7
   end
 
   it "should accepts switch -a (all files)" do
     out = with_stdout_captured do
       args = %w{-a}
-      args << TEST_DIR
+      args << File.join(FIXTURES, "test_dir")
       CliTree.new.parse_args(args)
     end
     # pp out
@@ -49,7 +49,7 @@ describe CliTree do
 
     out = with_stdout_captured do
       args = []
-      args << TEST_DIR
+      args << File.join(FIXTURES, "test_dir")
       CliTree.new.parse_args(args)
     end
     # puts out

data/spec/treevisitor/dir_processor_spec.rb

@@ -6,7 +6,7 @@ describe DirProcessor do
   it do
     files = []
     dp = DirProcessor.new { |f| files << f }
-    dp.process(TEST_DIR)
+    dp.process(FIXTURES)
     files.length.should == 3
   end
 

data/spec/treevisitor/dir_tree_walker_spec.rb

@@ -4,8 +4,7 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 describe DirTreeWalker do
 
   it "should accumulate file names" do
-    dir_tree_walker = DirTreeWalker.new( TEST_DIR )
-    dir_tree_walker.ignore_dir( ".svn" )
+    dir_tree_walker = DirTreeWalker.new( File.join(FIXTURES, "test_dir") )
 
     accumulator = []
     visitor = BlockTreeNodeVisitor.new { |pathname| accumulator << File.basename( pathname ) }
@@ -14,6 +13,17 @@ describe DirTreeWalker do
     accumulator.sort.should ==  %w{ test_dir dir.1 dir.1.2 file.1.2.1 file.1.1 dir.2 file.2.1 .dir_with_dot dummy.txt}.sort
   end
 
+  it "should accumulate file names 2" do
+    dir_tree_walker = DirTreeWalker.new( File.join( FIXTURES, "test_dir_2" ) )
+    dir_tree_walker.ignore( "sub" )
+    
+    accumulator = []
+    visitor = BlockTreeNodeVisitor.new { |pathname| accumulator << File.basename( pathname ) }
+    dir_tree_walker.run( visitor )
+    # accumulator.length.should == 4
+    accumulator.sort.should ==  %w{ [Dsube] test_dir_2}.sort
+  end
+
   it "should ignore files" do
     dtp = DirTreeWalker.new( "." )
 
@@ -30,4 +40,11 @@ describe DirTreeWalker do
     dtp.ignore_file?( "xvpics" ).should be_true
   end
 
+  it "should ignore files 2" do
+    dtp = DirTreeWalker.new( "." )
+
+    dtp.ignore("sub")
+    dtp.ignore_file?( "[Dsube]" ).should be_false
+    dtp.ignore_dir?( "[Dsube]" ).should be_false
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Tokiro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-18 00:00:00 +01:00
+date: 2011-01-05 00:00:00 +01:00
 default_executable: tree.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- examples/directory_without_subdirectory.rb
 - examples/find_files.rb
 - examples/print_files.rb
 - lib/tree_visitor.rb