treevisitor 0.2.2 → 0.2.3

data/lib/treevisitor/basic_tree_node_visitor.rb

@@ -12,6 +12,12 @@ module TreeVisitor
     def enter_node( tree_node )
     end
 
+    #
+    # called when the tree node is not accessible or an exception is raise when the node is accessed
+    #
+    def cannot_enter_node( tree_node, error)
+    end
+
     # alias :enter_tree_node :enter_node
 
     #
@@ -28,7 +34,11 @@ module TreeVisitor
     def visit_leaf( leaf_node )
     end
 
-    # alias :visit_leaf_node :visit_leaf
+    #
+    # called when the leaf node is not accessible or an exception is raise when the node is accessed
+    #
+    def cannot_visit_leaf( tree_node, error)
+    end
   end
 
 end

data/lib/treevisitor/directory_walker.rb

@@ -16,7 +16,7 @@ module TreeVisitor
     #
     # @overload initialize(dirname)
     #   @param [String] dirname the root of the tree (top level directory)
-    # 
+    #
     # @overload initialize(dirname, options)
     #   @param [Hash] options
     #   @option options [String,Regex, Array<String,Regexp>] :ignore list of ignore pattern
@@ -259,11 +259,24 @@ module TreeVisitor
     # recurse on other directories
     #
     def process_directory(dirname)
-      @visitor.enter_node(dirname)
       # return if ignore_dir?( dirname )
 
       begin
-        Dir.entries(dirname).sort.each { |basename|
+        entries = Dir.entries(dirname).sort
+      rescue Errno::EACCES => e
+        $stderr.puts e
+        @visitor.cannot_enter_node(dirname, e)
+        return
+      rescue  Errno::EPERM => e
+        $stderr.puts e
+        @visitor.cannot_enter_node(dirname, e)
+        return
+      end
+
+
+      @visitor.enter_node(dirname)
+        entries.each { |basename|
+          begin
           next if basename == "." or basename == ".." # ignore always "." and ".."
           pathname = File.join(dirname, basename)
 
@@ -274,10 +287,13 @@ module TreeVisitor
               @visitor.visit_leaf(pathname)
             end
           end
+          rescue Errno::EACCES => e
+            $stderr.puts e
+          rescue  Errno::EPERM
+            $stderr.puts e
+          end
         }
-      rescue Errno::EACCES => e
-        $stderr.puts e
-      end
+
       @visitor.exit_node(dirname)
     end
   end

data/lib/treevisitor/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module TreeVisitor
-  VERSION="0.2.2"
+  VERSION="0.2.3"
 end

data/lib/treevisitor/visitors/build_dir_tree_visitor.rb

@@ -5,7 +5,7 @@ module TreeVisitor
   # It similar to CloneTreeNodeVisitor
   #
   class BuildDirTreeVisitor # < BasicTreeNodeVisitor
-  
+
     attr_reader :root
 
     #
@@ -19,7 +19,7 @@ module TreeVisitor
     # @see AbsNode#nr_leaves
     #
     attr_reader :nr_files
-  
+
     def initialize
       super
       @root = nil
@@ -27,7 +27,7 @@ module TreeVisitor
       @nr_directories = 0
       @nr_files = 0
     end
-  
+
     def enter_node( pathname )
       if @stack.empty?
         tree_node = TreeNode.new( File.basename( pathname ) )
@@ -39,6 +39,10 @@ module TreeVisitor
       @stack.push( tree_node )
     end
 
+    def cannot_enter_node(pathname, error)
+
+    end
+
     def exit_node( pathname )
       @stack.pop
     end

data/spec/spec_helper.rb

@@ -11,14 +11,18 @@ include TreeVisitor
 
 FIXTURES = File.expand_path( File.join( File.dirname(__FILE__), "fixtures" ) )
 
-def with_stdout_captured
+def with_output_captured
   old_stdout = $stdout
+  old_stderr = $stderr
   out = StringIO.new
+  err = StringIO.new
   $stdout = out
+  $stderr = err
   begin
     yield
   ensure
     $stdout = old_stdout
+    $stderr = old_stderr
   end
-  out.string
+  { :stdout => out.string, :stderr => err.string }
 end

data/spec/treevisitor/cli/cli_tree_spec.rb

@@ -4,55 +4,66 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 describe CliTree do
 
   it "help message" do
-    out = with_stdout_captured do
+    out = with_output_captured do
       args = %w{-h}
       CliTree.new.parse_args(args)
     end
-    out.should match /Usage:/
+    out[:stdout].should match /Usage:/
   end
 
   it "version" do
-    out = with_stdout_captured do
+    out = with_output_captured do
       args = %w{--version}
       CliTree.new.parse_args(args)
     end
     version = TreeVisitor::VERSION
-    out.should match version
+    out[:stdout].should match version
   end
 
   it "should accepts switch -d (directories only)" do
-    out = with_stdout_captured do
+    out = with_output_captured do
       args = %w{-d}
       args << File.join(FIXTURES, "test_dir_1")
       CliTree.new.parse_args(args)
     end
     # puts out
-    out.split("\n").length.should == 6
+    out[:stdout].split("\n").length.should == 6
 
-    out = with_stdout_captured do
+    out = with_output_captured do
       args = %w{-da}
       args << File.join(FIXTURES, "test_dir_1")
       CliTree.new.parse_args(args)
     end
     # puts out
-    out.split("\n").length.should == 7
+    out[:stdout].split("\n").length.should == 7
   end
 
   it "should accepts switch -a (all files)" do
-    out = with_stdout_captured do
+    out = with_output_captured do
       args = %w{-a}
       args << File.join(FIXTURES, "test_dir_1")
       CliTree.new.parse_args(args)
     end
     # pp out
-    out.split("\n").length.should == 11
+    out[:stdout].split("\n").length.should == 11
 
-    out = with_stdout_captured do
+    out = with_output_captured do
       args = []
       args << File.join(FIXTURES, "test_dir_1")
       CliTree.new.parse_args(args)
     end
     # puts out
-    out.split("\n").length.should == 9
+    out[:stdout].split("\n").length.should == 9
+  end
+
+  it "should show tree with inaccessible directories" do
+    out = with_output_captured do
+      args = []
+      args << File.join(FIXTURES, "test_dir_3_with_error")
+      CliTree.new.parse_args(args)
+    end
+    puts out
+    out[:stderr].should_not be_empty
+    out[:stdout].split("\n").length.should == 4
   end
 end

data/spec/treevisitor/directory_walker_spec.rb

@@ -73,4 +73,27 @@ describe DirTreeWalker do
     accumulator.sort.should == %w{ [Dsube] test_dir_2 }.sort
   end
 
+  it "should ignore not accessible directory" do
+
+    dir = File.join(FIXTURES, "test_dir_3_with_error")
+
+    f1 = File.join(dir, "no_accessible_dir")
+    Dir.rmdir(f1) if File.exist?(f1)
+    Dir.mkdir(f1, 0000)
+
+    f2 = File.join(dir, "accessible_dir")
+    Dir.rmdir(f2) if File.exist?(f2)
+    Dir.mkdir(f2)
+
+    dir_tree_walker = DirTreeWalker.new(File.join(FIXTURES, "test_dir_3_with_error"))
+    accumulator = []
+    visitor     = BlockTreeNodeVisitor.new { |pathname| accumulator << File.basename(pathname) }
+    dir_tree_walker.run(visitor)
+    accumulator.length.should == 2
+    accumulator.sort.should == %w{accessible_dir test_dir_3_with_error }.sort
+
+    # Dir.rmdir(f1)
+    # Dir.rmdir(f2)
+  end
+
 end

data/treevisitor.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   #
 
   gem.add_runtime_dependency(%q<json>, [">= 0"])
-  gem.add_development_dependency(%q<jeweler>, [">= 0"])
   gem.add_development_dependency(%q<rake>, [">= 0"])
   gem.add_development_dependency(%q<yard>, [">= 0"])
   gem.add_development_dependency(%q<bundler>, [">= 0"])
@@ -30,27 +29,26 @@ Gem::Specification.new do |gem|
   #
   # bin
   #
-  gem.executables = %w{ tree.rb }
   # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables = %w{ tree.rb }
 
   #
   # files
   #
+  # s.files         = `git ls-files`.split("\n")
   gem.files = %w{LICENSE.txt README.md Rakefile treevisitor.gemspec .gemtest}
   gem.files.concat Dir['lib/**/*.rb']
   gem.files.concat Dir['tasks/**/*.rake']
   gem.files.concat Dir['examples/**/*']
-  # s.files         = `git ls-files`.split("\n")
 
   #
   # test files
   #
+  # s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.test_files = Dir['spec/**/*.rb']
   gem.test_files.concat Dir['spec/fixtures/**/*']
   gem.test_files.concat Dir['spec/fixtures/**/.gitkeep']
   gem.test_files.concat Dir['spec/fixtures/**/.dir_with_dot/*']
-  # s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-
 
   gem.require_paths = ["lib"]
 end

metadata

@@ -1,196 +1,204 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: treevisitor
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Tokiro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-18 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: "      Implementation of visitor design pattern. It contains a 'tree.rb'\n      command line clone of the tree unix tool.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "      Implementation of visitor design pattern. It contains a 'tree.rb'\n
+  \     command line clone of the tree unix tool.\n"
 email: tokiro.oyama@gmail.com
-executables: 
+executables:
 - tree.rb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE.txt
 - README.md
 - Rakefile
 - treevisitor.gemspec
 - .gemtest
 - bin/tree.rb
-- lib/treevisitor/abs_node.rb
-- lib/treevisitor/basic_tree_node_visitor.rb
 - lib/treevisitor/cli/cli_tree.rb
-- lib/treevisitor/directory_walker.rb
-- lib/treevisitor/leaf_node.rb
-- lib/treevisitor/tree_node.rb
-- lib/treevisitor/tree_node_visitor.rb
 - lib/treevisitor/util/dir_processor.rb
-- lib/treevisitor/version.rb
-- lib/treevisitor/visitors/block_tree_node_visitor.rb
+- lib/treevisitor/directory_walker.rb
+- lib/treevisitor/visitors/print_dir_tree_visitor.rb
 - lib/treevisitor/visitors/build_dir_tree_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/print_tree_node_visitor.rb
+- lib/treevisitor/visitors/callback_tree_node_visitor2.rb
 - lib/treevisitor/visitors/directory_to_hash_visitor.rb
 - lib/treevisitor/visitors/flat_print_tree_node_visitors.rb
-- lib/treevisitor/visitors/print_dir_tree_visitor.rb
-- lib/treevisitor/visitors/print_tree_node_visitor.rb
-- lib/treevisitor.rb
+- lib/treevisitor/visitors/block_tree_node_visitor.rb
+- lib/treevisitor/visitors/clone_tree_node_visitor.rb
+- lib/treevisitor/abs_node.rb
+- lib/treevisitor/leaf_node.rb
+- lib/treevisitor/tree_node_visitor.rb
+- lib/treevisitor/tree_node.rb
+- lib/treevisitor/basic_tree_node_visitor.rb
+- lib/treevisitor/version.rb
 - lib/treevisitor_cli.rb
 - lib/tree_visitor.rb
+- lib/treevisitor.rb
 - tasks/rspec.rake
 - tasks/yard.rake
+- examples/directory_walker/print_files.rb
 - examples/directory_walker/directory_without_subdirectory.rb
 - examples/directory_walker/find_files.rb
-- examples/directory_walker/print_files.rb
-- examples/protovis/directory_to_json_visitor.rb
-- examples/protovis/index.html
+- examples/protovis/treevisitor.png
 - examples/protovis/protovis-r3.2.js
+- examples/protovis/index.html
 - examples/protovis/treevisitor.js
-- examples/protovis/treevisitor.png
-- spec/spec_helper.rb
+- examples/protovis/directory_to_json_visitor.rb
 - spec/treevisitor/cli/cli_tree_spec.rb
+- spec/treevisitor/util/dir_processor_spec.rb
+- spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb
+- spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb
+- spec/treevisitor/visitors/block_tree_node_visitor_spec.rb
+- spec/treevisitor/visitors/tree_node_visitors_spec.rb
+- spec/treevisitor/tree_dsl_with_derived_class_spec.rb
 - spec/treevisitor/directory_walker_spec.rb
 - spec/treevisitor/tree_dsl_spec.rb
-- spec/treevisitor/tree_dsl_with_derived_class1_spec.rb
-- spec/treevisitor/tree_dsl_with_derived_class_spec.rb
 - spec/treevisitor/tree_node_paths_spec.rb
-- spec/treevisitor/tree_node_spec.rb
+- spec/treevisitor/tree_dsl_with_derived_class1_spec.rb
 - spec/treevisitor/tree_node_visitor_delegate_spec.rb
+- spec/treevisitor/tree_node_spec.rb
 - spec/treevisitor/tree_node_visitor_dsl_spec.rb
-- spec/treevisitor/util/dir_processor_spec.rb
-- spec/treevisitor/visitors/block_tree_node_visitor_spec.rb
-- spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb
-- spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb
-- spec/treevisitor/visitors/tree_node_visitors_spec.rb
+- spec/spec_helper.rb
 - spec/fixtures/test_dir_1/dir.1/dir.1.2/file.1.2.1
 - spec/fixtures/test_dir_1/dir.1/file.1.1
 - spec/fixtures/test_dir_1/dir.2/file.2.1
 - spec/fixtures/test_dir_2/[Dsube]/sub/.gitkeep
 - spec/fixtures/test_dir_1/.dir_with_dot/dummy.txt
-has_rdoc: true
 homepage: http://github.com/tokiro/treevisitor
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Implementation of visitor design pattern
-test_files: 
-- spec/spec_helper.rb
+test_files:
 - spec/treevisitor/cli/cli_tree_spec.rb
+- spec/treevisitor/util/dir_processor_spec.rb
+- spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb
+- spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb
+- spec/treevisitor/visitors/block_tree_node_visitor_spec.rb
+- spec/treevisitor/visitors/tree_node_visitors_spec.rb
+- spec/treevisitor/tree_dsl_with_derived_class_spec.rb
 - spec/treevisitor/directory_walker_spec.rb
 - spec/treevisitor/tree_dsl_spec.rb
-- spec/treevisitor/tree_dsl_with_derived_class1_spec.rb
-- spec/treevisitor/tree_dsl_with_derived_class_spec.rb
 - spec/treevisitor/tree_node_paths_spec.rb
-- spec/treevisitor/tree_node_spec.rb
+- spec/treevisitor/tree_dsl_with_derived_class1_spec.rb
 - spec/treevisitor/tree_node_visitor_delegate_spec.rb
+- spec/treevisitor/tree_node_spec.rb
 - spec/treevisitor/tree_node_visitor_dsl_spec.rb
-- spec/treevisitor/util/dir_processor_spec.rb
-- spec/treevisitor/visitors/block_tree_node_visitor_spec.rb
-- spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb
-- spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb
-- spec/treevisitor/visitors/tree_node_visitors_spec.rb
+- spec/spec_helper.rb
 - spec/fixtures/test_dir_1/dir.1/dir.1.2/file.1.2.1
 - spec/fixtures/test_dir_1/dir.1/file.1.1
 - spec/fixtures/test_dir_1/dir.2/file.2.1
 - spec/fixtures/test_dir_2/[Dsube]/sub/.gitkeep
 - spec/fixtures/test_dir_1/.dir_with_dot/dummy.txt
+has_rdoc: