dircat 0.1.7 → 0.1.8

data/VERSION.yml

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

data/dircat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dircat}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tokiro"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-08}
   s.default_executable = %q{dircat}
   s.description = %q{
       command line utilites to manage catalogs of directory
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tokiro/dircat}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{command line utilites to manage catalogs of directory}
   s.test_files = [
     "spec/dircat/cat_spec.rb",
@@ -66,20 +66,19 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<treevisitor>, ["= 0.2.0"])
-      s.add_runtime_dependency(%q<optparse-command>, ["= 0.1.1"])
+      s.add_runtime_dependency(%q<treevisitor>, ["= 0.2.1"])
+      s.add_runtime_dependency(%q<optparse-command>, ["= 0.1.4"])
       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.2.0"])
-      s.add_dependency(%q<optparse-command>, ["= 0.1.1"])
+      s.add_dependency(%q<treevisitor>, ["= 0.2.1"])
+      s.add_dependency(%q<optparse-command>, ["= 0.1.4"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -87,8 +86,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<treevisitor>, ["= 0.2.0"])
-    s.add_dependency(%q<optparse-command>, ["= 0.1.1"])
+    s.add_dependency(%q<treevisitor>, ["= 0.2.1"])
+    s.add_dependency(%q<optparse-command>, ["= 0.1.4"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/dircat/cli/command_build.rb

@@ -38,7 +38,7 @@ class CommandBuild < OptParseCommand::CliCommand
     parser
   end
 
-  def exec(options, rest)
+  def exec(main, options, rest)
     if rest.length < 1
       $stderr.puts "directory (from which build catalog) is missing"
       $stderr.puts "-h to print help"

data/lib/dircat/cli/command_query.rb

@@ -14,7 +14,7 @@ class CommandQuery < OptParseCommand::CliCommand
     "Usage: query [options] <catalog> [<method>]"
   end
 
-  def exec(options, rest)
+  def exec(main, options, rest)
     if rest.length < 1
       puts "missing catalog!"
       puts "-h to print help"

data/lib/dircat.rb

@@ -12,10 +12,10 @@ require 'pp'
 #
 # rubygems
 #
-gem "optparse-command", "0.1.1"
+gem "optparse-command", "0.1.4"
 require 'optparse-command'
 
-gem "treevisitor", "0.2.0"
+gem "treevisitor", "0.2.1"
 require 'treevisitor'
 
 #

data/spec/dircat/cli/command_build_spec.rb

@@ -31,7 +31,7 @@ describe CommandBuild do
     expect_filename = File.join(@certified_output_dirname, "dircat1.yaml")
     result_filename = File.join(@tmp_output_dirname, "dircat1.yaml")
 
-    out             = with_stdout_captured do
+    capture_out do
       args = "build -f -o #{result_filename} #{@dir1_dirname}"
       CliDirCat.new.parse_and_execute(args.split)
     end

data/spec/spec_helper.rb

@@ -7,12 +7,24 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'dircat'
 include DirCat
 
-TEST_DIR = File.expand_path( File.join( File.dirname(__FILE__), "fixtures" ) )
+TEST_DIR = File.expand_path(File.join(File.dirname(__FILE__), "fixtures"))
+
+def capture_out
+  old_stdout, old_stderr = $stdout, $stderr
+  out, err = StringIO.new, StringIO.new
+  $stdout, $stderr = out, err
+  begin
+    yield
+  ensure
+    $stdout, $stderr = old_stdout, old_stderr
+  end
+  OpenStruct.new(:out => out.string, :err => err.string)
+end
 
 def with_stdout_captured
   old_stdout = $stdout
-  out = StringIO.new
-  $stdout = out
+  out        = StringIO.new
+  $stdout    = out
   begin
     yield
   ensure

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dircat
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
+  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors: 
 - Tokiro
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: dircat
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,11 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -39,11 +31,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -54,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -67,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -80,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -93,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -106,8 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -173,21 +151,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: command line utilites to manage catalogs of directory