tree.rb 0.3.5 → 0.3.6

data/lib/tree_rb.rb

@@ -37,12 +37,20 @@ 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/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/visitors/sqlite_dir_tree_visitor'
+
+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 }
+
 
 require 'tree_rb/util/dir_processor'

data/lib/tree_rb/cli/cli_tree.rb

@@ -116,13 +116,15 @@ module TreeRb
         options[:only_files]       = true
         options[:show_md5sum]      = true
         options[:show_indentation] = false
+        options[:show_report]      = false
       end
 
       options[:show_sha1sum] = false
-      parser.on("--md5sum", "show ake md5sum implies -i and --only-files") do
+      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.on("-o [FILE]", "--output [FILE]", String) do |v|
@@ -138,6 +140,11 @@ module TreeRb
         options[:force_overwrite_output] = 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
     end
 
@@ -210,8 +217,11 @@ module TreeRb
           dtw.run(visitor)
 
           output.puts visitor.root.to_str('', options)
-          output.puts
-          output.puts "#{visitor.nr_directories} directories, #{visitor.nr_files} files"
+
+          if options[:show_report]
+            output.puts
+            output.puts "#{visitor.nr_directories} directories, #{visitor.nr_files} files"
+          end
 
         when 'print-dir'
           visitor = PrintDirTreeVisitor.new
@@ -235,45 +245,11 @@ module TreeRb
             else
               output.close
               filename = options[:output]
-
-              db = SQLite3::Database.new(filename)
-              db.execute("create table files(digest varchar(40),path varchar(1024))")
-
-              start = Time.now
-              me    = self
-              bytes = 0
-              dtw.run do
-                on_leaf do |filename|
-
-                  puts filename
-                  digest = SHA1.file(filename).hexdigest
-                  db.execute("insert into files values(\"#{digest}\",\"#{filename}\")")
-
-                  # entry = Entry.from_filename(filename)
-                  # me.add_entry(entry)
-                  # bytes += entry.size
-                  # if me.verbose_level > 0
-                  #   print "#{CR}#{filename}#{CLEAR}"
-                  # end
-                  # if me.show_progress
-                  #   sec = Time.now - start
-                  #   print "#{CR}bytes: #{bytes.to_human} time: #{sec} bytes/sec #{bytes/sec} #{CLEAR}"
-                  # end
-                end
-              end
-
-              # Loop through digests.
-              db.execute("select digest,count(1) as count from files group by digest order by count desc").each do |row|
-                if row[1] > 1 # Skip unique files.
-                  puts "Duplicates found:"
-                  digest = row[0]
-                  # List the duplicate files.
-                  db.execute("select digest,path from files where digest='#{digest}'").each do |dup_row|
-                    puts "[#{digest}] #{dup_row[1]}"
-                  end
-                end
-              end
-
+              visitor = SqliteDirTreeVisitor.new(filename)
+              #start = Time.now
+              #me    = self
+              #bytes = 0
+              dtw.run(visitor)
             end
 
           rescue LoadError

data/lib/tree_rb/version.rb

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

data/lib/tree_rb/visitors/build_dir_tree_visitor.rb

@@ -35,7 +35,11 @@ module TreeRb
       end
 
       if options[:show_md5sum]
-        @str = "#{MD5.file(pathname).hexdigest} #{file_name}"
+        @str = "#{MD5.file(pathname).hexdigest}  #{file_name}"
+        return
+      end
+      if options[:show_sha1sum]
+        @str = "#{SHA1.file(pathname).hexdigest}  #{file_name}"
         return
       end
 

data/lib/tree_rb/visitors/sqlite_dir_tree_visitor.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+module TreeRb
+
+  class SqliteDirTreeVisitor < BasicTreeNodeVisitor
+
+    def initialize(filename)
+      @db = SQLite3::Database.new(filename)
+      @db.execute("create table files(path varchar(1024), size integer, digest varchar(40))")
+    end
+
+    def visit_leaf(pathname)
+      puts pathname
+      stat = File.lstat(pathname)
+      digest = SHA1.file(pathname).hexdigest
+      @db.execute("insert into files (path, size, digest) values ( \"#{pathname}\", \"#{stat.size}\", \"#{digest}\")")
+
+      # entry = Entry.from_filename(filename)
+      # me.add_entry(entry)
+      # bytes += entry.size
+      # if me.verbose_level > 0
+      #   print "#{CR}#{filename}#{CLEAR}"
+      # end
+      # if me.show_progress
+      #   sec = Time.now - start
+      #   print "#{CR}bytes: #{bytes.to_human} time: #{sec} bytes/sec #{bytes/sec} #{CLEAR}"
+      # end
+      #content   = ContentFile.new(pathname, @options)
+      # connect the leaf_node created to the last tree_node on the stack
+      #@nr_files += 1
+      #LeafNode.new(content, @stack.last)
+    end
+
+    def find_duplicates
+      # Loop through digests.
+      @db.execute("select digest,count(1) as count from files group by digest order by count desc").each do |row|
+        if row[1] > 1 # Skip unique files.
+          puts "Duplicates found:"
+          digest = row[0]
+          # List the duplicate files.
+          db.execute("select digest,path from files where digest='#{digest}'").each do |dup_row|
+            puts "[#{digest}] #{dup_row[1]}"
+          end
+        end
+      end
+    end
+
+  end
+end # end module TreeVisitor

data/spec/fixtures/test_dir_1/.dir_with_dot/dummy.txt

@@ -0,0 +1 @@
+dummy.txt

data/spec/fixtures/test_dir_1/dir.1/dir.1.2/file.1.2.1

@@ -0,0 +1 @@
+file.1.2.1

data/spec/fixtures/test_dir_1/dir.1/file.1.1

@@ -0,0 +1 @@
+file.1.1

data/spec/fixtures/test_dir_1/dir.2/file.2.1

@@ -0,0 +1 @@
+file.2.1

data/spec/spec_helper.rb

@@ -3,7 +3,11 @@
 # std lib
 #
 require "stringio"
+require 'ostruct'
 
+#
+# gem
+#
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'tree_rb'
 require 'tree_rb_cli'
@@ -11,7 +15,7 @@ include TreeRb
 
 FIXTURES = File.expand_path( File.join( File.dirname(__FILE__), "fixtures" ) )
 
-def with_output_captured
+def capture_output
   old_stdout, old_stderr = $stdout, $stderr
   out = StringIO.new
   err = StringIO.new
@@ -23,5 +27,5 @@ def with_output_captured
     $stdout = old_stdout
     $stderr = old_stderr
   end
-  { :stdout => out.string, :stderr => err.string }
+  OpenStruct.new(:out => out.string, :err => err.string)
 end

data/spec/tree_rb/cli/cli_tree_digest_spec.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+
+describe CliTree do
+
+  it "should accepts --md5sum switch" do
+    captured = capture_output do
+      args = %w{--md5sum}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+
+    certified_out=<<-EOS
+a4788ba25d42f21003db11ec53112f1e  file.1.1
+afb96f2652f4ba3cd84f7be0ae6fffe3  file.1.2.1
+c4c0c530b842efe4038ac4a659bfbe77  file.2.1
+EOS
+    captured.out.should == certified_out
+  end
+
+  it "should accepts --sha1sum switch" do
+    captured = capture_output do
+      args = %w{--sha1sum}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+
+    certified_out=<<-EOS
+9140d4031d95f459eb0bee8160509e5d83271fe8  file.1.1
+4b7f45a8c0be069e7eac5f7d64b997c92c740656  file.1.2.1
+3c58aeb1552b0318a86279b52c918f2fb953b4b9  file.2.1
+EOS
+    captured.out.should == certified_out
+  end
+
+end

data/spec/tree_rb/cli/cli_tree_generic_spec.rb

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+
+describe CliTree do
+
+  it "should accept --help switch" do
+    captured = capture_output do
+      args = %w{--help}
+      CliTree.new.parse_args(args)
+    end
+    captured.out.should match /Usage:/
+  end
+
+  it "should accept --version switch" do
+    captured     = capture_output do
+      args = %w{--version}
+      CliTree.new.parse_args(args)
+    end
+    version = TreeRb::VERSION
+    captured.out.should match version
+  end
+
+  it "should accepts -d switch (directories only)" do
+    captured = capture_output do
+      args = %w{-d}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    # puts captured
+    captured.out.split("\n").length.should == 6
+  end
+
+  it "should accepts -da switch (directories only)" do
+    captured = capture_output do
+      args = %w{-da}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    # puts captured
+    captured.out.split("\n").length.should == 7
+  end
+
+  it "should accepts -a switch (all files)" do
+    captured = capture_output do
+      args = %w{-a}
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    # pp captured
+    captured.out.split("\n").length.should == 11
+  end
+
+  it "should accepts -a switch (all files)" do
+    captured = capture_output do
+      args = []
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+    # puts captured
+    captured.out.split("\n").length.should == 9
+  end
+
+  it "should show tree with inaccessible directories" do
+    captured = capture_output do
+      args = []
+      args << File.join(FIXTURES, "test_dir_3_with_error")
+      CliTree.new.parse_args(args)
+    end
+    #puts captured
+    captured.err.should_not be_empty
+    captured.out.split("\n").length.should == 4
+  end
+end

data/spec/tree_rb/cli/cli_tree_sqlite_spec.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+
+describe CliTree do
+
+  it "should accepts '--format sqlite -o test.db' switches" do
+    db_filename = File.join(FIXTURES, 'tmp', 'test.db')
+
+    File.unlink(db_filename) if File.exist?(db_filename)
+
+    captured = capture_output do
+      args = %w{--format sqlite -o } << db_filename
+      args << File.join(FIXTURES, "test_dir_1")
+      CliTree.new.parse_args(args)
+    end
+
+    File.exist?(db_filename).should be_true
+
+    File.unlink(db_filename) if File.exist?(db_filename)
+  end
+
+end

data/spec/tree_rb/util/dir_processor_spec.rb

@@ -3,10 +3,12 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
 describe DirProcessor do
 
-  it do
+  it "should capture all files" do
     files = []
     dp    = DirProcessor.new { |f| files << f }
     dp.process(FIXTURES)
+
+    # puts files
     files.length.should == 3
   end
 

data/tree.rb.gemspec

@@ -48,7 +48,7 @@ An example of DSL to build tree:
 
   gem.add_runtime_dependency(%q<json>, [">= 0"])
   gem.add_runtime_dependency(%q<ansi>, [">= 0"])
-  gem.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
+  gem.add_runtime_dependency(%q<sqlite3>, [">= 0"])
 
   gem.add_development_dependency(%q<rake>, [">= 0"])
   gem.add_development_dependency(%q<yard>, [">= 0"])
@@ -58,7 +58,6 @@ An example of DSL to build tree:
   #
   # files
   #
-  # s.files         = `git ls-files`.split("\n")
   # gem.files         = `git ls-files`.split($\)
   gem.files = %w{LICENSE.txt README.md Rakefile tree.rb.gemspec .gemtest}
   gem.files.concat Dir['ext/**/*.rb']
@@ -69,10 +68,9 @@ An example of DSL to build tree:
   #
   # bin
   #
-  # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  # gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   # gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  # Dir["bin/*"].map(&File.method(:basename))
-  gem.executables = %w{ tree.rb rtree tree_rb }
+  gem.executables = Dir["bin/*"].map(&File.method(:basename))
 
 
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -131,8 +131,8 @@ description: ! "(This gem was named as treevisitor)\ntree.rb is a 'clone' of tre
   \"l3\"\n       end\n       node \"wo leaves\"\n     end\n</pre>\n"
 email: tokiro.oyama@gmail.com
 executables:
-- tree.rb
 - rtree
+- tree.rb
 - tree_rb
 extensions: []
 extra_rdoc_files: []
@@ -153,6 +153,7 @@ files:
 - 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/sqlite_dir_tree_visitor.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
@@ -179,7 +180,9 @@ files:
 - examples/protovis/treevisitor.js
 - examples/protovis/directory_to_json_visitor.rb
 - spec/spec_helper.rb
-- spec/tree_rb/cli/cli_tree_spec.rb
+- 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/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
@@ -200,8 +203,8 @@ files:
 - 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
-- bin/tree.rb
 - bin/rtree
+- bin/tree.rb
 - bin/tree_rb
 homepage: http://github.com/tokiro/tree.rb
 licenses: []
@@ -230,7 +233,9 @@ summary: tree.rb is a 'clone' of tree unix command. The gem implements a library
   mange tree structures.
 test_files:
 - spec/spec_helper.rb
-- spec/tree_rb/cli/cli_tree_spec.rb
+- 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/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

data/spec/tree_rb/cli/cli_tree_spec.rb

@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-
-describe CliTree do
-
-  it "help message" do
-    out = with_output_captured do
-      args = %w{--help}
-      CliTree.new.parse_args(args)
-    end
-    out[:stdout].should match /Usage:/
-  end
-
-  it "version" do
-    out = with_output_captured do
-      args = %w{--version}
-      CliTree.new.parse_args(args)
-    end
-    version = TreeRb::VERSION
-    out[:stdout].should match version
-  end
-
-  it "should accepts switch -d (directories only)" 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[:stdout].split("\n").length.should == 6
-
-    out = with_output_captured do
-      args = %w{-da}
-      args << File.join(FIXTURES, "test_dir_1")
-      CliTree.new.parse_args(args)
-    end
-    # puts out
-    out[:stdout].split("\n").length.should == 7
-  end
-
-  it "should accepts switch -a (all files)" 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[:stdout].split("\n").length.should == 11
-
-    out = with_output_captured do
-      args = []
-      args << File.join(FIXTURES, "test_dir_1")
-      CliTree.new.parse_args(args)
-    end
-    # puts out
-    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