dircat 0.1.10 → 0.1.11

data/dircat.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   # dependencies
   #
   gem.add_runtime_dependency(%q<treevisitor>, ["= 0.2.2"])
-  gem.add_runtime_dependency(%q<optparse-command>, ["= 0.1.5"])
+  gem.add_runtime_dependency(%q<optparse-command>, ["= 0.1.6"])
   gem.add_development_dependency(%q<rake>, [">= 0"])
   gem.add_development_dependency(%q<yard>, [">= 0"])
   gem.add_development_dependency(%q<bundler>, [">= 0"])
@@ -54,4 +54,3 @@ Gem::Specification.new do |gem|
   # s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
 end
-

data/lib/dircat/cli/cli_dircat.rb

@@ -16,7 +16,7 @@ module DirCat
       DirCat::VERSION
     end
 
-    def defaults
+    def defaults(options)
       OpenStruct.new(
           :verbose => true,
           :force   => false

data/lib/dircat/cli/command_build.rb

@@ -4,7 +4,9 @@ module DirCat
 #
 # Build a catalogue starting from a directory
 #
-  class CommandBuild < OptParseCommand::CliCommand
+  class CommandBuild < OptParseCommand::Command
+
+    CliDirCat.register_command(self)
 
     def self.command
       "build"
@@ -94,4 +96,4 @@ module DirCat
     end
 
   end
-end
+end

data/lib/dircat/cli/command_diff.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 module DirCat
-  class CommandDiff < OptParseCommand::CliCommand
+  class CommandDiff < OptParseCommand::Command
+
+    CliDirCat.register_command(self)
 
     def self.command
       "diff"
@@ -83,4 +85,4 @@ and then print the difference with the format specified on output
     end
 
   end
-end
+end

data/lib/dircat/cli/command_query.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 module DirCat
-  class CommandQuery < OptParseCommand::CliCommand
+  class CommandQuery < OptParseCommand::Command
+
+    CliDirCat.register_command(self)
 
     def self.command
       "query"
@@ -21,7 +23,7 @@ module DirCat
         return 0
       end
 
-      cat_opts     = {}
+      cat_opts = {}
       cat_filename = rest[0]
       if !File.exists?(cat_filename) or File.directory?(cat_filename)
         puts "first args must be a catalogue"
@@ -53,4 +55,4 @@ module DirCat
     end
 
   end
-end
+end

data/lib/dircat/version.rb

@@ -1,11 +1,4 @@
+# -*- coding: utf-8 -*-
 module DirCat
-  VERSION="0.1.10"
-#  def self.version
-#    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
+  VERSION="0.1.11"
 end

data/lib/dircat.rb

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

data/spec/dircat/cat_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.expand_path( File.join(File.dirname(__FILE__), "..", "spec_helper") )
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 
 #
 # dir1 contains 2 files
@@ -13,61 +13,65 @@ describe Cat do
 
   before do
     @data_dir = TEST_DIR
-    @tmp_dir  = File.join( @data_dir, "tmp" )
   end
 
   it "should build catalog from dir1" do
-    cat1 = Cat.from_dir( File.join(@data_dir, "dir1") )
+    cat1 = Cat.from_dir(File.join(@data_dir, "dir1"))
     cat1.size.should == 2
     cat1.bytes.size.should == 8
   end
 
   it "should load catalog from dir2" do
-    cat2 = Cat.from_dir( File.join(@data_dir, "dir2") )
+    cat2 = Cat.from_dir(File.join(@data_dir, "dir2"))
     cat2.size.should == 3
     cat2.bytes.should == 6
   end
 
-  it "(dir1 - dir2) the difference from dir1 and dir2 is empty" do
-    cat1 = Cat.from_dir( File.join(@data_dir, "dir1") )
-    cat2 = Cat.from_dir( File.join(@data_dir, "dir2") )
-    # dir1 contiene tutti i file di dir2
+  it "(dir1 - dir2): the difference from dir1 and dir2 is empty" do
+    cat1 = Cat.from_dir(File.join(@data_dir, "dir1"))
+    cat2 = Cat.from_dir(File.join(@data_dir, "dir2"))
+    # dir1 contains all the files in dir2
     cat_diff = cat1 - cat2
     cat_diff.size.should == 0
   end
 
-  it "(dir2 - dir1) the difference from dir2 and dir1 is a file" do
-    cat1 = Cat.from_dir( File.join(@data_dir, "dir1") )
-    cat2 = Cat.from_dir( File.join(@data_dir, "dir2") )
+  it "(dir2 - dir1): the difference from dir2 and dir1 is a file" do
+    cat1 = Cat.from_dir(File.join(@data_dir, "dir1"))
+    cat2 = Cat.from_dir(File.join(@data_dir, "dir2"))
 
-    # dir2 contiene un file in piu' di dir1
+    # dir2 contains one file more than dir1
     cat_diff = cat2 - cat1
     cat_diff.size.should == 1
   end
 
-  it "saving to an inexistents file shoud raise an exception" do
-    cat1  = Cat.from_dir( File.join(@data_dir, "dir1") )
-
-    not_existent_file = File.join(@tmp_dir, "not_existent", "dircat1.yaml")
-    lambda {cat1.save_to( not_existent_file )}.should raise_exception(DirCatException)
-  end
-
-  it "saving to a file" do
-    cat1  = Cat.from_dir( File.join(@data_dir, "dir1") )
-    tmp_file = File.join(@tmp_dir, "dircat1.yaml")
-    cat1.save_to( tmp_file )
-
-    dircat1_bis = Cat.from_file( tmp_file )
-    (cat1 - dircat1_bis).size.should == 0
-    (dircat1_bis - cat1).size.should == 0
-
-    FileUtils.rm( tmp_file )
-  end
-
 
   it "should detect duplicates" do
-    cat1  = Cat.from_dir( File.join(@data_dir, "dir3") )
+    cat1 = Cat.from_dir(File.join(@data_dir, "dir3"))
     cat1.duplicates.should have(1).files
   end
 
+  context "save to a file" do
+    before do
+      @tmp_file = File.join(Dir.tmpdir, "dircat1.yaml")
+    end
+
+    after do
+      FileUtils.rm(@tmp_file)   if File.exist? @tmp_file
+    end
+
+    it "saving to a file" do
+      cat1 = Cat.from_dir(File.join(@data_dir, "dir1"))
+      cat1.save_to(@tmp_file)
+
+      dircat1_bis = Cat.from_file(@tmp_file)
+      (cat1 - dircat1_bis).size.should == 0
+      (dircat1_bis - cat1).size.should == 0
+    end
+
+    it "saving to an non-existent file should raise an exception" do
+      cat1 = Cat.from_dir(File.join(@data_dir, "dir1"))
+      not_existent_file = File.join(Dir.tmpdir, "not_existent", "dircat1.yaml")
+      lambda { cat1.save_to(not_existent_file) }.should raise_exception(DirCatException)
+    end
+  end
 end

data/spec/dircat/cli/command_build_spec.rb

@@ -4,10 +4,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 describe CommandBuild do
 
   before do
-    @dir1_dirname             = File.join(TEST_DIR, "dir1")
-    @dir2_dirname             = File.join(TEST_DIR, "dir2")
+    @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")
+    @tmp_output_dirname = Dir.tmpdir
   end
 
   it "should accept -h (-help) option" do
@@ -27,8 +27,8 @@ describe CommandBuild do
 
     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)
+    cat_expect = Cat.from_file(expect_filename)
+    cat_result = Cat.from_file(result_filename)
 
     (cat_result - cat_result).size.should == 0
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-
 require "stringio"
 require 'ostruct'
+require 'tmpdir'
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'dircat'
@@ -20,15 +20,3 @@ def capture_out
   end
   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

metadata

@@ -2,7 +2,7 @@
 name: dircat
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Tokiro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,6 @@ files:
 - lib/dircat/version.rb
 - lib/dircat.rb
 - examples/example.rb
-- tasks/jeweler.rake
 - tasks/rspec.rake
 - tasks/yard.rake
 - spec/dircat/cat_spec.rb
@@ -126,7 +125,6 @@ files:
 - spec/fixtures/dir2/subdir/file3.txt
 - spec/fixtures/dir3/file1.txt
 - spec/fixtures/dir3/subdir/file1.txt
-- spec/fixtures/tmp/dummy.txt
 has_rdoc: true
 homepage: http://github.com/tokiro/dircat
 licenses: []
@@ -173,4 +171,3 @@ test_files:
 - spec/fixtures/dir2/subdir/file3.txt
 - spec/fixtures/dir3/file1.txt
 - spec/fixtures/dir3/subdir/file1.txt
-- spec/fixtures/tmp/dummy.txt

data/spec/fixtures/tmp/dummy.txt

@@ -1 +0,0 @@
-This file exists so git create this directory

data/tasks/jeweler.rake

@@ -1,44 +0,0 @@
-## -*- 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 dircat.gemspec .gemtest}
-#    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