tree.rb 0.3.9 → 0.3.10

data/lib/tree_rb/cli/cli_tree.rb

@@ -74,7 +74,7 @@ module TreeRb
         options[:show_indentation] = false
       end
 
-      algos        = %w[build-dir print-dir json d3js html_partition yaml sqlite]
+      algos        = %w[build-dir print-dir json d3js html_partition html_tree html_treemap 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, "select an algo", "  (#{algos})") do |algo|
@@ -231,18 +231,18 @@ module TreeRb
       # 1. build dir tree walker
       #
       dirname = File.expand_path(dirname)
-      dtw     = DirTreeWalker.new(dirname, options)
+      directory_tree_walker     = DirTreeWalker.new(dirname, options)
       unless options[:all_files]
-        dtw.ignore(/^\.[^.]+/) # ignore all file starting with "."
+        directory_tree_walker.ignore(/^\.[^.]+/) # ignore all file starting with "."
       end
-      dtw.visit_file = !options[:only_directories]
+      directory_tree_walker.visit_file = !options[:only_directories]
 
       case options[:algo]
 
         when 'build-dir'
 
           visitor = BuildDirTreeVisitor.new(options)
-          dtw.run(visitor)
+          directory_tree_walker.run(visitor)
 
           output.puts visitor.root.to_str('', options)
 
@@ -253,11 +253,11 @@ module TreeRb
 
         when 'print-dir'
           visitor = PrintDirTreeVisitor.new
-          dtw.run(visitor)
+          directory_tree_walker.run(visitor)
 
         when 'json'
           visitor = DirectoryToHashVisitor.new(dirname)
-          root    = dtw.run(visitor).root
+          root    = directory_tree_walker.run(visitor).root
           begin
             output.puts JSON.pretty_generate(root)
           rescue JSON::NestingError => e
@@ -266,7 +266,7 @@ module TreeRb
 
         when 'd3js'
           visitor = DirectoryToHash2Visitor.new(dirname)
-          root    = dtw.run(visitor).root
+          root    = directory_tree_walker.run(visitor).root
           begin
             str_json = JSON.pretty_generate(root)
             str_json = "var data = " + str_json
@@ -276,21 +276,17 @@ module TreeRb
           end
 
         when 'html_partition'
-          visitor = DirectoryToHash2Visitor.new(dirname)
-          root    = dtw.run(visitor).root
-          begin
-            str_json = JSON.pretty_generate(root)
-            str_json = "var data = " + str_json
+          D3jsHelper.new.run(directory_tree_walker, dirname,"d3js_layout_partition.erb", output)
 
-            render = ErbRender.new("d3js_layout_partition.erb", str_json)
-            output.puts render.render
-          rescue JSON::NestingError => e
-            $stderr.puts "#{File.basename(__FILE__)}:#{__LINE__} #{e.to_s}"
-          end
+        when 'html_tree'
+          D3jsHelper.new.run(directory_tree_walker, dirname,"d3js_layout_tree.erb", output)
+
+        when 'html_treemap'
+          D3jsHelper.new.run(directory_tree_walker, dirname,"d3js_layout_treemap.erb", output)
 
         when 'yaml'
           visitor = DirectoryToHashVisitor.new(dirname)
-          root    = dtw.run(visitor).root
+          root    = directory_tree_walker.run(visitor).root
           output.puts root.to_yaml
 
         when 'sqlite'
@@ -305,7 +301,7 @@ module TreeRb
               #start = Time.now
               #me    = self
               #bytes = 0
-              dtw.run(visitor)
+              directory_tree_walker.run(visitor)
             end
 
           rescue LoadError

data/lib/tree_rb/d3js_helper.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+module TreeRb
+
+  class D3jsHelper
+
+    def run(directory_tree_walker, dirname, template, output)
+      visitor = DirectoryToHash2Visitor.new(dirname)
+      root    = directory_tree_walker.run(visitor).root
+      begin
+        str_json = JSON.pretty_generate(root)
+        str_json = "var data = " + str_json
+
+        render = ErbRender.new(template, str_json)
+        output.puts render.render
+      rescue JSON::NestingError => e
+        $stderr.puts "#{File.basename(__FILE__)}:#{__LINE__} #{e.to_s}"
+      end
+    end
+  end
+end # module

data/lib/tree_rb/version.rb

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

data/lib/tree_rb_cli.rb

@@ -14,6 +14,7 @@ require 'erb'
 # tree_rb cli
 #
 require 'tree_rb'
+require 'tree_rb/d3js_helper'
 require 'tree_rb/erb_render'
 require 'tree_rb/cli/cli_tree'
 require 'tree_rb/cli/cli_json'

data/spec/tree_rb/cli/cli_tree_d3js_spec.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+
+describe CliTree do
+
+  it "should accepts --format html_partition" do
+    captured = capture_output do
+      args = %w{--format html_partition}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    captured.out.should match  /d3.layout.partition/
+  end
+
+  it "should accepts --format html_tree" do
+    captured = capture_output do
+      args = %w{--format html_tree}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    captured.out.should match  /d3.layout.tree/
+  end
+
+  it "should accepts --format html_treemap" do
+    captured = capture_output do
+      args = %w{--format html_treemap}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    captured.out.should match  /d3.layout.treemap/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -168,6 +168,7 @@ files:
 - lib/tree_rb/extension_digest.rb
 - lib/tree_rb/tree_node_visitor.rb
 - lib/tree_rb/tree_node.rb
+- lib/tree_rb/d3js_helper.rb
 - lib/tree_rb/basic_tree_node_visitor.rb
 - lib/tree_rb/erb_render.rb
 - lib/tree_rb/version.rb
@@ -197,6 +198,7 @@ files:
 - spec/tree_rb/cli/cli_tree_sqlite_spec.rb
 - spec/tree_rb/cli/cli_tree_digest_spec.rb
 - spec/tree_rb/cli/cli_tree_generic_spec.rb
+- spec/tree_rb/cli/cli_tree_d3js_spec.rb
 - spec/tree_rb/cli/cli_json_spec.rb
 - spec/tree_rb/util/dir_processor_spec.rb
 - spec/tree_rb/visitors/depth_tree_node_visitor_spec.rb
@@ -253,6 +255,7 @@ test_files:
 - spec/tree_rb/cli/cli_tree_sqlite_spec.rb
 - spec/tree_rb/cli/cli_tree_digest_spec.rb
 - spec/tree_rb/cli/cli_tree_generic_spec.rb
+- spec/tree_rb/cli/cli_tree_d3js_spec.rb
 - spec/tree_rb/cli/cli_json_spec.rb
 - spec/tree_rb/util/dir_processor_spec.rb
 - spec/tree_rb/visitors/depth_tree_node_visitor_spec.rb