dircat 0.1.4 → 0.1.5

data/spec/dircat/cli/cli_dircat_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+
+describe CliDirCat do
+
+  before do
+    @dir1_dirname             = File.join(TEST_DIR, "dir1")
+    @dir2_dirname             = File.join(TEST_DIR, "dir2")
+    @certified_output_dirname = File.join(TEST_DIR, "certified_output")
+    @tmp_output_dirname       = File.join(TEST_DIR, "tmp")
+  end
+
+  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.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.should match /#{DirCat::version}/
+    end
+  end
+
+end

data/spec/dircat/cli/command_build_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+
+describe CommandBuild do
+
+  before do
+    @dir1_dirname             = File.join(TEST_DIR, "dir1")
+    @dir2_dirname             = File.join(TEST_DIR, "dir2")
+    @certified_output_dirname = File.join(TEST_DIR, "certified_output")
+    @tmp_output_dirname       = File.join(TEST_DIR, "tmp")
+  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.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.should match /only one file/
+  end
+
+
+  it "should build a catalog from a directory" do
+    expect_filename = File.join(@certified_output_dirname, "dircat1.yaml")
+    result_filename = File.join(@tmp_output_dirname, "dircat1.yaml")
+
+    out             = with_stdout_captured do
+      args = "build -f -o #{result_filename} #{@dir1_dirname}"
+      CliDirCat.new.parse_and_execute(args.split)
+    end
+
+    cat_expect      = Cat.from_file(expect_filename)
+    cat_result      = Cat.from_file(result_filename)
+
+    (cat_result - cat_result).size.should == 0
+
+    (cat_result - cat_expect).size.should == 0
+    (cat_expect - cat_result).size.should == 0
+
+    FileUtils.rm(result_filename)
+  end
+
+end

data/spec/dircat/cli/command_diff_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_helper") )
+
+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.should match /Usage:/
+  end
+
+end

data/spec/dircat/cli/command_query_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_helper") )
+
+describe CommandQuery do
+
+  before do
+    @certified_output_dirname = File.join( TEST_DIR, "certified_output" )
+  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.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.should match /file: 2/
+    out.should match /Bytes: 4/
+  end
+end

data/spec/dircat/md5_spec.rb

@@ -6,7 +6,7 @@ describe "MD5" do
 
   it "test_simple_md5" do
     file_name = File.join( TEST_FILE )
-    MD5.file( file_name ).to_s.should  ==  "8777d9d35da17496e21dcc8a4f9f8191"
+    MD5.file( file_name ).to_s.should  ==  "eb29e47aba9693862895688422171221"
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Tokiro
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +01:00
-default_executable: 
+date: 2011-01-16 00:00:00 +01:00
+default_executable: dircat
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: treevisitor
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,24 +27,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: optparse-command
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,7 +59,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,7 +72,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,12 +84,36 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: "\n      command line utilites to manage catalogs of directory\n    "
 email: tokiro.oyama@gmail.com
 executables: 
-- dircat-build
-- dircat-diff
-- dircat-query
+- dircat
 extensions: []
 
 extra_rdoc_files: 
@@ -102,17 +128,19 @@ files:
 - 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
 - lib/dircat/report.rb
 - 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
@@ -126,9 +154,7 @@ files:
 - spec/fixtures/dir3/subdir/file1.txt
 - spec/fixtures/tmp/dummy.txt
 - spec/spec_helper.rb
-- bin/dircat-build
-- bin/dircat-diff
-- bin/dircat-query
+- bin/dircat
 has_rdoc: true
 homepage: http://github.com/tokiro/dircat
 licenses: []
@@ -163,9 +189,10 @@ specification_version: 3
 summary: command line utilites to manage catalogs of directory
 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

data/bin/dircat-build

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift  File.join( File.dirname( __FILE__), "..", "lib"  )
-
-require 'dircat'
-include DirCat
-exit DirCatBuild.run

data/bin/dircat-diff

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift  File.join( File.dirname( __FILE__), "..", "lib"  )
-
-require 'dircat'
-include DirCat
-exit DirCatDiff.run

data/bin/dircat-query

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift(File.join( File.dirname( __FILE__), "..", "lib"  ))
-
-require 'dircat'
-include DirCat
-exit DirCatQuery.run

data/lib/dircat/cli/dircat_build.rb

@@ -1,114 +0,0 @@
-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 << "Usage: dircat-build [options]\n"
-      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("--version", "show the dircat version") do
-        puts "dircat version #{DirCat::version}"
-        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/dircat_diff.rb

@@ -1,85 +0,0 @@
-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("--version", "show the dircat version") do
-        puts "dircat version #{DirCat::version}"
-        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/dircat_query.rb

@@ -1,69 +0,0 @@
-module DirCat
-
-  class DirCatQuery
-
-    def self.run
-      return self.new.parse_args( ARGV)
-    end
-
-    def parse_args( args )
-      options = {}
-      opts = OptionParser.new
-      opts.banner =
-        "Usage: dircat-query [options] <filedircat> [<command>]\n" +
-        "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/spec/dircat/cli/dircat_build_spec.rb

@@ -1,59 +0,0 @@
-require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_helper") )
-
-describe DirCatBuild do
-
-  before do
-    @testdata_dirname         = TEST_DIR
-    @dir1_dirname             = File.join( @testdata_dirname, "dir1" )
-    @dir2_dirname             = File.join( @testdata_dirname, "dir2" )
-    @certified_output_dirname = File.join( @testdata_dirname, "certified_output" )
-    @tmp_output_dirname       = File.join( @testdata_dirname, "tmp" )
-  end
-
-  it "should accept -h (-help) option" do
-    out = with_stdout_captured do
-      args = %w{-h}
-      DirCatBuild.new.parse_args(args)
-    end
-    out.should match /Usage:/
-  end
-
-  it "should accept --version option" do
-    out = with_stdout_captured do
-      args = %w{--version}
-      DirCatBuild.new.parse_args(args)
-    end
-    out.should match /#{DirCat::version}/
-  end
-
-  it "should not accept more then -o options" do
-    out = with_stdout_captured do
-      args = "-f -o filename -o filename1"
-      DirCatBuild.new.parse_args( args.split )
-    end
-    out.should match /only one file/
-  end
-
-
-  it "should build a catalog from a directory" do
-    expect_filename = File.join( @certified_output_dirname, "dircat1.yaml" )
-    result_filename = File.join( @tmp_output_dirname,       "dircat1.yaml")
-
-    out = with_stdout_captured do
-      args = "-f -o #{result_filename} #{@dir1_dirname}"
-      DirCatBuild.new.parse_args( args.split )
-    end
-    # out.should match /Usage:/
-
-    cat_expect = Cat.from_file( expect_filename )
-    cat_result = Cat.from_file( result_filename )
-
-    (cat_result - cat_result).size.should == 0
-
-    (cat_result - cat_expect).size.should == 0
-    (cat_expect - cat_result).size.should == 0
-
-    FileUtils.rm(result_filename)
-  end
-
-end

data/spec/dircat/cli/dircat_query_diff_spec.rb

@@ -1,26 +0,0 @@
-require File.expand_path( File.join(File.dirname(__FILE__), "..", "..", "spec_helper") )
-
-describe DirCatDiff do
-
-  before do
-    @testdata_dirname         = TEST_DIR
-    @certified_output_dirname = File.join( @testdata_dirname, "certified_output" )
-  end
-
-  it "should accept -h (help) option" do
-    out = with_stdout_captured do
-      args = %w{-h}
-      DirCatDiff.new.parse_args(args)
-    end
-    out.should match /Usage:/
-  end
-
-  it "should accept --version option" do
-    out = with_stdout_captured do
-      args = %w{--version}
-      DirCatDiff.new.parse_args(args)
-    end
-    out.should match /#{DirCat::version}/
-  end
-
-end