dircat 0.1.4 → 0.1.5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 tokiro
+Copyright (c) 2009-2010 tokiro.oyama@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION.yml

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

data/bin/dircat

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+cwd = File.expand_path(File.join(File.dirname(__FILE__), %w{ .. lib}))
+$:.unshift(cwd) unless $:.include?(cwd)
+
+require 'dircat'
+include DirCat
+exit CliDirCat.run

data/dircat.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dircat}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tokiro"]
-  s.date = %q{2010-12-17}
+  s.date = %q{2011-01-16}
+  s.default_executable = %q{dircat}
   s.description = %q{
       command line utilites to manage catalogs of directory
     }
   s.email = %q{tokiro.oyama@gmail.com}
-  s.executables = ["dircat-build", "dircat-diff", "dircat-query"]
+  s.executables = ["dircat"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -28,9 +29,10 @@ Gem::Specification.new do |s|
     "examples/example.rb",
     "lib/dircat.rb",
     "lib/dircat/cat.rb",
-    "lib/dircat/cli/dircat_build.rb",
-    "lib/dircat/cli/dircat_diff.rb",
-    "lib/dircat/cli/dircat_query.rb",
+    "lib/dircat/cli/cli_dircat.rb",
+    "lib/dircat/cli/command_build.rb",
+    "lib/dircat/cli/command_diff.rb",
+    "lib/dircat/cli/command_query.rb",
     "lib/dircat/entry.rb",
     "lib/dircat/extension_md5.rb",
     "lib/dircat/extension_numeric.rb",
@@ -42,9 +44,10 @@ Gem::Specification.new do |s|
   s.summary = %q{command line utilites to manage catalogs of directory}
   s.test_files = [
     "spec/dircat/cat_spec.rb",
-    "spec/dircat/cli/dircat_build_spec.rb",
-    "spec/dircat/cli/dircat_query_diff_spec.rb",
-    "spec/dircat/cli/dircat_query_spec.rb",
+    "spec/dircat/cli/cli_dircat_spec.rb",
+    "spec/dircat/cli/command_build_spec.rb",
+    "spec/dircat/cli/command_diff_spec.rb",
+    "spec/dircat/cli/command_query_spec.rb",
     "spec/dircat/md5_spec.rb",
     "spec/dircat/numeric_spec.rb",
     "spec/fixtures/certified_output/dircat1.yaml",
@@ -65,12 +68,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_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<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -78,6 +85,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<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/dircat/cat.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module DirCat
 
   class Cat

data/lib/dircat/cli/cli_dircat.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+class CliDirCat < CliMain
+
+  def self.command
+    "dircat"
+  end
+
+  def self.description
+    "Simple set of command to build catalogs of files."
+  end
+
+  def self.version
+    puts DirCat::version
+  end
+
+  def defaults
+    OpenStruct.new(
+        :verbose => true,
+        :force   => false
+    )
+  end
+
+  def opt_parser(options)
+    opt_parser = super(options)
+    opt_parser
+  end
+
+end

data/lib/dircat/cli/command_build.rb

@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+
+class CommandBuild < CliCommand
+
+  def self.command
+    "build"
+  end
+
+  def self.description
+    "Build a catalogue starting from a directory"
+  end
+
+  def self.usage
+    "Usage: dircat build [options]"
+  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"
+        options.exit = true
+      end
+      options.output = v
+    end
+
+    opt_parser.on("-f", "--force", "force write on existent file") do |v|
+      options.force
+    end
+
+    opt_parser
+  end
+
+  def exec(options, rest)
+    if rest.length < 1
+      puts "directory (from which build catalog) is missing"
+      puts "-h to print help"
+      return false
+    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.verbose
+      cat_opts[:verbose_level] = 1
+    end
+
+    #
+    # option: output, force
+    #
+    output = $stdout
+    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")
+
+    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}"
+
+    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

@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+
+class CommandDiff < CliCommand
+
+  def self.command
+    "diff"
+  end
+
+  def self.description
+    "Show diff from two catalogs"
+  end
+
+  def self.usage
+    <<-EOS
+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
+  end
+  
+  def opt_parser(options)
+    opt_parser = super(options)
+    opt_parser.on("-f FORMAT", "--fmt FORMAT", "formato") do |v|
+      options.format = v
+    end
+    opt_parser
+  end
+
+  def exec(options, rest)
+    if rest.length < 2
+      puts "you must provide two args (catalogs or directory)"
+      puts "-h to print help"
+      return false
+    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.format
+    when "simple"
+      s3.fmt_simple
+    when "ruby"
+      s3.fmt_ruby( "." )
+    else
+      s3.fmt_simple
+    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

@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+class CommandQuery < CliCommand
+
+  def self.command
+    "query"
+  end
+
+  def self.description
+    "show info about dircat catalogs"
+  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
+  end
+
+  def exec(options, rest)
+    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.verbose
+      cat_opts[:verbose_level] = 1
+    end
+
+    s = Cat.from_file(cat_filename, cat_opts)
+
+    puts s.send(command.to_sym)
+    true
+  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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module DirCat
 
   class EntrySer < OpenStruct

data/lib/dircat/extension_md5.rb

@@ -1,12 +1,13 @@
+# -*- coding: utf-8 -*-
 #
 # calculate md5 of big files, found on usenet
 #
 
 if RUBY_VERSION =~ /1\.8/
-  # stdlib
+  # std lib
   require 'md5'
 else
-  # stdlib
+  # std lib
   require 'digest/md5'
   include Digest
 end

data/lib/dircat/extension_numeric.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Numeric
   #
   # ritorna una stringa con le migliaia serparate da <separator>

data/lib/dircat/report.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module DirCat
 
   # From http://gist.github.com/72234

data/lib/dircat.rb

@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 #
-# stdlib
+# std lib
 #
 require 'fileutils'
 require 'tmpdir'
@@ -7,6 +8,11 @@ require 'yaml'
 require 'ostruct'
 require 'optparse'
 
+#
+# rubygems
+#
+require 'optparse-command'
+
 module DirCat
   def self.version
     cwd = File.dirname( __FILE__)
@@ -25,6 +31,7 @@ require 'dircat/cat'
 require 'dircat/entry'
 require 'dircat/report'
 
-require 'dircat/cli/dircat_build'
-require 'dircat/cli/dircat_diff'
-require 'dircat/cli/dircat_query'
+require 'dircat/cli/cli_dircat'
+require 'dircat/cli/command_build'
+require 'dircat/cli/command_diff'
+require 'dircat/cli/command_query'