tree.rb 0.3.11 → 0.3.12

data/bin/rjson.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-#require 'rubygems'
-cwd = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+cwd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $:.unshift(cwd) unless $:.include?(cwd)
 require 'tree_rb_cli'
 

data/bin/rtree

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-#require 'rubygems'
-
-cwd = File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
+cwd = File.expand_path( File.join( File.dirname(__FILE__), '..', 'lib') )
 $:.unshift(cwd) unless $:.include?(cwd)
 require 'tree_rb_cli'
 

data/bin/tree.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-#require 'rubygems'
-
-cwd = File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
+cwd = File.expand_path( File.join( File.dirname(__FILE__), '..', 'lib') )
 $:.unshift(cwd) unless $:.include?(cwd)
 require 'tree_rb_cli'
 

data/bin/tree_rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-#require 'rubygems'
-
-cwd = File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
+cwd = File.expand_path( File.join( File.dirname(__FILE__), '..', 'lib') )
 $:.unshift(cwd) unless $:.include?(cwd)
 require 'tree_rb_cli'
 

data/lib/tree_rb.rb

@@ -35,10 +35,10 @@ require 'tree_rb/core/tree_node'
 require 'tree_rb/core/basic_tree_node_visitor'
 require 'tree_rb/core/tree_node_visitor'
 
-require 'tree_rb/input_file_system/directory_walker'
-require 'tree_rb/input_file_system/dir_processor'
+require 'tree_rb/input_plugins/file_system/directory_walker'
+require 'tree_rb/input_plugins/file_system/dir_processor'
 
-require 'tree_rb/input_html_page/dom_walker'
+require 'tree_rb/input_plugins/html_page/dom_walker'
 
 #
 # visitors
@@ -48,11 +48,11 @@ visitors_dir = File.join(File.dirname(__FILE__), "tree_rb", "visitors")
 unless Dir.exist? visitors_dir
   raise "cannot found directory '#{visitors_dir}'"
 end
-Dir[ File.join(visitors_dir, "*.rb") ].each { |f|require f }
+Dir[ File.join(visitors_dir, '*.rb') ].each { |f|require f }
 
-visitors_dir = File.join(File.dirname(__FILE__), "tree_rb", "visitors_file_system")
+visitors_dir = File.join(File.dirname(__FILE__), 'tree_rb', 'visitors_file_system')
 unless Dir.exist? visitors_dir
   raise "cannot found directory '#{visitors_dir}'"
 end
-Dir[ File.join(visitors_dir, "*.rb") ].each { |f|require f }
+Dir[ File.join(visitors_dir, '*.rb') ].each { |f|require f }
 

data/lib/tree_rb/cli/cli_json.rb

@@ -16,23 +16,12 @@ module TreeRb
     def options_parser(options)
       parser        = OptionParser.new
       parser.banner = "Usage: rjson.rb [options] [directory]"
-      parser.separator "pretty format json file"
-      parser.separator "Code https://github.com/tokiro/treevisitor. Feedback to tokiro.oyama@gmail.com"
+      parser.separator 'pretty format json file'
+      parser.separator 'Code https://github.com/tokiro/treevisitor. Feedback to tokiro.oyama@gmail.com'
 
-      #parser.separator ""
-      #parser.separator "Generic options: "
-      #
-      #parser.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-      #  options[:verbose] = v
-      #end
-      #
-      #parser.on("-q", "--quiet", "quiet mode as --no-verbose") do
-      #  options[:verbose] = false
-      #end
-      #
-      parser.on("-o [FILE]", "--output [FILE]", String) do |v|
+      parser.on('-o [FILE]', "--output [FILE]", String) do |v|
         if options[:output]
-          puts "only one file of output can be used"
+          puts 'only one file of output can be used'
           options[:exit] = true
         end
         options[:output] = v
@@ -42,121 +31,7 @@ module TreeRb
       parser.on("--force", "overwrite output") do
         options[:force_overwrite_output] = true
       end
-      #
-      #parser.separator ""
-      #parser.separator "Filter options: "
-      #
-      #parser.on("-a", "All file are listed i.e. include dot files") do
-      #  options[:all_files] = true
-      #end
-      #
-      #parser.on("-d", "List directories only") do
-      #  options[:only_directories] = true
-      #end
-      #
-      #options[:only_files] = false
-      #parser.on("--only-files", "show only file implies -i") do
-      #  options[:only_files]       = true
-      #  options[:show_indentation] = false
-      #end
-      #
-      #algos        = %w[build-dir print-dir json json2 yaml sqlite]
-      #algo_aliases = { "b" => "build-dir", "v" => "print-dir", "j" => "json", "y" => "yaml", "s" => "sqlite" }
-      #
-      #algo_list = (algo_aliases.keys + algos).join(',')
-      #parser.on("--format ALGO", algos, algo_aliases, "select an algo", "  (#{algo_list})") do |algo|
-      #  options[:algo] = algo
-      #end
-      #
-      #parser.separator ""
-      #parser.separator "print options:"
-      #
-      ##
-      ## begin colorize
-      ##
-      ## copied from tree man page
-      #parser.on("-n", "Turn colorization off always, over-ridden by the -C option.") do
-      #  options[:colorize_force] = false
-      #end
-      #
-      ## copied from tree man page
-      #parser.on("-C",
-      #          "Turn colorization on always, using built-in color",
-      #          "  defaults if the LS_COLORS environment variable is not set.",
-      #          "  Useful to colorize output to a pipe.") do
-      #  options[:colorize_force] = true
-      #end
-      #
-      ##
-      ## end colorize
-      ##
-      #
-      #options[:max_level] = nil
-      #parser.on("-L [LEVEL]", Integer, "Max display depth of the directory tree.") do |l|
-      #  options[:max_level] = l
-      #end
-      #
-      #options[:show_full_path] = false
-      #parser.on("-f", "Prints the full path prefix for each file.") do
-      #  options[:show_full_path] = true
-      #end
-      #
-      #parser.on("-s", "Print the size of each file in bytes along with the name.") do
-      #  options[:show_size] = true
-      #end
-      #
-      #parser.on("-h",
-      #          "Print the size of each file but in a more human readable way,",
-      #          "  e.g. appending  a  size  letter  for  kilobytes  (K), megabytes (M),",
-      #          "  gigabytes (G), terrabytes (T), petabytes (P) and exabytes (E).") do
-      #  options[:show_size_human] = true
-      #end
-      #
-      #options[:show_indentation] = true
-      #parser.on("-i",
-      #          "Makes tree not print the indentation lines, ",
-      #          "  useful when used in conjunction with the -f option.") do
-      #  options[:show_indentation] = false
-      #end
-      #
-      #options[:show_md5] = false
-      #parser.on("--md5", "show md5 of file") do
-      #  options[:show_md5] = true
-      #end
-      #
-      #options[:show_sha1] = false
-      #parser.on("--sha1", "show sha1 of a file") do
-      #  options[:show_sha1] = true
-      #end
-      #
-      #options[:show_report] = true
-      #parser.on("--noreport", "Omits printing of the file and directory report at the end of the tree listing.") do
-      #  options[:show_report] = false
-      #end
-      #
-      #parser.separator ""
-      #parser.separator "shortcut options:"
-      #
-      #options[:show_md5sum] = false
-      #parser.on("--md5sum", "show ake md5sum implies -i and --only-files") do
-      #  options[:only_files]       = true
-      #  options[:show_md5sum]      = true
-      #  options[:show_indentation] = false
-      #  options[:show_report]      = false
-      #end
-      #
-      #options[:show_sha1sum] = false
-      #parser.on("--sha1sum", "show ake sha1sum output implies -i and --only-files") do
-      #  options[:only_files]       = true
-      #  options[:show_sha1sum]     = true
-      #  options[:show_indentation] = false
-      #  options[:show_report]      = false
-      #end
-      #
-      #parser.separator ""
-      #parser.separator "Other options:"
-      #
-      parser.on_tail("--help", "Show this message") do
+      parser.on_tail('--help', 'Show this message') do
         puts parser
         options[:exit] = SUCCESS
       end
@@ -170,7 +45,7 @@ module TreeRb
     end
 
     def parse_args(argv)
-      options = { :verbose => true, :force => false, :algo => 'build-dir' }
+      options = { :verbose => true, :force => false, :output_plugins => 'build-dir' }
       parser  = options_parser(options)
 
       begin
@@ -202,93 +77,14 @@ module TreeRb
         output = File.open(filename, "w")
         $stderr.puts "Writing file '#{filename}'"
       end
-      #
-      #if options[:colorize_force]
-      #  options[:colorize] = options[:colorize_force]
-      #else
-      #  options[:colorize] = output.isatty
-      #end
-      #
-      ## TODO: capture CTRL^C to avoid show the stack trace
-      ## http://ruby-doc.org/core-1.9.3/Kernel.html#method-i-trap
-      #Signal.trap('INT') { puts "intercepted ctr+c"; exit }
-      #
 
       if rest.length < 1
-        $stderr.puts "missing arg"
+        $stderr.puts 'missing arg'
         return FAILURE
       else
         filename = rest[0]
       end
 
-      #
-      ##
-      ## 1. build dir tree walker
-      ##
-      #dirname = File.expand_path(dirname)
-      #dtw     = DirTreeWalker.new(dirname, options)
-      #unless options[:all_files]
-      #  dtw.ignore(/^\.[^.]+/) # ignore all file starting with "."
-      #end
-      #dtw.visit_file = !options[:only_directories]
-      #
-      #case options[:algo]
-      #
-      #  when 'build-dir'
-      #
-      #    visitor = BuildDirTreeVisitor.new(options)
-      #    dtw.run(visitor)
-      #
-      #    output.puts visitor.root.to_str('', options)
-      #
-      #    if options[:show_report]
-      #      output.puts
-      #      output.puts "#{visitor.nr_directories} directories, #{visitor.nr_files} files"
-      #    end
-      #
-      #  when 'print-dir'
-      #    visitor = PrintDirTreeVisitor.new
-      #    dtw.run(visitor)
-      #
-      #  when 'json'
-      #    visitor = DirectoryToHashVisitor.new(dirname)
-      #    root    = dtw.run(visitor).root
-      #    output.puts JSON.pretty_generate(root)
-      #
-      #  when 'json2'
-      #    visitor = DirectoryToHash2Visitor.new(dirname)
-      #    root    = dtw.run(visitor).root
-      #    output.puts JSON.pretty_generate(root)
-      #
-      #  when 'yaml'
-      #    visitor = DirectoryToHashVisitor.new(dirname)
-      #    root    = dtw.run(visitor).root
-      #    output.puts root.to_yaml
-      #
-      #  when 'sqlite'
-      #    begin
-      #      require 'sqlite3'
-      #      unless options[:output]
-      #        $stderr.puts "need to specify the -o options"
-      #      else
-      #        output.close
-      #        filename = options[:output]
-      #        visitor  = SqliteDirTreeVisitor.new(filename)
-      #        #start = Time.now
-      #        #me    = self
-      #        #bytes = 0
-      #        dtw.run(visitor)
-      #      end
-      #
-      #    rescue LoadError
-      #      puts 'You must gem install sqlite3 to use this output format'
-      #    end
-      #
-      #  else
-      #    puts "unknown algo #{options[:algo]} specified"
-      #end
-
-
       show_input = false
 
       unless File.exists?(filename)
@@ -299,21 +95,21 @@ module TreeRb
       my_json_str = File.read(filename)
 
       if show_input
-        $stderr.puts "*************************"
+        $stderr.puts '*************************'
         $stderr.puts my_json_str
-        $stderr.puts "*************************"
+        $stderr.puts '*************************'
       end
 
       begin
         my_json = JSON(my_json_str)
       rescue JSON::ParserError
-        $stderr.puts "json is malformed"
+        $stderr.puts 'json is malformed'
         return FAILURE
       end
 
       output.puts JSON.pretty_generate(my_json)
 
-      return SUCCESS
+      SUCCESS
     end
 
   end # end class

data/lib/tree_rb/cli/cli_tree.rb

@@ -2,7 +2,7 @@
 module TreeRb
 
   #
-  #
+  # Command Line Interface to Tree
   #
   class CliTree
 
@@ -11,11 +11,11 @@ module TreeRb
     end
 
     def options_parser(options)
-      parser        = OptionParser.new
-      parser.banner = "Usage: tree.rb [options] [directory]"
-      parser.separator "list contents of directories in a tree-like format"
-      parser.separator "this is a almost :-) a clone of tree unix command written in ruby"
-      parser.separator "Code https://github.com/tokiro/treevisitor. Feedback to tokiro.oyama@gmail.com"
+      parser = OptionParser.new
+      parser.banner = 'Usage: tree.rb [options] [directory]'
+      parser.separator 'list contents of directories in a tree-like format'
+      parser.separator 'this is a almost :-) a clone of tree unix command written in ruby'
+      parser.separator 'Code https://github.com/tokiro/treevisitor. Feedback to tokiro.oyama@gmail.com'
 
       #
       # Generic
@@ -70,19 +70,19 @@ module TreeRb
 
       options[:only_files] = false
       parser.on("--only-files", "show only file implies -i") do
-        options[:only_files]       = true
+        options[:only_files] = true
         options[:show_indentation] = false
       end
 
-      algos = %w[build-dir print-dir json d3js html_partition html_tree html_treemap yaml sqlite dircat]
+      formats = %w[build-dir print-dir json d3js html_partition html_tree html_treemap yaml sqlite dircat]
       # algo_aliases = { "b" => "build-dir", "v" => "print-dir", "j" => "json", "y" => "yaml", "s" => "sqlite" }
-      # algo_list = (algo_aliases.keys + algos).join(',')
-      parser.on("--format ALGO", algos, "select an algo", "  (#{algos})") do |algo|
-        options[:algo] = algo
+      # algo_list = (algo_aliases.keys + formats).join(',')
+      parser.on('--format FORMAT', formats, 'select a output format', "  (#{formats})") do |format|
+        options[:output_plugins] = format
       end
 
       options[:max_level] = nil
-      parser.on("-L [LEVEL]", Integer, "Max display depth of the directory tree.") do |l|
+      parser.on("-L [LEVEL]", Integer, 'Max display depth of the directory tree.') do |l|
         options[:max_level] = l
       end
 
@@ -96,13 +96,13 @@ module TreeRb
       # begin colorize
       #
       # copied from tree man page
-      parser.on("-n", "Turn colorization off always, over-ridden by the -C option.") do
+      parser.on("-n", 'Turn colorization off always, over-ridden by the -C option.') do
         options[:colorize_force] = false
       end
 
       # copied from tree man page
       parser.on("-C",
-                "Turn colorization on always, using built-in color",
+                'Turn colorization on always, using built-in color',
                 "  defaults if the LS_COLORS environment variable is not set.",
                 "  Useful to colorize output to a pipe.") do
         options[:colorize_force] = true
@@ -134,8 +134,8 @@ module TreeRb
 
       options[:show_indentation] = true
       parser.on("-i",
-                "Makes tree not print the indentation lines, ",
-                "  useful when used in conjunction with the -f option.") do
+                'Makes tree not print the indentation lines, ',
+                '  useful when used in conjunction with the -f option.') do
         options[:show_indentation] = false
       end
 
@@ -159,18 +159,18 @@ module TreeRb
 
       options[:show_md5sum] = false
       parser.on("--md5sum", "show ake md5sum implies -i and --only-files") do
-        options[:only_files]       = true
-        options[:show_md5sum]      = true
+        options[:only_files] = true
+        options[:show_md5sum] = true
         options[:show_indentation] = false
-        options[:show_report]      = false
+        options[:show_report] = false
       end
 
       options[:show_sha1sum] = false
-      parser.on("--sha1sum", "show ake sha1sum output implies -i and --only-files") do
-        options[:only_files]       = true
-        options[:show_sha1sum]     = true
+      parser.on('--sha1sum', 'show ake sha1sum output implies -i and --only-files') do
+        options[:only_files] = true
+        options[:show_sha1sum] = true
         options[:show_indentation] = false
-        options[:show_report]      = false
+        options[:show_report] = false
       end
 
 
@@ -178,22 +178,22 @@ module TreeRb
     end
 
     def parse_args(argv)
-      options = { :verbose => true, :force => false, :algo => 'build-dir' }
-      parser  = options_parser(options)
+      options = {:verbose => true, :force => false, :output_plugins => 'build-dir'}
+      parser = options_parser(options)
 
       begin
         rest = parser.parse(argv)
       rescue OptionParser::InvalidOption => e
         $stderr.puts e.to_s
-        $stderr.puts "try --help for help"
+        $stderr.puts 'try --help for help'
         return false
       rescue OptionParser::MissingArgument => e
         $stderr.puts e.to_s
-        $stderr.puts "try --help for help"
+        $stderr.puts 'try --help for help'
         return false
       rescue OptionParser::InvalidArgument => e
         $stderr.puts e.to_s
-        $stderr.puts "try --help for help"
+        $stderr.puts 'try --help for help'
         return false
       end
 
@@ -211,7 +211,7 @@ module TreeRb
           $stderr.puts "catalog '#{filename}' exists use --force to overwrite"
           return 0
         end
-        output = File.open(filename, "w")
+        output = File.open(filename, 'w')
         $stderr.puts "Writing file '#{filename}'"
       end
 
@@ -223,7 +223,10 @@ module TreeRb
 
       # TODO: capture CTRL^C to avoid show the stack trace
       # http://ruby-doc.org/core-1.9.3/Kernel.html#method-i-trap
-      Signal.trap('INT') { puts "intercepted ctr+c"; exit }
+      Signal.trap('INT') do
+        puts 'intercepted ctr+c'
+        exit
+      end
 
       if rest.length < 1
         dirname = Dir.pwd
@@ -247,64 +250,79 @@ module TreeRb
       end
       directory_tree_walker.visit_file = !options[:only_directories]
 
-      case options[:algo]
-
-        when 'build-dir'
-
-          visitor = BuildDirTreeVisitor.new(options)
-          directory_tree_walker.run(visitor)
-
-          output.puts visitor.root.to_str('', options)
-
-          if options[:show_report]
-            output.puts
-            output.puts "#{visitor.nr_directories} directories, #{visitor.nr_files} files"
+      formats = {
+          'build-dir' => Proc.new do |directory_tree_walker,output,options|
+
+            visitor = BuildDirTreeVisitor.new(options)
+            directory_tree_walker.run(visitor)
+
+            output.puts visitor.root.to_str('', options)
+
+            if options[:show_report]
+              output.puts
+              output.puts "#{visitor.nr_directories} directories, #{visitor.nr_files} files"
+            end
+          end,
+
+          'print-dir' => Proc.new do |directory_tree_walker,output,options|
+            visitor = PrintDirTreeVisitor.new
+            directory_tree_walker.run(visitor)
+          end,
+
+          'yaml' => Proc.new do |directory_tree_walker,output,options|
+            visitor = DirectoryToHashVisitor.new(dirname)
+            root = directory_tree_walker.run(visitor).root
+            output.puts root.to_yaml
+          end,
+
+          'json' => Proc.new do |directory_tree_walker,output,options|
+            visitor = DirectoryToHashVisitor.new(dirname)
+            root = directory_tree_walker.run(visitor).root
+            begin
+              output.puts JSON.pretty_generate(root)
+            rescue JSON::NestingError => e
+              $stderr.puts "#{File.basename(__FILE__)}:#{__LINE__} #{e.to_s}"
+            end
+          end,
+
+          'd3js' => Proc.new do |directory_tree_walker,output,options|
+            require 'tree_rb/output_plugins/html/d3js_output'
+            D3jsOutput.new.run(directory_tree_walker, dirname, nil, output)
+          end,
+
+          'html_partition' => Proc.new do |directory_tree_walker,output,options|
+            require 'tree_rb/output_plugins/html/d3js_output'
+            D3jsOutput.new.run(directory_tree_walker, dirname, 'd3js_layout_partition.erb', output)
+          end,
+
+          'html_tree' => Proc.new do |directory_tree_walker,output,options|
+            require 'tree_rb/output_plugins/html/d3js_output'
+            D3jsOutput.new.run(directory_tree_walker, dirname, 'd3js_layout_tree.erb', output)
+          end,
+
+          'html_treemap' => Proc.new do |directory_tree_walker,output,options|
+            require 'tree_rb/output_plugins/html/d3js_output'
+            D3jsOutput.new.run(directory_tree_walker, dirname, 'd3js_layout_treemap.erb', output)
+          end,
+
+          'dircat' => Proc.new do |directory_tree_walker,output,options|
+            require 'tree_rb/output_plugins/dircat/dircat_output'
+            DirCatOutput.new.run(directory_tree_walker, options)
+          end,
+
+          'sqlite' => Proc.new do |directory_tree_walker,output,options|
+            require 'tree_rb/output_plugins/sqlite/sqlite_output'
+            SqliteOutput.new.run(directory_tree_walker, output, options)
           end
+      }
 
-        when 'print-dir'
-          visitor = PrintDirTreeVisitor.new
-          directory_tree_walker.run(visitor)
-
-        when 'yaml'
-          visitor = DirectoryToHashVisitor.new(dirname)
-          root    = directory_tree_walker.run(visitor).root
-          output.puts root.to_yaml
-
-        when 'json'
-          visitor = DirectoryToHashVisitor.new(dirname)
-          root    = directory_tree_walker.run(visitor).root
-          begin
-            output.puts JSON.pretty_generate(root)
-          rescue JSON::NestingError => e
-            $stderr.puts "#{File.basename(__FILE__)}:#{__LINE__} #{e.to_s}"
-          end
-
-        when 'd3js'
-          require 'tree_rb/output_html/d3js_helper'
-          D3jsHelper.new.run(directory_tree_walker, dirname, nil, output)
-
-        when 'html_partition'
-          require 'tree_rb/output_html/d3js_helper'
-          D3jsHelper.new.run(directory_tree_walker, dirname, "d3js_layout_partition.erb", output)
-
-        when 'html_tree'
-          require 'tree_rb/output_html/d3js_helper'
-          D3jsHelper.new.run(directory_tree_walker, dirname, "d3js_layout_tree.erb", output)
+      format = options[:output_plugins]
 
-        when 'html_treemap'
-          require 'tree_rb/output_html/d3js_helper'
-          D3jsHelper.new.run(directory_tree_walker, dirname, "d3js_layout_treemap.erb", output)
-
-        when 'sqlite'
-          require 'tree_rb/output_sqlite/sqlite_helper'
-          SqliteHelper.new.run(directory_tree_walker, output, options)
-
-        when 'dircat'
-          require 'tree_rb/output_dircat/dircat_helper'
-          DirCatHelper.new.run(directory_tree_walker, options)
-
-        else
-          puts "unknown format #{options[:algo]} specified"
+      p = formats[format]
+      if p
+        p.call(directory_tree_walker, output, options)
+      else
+        puts "unknown format #{options[:output_plugins]} specified"
       end
 
       0