dircat 0.1.5 → 0.1.6

data/README.md

@@ -0,0 +1,38 @@
+# DIRCAT
+
+Dircat build, starting from a directory, a catalog with files meta information (path, timestamp, md5. ...), so it
+is possible to compare this catalog with another directory to detect duplicate, file change, and so.
+This utilities could be utilized as help to backup a directory or to find duplicates
+
+### dircat build
+
+Build a catalog from a directory
+
+Ex.: dircat build -o <catalog_name> dir1
+
+builds catalog from directory dir1.
+
+### dircat cfr
+
+Compare two catalogs or directories
+
+Ex. dircat diff spec/fixtures/dir1 spec/fixtures/dir2
+
+### dircat query
+
+query the contents of catalog
+
+Ex.: ruby bin/dircat query cat_dir1.yaml
+Ex.: ruby bin/dircat query cat_dir1.yaml duplicates
+
+### INSTALL:
+
+sudo gem install dircat
+
+or
+
+sudo gem install gf-dircat -s gems.github.com
+
+### Copyright
+
+Copyright (c) 2009-2010 tokiro.oyama@gmail.com See LICENSE for details.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 5
+:patch: 6
 :build: 

data/dircat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dircat}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tokiro"]
-  s.date = %q{2011-01-16}
+  s.date = %q{2011-01-22}
   s.default_executable = %q{dircat}
   s.description = %q{
       command line utilites to manage catalogs of directory
@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.email = %q{tokiro.oyama@gmail.com}
   s.executables = ["dircat"]
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
+    "LICENSE.txt",
+    "README.md"
   ]
   s.files = [
-    "LICENSE",
-    "README.rdoc",
+    "LICENSE.txt",
+    "README.md",
     "Rakefile",
     "VERSION.yml",
     "dircat.gemspec",
@@ -36,7 +36,9 @@ Gem::Specification.new do |s|
     "lib/dircat/entry.rb",
     "lib/dircat/extension_md5.rb",
     "lib/dircat/extension_numeric.rb",
-    "lib/dircat/report.rb"
+    "tasks/jeweler.rake",
+    "tasks/rspec.rake",
+    "tasks/yard.rake"
   ]
   s.homepage = %q{http://github.com/tokiro/dircat}
   s.require_paths = ["lib"]
@@ -68,16 +70,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<treevisitor>, [">= 0"])
-      s.add_runtime_dependency(%q<optparse-command>, ["= 0.1.0"])
+      s.add_runtime_dependency(%q<treevisitor>, ["= 0.1.6"])
+      s.add_runtime_dependency(%q<optparse-command>, ["= 0.1.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<treevisitor>, [">= 0"])
-      s.add_dependency(%q<optparse-command>, ["= 0.1.0"])
+      s.add_dependency(%q<treevisitor>, ["= 0.1.6"])
+      s.add_dependency(%q<optparse-command>, ["= 0.1.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -85,8 +87,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<treevisitor>, [">= 0"])
-    s.add_dependency(%q<optparse-command>, ["= 0.1.0"])
+    s.add_dependency(%q<treevisitor>, ["= 0.1.6"])
+    s.add_dependency(%q<optparse-command>, ["= 0.1.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/dircat/cat.rb

@@ -5,51 +5,64 @@ module DirCat
 
     attr_reader :dirname
 
-    # data di creazione
-    attr_reader :ctime
-    attr_writer :ctime
+    # creation date
+    attr_accessor :ctime
 
-    def initialize( options = {} )
-      @verbose_level = options.delete(:verbose) || 0
-      @dirname = ""
-      @ctime   = DateTime.now
-      @entries = Array.new
-      @md5ToEntries = Hash.new
+    def initialize(options = {})
+      @verbose_level  = options.delete(:verbose) || 0
+      @dirname        = ""
+      @ctime          = DateTime.now
+      @entries        = Array.new
+      @md5_to_entries = Hash.new
+    end
+
+    def self.from_dir(dirname, options = {})
+      new(options).from_dir(dirname)
     end
 
-    def from_dir( dirname )
-      if not File.directory?( dirname )
+    def self.from_file(filename, options = {})
+      new(options).from_file(filename)
+    end
+
+    def self.load(file_or_dir, options = {})
+      new(options).load(file_or_dir)
+    end
+
+    def from_dir(dirname)
+      if not File.directory?(dirname)
         raise "'#{dirname}' is not a directory or doesn't exists"
       end
       @dirname = File.expand_path dirname
       @ctime   = DateTime.now
-      _loadfromdir
+      _load_from_dir
       self
     end
 
-    def self.from_dir( dirname, options = {} )
-      new(options).from_dir(dirname)
-    end
-    
-    def from_file( filename )
-      if not File.exist?( filename )
+    def from_file(filename)
+      if not File.exist?(filename)
         raise DirCatException.new, "'#{filename}' not exists"
       end
-      dircat_ser = YAML::load( File.open( filename ) )
-      @dirname = dircat_ser.dirname
-      @ctime   = dircat_ser.ctime
-      dircat_ser.entries.each{ |entry_ser|
-        add_entry( Entry.new.from_ser( entry_ser ) )
+      dircat_ser = YAML::load(File.open(filename))
+      @dirname   = dircat_ser.dirname
+      @ctime     = dircat_ser.ctime
+      dircat_ser.entries.each { |entry_ser|
+        add_entry(Entry.new.from_ser(entry_ser))
       }
       self
     end
 
-    def self.from_file( filename, options = {} )
-      new(options).from_file(filename)
+    def load(file_or_dir)
+      if File.directory?(file_or_dir)
+        from_dir(file_or_dir)
+      elsif File.exists?(file_or_dir)
+        from_file(file_or_dir)
+      else
+        raise DirCatException.new, "'#{file_or_dir}' not exists"
+      end
     end
 
     def to_ser
-      dircat_ser = DirCatSer.new
+      dircat_ser         = DirCatSer.new
       dircat_ser.version = 0.1
       dircat_ser.dirname = @dirname
       dircat_ser.ctime   = @ctime
@@ -60,31 +73,46 @@ module DirCat
       dircat_ser
     end
 
-    def _loadfromdir()
+    def _load_from_dir
       old_dirname = Dir.pwd
-      Dir.chdir( @dirname )
+      Dir.chdir(@dirname)
       Dir["**/*"].each { |f|
-        next if File.directory?( f )
+        next if File.directory?(f)
 
         if @verbose_level > 0
-          cr = "\r"
+          cr    = "\r"
           clear = "\e[K"
           print "#{cr}#{filename}#{clear}"
         end
 
-        add_entry( Entry.new.from_filename( f ) )
+        add_entry(Entry.new.from_filename(f))
       }
       if @verbose_level > 0
         print "\n"
       end
-      Dir.chdir( old_dirname )
+      Dir.chdir(old_dirname)
       self
     end
 
-    def save_to( file )
+    def _load_from_dir_with_tree_visitor
+      dtw = DirTreeWalker.new("..")
+      dtw.run do
+        visit_leaf_node do |filename|
+          add_entry(Entry.new.from_filename(f))
+          if @verbose_level > 0
+            cr    = "\r"
+            clear = "\e[K"
+            print "#{cr}#{filename}#{clear}"
+          end
+        end
+      end
+      self
+    end
+
+    def save_to(file)
       if file.kind_of?(String)
         begin
-          File.open( file, "w" ) do |f|
+          File.open(file, "w") do |f|
             f.puts to_ser.to_yaml
           end
         rescue Errno::ENOENT
@@ -99,33 +127,36 @@ module DirCat
       @entries.size
     end
 
+    def empty?
+      @entries.size == 0
+    end
+
     def bytes
-      @entries.inject(0) {|sum, entry| sum + entry.size }
+      @entries.inject(0) { |sum, entry| sum + entry.size }
     end
 
     def report
       dups = duplicates
-      s = "Base dir: #@dirname\n" +
-        "Nr. file: #{size}\n" +
-        "Bytes: #{bytes.with_separator}"
+      s    = "Base dir: #{@dirname}\n"
+      s    += "Nr. file: #{size}"
       if duplicates.size > 0
-        s+= "\n duplicates #{dups.size}"
+        s+= " (duplicates #{dups.size})"
       end
+      s += "\nBytes: #{bytes.with_separator}"
       s
     end
 
-    def add_entry( e )
-      @entries.push( e )
-      if @md5ToEntries.has_key?( e.md5 )
-        # puts "Entry duplicata!!!"
-        @md5ToEntries[ e.md5 ].push( e )
+    def add_entry(e)
+      @entries.push(e)
+      if @md5_to_entries.has_key?(e.md5)
+        @md5_to_entries[e.md5].push(e)
       else
-        @md5ToEntries[ e.md5 ] = [ e ]
+        @md5_to_entries[e.md5] = [e]
       end
     end
 
-    def contains( e )
-      @md5ToEntries.has_key?( e.md5 )
+    def contains(e)
+      @md5_to_entries.has_key?(e.md5)
     end
 
     def -(s)
@@ -138,9 +169,9 @@ module DirCat
 
     def duplicates
       list = []
-      @md5ToEntries.each_value do |ee|
+      @md5_to_entries.each_value do |ee|
         next if ee.size < 2
-        list.push( ee )
+        list.push(ee)
       end
       list
     end
@@ -155,10 +186,10 @@ module DirCat
       DirCat::report(@entries, :md5, :name, :path)
     end
 
-    def fmt_ruby( dst )
+    def fmt_ruby(dst)
       puts "require 'fileutils'"
       @entries.each { |entry|
-        src = File.join( @dirname, entry.path, entry.name );
+        src = File.join(@dirname, entry.path, entry.name);
         puts "FileUtils.cp( \"#{src}\", \"#{dst}\" )"
       }
     end
@@ -175,12 +206,12 @@ module DirCat
       r = "require 'fileutils'\n"
       duplicates.each { |entries|
         flg_first = true
-        r += "\n"
-        entries.each{ |entry|
-          src = File.join( @dirname, entry.path, entry.name );
+        r         += "\n"
+        entries.each { |entry|
+          src = File.join(@dirname, entry.path, entry.name);
           if flg_first
             flg_first = false
-            r += "# FileUtils.mv( \"#{src}\", \"#{Dir.tmpdir}\" )\n"
+            r         += "# FileUtils.mv( \"#{src}\", \"#{Dir.tmpdir}\" )\n"
           else
             r += "FileUtils.mv( \"#{src}\", \"#{Dir.tmpdir}\" )\n"
           end

data/lib/dircat/cli/cli_dircat.rb

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
-
-class CliDirCat < CliMain
+class CliDirCat < OptParseCommand::CliMain
 
   def self.command
     "dircat"
   end
 
   def self.description
-    "Simple set of command to build catalogs of files."
+    "Simple set of command to build catalogs of files.\n" +
+    "Code https://github.com/tokiro/dircat. Feedback to tokiro.oyama@gmail.com"
   end
 
   def self.version
-    puts DirCat::version
+    DirCat::version
   end
 
   def defaults

data/lib/dircat/cli/command_build.rb

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-class CommandBuild < CliCommand
+#
+# Build a catalogue starting from a directory
+#
+class CommandBuild < OptParseCommand::CliCommand
 
   def self.command
     "build"
@@ -14,10 +17,17 @@ class CommandBuild < CliCommand
     "Usage: dircat build [options]"
   end
 
-  def opt_parser(options)
-    opt_parser = super(options)
+  def defaults(options)
+    options.force = false
+  end
+
+  def option_parser(options)
+    parser = super(options)
+    parser.on("-f", "--force", "force write on existent file") do |v|
+      options.force = true
+    end
 
-    opt_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"
         options.exit = true
@@ -25,17 +35,13 @@ class CommandBuild < CliCommand
       options.output = v
     end
 
-    opt_parser.on("-f", "--force", "force write on existent file") do |v|
-      options.force
-    end
-
-    opt_parser
+    parser
   end
 
   def exec(options, rest)
     if rest.length < 1
-      puts "directory (from which build catalog) is missing"
-      puts "-h to print help"
+      $stderr.puts "directory (from which build catalog) is missing"
+      $stderr.puts "-h to print help"
       return false
     end
 
@@ -44,7 +50,7 @@ class CommandBuild < CliCommand
     cat_opts = {}
 
     if not FileTest.directory?(dirname)
-      puts "'#{dirname}' not exists or is not a directory"
+      $stderr.puts "'#{dirname}' not exists or is not a directory"
       return 0
     end
 
@@ -66,17 +72,14 @@ class CommandBuild < CliCommand
       filename = "cat_" + File.basename(dirname) + "_" + Date.today.strftime("%Y%m%d") + ".yaml"
     end
     if File.exist?(filename) and not options.force
-      puts "catalog '#{filename}' exists use --force or -f to overwrite"
+      $stderr.puts "catalog '#{filename}' exists use --force or -f to overwrite"
       return 0
     end
-    output     = File.open(filename, "w")
 
+    output     = File.open(filename, "w")
     start_time = Time.now
     s          = Cat.from_dir(dirname)
     end_time   = Time.now
-
-    # s.pr
-    # f.puts s.to_yaml
     s.save_to(output)
 
     if output != $stdout
@@ -84,118 +87,9 @@ class CommandBuild < CliCommand
     end
     $stderr.puts s.report
     $stderr.puts "elapsed: #{end_time - start_time}"
+    $stderr.puts "written to #{filename}" if output != $stdout
 
     true
   end
 
 end
-
-
-#module DirCat
-#  #
-#  # Build a catalogue starting from a directory
-#  #
-#  class DirCatBuild
-#
-#    def self.run
-#      return self.new.parse_args( ARGV )
-#    end
-#
-#    def parse_args( argv )
-#      options = { :verbose => true, :force => false }
-#      opts = OptionParser.new
-#      opts.banner << "\n"
-#      opts.banner << "Build a catalogue starting from a directory\n";
-#      opts.banner << "\n"
-#
-#      opts.on("-h", "--help", "Print this message") do
-#        puts opts
-#        return 0
-#      end
-#
-#      opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#        options[:verbose] = v
-#      end
-#
-#      opts.on("-q", "--quiet", "quiet mode as --no-verbose") do |v|
-#        options[:verbose] = false
-#      end
-#
-#      opts.on("-f", "--force", "force write on existent file") do |v|
-#        options[:force] = true
-#      end
-#
-#      opts.on("-o [FILE]", "--output [FILE]",String) do |v|
-#        if options[:output]
-#          puts "only one file of output can be used"
-#          return 1
-#        end
-#        options[:output] = v
-#      end
-#
-#      rest = opts.parse(argv)
-#
-#      # p options
-#      # p ARGV
-#
-#      if rest.length < 1
-#        puts "directory (from which build catalog) is missing"
-#        puts "-h to print help"
-#        return 0
-#      end
-#
-#      dirname = rest[0]
-#      dirname = File.expand_path( dirname )
-#      cat_opts = {}
-#
-#      if not FileTest.directory?(dirname)
-#        puts "'#{dirname}' not exists or is not a directory"
-#        return 0
-#      end
-#
-#      #
-#      # option verbose
-#      #
-#
-#      if options.has_key?(:verbose)
-#        if options[:verbose]
-#          cat_opts[:verbose_level] = 1
-#        end
-#      end
-#
-#      #
-#      # option: output, force
-#      #
-#      output = $stdout
-#      if options.has_key?(:output)
-#        if options[:output]
-#          filename = options[:output]
-#        else
-#          filename = "cat_" + File.basename( dirname ) + "_" + Date.today.strftime("%Y%m%d") + ".yaml"
-#        end
-#        if File.exist?(filename) and not options[:force]
-#          puts "catalog '#{filename}' exists use --force or -f to overwrite"
-#          return 0
-#        end
-#        output = File.open(filename, "w")
-#      end
-#
-#      start_time = Time.now
-#      s = Cat.from_dir(dirname)
-#      end_time = Time.now
-#
-#      # s.pr
-#      # f.puts s.to_yaml
-#      s.save_to( output )
-#
-#      if output != $stdout
-#        output.close
-#      end
-#      $stderr.puts s.report
-#      $stderr.puts "elapsed: #{end_time - start_time}"
-#
-#      0
-#    end
-#
-#  end
-#end

data/lib/dircat/cli/command_diff.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-class CommandDiff < CliCommand
+class CommandDiff < OptParseCommand::CliCommand
 
   def self.command
     "diff"
@@ -15,15 +15,15 @@ class CommandDiff < CliCommand
 Usage: dircat diff [options] <filedircat1> <filedircat2>
 diff first catalog from second (<filedircat1> - <filedircat2>)
 and then print the difference with the format specified on output
-  EOS
+    EOS
   end
-  
-  def opt_parser(options)
-    opt_parser = super(options)
-    opt_parser.on("-f FORMAT", "--fmt FORMAT", "formato") do |v|
+
+  def option_parser(options)
+    parser = super(options)
+    parser.on("-f FORMAT", "--fmt FORMAT", "format (simple, ruby)") do |v|
       options.format = v
     end
-    opt_parser
+    parser
   end
 
   def exec(options, rest)
@@ -36,123 +36,50 @@ and then print the difference with the format specified on output
     cat_filename1 = rest[0]
     cat_filename2 = rest[1]
 
-    if File.exists?( cat_filename1 )
-      puts "load catalog #{cat_filename1}"
-      s1 = Cat.from_file(cat_filename1)
-    elsif File.directory?(cat_filename1)
+    #
+    # process first argument
+    #
+    if File.directory?(cat_filename1)
       puts "build first set from directory #{cat_filename1}"
       s1 = Cat.from_dir(cat_filename1)
+    elsif File.exists?(cat_filename1)
+      puts "load catalog #{cat_filename1}"
+      s1 = Cat.from_file(cat_filename1)
     else
       puts "#{cat_filename1} is not a catalog file or directory"
       return 1
     end
 
-    if File.exists?( cat_filename2 )
-      puts "load catalog #{cat_filename2}"
-      s2 = Cat.from_file(cat_filename2)
-    elsif File.directory?(cat_filename2)
+    #
+    # process second argument
+    #
+    if File.directory?(cat_filename2)
       puts "build first set from directory #{cat_filename2}"
       s2 = Cat.from_dir(cat_filename2)
+    elsif File.exists?(cat_filename2)
+      puts "load catalog #{cat_filename2}"
+      s2 = Cat.from_file(cat_filename2)
     else
       puts "#{cat_filename2} is not a catalog file or directory"
       return 1
     end
 
-    puts "build difference"
     s3 = s1 - s2
 
-    case options.format
-    when "simple"
-      s3.fmt_simple
-    when "ruby"
-      s3.fmt_ruby( "." )
+    if s3.empty?
+      puts "no difference (first catalog contains all file of second catalog)"
     else
-      s3.fmt_simple
+      puts "differences (file in first catalog not contained in the second catalog)"
+      case options.format
+        when "simple"
+          s3.fmt_simple
+        when "ruby"
+          s3.fmt_ruby(".")
+        else
+          s3.fmt_simple
+      end
     end
     true
   end
 
 end
-
-
-#module DirCat
-#
-#  class DirCatDiff
-#
-#    def self.run
-#      return self.new.parse_args( ARGV )
-#    end
-#
-#    def parse_args( args )
-#      options = {}
-#      opts = OptionParser.new
-#      opts.banner =
-#        "Usage: dircat_cfr.rb [options] <filedircat1> <filedircat2>\n\n" +
-#        "fa la differenza fra il primo catalog e il secondo\n" +
-#        "<filedircat1> - <filedircat2>\n" +
-#        "e stampa sull'output con un formato\n"
-#
-#      opts.on("-h", "--help", "Print this message") do
-#        puts opts
-#        return 0
-#      end
-#
-#      opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#        options[:verbose] = v
-#      end
-#
-#      opts.on("-f FORMAT", "--fmt FORMAT", "formato") do |v|
-#        options[:fmt] = v
-#      end
-#      rest = opts.parse( args )
-#
-#      # p options
-#      # p ARGV
-#
-#      if rest.length < 2
-#        puts "you must provide two args (catalogs or directory)"
-#        puts "dircat_cfr -h to print help"
-#        exit
-#      end
-#
-#      cat_filename1 = rest[0]
-#      cat_filename2 = rest[1]
-#
-#      if File.exists?( cat_filename1 )
-#        puts "load catalog #{cat_filename1}"
-#        s1 = Cat.from_file(cat_filename1)
-#      elsif File.directory?(cat_filename1)
-#        puts "build first set from directory #{cat_filename1}"
-#        s1 = Cat.from_dir(cat_filename1)
-#      else
-#        puts "#{cat_filename1} is not a catalog file or directory"
-#        return 1
-#      end
-#
-#      if File.exists?( cat_filename2 )
-#        puts "load catalog #{cat_filename2}"
-#        s2 = Cat.from_file(cat_filename2)
-#      elsif File.directory?(cat_filename2)
-#        puts "build first set from directory #{cat_filename2}"
-#        s2 = Cat.from_dir(cat_filename2)
-#      else
-#        puts "#{cat_filename2} is not a catalog file or directory"
-#        return 1
-#      end
-#
-#      puts "build difference"
-#      s3 = s1 - s2
-#
-#      case options[:fmt]
-#      when "simple"
-#        s3.fmt_simple
-#      when "ruby"
-#        s3.fmt_ruby( "." )
-#      else
-#        s3.fmt_simple
-#      end
-#      0
-#    end
-#  end
-#end
-#

data/lib/dircat/cli/command_query.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-class CommandQuery < CliCommand
+class CommandQuery < OptParseCommand::CliCommand
 
   def self.command
     "query"
@@ -11,25 +11,7 @@ class CommandQuery < CliCommand
   end
 
   def self.usage
-    "Usage: dircat-query [options] <filedircat> [<command>]"
-  end
-
-  def opt_parser(options)
-    opt_parser = super(options)
-
-    opt_parser.on("-o [FILE]", "--output [FILE]", String) do |v|
-      if options[:output]
-        puts "only one file of output can be used"
-        return 1
-      end
-      options.output = v
-    end
-
-    opt_parser.on("-f", "--force", "force write on existent file") do |v|
-      options[:force] = true
-    end
-
-    opt_parser
+    "Usage: query [options] <catalog> [<method>]"
   end
 
   def exec(options, rest)
@@ -41,7 +23,7 @@ class CommandQuery < CliCommand
 
     cat_opts     = {}
     cat_filename = rest[0]
-    unless File.exists?(cat_filename)
+    if !File.exists?(cat_filename) or File.directory?(cat_filename)
       puts "first args must be a catalogue"
       return 1
     end
@@ -66,73 +48,3 @@ class CommandQuery < CliCommand
   end
 
 end
-
-
-#module DirCat
-#
-#  class DirCatQuery
-#
-#    def self.run
-#      return self.new.parse_args( ARGV)
-#    end
-#
-#    def parse_args( args )
-#      options = {}
-#      opts = OptionParser.new
-#      opts.banner =
-#        "show info on dircat catalogs\n"
-#
-#      opts.on("--version", "show the dircat version") do
-#        puts "dircat version #{DirCat::version}"
-#        return 0
-#      end
-#
-#      opts.on("-h", "--help", "Print this message") do
-#        puts opts
-#        return 0
-#      end
-#
-#      opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#        options[:verbose] = v
-#      end
-#
-#      rest = opts.parse( args )
-#
-#      # p options
-#      # p ARGV
-#
-#      if rest.length < 1
-#        puts "missing catalog!"
-#        puts "-h to print help"
-#        return 0
-#      end
-#
-#      cat_opts = {}
-#      cat_filename = rest[0]
-#      unless File.exists?(cat_filename)
-#        puts "first args must be a catalogue"
-#        return 1
-#      end
-#
-#      if rest.length > 1
-#        command = rest[1]
-#      else
-#        command = "report"
-#      end
-#
-#      #
-#      # option verbose
-#      #
-#      if options.has_key?(:verbose)
-#        if options[:verbose]
-#          cat_opts[:verbose_level] = 1
-#        end
-#      end
-#
-#      s = Cat.from_file( cat_filename, cat_opts )
-#
-#      puts s.send( command.to_sym )
-#      0
-#    end
-#  end
-#end

data/lib/dircat/entry.rb

@@ -58,4 +58,4 @@ module DirCat
   class DirCatException < RuntimeError
   end
 
-end
+end

data/lib/dircat/extension_md5.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# calculate md5 of big files, found on usenet
+# calculate md5 of big files, snipped found on usenet
 #
 
 if RUBY_VERSION =~ /1\.8/

data/lib/dircat/extension_numeric.rb

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 class Numeric
   #
-  # ritorna una stringa con le migliaia serparate da <separator>
+  # returns a string separated by the thousands <separator>
   # es.: 100000 -> 1.000.000
   #
-  #
-  # copiata da http://wiki.rubygarden.org/Ruby/page/show/FixNumFormat
-  #
   def with_separator( separator = ',', length = 3 )
     splitter = Regexp.compile "(\\d{#{length}})"
     before, after = self.to_s.split('.')

data/lib/dircat.rb

@@ -7,19 +7,27 @@ require 'tmpdir'
 require 'yaml'
 require 'ostruct'
 require 'optparse'
+require 'pp'
 
 #
 # rubygems
 #
+gem "optparse-command", "0.1.1"
 require 'optparse-command'
 
+gem "treevisitor", "0.1.6"
+require 'treevisitor'
+
+#
+# dircat
+#
 module DirCat
   def self.version
-    cwd = File.dirname( __FILE__)
-    yaml = YAML.load_file(cwd + '/../VERSION.yml')
-    major = (yaml['major'] || yaml[:major]).to_i
-    minor = (yaml['minor'] || yaml[:minor]).to_i
-    patch = (yaml['patch'] || yaml[:patch]).to_i
+    filename = File.join(File.dirname(__FILE__), %w{.. VERSION.yml})
+    yaml     = YAML.load_file(filename)
+    major    = (yaml['major'] || yaml[:major]).to_i
+    minor    = (yaml['minor'] || yaml[:minor]).to_i
+    patch    = (yaml['patch'] || yaml[:patch]).to_i
     "#{major}.#{minor}.#{patch}"
   end
 end
@@ -29,7 +37,6 @@ require 'dircat/extension_numeric'
 
 require 'dircat/cat'
 require 'dircat/entry'
-require 'dircat/report'
 
 require 'dircat/cli/cli_dircat'
 require 'dircat/cli/command_build'

data/spec/dircat/cat_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.expand_path( File.join(File.dirname(__FILE__), "..", "spec_helper") )
 
 #

data/spec/dircat/cli/cli_dircat_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 
 describe CliDirCat do

data/spec/dircat/cli/command_build_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 
 describe CommandBuild do

data/spec/dircat/cli/command_diff_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_helper") )
 
 describe CommandDiff do

data/spec/dircat/cli/command_query_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_helper") )
 
 describe CommandQuery do

data/spec/dircat/md5_spec.rb

@@ -1,12 +1,8 @@
+# -*- coding: utf-8 -*-
 require File.expand_path( File.join(File.dirname(__FILE__), "..", "spec_helper") )
-
 describe "MD5" do
-
-  TEST_FILE = File.expand_path( File.join( File.dirname(__FILE__), "..", "..", "lib", "dircat", "extension_md5.rb" ) )
-
   it "test_simple_md5" do
-    file_name = File.join( TEST_FILE )
-    MD5.file( file_name ).to_s.should  ==  "eb29e47aba9693862895688422171221"
+    file_name = File.expand_path( File.join( File.dirname(__FILE__), "..", "..", "lib", "dircat", "extension_md5.rb" ) )
+    MD5.file( file_name ).to_s.should  ==  "ab4bc9cf679dede00672f2246e204b06"
   end
-
 end

data/spec/dircat/numeric_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.expand_path( File.join(File.dirname(__FILE__), "..", "spec_helper") )
 
 describe "TCNumeric" do

data/spec/spec_helper.rb

@@ -1,17 +1,14 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift(File.dirname(__FILE__))
+# -*- coding: utf-8 -*-
+
+require "stringio"
+require 'ostruct'
 
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'dircat'
 include DirCat
 
 TEST_DIR = File.expand_path( File.join( File.dirname(__FILE__), "fixtures" ) )
 
-# Spec::Runner.configure do |config|
-# end
-
-# require 'test/unit'
-require "stringio"
-
 def with_stdout_captured
   old_stdout = $stdout
   out = StringIO.new

data/tasks/jeweler.rake

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.name = "dircat"
+    gem.summary = "command line utilites to manage catalogs of directory"
+    gem.description = %Q{
+      command line utilites to manage catalogs of directory
+    }
+    gem.authors = ["Tokiro"]
+    gem.email = "tokiro.oyama@gmail.com"
+    gem.homepage = "http://github.com/tokiro/dircat"
+
+    #
+    # dependencies, automatically loaded from Gemfile
+    #
+
+    #
+    # bin
+    #
+    gem.executables = %w{ dircat }
+
+    #
+    # files
+    #
+    gem.files  = %w{LICENSE.txt README.md Rakefile VERSION.yml dircat.gemspec}
+    gem.files.concat Dir['lib/**/*.rb']
+    gem.files.concat Dir['examples/*.rb']
+    gem.files.concat Dir['tasks/*.rake']
+
+    #
+    # test files
+    #
+    gem.test_files = Dir['spec/**/*.rb']
+    gem.test_files.concat Dir['spec/fixtures/**/*']
+
+  end
+
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end

data/tasks/rspec.rake

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+
+  RSpec::Core::RakeTask.new do |t|
+    t.rspec_opts = ["--color", "--format", "spec", '--backtrace']
+    t.pattern    = 'spec/**/*_spec.rb'
+  end
+rescue LoadError
+  puts "rspec (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+

data/tasks/yard.rake

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.files   = ['lib/**/*.rb']
+    t.options = [
+        '--readme', 'README.md',
+        '--any',
+        '--extra',
+        '--opts'
+    ]
+  end
+rescue LoadError
+  puts "Yard (or a dependency) not available. Install it with: sudo gem install jeweler"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tokiro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +01:00
+date: 2011-01-22 00:00:00 +01:00
 default_executable: dircat
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,11 +22,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 6
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -40,8 +42,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 1
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -117,11 +119,11 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+- LICENSE.txt
+- README.md
 files: 
-- LICENSE
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
 - VERSION.yml
 - dircat.gemspec
@@ -135,7 +137,9 @@ files:
 - lib/dircat/entry.rb
 - lib/dircat/extension_md5.rb
 - lib/dircat/extension_numeric.rb
-- lib/dircat/report.rb
+- tasks/jeweler.rake
+- tasks/rspec.rake
+- tasks/yard.rake
 - spec/dircat/cat_spec.rb
 - spec/dircat/cli/cli_dircat_spec.rb
 - spec/dircat/cli/command_build_spec.rb

data/README.rdoc

@@ -1,36 +0,0 @@
-= DIRCAT
-
-Utilities for manage catalogs of files and directory.
-This utilities can be utilized as help to backup a directory.
-
-=== dircat-build
-
-Build a catalog from a directory
-
-Ex.: dircat-build -o <catalog_name> dir1
-
-builds catalog from directory dir1.
-
-=== dircat-cfr
-
-Compare two catalogs
-
-=== dircat-query
-
-show the contents of catalog
-
-== REQUIREMENTS:
-
-* utilizza la libreria abstract di kwartz
-
-== INSTALL:
-
-sudo gem install dircat
-
-or
-
-sudo gem install gf-dircat -s gems.github.com
-
-== Copyright
-
-Copyright (c) 2009-2010 tokiro. See LICENSE for details.

data/lib/dircat/report.rb

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-module DirCat
-
-  # From http://gist.github.com/72234
-  #
-  # mysql-style output for an array of ActiveRecord objects
-  #
-  # Usage:
-  #   report(records)  # displays report with all fields
-  #   report(records, :field1, :field2, ...) # displays report with given fields
-  #
-  # Example:
-  # >> report(records, :id, :amount, :created_at)
-  # +------+-----------+--------------------------------+
-  # | id   | amount    | created_at                     |
-  # +------+-----------+--------------------------------+
-  # | 8301 | $12.40    | Sat Feb 28 09:20:47 -0800 2009 |
-  # | 6060 | $39.62    | Sun Feb 15 14:45:38 -0800 2009 |
-  # | 6061 | $167.52   | Sun Feb 15 14:45:38 -0800 2009 |
-  # | 6067 | $12.00    | Sun Feb 15 14:45:40 -0800 2009 |
-  # | 6059 | $1,000.00 | Sun Feb 15 14:45:38 -0800 2009 |
-  # +------+-----------+--------------------------------+
-  # 5 rows in set
-  #
-  def self.report(items, *fields)
-    # find max length for each field; start with the field names themselves
-    max_len = Hash[*fields.map {|f| [f, f.to_s.length]}.flatten]
-
-    items.each do |item|
-      fields.each do |field|
-        len = item.send(field).to_s.length
-        max_len[field] = len if len > max_len[field]
-      end
-    end
-
-    border = '+-' + fields.map {|f| '-' * max_len[f] }.join('-+-') + '-+'
-    title_row = '| ' + fields.map {|f| sprintf("%-#{max_len[f]}s", f.to_s) }.join(' | ') + ' |'
-
-    puts border
-    puts title_row
-    puts border
-
-    items.each do |item|
-      row = '| ' + fields.map {|f| sprintf("%-#{max_len[f]}s", item.send(f)) }.join(' | ') + ' |'
-      puts row
-    end
-
-    puts border
-    puts "#{items.length} rows in set\n"
-  end
-end
-
-if __FILE__ == $0
-  require 'ostruct'
-  o1 = OpenStruct.new
-  o1.a = 1
-  o1.b = 2
-
-  o2 = OpenStruct.new :a => 2, :b => 4
-  
-  DirCat::report( [o1, o2], :a, :b )
-end