dircat 0.1.8 → 0.1.9

data/Rakefile

@@ -4,6 +4,6 @@ require 'rake'
 # Load tasks
 Dir.glob('tasks/**/*.rake').each { |r| Rake.application.add_import r }
 
-task :test => :check_dependencies
+task :test => :spec
 task :default => :spec
 

data/VERSION.yml

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

data/bin/dircat

@@ -3,5 +3,4 @@ cwd = File.expand_path(File.join(File.dirname(__FILE__), %w{ .. lib}))
 $:.unshift(cwd) unless $:.include?(cwd)
 
 require 'dircat'
-include DirCat
-exit CliDirCat.run
+DirCat::CliDirCat.run!

data/dircat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dircat}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tokiro"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-14}
   s.default_executable = %q{dircat}
   s.description = %q{
       command line utilites to manage catalogs of directory
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".gemtest",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -70,7 +71,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<treevisitor>, ["= 0.2.1"])
-      s.add_runtime_dependency(%q<optparse-command>, ["= 0.1.4"])
+      s.add_runtime_dependency(%q<optparse-command>, ["= 0.1.5"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -78,7 +79,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<treevisitor>, ["= 0.2.1"])
-      s.add_dependency(%q<optparse-command>, ["= 0.1.4"])
+      s.add_dependency(%q<optparse-command>, ["= 0.1.5"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -87,7 +88,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<treevisitor>, ["= 0.2.1"])
-    s.add_dependency(%q<optparse-command>, ["= 0.1.4"])
+    s.add_dependency(%q<optparse-command>, ["= 0.1.5"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/dircat/cli/cli_dircat.rb

@@ -1,29 +1,28 @@
 # -*- coding: utf-8 -*-
-class CliDirCat < OptParseCommand::CliMain
+module DirCat
 
-  def self.command
-    "dircat"
-  end
+  class CliDirCat < OptParseCommand::CliMain
 
-  def self.description
-    "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.command
+      "dircat"
+    end
 
-  def self.version
-    DirCat::version
-  end
+    def self.description
+      "Simple set of command to build catalogs of files.\n" +
+          "Code https://github.com/tokiro/dircat. Feedback to tokiro.oyama@gmail.com"
+    end
 
-  def defaults
-    OpenStruct.new(
-        :verbose => true,
-        :force   => false
-    )
-  end
+    def self.version
+      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

@@ -1,95 +1,97 @@
 # -*- coding: utf-8 -*-
 
+module DirCat
 #
 # Build a catalogue starting from a directory
 #
-class CommandBuild < OptParseCommand::CliCommand
+  class CommandBuild < OptParseCommand::CliCommand
 
-  def self.command
-    "build"
-  end
-
-  def self.description
-    "Build a catalogue starting from a directory"
-  end
+    def self.command
+      "build"
+    end
 
-  def self.usage
-    "Usage: dircat build [options]"
-  end
+    def self.description
+      "Build a catalogue starting from a directory"
+    end
 
-  def defaults(options)
-    options.force = false
-  end
+    def self.usage
+      "Usage: dircat build [options]"
+    end
 
-  def option_parser(options)
-    parser = super(options)
-    parser.on("-f", "--force", "force write on existent file") do |v|
-      options.force = true
+    def defaults(options)
+      options.force = false
     end
 
-    parser.on("-o [FILE]", "--output [FILE]", String) do |v|
-      if options.output
-        puts "only one file of output can be used"
-        options.exit = true
+    def option_parser(options)
+      parser = super(options)
+      parser.on("-f", "--force", "force write on existent file") do |v|
+        options.force = true
       end
-      options.output = v
-    end
 
-    parser
-  end
+      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
 
-  def exec(main, options, rest)
-    if rest.length < 1
-      $stderr.puts "directory (from which build catalog) is missing"
-      $stderr.puts "-h to print help"
-      return false
+      parser
     end
 
-    dirname  = rest[0]
-    dirname  = File.expand_path(dirname)
-    cat_opts = {}
+    def exec(main, options, rest)
+      if rest.length < 1
+        $stderr.puts "directory (from which build catalog) is missing"
+        $stderr.puts "-h to print help"
+        return false
+      end
+
+      dirname  = rest[0]
+      dirname  = File.expand_path(dirname)
+      cat_opts = {}
 
-    if not FileTest.directory?(dirname)
-      $stderr.puts "'#{dirname}' not exists or is not a directory"
-      return 0
-    end
+      if not FileTest.directory?(dirname)
+        $stderr.puts "'#{dirname}' not exists or is not a directory"
+        return 0
+      end
 
-    #
-    # option verbose
-    #
+      #
+      # option verbose
+      #
 
-    if options.verbose
-      cat_opts[:verbose_level] = 1
-    end
+      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
-      $stderr.puts "catalog '#{filename}' exists use --force or -f to overwrite"
-      return 0
-    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
+        $stderr.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.save_to(output)
+      output     = File.open(filename, "w")
+      start_time = Time.now
+      s          = Cat.from_dir(dirname)
+      end_time   = Time.now
+      s.save_to(output)
 
-    if output != $stdout
-      output.close
+      if output != $stdout
+        output.close
+      end
+      $stderr.puts s.report
+      $stderr.puts "elapsed: #{end_time - start_time}"
+      $stderr.puts "written to #{filename}" if output != $stdout
+
+      true
     end
-    $stderr.puts s.report
-    $stderr.puts "elapsed: #{end_time - start_time}"
-    $stderr.puts "written to #{filename}" if output != $stdout
 
-    true
   end
-
-end
+end

data/lib/dircat/cli/command_diff.rb

@@ -1,85 +1,86 @@
 # -*- coding: utf-8 -*-
+module DirCat
+  class CommandDiff < OptParseCommand::CliCommand
 
-class CommandDiff < OptParseCommand::CliCommand
-
-  def self.command
-    "diff"
-  end
+    def self.command
+      "diff"
+    end
 
-  def self.description
-    "Show diff from two catalogs"
-  end
+    def self.description
+      "Show diff from two catalogs"
+    end
 
-  def self.usage
-    <<-EOS
+    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 option_parser(options)
-    parser = super(options)
-    parser.on("-f FORMAT", "--fmt FORMAT", "format (simple, ruby)") do |v|
-      options.format = v
+      EOS
     end
-    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
+    def option_parser(options)
+      parser = super(options)
+      parser.on("-f FORMAT", "--fmt FORMAT", "format (simple, ruby)") do |v|
+        options.format = v
+      end
+      parser
     end
 
-    cat_filename1 = rest[0]
-    cat_filename2 = rest[1]
+    def exec(main, options, rest)
+      if rest.length < 2
+        puts "you must provide two args (catalogs or directory)"
+        puts "-h to print help"
+        return false
+      end
 
-    #
-    # 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
+      cat_filename1 = rest[0]
+      cat_filename2 = rest[1]
 
-    #
-    # 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
+      #
+      # 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
 
-    s3 = s1 - s2
+      #
+      # 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
+
+      s3 = s1 - s2
 
-    if s3.empty?
-      puts "no difference (first catalog contains all file of second catalog)"
-    else
-      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
+      if s3.empty?
+        puts "no difference (first catalog contains all file of second catalog)"
+      else
+        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
-    true
-  end
 
-end
+  end
+end

data/lib/dircat/cli/command_query.rb

@@ -1,50 +1,56 @@
 # -*- coding: utf-8 -*-
+module DirCat
+  class CommandQuery < OptParseCommand::CliCommand
 
-class CommandQuery < OptParseCommand::CliCommand
-
-  def self.command
-    "query"
-  end
-
-  def self.description
-    "show info about dircat catalogs"
-  end
-
-  def self.usage
-    "Usage: query [options] <catalog> [<method>]"
-  end
-
-  def exec(main, options, rest)
-    if rest.length < 1
-      puts "missing catalog!"
-      puts "-h to print help"
-      return 0
+    def self.command
+      "query"
     end
 
-    cat_opts     = {}
-    cat_filename = rest[0]
-    if !File.exists?(cat_filename) or File.directory?(cat_filename)
-      puts "first args must be a catalogue"
-      return 1
+    def self.description
+      "show info about dircat catalogs"
     end
 
-    if rest.length > 1
-      command = rest[1]
-    else
-      command = "report"
+    def self.usage
+      "Usage: query [options] <catalog> [<method>]"
     end
 
-    #
-    # option verbose
-    #
-    if options.verbose
-      cat_opts[:verbose_level] = 1
+    def exec(main, options, rest)
+      if rest.length < 1
+        puts "missing catalog!"
+        puts "-h to print help"
+        return 0
+      end
+
+      cat_opts     = {}
+      cat_filename = rest[0]
+      if !File.exists?(cat_filename) or File.directory?(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)
+
+      if s.respond_to? command.to_sym
+        puts s.send(command.to_sym)
+        true
+      else
+        puts "unknow methods '#{command}'"
+        false
+      end
     end
 
-    s = Cat.from_file(cat_filename, cat_opts)
-
-    puts s.send(command.to_sym)
-    true
   end
-
-end
+end

data/lib/dircat.rb

@@ -12,7 +12,7 @@ require 'pp'
 #
 # rubygems
 #
-gem "optparse-command", "0.1.4"
+gem "optparse-command", "0.1.5"
 require 'optparse-command'
 
 gem "treevisitor", "0.2.1"

data/spec/dircat/cli/cli_dircat_spec.rb

@@ -12,18 +12,12 @@ describe CliDirCat do
 
   context "common args" do
     it "should accept -h (-help) option" do
-      out = with_stdout_captured do
-        args = %w{-h}
-        CliDirCat.new.parse_and_execute(args)
-      end
+      out = capture_out { CliDirCat.run(%w{-h}) }.out
       out.should match /Usage:/
     end
 
     it "should accept --version option" do
-      out = with_stdout_captured do
-        args = %w{--version}
-        CliDirCat.new.parse_and_execute(args)
-      end
+      out = capture_out { CliDirCat.run(%w{--version}) }.out
       out.should match /#{DirCat::version}/
     end
   end

data/spec/dircat/cli/command_build_spec.rb

@@ -11,18 +11,12 @@ describe CommandBuild do
   end
 
   it "should accept -h (-help) option" do
-    out = with_stdout_captured do
-      args = %w{build -h}
-      CliDirCat.new.parse_and_execute(args)
-    end
+    out = capture_out { CliDirCat.run(%w{build -h}) }.out
     out.should match /Usage:/
   end
 
   it "should not accept more then -o options" do
-    out = with_stdout_captured do
-      args = "build -f -o filename -o filename1"
-      CliDirCat.new.parse_and_execute(args.split)
-    end
+    out = capture_out { CliDirCat.run("build -f -o filename -o filename1".split) }.out
     out.should match /only one file/
   end
 
@@ -31,10 +25,7 @@ describe CommandBuild do
     expect_filename = File.join(@certified_output_dirname, "dircat1.yaml")
     result_filename = File.join(@tmp_output_dirname, "dircat1.yaml")
 
-    capture_out do
-      args = "build -f -o #{result_filename} #{@dir1_dirname}"
-      CliDirCat.new.parse_and_execute(args.split)
-    end
+    capture_out { CliDirCat.run("build -f -o #{result_filename} #{@dir1_dirname}".split) }
 
     cat_expect      = Cat.from_file(expect_filename)
     cat_result      = Cat.from_file(result_filename)

data/spec/dircat/cli/command_diff_spec.rb

@@ -4,10 +4,7 @@ require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_he
 describe CommandDiff do
 
   it "should accept -h (help) option" do
-    out = with_stdout_captured do
-      args = %w{diff -h}
-      CliDirCat.new.parse_and_execute(args)
-    end
+    out = capture_out { CliDirCat.run %w{diff -h} }.out
     out.should match /Usage:/
   end
 

data/spec/dircat/cli/command_query_spec.rb

@@ -8,19 +8,13 @@ describe CommandQuery do
   end
 
   it "should accept -h (help) option" do
-    out = with_stdout_captured do
-      args = %w{query -h}
-      CliDirCat.new.parse_and_execute(args)
-    end
+    out = capture_out { CliDirCat.run %w{query -h} }.out
     out.should match /Usage:/
   end
 
   it "should show catalogs info" do
     cat_filename = File.join( @certified_output_dirname, "dircat1.yaml" )
-    out = with_stdout_captured do
-      args = "query #{cat_filename}"
-      CliDirCat.new.parse_and_execute(args.split)
-    end
+    out = capture_out { CliDirCat.run "query #{cat_filename}".split }.out
     out.should match /file: 2/
     out.should match /Bytes: 4/
   end

data/spec/spec_helper.rb

@@ -21,14 +21,14 @@ def capture_out
   OpenStruct.new(:out => out.string, :err => err.string)
 end
 
-def with_stdout_captured
-  old_stdout = $stdout
-  out        = StringIO.new
-  $stdout    = out
-  begin
-    yield
-  ensure
-    $stdout = old_stdout
-  end
-  out.string
-end
+#def with_stdout_captured
+#  old_stdout = $stdout
+#  out        = StringIO.new
+#  $stdout    = out
+#  begin
+#    yield
+#  ensure
+#    $stdout = old_stdout
+#  end
+#  out.string
+#end

data/tasks/jeweler.rake

@@ -25,7 +25,7 @@ begin
     #
     # files
     #
-    gem.files  = %w{LICENSE.txt README.md Rakefile VERSION.yml dircat.gemspec}
+    gem.files  = %w{LICENSE.txt README.md Rakefile VERSION.yml dircat.gemspec .gemtest}
     gem.files.concat Dir['lib/**/*.rb']
     gem.files.concat Dir['examples/*.rb']
     gem.files.concat Dir['tasks/*.rake']

metadata

@@ -2,7 +2,7 @@
 name: dircat
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Tokiro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: dircat
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -100,6 +100,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files: 
+- .gemtest
 - LICENSE.txt
 - README.md
 - Rakefile