tree.rb 0.3.1 → 0.3.2

data/bin/tree.rb

@@ -4,7 +4,7 @@
 
 cwd = File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
 $:.unshift(cwd) unless $:.include?(cwd)
-require 'treevisitor_cli'
+require 'tree_rb_cli'
 
 include TreeRb
 exit CliTree.run

data/lib/tree_rb.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+#
+# std lib
+#
+require 'pathname'
+require 'yaml'
+
+#
+# rubygems
+#
+# require 'rubygems' # rubygems must be loaded from binary file (tree.rb) so $LOAD_PATH is not modified
+require 'json'
+require 'ansi/code'
+
+#
+# treevisitor
+#
+
+require "tree_rb/version"
+require "tree_rb/abs_node"
+require 'tree_rb/leaf_node'
+require 'tree_rb/tree_node'
+require 'tree_rb/basic_tree_node_visitor'
+require 'tree_rb/tree_node_visitor'
+
+require 'tree_rb/directory_walker'
+
+#
+# visitors
+#
+require 'tree_rb/visitors/block_tree_node_visitor'
+require 'tree_rb/visitors/build_dir_tree_visitor'
+require 'tree_rb/visitors/callback_tree_node_visitor2'
+require 'tree_rb/visitors/clone_tree_node_visitor'
+require 'tree_rb/visitors/depth_tree_node_visitor'
+require 'tree_rb/visitors/print_dir_tree_visitor'
+require 'tree_rb/visitors/directory_to_hash_visitor'
+
+require 'tree_rb/util/dir_processor'

data/lib/tree_rb/cli/cli_tree.rb

@@ -74,6 +74,10 @@ module TreeRb
       # end colorize
       #
 
+      opts.on("-s", "Print the size of each file in bytes along with the name.") do
+        options[:show_size] = true
+      end
+
       begin
         rest = opts.parse(argv)
       rescue OptionParser::InvalidOption => e
@@ -106,9 +110,11 @@ module TreeRb
         when 'build-dir'
           # TODO: capture CTRL^C
           # http://ruby-doc.org/core-1.9.3/Kernel.html#method-i-trap
-          Kernel.trap('INT') { put "User interrupted exit"; exit }
+          Signal.trap('INT') { put "User interrupted exit"; exit }
 
           visitor = BuildDirTreeVisitor.new
+          visitor.show_size = options[:show_size]
+  
           dtw.run(visitor)
 
           puts visitor.root.to_str('', options[:colorize])

data/lib/tree_rb/directory_walker.rb

@@ -275,7 +275,7 @@ module TreeRb
 
 
       @visitor.enter_node(dirname)
-        entries.each { |basename|
+        entries.each do |basename|
           begin
           next if basename == "." or basename == ".." # ignore always "." and ".."
           pathname = File.join(dirname, basename)
@@ -292,7 +292,7 @@ module TreeRb
           rescue  Errno::EPERM
             $stderr.puts e
           end
-        }
+        end
 
       @visitor.exit_node(dirname)
     end

data/lib/tree_rb/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module TreeRb
-  VERSION="0.3.1"
+  VERSION="0.3.2"
 end

data/lib/tree_rb/visitors/build_dir_tree_visitor.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 module TreeRb
+
   #
   # Builds a TreeNode from a filesystem directory
   # It similar to CloneTreeNodeVisitor
@@ -13,13 +14,14 @@ module TreeRb
     #
     attr_reader :nr_directories
 
-
     #
     # Number of visited directory (nr_leaves)
     # @see AbsNode#nr_leaves
     #
     attr_reader :nr_files
 
+    attr_accessor :show_size
+
     def initialize
       super
       @root = nil
@@ -49,7 +51,14 @@ module TreeRb
     def visit_leaf( pathname )
       @nr_files  += 1
       # connect the leaf_node created to the last tree_node on the stack
-      LeafNode.new( File.basename(pathname), @stack.last )
+      stat = File.lstat(pathname)
+      # stat.symlink?
+      if show_size
+        str  = "#{File.basename(pathname)} #{stat.size}"
+      else
+        str  = "#{File.basename(pathname)}"
+      end
+      LeafNode.new( str, @stack.last )
     end
 
   end

data/lib/tree_rb_cli.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+#
+# cli
+#
+
+require 'optparse'
+require 'treevisitor'
+
+begin
+  require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
+rescue LoadError
+  puts 'You must gem install win32console to use color on Windows'
+end
+
+#
+# gem
+#
+require "tree_rb/cli/cli_tree"

data/lib/treevisitor.rb

@@ -1,40 +1,2 @@
 # -*- coding: utf-8 -*-
-
-#
-# std lib
-#
-require 'pathname'
-require 'yaml'
-
-#
-# rubygems
-#
-# require 'rubygems' # rubygems must be loaded from binary file (tree.rb) so $LOAD_PATH is not modified
-require 'json'
-require 'ansi/code'
-
-#
-# treevisitor
-#
-
-require "tree_rb/version"
-require "tree_rb/abs_node"
-require 'tree_rb/leaf_node'
-require 'tree_rb/tree_node'
-require 'tree_rb/basic_tree_node_visitor'
-require 'tree_rb/tree_node_visitor'
-
-require 'tree_rb/directory_walker'
-
-#
-# visitors
-#
-require 'tree_rb/visitors/block_tree_node_visitor'
-require 'tree_rb/visitors/build_dir_tree_visitor'
-require 'tree_rb/visitors/callback_tree_node_visitor2'
-require 'tree_rb/visitors/clone_tree_node_visitor'
-require 'tree_rb/visitors/depth_tree_node_visitor'
-require 'tree_rb/visitors/print_dir_tree_visitor'
-require 'tree_rb/visitors/directory_to_hash_visitor'
-
-require 'tree_rb/util/dir_processor'
+require 'tree_rb'

data/lib/treevisitor_cli.rb

@@ -1,18 +1,3 @@
 # -*- coding: utf-8 -*-
-#
-# cli
-#
-
-require 'optparse'
-require 'treevisitor'
-
-begin
-  require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
-rescue LoadError
-  puts 'You must gem install win32console to use color on Windows'
-end
-
-#
-# gem
-#
-require "tree_rb/cli/cli_tree"
+warn "use require 'tree_rb_cli' instead of require 'treevisitor_cli'"
+require 'tree_rb_cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -124,55 +124,57 @@ files:
 - Rakefile
 - tree.rb.gemspec
 - .gemtest
-- lib/treevisitor_cli.rb
+- lib/treevisitor.rb
 - lib/tree_visitor.rb
-- lib/tree_rb/cli/cli_tree.rb
+- lib/tree_rb_cli.rb
 - lib/tree_rb/util/dir_processor.rb
+- lib/tree_rb/abs_node.rb
+- lib/tree_rb/version.rb
 - lib/tree_rb/directory_walker.rb
-- lib/tree_rb/visitors/print_dir_tree_visitor.rb
+- lib/tree_rb/tree_node.rb
+- lib/tree_rb/basic_tree_node_visitor.rb
+- lib/tree_rb/tree_node_visitor.rb
+- lib/tree_rb/cli/cli_tree.rb
+- lib/tree_rb/visitors/block_tree_node_visitor.rb
+- lib/tree_rb/visitors/flat_print_tree_node_visitors.rb
+- lib/tree_rb/visitors/clone_tree_node_visitor.rb
 - lib/tree_rb/visitors/build_dir_tree_visitor.rb
+- lib/tree_rb/visitors/directory_to_hash_visitor.rb
 - lib/tree_rb/visitors/depth_tree_node_visitor.rb
-- lib/tree_rb/visitors/print_tree_node_visitor.rb
 - lib/tree_rb/visitors/callback_tree_node_visitor2.rb
-- lib/tree_rb/visitors/directory_to_hash_visitor.rb
-- lib/tree_rb/visitors/flat_print_tree_node_visitors.rb
-- lib/tree_rb/visitors/block_tree_node_visitor.rb
-- lib/tree_rb/visitors/clone_tree_node_visitor.rb
-- lib/tree_rb/abs_node.rb
+- lib/tree_rb/visitors/print_tree_node_visitor.rb
+- lib/tree_rb/visitors/print_dir_tree_visitor.rb
 - lib/tree_rb/leaf_node.rb
-- lib/tree_rb/tree_node_visitor.rb
-- lib/tree_rb/tree_node.rb
-- lib/tree_rb/basic_tree_node_visitor.rb
-- lib/tree_rb/version.rb
-- lib/treevisitor.rb
+- lib/tree_rb.rb
+- lib/treevisitor_cli.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/protovis/treevisitor.png
+- examples/directory_walker/print_files.rb
+- examples/protovis/treevisitor.js
 - examples/protovis/protovis-r3.2.js
 - examples/protovis/index.html
-- examples/protovis/treevisitor.js
+- examples/protovis/treevisitor.png
 - examples/protovis/directory_to_json_visitor.rb
-- spec/spec_helper.rb
-- spec/tree_rb/cli/cli_tree_spec.rb
+- spec/tree_rb/tree_node_paths_spec.rb
 - spec/tree_rb/util/dir_processor_spec.rb
-- spec/tree_rb/visitors/depth_tree_node_visitor_spec.rb
-- spec/tree_rb/visitors/callback_tree_node_visitor2_spec.rb
-- spec/tree_rb/visitors/block_tree_node_visitor_spec.rb
-- spec/tree_rb/visitors/tree_node_visitors_spec.rb
-- spec/tree_rb/tree_dsl_with_derived_class_spec.rb
+- spec/tree_rb/tree_node_spec.rb
 - spec/tree_rb/directory_walker_spec.rb
 - spec/tree_rb/tree_dsl_spec.rb
-- spec/tree_rb/tree_node_paths_spec.rb
 - spec/tree_rb/tree_dsl_with_derived_class1_spec.rb
+- spec/tree_rb/cli/cli_tree_spec.rb
+- spec/tree_rb/visitors/depth_tree_node_visitor_spec.rb
+- spec/tree_rb/visitors/tree_node_visitors_spec.rb
+- spec/tree_rb/visitors/block_tree_node_visitor_spec.rb
+- spec/tree_rb/visitors/callback_tree_node_visitor2_spec.rb
+- spec/tree_rb/tree_dsl_with_derived_class_spec.rb
 - spec/tree_rb/tree_node_visitor_delegate_spec.rb
-- spec/tree_rb/tree_node_spec.rb
 - spec/tree_rb/tree_node_visitor_dsl_spec.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/spec_helper.rb
 - spec/fixtures/test_dir_1/dir.2/file.2.1
+- spec/fixtures/test_dir_1/dir.1/file.1.1
+- spec/fixtures/test_dir_1/dir.1/dir.1.2/file.1.2.1
 - spec/fixtures/test_dir_2/[Dsube]/sub/.gitkeep
 - spec/fixtures/test_dir_1/.dir_with_dot/dummy.txt
 - bin/tree.rb
@@ -188,12 +190,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3293516785273926334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3293516785273926334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -202,24 +210,24 @@ specification_version: 3
 summary: tree.rb is a 'clone' of tree unix command. The gem implements a library to
   mange tree structures.
 test_files:
-- spec/spec_helper.rb
-- spec/tree_rb/cli/cli_tree_spec.rb
+- spec/tree_rb/tree_node_paths_spec.rb
 - spec/tree_rb/util/dir_processor_spec.rb
-- spec/tree_rb/visitors/depth_tree_node_visitor_spec.rb
-- spec/tree_rb/visitors/callback_tree_node_visitor2_spec.rb
-- spec/tree_rb/visitors/block_tree_node_visitor_spec.rb
-- spec/tree_rb/visitors/tree_node_visitors_spec.rb
-- spec/tree_rb/tree_dsl_with_derived_class_spec.rb
+- spec/tree_rb/tree_node_spec.rb
 - spec/tree_rb/directory_walker_spec.rb
 - spec/tree_rb/tree_dsl_spec.rb
-- spec/tree_rb/tree_node_paths_spec.rb
 - spec/tree_rb/tree_dsl_with_derived_class1_spec.rb
+- spec/tree_rb/cli/cli_tree_spec.rb
+- spec/tree_rb/visitors/depth_tree_node_visitor_spec.rb
+- spec/tree_rb/visitors/tree_node_visitors_spec.rb
+- spec/tree_rb/visitors/block_tree_node_visitor_spec.rb
+- spec/tree_rb/visitors/callback_tree_node_visitor2_spec.rb
+- spec/tree_rb/tree_dsl_with_derived_class_spec.rb
 - spec/tree_rb/tree_node_visitor_delegate_spec.rb
-- spec/tree_rb/tree_node_spec.rb
 - spec/tree_rb/tree_node_visitor_dsl_spec.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/spec_helper.rb
 - spec/fixtures/test_dir_1/dir.2/file.2.1
+- spec/fixtures/test_dir_1/dir.1/file.1.1
+- spec/fixtures/test_dir_1/dir.1/dir.1.2/file.1.2.1
 - spec/fixtures/test_dir_2/[Dsube]/sub/.gitkeep
 - spec/fixtures/test_dir_1/.dir_with_dot/dummy.txt
 has_rdoc: