smallcage 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.2 2012-03-23
+
+* add --quiet / -q option.
+* add --bell option to auto command.
+* change server command default port number from 80 to 8080.
+* fix exit status.
+
 == 0.2.1 2009-11-24
 
 * Rakefile can be put in any directory.

data/README.rdoc

@@ -11,6 +11,8 @@ With SmallCage, you can
 * manage your website with a source code management system like a Git, Subversion, and CVS.
 * customize the rules of convert with Ruby.
 
+{Please visit our wiki for more detailed discussion.}[http://wiki.github.com/bluemark/smallcage]
+
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/smallcage/application.rb

@@ -31,79 +31,171 @@ class SmallCage::Application
     self.new.execute
   end
 
-  def execute
+  def execute(argv = ARGV)
+    options = parse_options(argv)
+    SmallCage::Runner.run(options)
+  end
+
+  def parse_options(argv)
+    @argv = argv
     @options = {}
+
     @parser = create_main_parser
     parse_main_options
+
     @command_parsers = create_command_parsers
     parse_command
     parse_command_options
-    SmallCage::Runner.run(@options)
+
+    @options
   end
 
   def create_main_parser
     parser = OptionParser.new
     parser.banner =<<BANNER
-Usage: #{File.basename($0)} <subcommand> [options]
+Usage: #{File.basename($0)} [options] <subcommand> [subcommand-options]
 #{VERSION_NOTE}
 Subcommands are:
     update [path]                    Build smc contents.
     clean  [path]                    Remove files generated from *.smc source.
     server [path] [port]             Start HTTP server.
-    auto   [path] [port]             Start auto update server.
+    auto   [path] [port] [--bell]    Start auto update server.
     import [name|uri]                Import project.
     export [path] [outputpath]       Export project.
     uri    [path]                    Print URIs.
     manifest [path]                  Generate Manifest.html file.
 
-Options are:
 BANNER
+
+    parser.separator "Options are:"
+    parser.on("-h", "--help", "Show this help message.") do
+      puts parser
+      exit(true)
+    end
+    parser.on("-v", "--version", "Show version info.") do
+      puts VERSION_NOTE
+      exit(true)
+    end
+    
+    @options[:quiet] = false
+    parser.on("-q", "--quiet", "Do not print message.") do |boolean|
+      @options[:quiet] = boolean
+    end
+
     return parser
   end
   private :create_main_parser
 
   def parse_main_options
-    @parser.separator ""
-    @parser.on("-h", "--help", "Show this help message.") do
-      puts @parser
-      exit
-    end
-    @parser.on("-v", "--version", "Show version info.") do
-      puts VERSION_NOTE
-      exit
-    end
-    @parser.order!(ARGV)
+    @parser.order!(@argv)
+  rescue OptionParser::InvalidOption => e
+    $stderr.puts e.message
+    exit(false)
   end
   private :parse_main_options
 
   def create_command_parsers
-    parsers = Hash.new do |h,k|
-      STDERR << "no such subcommand: #{k}\n"
-      exit 1
-    end
-
     banners = {
-      :update => "smc update [path]\n",
-      :clean  => "smc clean [path]\n",
-      :server => "smc server [path] [port]\n",
-      :auto   => "smc auto [path] [port]\n",
-      :import => "smc import [name|uri]",
-      :export => "smc export [path] [outputpath]",
-      :help   => "smc help [command]\n",
-      :uri    => "smc uri [path]\n",
+      :update => <<EOT,
+smc update [path] [options]
+    path : target directory. (default:'.')
+EOT
+
+      :clean  => <<EOT,
+smc clean [path] [options]
+    path : target directory (default:'.')
+EOT
+
+      :server => <<EOT,
+smc server [path] [port] [options]
+    path : target directory (default:'.')
+    port : HTTP server port number (default:8080)
+EOT
+
+      :auto   => <<EOT,
+smc auto [path] [port] [options]
+    path : target directory (default:'.')
+    port : HTTP server port number (default:don't launch the server)
+EOT
+
+      :import => <<EOT,
+smc import [name|uri] [options]
+EOT
+
+      :export => <<EOT,
+smc export [path] [outputpath] [options]
+EOT
+
+      :help   => <<EOT,
+smc help [command]
+EOT
+
+      :uri    => <<EOT,
+smc uri [path] [options]
+EOT
+
+      :manifest => <<EOT,
+smc manifest [path] [options]
+EOT
+
     }
-  
-    banners.each do |k,v|
-      parsers[k] = OptionParser.new do |cp|
-        cp.banner = "Usage: " + v
-      end
+
+    parsers = {}
+    banners.each do |command, banner|
+      parsers[command] = create_default_command_parser(banner)
+    end
+
+    parsers[:auto].on("--bell", "Ring bell after publishing files.") do |boolean|
+      @options[:bell] = boolean
     end
 
     return parsers
   end
   private :create_command_parsers
 
+  def create_default_command_parser(banner)
+    parser = OptionParser.new
+    parser.banner = "Usage: " + banner
+    parser.separator "Options are:"
+
+    # these options can place both before and after the subcommand.
+    parser.on("-h", "--help", "Show this help message.") do
+      puts parser
+      exit(true)
+    end
+    parser.on("-v", "--version", "Show version info.") do
+      puts VERSION_NOTE
+      exit(true)
+    end
+    parser.on("-q", "--quiet", "Do not print message.") do |boolean|
+      @options[:quiet] = boolean
+    end
+
+    return parser
+  end
+  private :create_default_command_parser
+
   def parse_command
+    @options[:command] = get_command
+
+    if @options[:command].nil?
+      puts @parser
+      exit(false)
+    end
+    parser = @command_parsers[@options[:command]]
+    if parser.nil?
+      $stderr.puts "no such subcommand: #{@options[:command]}"
+      exit(false)
+    end
+    parser.parse!(@argv)
+  rescue OptionParser::InvalidOption => e
+    $stderr.puts e.message
+    exit(false)
+  end
+  private :parse_command
+
+
+  def get_command
     commands = Hash.new {|h,k| k}
     commands.merge!({
       :up => :update,
@@ -111,59 +203,65 @@ BANNER
       :au => :auto,
     })
 
-    unless ARGV.empty?
-      @options[:command] = commands[ARGV.shift.to_sym]
-      @command_parsers[@options[:command]].parse!(ARGV)
-    end
-
-    if @options[:command].nil?
-      puts @parser
-      exit
-    end
+    command_name = @argv.shift.to_s.strip
+    return nil if command_name.empty?
+    return commands[command_name.to_sym]
   end
-  private :parse_command
+  private :get_command
 
   def parse_command_options
     if @options[:command] == :help
-      subcmd = ARGV.shift
+      subcmd = @argv.shift
       if subcmd.nil?
         puts @parser
       else
         puts @command_parsers[subcmd.to_sym]
       end
-      exit
+      exit(true)
     elsif @options[:command] == :update
-      @options[:path] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
     elsif @options[:command] == :server
-      @options[:path] = ARGV.shift
-      @options[:port] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
-      @options[:port] ||= 80
+      @options[:port] = get_port_number(8080)
     elsif @options[:command] == :auto
-      @options[:path] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
-      @options[:port] = ARGV.shift
+      @options[:port] = get_port_number(nil)
+      @options[:bell] ||= false
     elsif @options[:command] == :import
-      @options[:from] = ARGV.shift
+      @options[:from] = @argv.shift
       @options[:from] ||= "default"
-      @options[:to] = ARGV.shift
+      @options[:to] = @argv.shift
       @options[:to] ||= "."
     elsif @options[:command] == :export
-      @options[:path] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
-      @options[:out] = ARGV.shift
+      @options[:out] = @argv.shift
     elsif @options[:command] == :uri
-      @options[:path] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
     elsif @options[:command] == :manifest
-      @options[:path] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
     elsif @options[:command] == :clean
-      @options[:path] = ARGV.shift
+      @options[:path] = @argv.shift
       @options[:path] ||= "."
     end
   end
   private :parse_command_options
 
+  def get_port_number(default)
+    return default if @argv.empty?
+      
+    port = @argv.shift
+    if port.to_i == 0
+      $stderr.puts "illegal port number: #{port}"
+      exit(false)
+    end
+    return port.to_i
+  end
+  private :get_port_number
+
 end

data/lib/smallcage/commands/auto.rb

@@ -67,7 +67,7 @@ module SmallCage::Commands
       modified_special_files
       target_files = modified_files 
 
-      runner = SmallCage::Runner.new({ :path => @target })
+      runner = SmallCage::Runner.new({ :path => @target, :quiet => @opts[:quiet] })
       begin
         runner.update
       rescue Exception => e
@@ -78,6 +78,7 @@ module SmallCage::Commands
       
       update_http_server(target_files)
       puts_line
+      notify
     end
     private :update_target
 
@@ -94,9 +95,9 @@ module SmallCage::Commands
       return if target_files.empty?
       target_files.each do |tf|
         if tf.basename.to_s == "_dir.smc"
-          runner = SmallCage::Runner.new({ :path => tf.parent })
+          runner = SmallCage::Runner.new({ :path => tf.parent, :quiet => @opts[:quiet] })
         else
-          runner = SmallCage::Runner.new({ :path => tf })
+          runner = SmallCage::Runner.new({ :path => tf, :quiet => @opts[:quiet] })
         end
         runner.update
       end
@@ -107,12 +108,14 @@ module SmallCage::Commands
         update_http_server(target_files)
       end
       puts_line
+      notify
     rescue Exception => e
       STDERR.puts e.to_s
       STDERR.puts $@[0..4].join("\n")
       STDERR.puts ":"
-      print "\a" unless quiet? # Bell
       puts_line
+      notify
+      notify
     end
     private :update_modified_files
     
@@ -127,10 +130,15 @@ module SmallCage::Commands
     def puts_line
       return if quiet?
       puts "-" * 60
-      print "\a" # Bell
     end
     private :puts_line
     
+    def notify
+      return unless @opts[:bell]
+      print "\a" # Bell
+    end
+    private :notify
+
     def update_http_server(target_files)
       return unless @http_server
       path = target_files.find {|p| p.basename.to_s != "_dir.smc" }
@@ -167,4 +175,4 @@ module SmallCage::Commands
     private :start_http_server
     
   end
-end
+end

data/lib/smallcage/erb_base.rb

@@ -4,10 +4,13 @@ class SmallCage::ErbBase
     @loader, @renderer, @obj = loader, renderer, obj
   end
 
-  def method_missing(name)
-    n = name.to_s
-    
-    return @obj[n] unless @obj[n].nil?
+  def method_missing(*args)
+    if 1 < args.length
+      raise NameError.new("method_missing called with more than one argument: #{@renderer.current_template} #{args.inspect}")
+    end
+
+    name = args[0].to_s
+    return @obj[name] unless @obj[name].nil?
 
     # render if template file exists. or return nil.
     return @renderer.render(name, @obj)

data/lib/smallcage/renderer.rb

@@ -1,4 +1,5 @@
 class SmallCage::Renderer
+  attr_reader :current_template
 
   def initialize(loader)
     @loader = loader
@@ -7,6 +8,7 @@ class SmallCage::Renderer
   def render(name, obj)
     path = @loader.template_path(name)
     return nil if path.nil?
+    @current_template = path
     return render_string(path.read, obj)
   end
     

data/lib/smallcage/version.rb

@@ -2,7 +2,7 @@ module SmallCage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/smallcage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smallcage}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SAITO Toshihiro", "gommmmmm", "KOSEKI Kengo"]
-  s.date = %q{2009-11-24}
+  s.date = %q{2012-03-23}
   s.default_executable = %q{smc}
   s.description = %q{SmallCage is a simple, but powerful website generator. It converts content and template files, which has common elements in a website, to a plain, static website. No database, no application container, and no repeat in many pages is needed. You can keep your site well with very little work.}
   s.email = %q{smallcage@googlegroups.com}
@@ -138,6 +138,9 @@ Gem::Specification.new do |s|
      "spec/loader_spec.rb",
      "spec/manifest_spec.rb",
      "spec/misc_spec.rb",
+     "spec/smallcage/application_spec.rb",
+     "spec/smallcage/commands/auto_spec.rb",
+     "spec/smallcage/commands/server_spec.rb",
      "spec/smallcage_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -157,6 +160,9 @@ Gem::Specification.new do |s|
      "spec/loader_spec.rb",
      "spec/manifest_spec.rb",
      "spec/misc_spec.rb",
+     "spec/smallcage/application_spec.rb",
+     "spec/smallcage/commands/auto_spec.rb",
+     "spec/smallcage/commands/server_spec.rb",
      "spec/smallcage_spec.rb",
      "spec/spec_helper.rb",
      "spec/update_list_spec.rb",

data/spec/document_path_spec.rb

@@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'smallcage'
 
 describe SmallCage::DocumentPath do
-  root = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
   
   before do
-    @docpath = SmallCage::DocumentPath.new(root, root + "a/b/c/index.html.smc")
+    @rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    @docpath = SmallCage::DocumentPath.new(@rootdir, @rootdir + "a/b/c/index.html.smc")
   end
   
   it "should have uri property" do
@@ -30,13 +30,53 @@ describe SmallCage::DocumentPath do
   end
   
   it "should return root uri" do
-    docpath = SmallCage::DocumentPath.new(root, root)
+    docpath = SmallCage::DocumentPath.new(@rootdir, @rootdir)
     docpath.uri.should == "/"
   end
   
   it "should return directory uri" do
-    docpath = SmallCage::DocumentPath.new(root, root + "a/b")
+    docpath = SmallCage::DocumentPath.new(@rootdir, @rootdir + "a/b")
     docpath.uri.should == "/a/b"
   end
+
+  it "should raise Exception when the path doesn't exist under the root directory" do
+    rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    path    = Pathname.new(File.dirname(__FILE__))
+
+    ok = false
+    begin
+      docpath = SmallCage::DocumentPath.new(rootdir, path)
+    rescue => e
+      e.message.should =~ /\AIllegal path: /
+      ok = true
+    end
+    ok.should be_true
+
+
+    rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    path    = Pathname.new(File.dirname(__FILE__) + "/data/htdocs")
+
+    ok = false
+    begin
+      docpath = SmallCage::DocumentPath.new(rootdir, path)
+    rescue => e
+      e.message.should =~ /\AIllegal path: /
+      ok = true
+    end
+    ok.should be_true
+
+
+    rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    path    = Pathname.new(File.dirname(__FILE__) + "/data/htdocs2")
+
+    ok = false
+    begin
+      docpath = SmallCage::DocumentPath.new(rootdir, path)
+    rescue => e
+      e.message.should =~ /\AIllegal path: /
+      ok = true
+    end
+    ok.should be_true
+  end
   
-end
+end

data/spec/smallcage/application_spec.rb

@@ -0,0 +1,271 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'smallcage'
+
+describe SmallCage::Application do
+
+  def capture_result
+    status = nil
+    result = nil
+    tmpout = StringIO.new
+    tmperr = StringIO.new
+    original_out, $stdout = $stdout, tmpout
+    original_err, $stderr = $stderr, tmperr
+    begin
+      result = yield
+    rescue SystemExit => e
+      status = e.status
+    ensure
+      $stdout = original_out
+      $stderr = original_err
+    end
+
+    return { 
+      :exit => status,
+      :result => result,
+      :stdout => tmpout.string,
+      :stderr => tmperr.string
+    }
+  end
+
+  before(:each) do
+    @target = SmallCage::Application.new
+  end
+
+  it "should parse update command" do
+    options = @target.parse_options(["update", "."])
+    options.should == { :path => ".", :command => :update, :quiet => false }
+
+    options = @target.parse_options(["up", "."])
+    options.should == { :path => ".", :command => :update, :quiet => false }
+  end
+
+  it "should parse clean command" do
+    options = @target.parse_options(["clean", "."])
+    options.should == { :path => ".", :command => :clean, :quiet => false }
+  end
+
+  it "should parse server command" do
+    options = @target.parse_options(["server", "."])
+    options.should == { :path => ".", :command => :server, :quiet => false, :port => 8080 } # num
+
+    options = @target.parse_options(["sv", ".", "8080"])
+    options.should == { :path => ".", :command => :server, :quiet => false, :port => 8080 } # string
+  end
+
+  it "should accept only number port" do
+    result = capture_result { @target.parse_options(["server", ".", "pot"]) }
+    result[:exit].should == 1
+    result[:stdout].should be_empty
+    result[:stderr].should == "illegal port number: pot\n"
+  end
+
+  it "should not accept port 0" do
+    result = capture_result { @target.parse_options(["server", ".", "0"]) }
+    result[:exit].should == 1
+    result[:stdout].should be_empty
+    result[:stderr].should == "illegal port number: 0\n"
+  end
+
+  it "should parse auto command" do
+    options = @target.parse_options(["auto", "."])
+    options.should == { :path => ".", :command => :auto, :port => nil, :bell => false, :quiet => false }
+
+    options = @target.parse_options(["au", ".", "8080"])
+    options.should == { :path => ".", :command => :auto, :port => 8080, :bell => false, :quiet => false }
+  end
+
+  it "should parse import command" do
+    options = @target.parse_options(["import", "base", "."])
+    options.should == {  :command => :import, :from => "base", :to => ".", :quiet => false }
+
+    options = @target.parse_options(["import"])
+    options.should == {  :command => :import, :from => "default", :to => ".", :quiet => false }
+  end
+  
+  it "should parse export command" do
+    options = @target.parse_options(["export", ".", "path"])
+    options.should == { :command => :export, :path => ".",  :out => "path", :quiet => false }
+
+    options = @target.parse_options(["export"])
+    options.should == { :command => :export, :path => ".",  :out => nil, :quiet => false }
+  end
+
+  it "should parse uri command" do
+    options = @target.parse_options(["uri", "./path/to/target"])
+    options.should == { :command => :uri, :path => "./path/to/target", :quiet => false }
+
+    options = @target.parse_options(["uri"])
+    options.should == { :command => :uri, :path => ".", :quiet => false }
+  end
+
+  it "should parse manifest command" do
+    options = @target.parse_options(["manifest", "./path/to/target"])
+    options.should == { :command => :manifest, :path => "./path/to/target", :quiet => false }
+
+    options = @target.parse_options(["manifest"])
+    options.should == { :command => :manifest, :path => ".", :quiet => false }
+  end
+
+  it "should exit 1 if command is empty" do
+    result = capture_result { @target.parse_options([]) }
+    result[:exit].should == 1
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+
+  it "should show help" do
+    result = capture_result { @target.parse_options(["help"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+
+  it "should show help if the arguments include --help" do
+    result = capture_result { @target.parse_options(["--help", "update"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+
+  it "should show subcommand help" do
+    result = capture_result { @target.parse_options(["help", "update"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\AUsage: smc update \[path\]/
+    result[:stderr].should be_empty
+  end
+
+  it "should exit if the command is unknown" do
+    result = capture_result { @target.parse_options(["xxxx"]) }
+    result[:exit].should == 1
+    result[:stdout].should be_empty
+    result[:stderr].should == "no such subcommand: xxxx\n"
+  end
+
+  it "should show version" do
+    result = capture_result { @target.parse_options(["--version", "update"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\ASmallCage \d+\.\d+\.\d+ - /
+    result[:stderr].should be_empty
+  end
+
+  it "should exit when subcommand is empty" do
+    result = capture_result { @target.parse_options(["", "--version"]) }
+    result[:exit].should == 1
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+
+  it "should ignore subcommand with --version option" do
+    result = capture_result { @target.parse_options(["help", "--version"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\ASmallCage \d+\.\d+\.\d+ - /
+    result[:stderr].should be_empty
+  end
+
+  it "should ignore subcommand with -v option" do
+    result = capture_result { @target.parse_options(["help", "-v"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\ASmallCage \d+\.\d+\.\d+ - /
+    result[:stderr].should be_empty
+  end
+
+  it "should ignore subcommand with --help option" do
+    result = capture_result { @target.parse_options(["update", "--help"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\AUsage: smc update \[path\] \[options\]/
+    result[:stderr].should be_empty
+  end
+
+  it "should ignore subcommand with -h option" do
+    result = capture_result { @target.parse_options(["update", "-h"]) }
+    result[:exit].should == 0
+    result[:stdout].should =~ /\AUsage: smc update \[path\] \[options\]/
+    result[:stderr].should be_empty
+  end
+
+  it "should exit with unknown main option --QQQ" do
+    result = capture_result { @target.parse_options(["--QQQ"]) }
+    result[:exit].should == 1
+    result[:stdout].should be_empty
+    result[:stderr].should == "invalid option: --QQQ\n"
+  end
+
+  it "should exit with unknown sub option --QQQ" do
+    result = capture_result { @target.parse_options(["update", "--QQQ"]) }
+    result[:exit].should == 1
+    result[:stdout].should be_empty
+    result[:stderr].should == "invalid option: --QQQ\n"
+  end
+
+  it "should accept auto command --bell option" do
+    result = capture_result { @target.parse_options(["auto", "--bell"]) }
+    result[:exit].should == nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should == {
+      :command => :auto,
+      :port => nil,
+      :path => ".",
+      :bell => true,
+      :quiet => false,
+    }
+  end
+
+  it "should set bell option false as default" do
+    result = capture_result { @target.parse_options(["auto"]) }
+    result[:exit].should == nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should == {
+      :command => :auto,
+      :port => nil,
+      :path => ".",
+      :bell => false,
+      :quiet => false,
+    }
+  end
+
+  it "should accept --quiet option" do
+    result = capture_result { @target.parse_options(["--quiet", "update"]) }
+    result[:exit].should == nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should == {
+      :command => :update,
+      :path => ".",
+      :quiet => true,
+    }
+  end
+
+  it "should accept --quiet option after subcommand" do
+    result = capture_result { @target.parse_options(["update", "--quiet"]) }
+    result[:exit].should == nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should == {
+      :command => :update,
+      :path => ".",
+      :quiet => true,
+    }
+  end
+
+  it "should accept --quiet option before and after subcommand" do
+    opts = ["--quiet", "auto", "--quiet", "path", "--bell", "80"]
+    result = capture_result { @target.parse_options(opts) }
+    result[:exit].should == nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should == {
+      :command => :auto,
+      :path => "path",
+      :port => 80,
+      :bell => true,
+      :quiet => true,
+    }
+  end
+
+end

data/spec/smallcage/commands/auto_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'smallcage'
+require 'smallcage/commands/base'
+require 'smallcage/commands/auto'
+
+describe SmallCage::Commands::Auto do
+  it "should exist" do
+    SmallCage::Commands::Auto
+  end
+end
+

data/spec/smallcage/commands/server_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'smallcage'
+require 'smallcage/commands/base'
+require 'smallcage/commands/server'
+
+describe SmallCage::Commands::Server do
+  it "should exist" do
+    SmallCage::Commands::Server
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smallcage
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - SAITO Toshihiro
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +09:00
+date: 2012-03-23 00:00:00 +09:00
 default_executable: smc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,6 +153,9 @@ files:
 - spec/loader_spec.rb
 - spec/manifest_spec.rb
 - spec/misc_spec.rb
+- spec/smallcage/application_spec.rb
+- spec/smallcage/commands/auto_spec.rb
+- spec/smallcage/commands/server_spec.rb
 - spec/smallcage_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -194,6 +197,9 @@ test_files:
 - spec/loader_spec.rb
 - spec/manifest_spec.rb
 - spec/misc_spec.rb
+- spec/smallcage/application_spec.rb
+- spec/smallcage/commands/auto_spec.rb
+- spec/smallcage/commands/server_spec.rb
 - spec/smallcage_spec.rb
 - spec/spec_helper.rb
 - spec/update_list_spec.rb