milkode 0.7.0 → 0.7.1

data/Gemfile

@@ -2,10 +2,10 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gemspec
+# gemspec
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler"
-  gem "jeweler"
-end
+# group :development do
+#   gem "bundler"
+#   gem "jeweler"
+# end

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/milkode/cli.rb

@@ -7,18 +7,15 @@ require 'milkode/grep/cli_grep'
 
 module Milkode
   class CLI < Thor
+    class_option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+
     desc "init [db_dir]", "Initialize database directory. If db_dir is omitted"
     option :default, :type => :boolean, :desc => "Init default db, ENV['MILKODE_DEFAULT_DIR'] or ~/.milkode."
     option :setdb, :type => :boolean, :aliases => '-s', :desc => 'Run setdb after initialization.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def init(db_dir = nil)
-      if options[:help]
-        CLI.task_help(shell, "init")
-      else
-        db_dir = db_dir || Dbdir.default_dir
-        FileUtils.mkdir_p db_dir
-        cdstk(db_dir).init(options)
-      end
+      db_dir = db_dir || Dbdir.default_dir
+      FileUtils.mkdir_p db_dir
+      cdstk(db_dir).init(options)
     end
 
     desc "add PATH", <<EOF
@@ -36,9 +33,9 @@ EOF
     option :ignore, :type => :array, :aliases => '-i', :desc => 'Ignore path.'
     option :no_auto_ignore, :type => :boolean, :desc => 'Disable auto ignore (.gitignore).'
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    
     def add(*args)
-      if options[:help] || args.empty?
+      if args.empty?
         CLI.task_help(shell, "add")
       else
         cdstk.add(args, options)
@@ -48,124 +45,69 @@ EOF
     desc "update [keyword1 keyword2 ...]", "Update database"
     option :all, :type => :boolean, :desc => "Update all."
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def update(*args)
-      if options[:help]
-        CLI.task_help(shell, "update")
-      else
-        cdstk.update(args, options)
-      end
+      cdstk.update(args, options)
     end
 
     desc "remove keyword1 [keyword2 ...]", "Remove package"
     option :all, :type => :boolean, :desc => 'Remove all.'
     option :force, :type => :boolean, :aliases => '-f', :desc => 'Force remove.'
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def remove(*args)
-      if options[:help]
-        CLI.task_help(shell, "remove")
-      else
-        cdstk.remove(args, options)
-      end
+      cdstk.remove(args, options)
     end
 
     desc "list [package1 package2 ...]", "List package"
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def list(*args)
-      if options[:help]
-        CLI.task_help(shell, "list")
-      else
-        cdstk.list(args, options)
-      end
+      cdstk.list(args, options)
     end
 
     desc "pwd", "Display the current database"
     option :default, :type => :boolean, :desc => 'Show default db, ENV[\'MILKODE_DEFAULT_DIR\'] or ~/.milkode.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def pwd()
-      if options[:help]
-        CLI.task_help(shell, "pwd")
-      else
-        cdstk.pwd(options)
-      end
+      cdstk.pwd(options)
     end
 
     desc "cleanup", "Creanup garbage recoeds"
     option :force, :type => :boolean, :aliases => '-f', :desc => 'Force cleanup.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def cleanup
-      if options[:help]
-        CLI.task_help(shell, "cleanup")
-      else
-        cdstk.cleanup(options)
-      end
+      cdstk.cleanup(options)
     end
 
     desc "rebuild [keyword1 keyword2]", "Rebuild database"
     option :all, :type => :boolean, :desc => 'Rebuild all.'
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def rebuild(*args)
-      if options[:help]
-        CLI.task_help(shell, "rebuild")
-      else
-        cdstk.rebuild(args, options)
-      end
+      cdstk.rebuild(args, options)
     end
 
     desc "dump", "Dump records"
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def dump
-      if options[:help]
-        CLI.task_help(shell, "dump")
-      else
-        cdstk.dump
-      end
+      cdstk.dump
     end
 
     desc "dir [package1 package2]", "Print project root directory"
     option :top, :type => :boolean
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def dir(*args)
-      if options[:help]
-        CLI.task_help(shell, "dir")
-      else
-        cdstk.dir(args, options)
-      end
+      cdstk.dir(args, options)
     end
 
     desc "setdb [dbpath]", "Set default db to dbpath"
     option :reset, :type => :boolean, :aliases => '--default', :desc => 'Reset to the system default database.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def setdb(dbpath = nil)
-      if options[:help]
-        CLI.task_help(shell, "setdb")
-      else
-        cdstk.setdb(dbpath, options)
-      end
+      cdstk.setdb(dbpath, options)
     end
 
     desc "mcd", "Generate `mcd' command"
     option :shell, :desc => 'Type of shell. bash or cygwin'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def mcd
-      if options[:help]
-        CLI.task_help(shell, "mcd")
-      else
-        cdstk.mcd(options)
-      end
+      cdstk.mcd(options)
     end
 
     desc "info", "Information of milkode status"
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def info
-      if options[:help]
-        CLI.task_help(shell, "info")
-      else
-        cdstk.info
-      end
+      cdstk.info
     end
 
     desc "ignore [path ...]", "Ignore a file or directory"
@@ -173,16 +115,11 @@ EOF
     option :delete, :type => :boolean, :aliases => '-d', :desc => "Delete ignore setting."
     option :delete_all, :type => :boolean, :desc => "Delete all ignore setting."
     option :dry_run, :type => :boolean, :aliases => '-n', :desc => "Ignore setting test."
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def ignore(*paths)
-      if options[:help]
-        CLI.task_help(shell, "ignore")
-      else
-        begin
-          cdstk.ignore(paths, options)
-        rescue IgnoreError => e
-          $stdout.puts e.message
-        end
+      begin
+        cdstk.ignore(paths, options)
+      rescue IgnoreError => e
+        $stdout.puts e.message
       end
     end
 
@@ -193,27 +130,22 @@ EOF
     option :server, :default => 'thin', :aliases => '-s'
     option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :type => :boolean, :desc => 'Do not launch browser.'
     option :customize, :type => :boolean, :desc => 'Create customize file.'
-    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
     def web
-      if options[:help]
-        CLI.task_help(shell, "web")
-      else
-        opts = {
-          :environment => ENV['RACK_ENV'] || "development",
-          :pid         => nil,
-          :Port        => options[:port],
-          :Host        => options[:host],
-          :AccessLog   => [],
-          :config      => "config.ru",
-          # ----------------------------
-          :server        => options[:server],
-          :LaunchBrowser => !options[:no_browser],
-          :DbDir         => options[:db],
-        }
-        opts[:customize] = options[:customize]
-        cdstk(opts[:DbDir]).assert_compatible
-        Milkode::CLI_Cdweb.execute_with_options($stdout, opts)
-      end
+      opts = {
+        :environment => ENV['RACK_ENV'] || "development",
+        :pid         => nil,
+        :Port        => options[:port],
+        :Host        => options[:host],
+        :AccessLog   => [],
+        :config      => "config.ru",
+        # ----------------------------
+        :server        => options[:server],
+        :LaunchBrowser => !options[:no_browser],
+        :DbDir         => options[:db],
+      }
+      opts[:customize] = options[:customize]
+      cdstk(opts[:DbDir]).assert_compatible
+      Milkode::CLI_Cdweb.execute_with_options($stdout, opts)
     end
 
     desc "grep", "Search projects"
@@ -228,6 +160,16 @@ EOF
       def shell
         @shell ||= Thor::Base.shell.new
       end
+
+      # デフォルトメソッドを上書きして -h を処理
+      # defined in /lib/thor/invocation.rb
+      def invoke_task(task, *args)
+        if options[:help] && task.name != 'grep'
+          CLI.task_help(shell, task.name)
+        else
+          super
+        end
+      end
     end
 
     private

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-05-06}
+  s.date = %q{2012-05-15}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -128,11 +128,6 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<milkode>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<rroonga>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.3.4"])
@@ -145,11 +140,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sass>, [">= 3.1.3"])
       s.add_runtime_dependency(%q<thor>, ["~> 0.15.0"])
     else
-      s.add_dependency(%q<milkode>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<termcolor>, [">= 1.2.0"])
       s.add_dependency(%q<rroonga>, [">= 1.1.0"])
       s.add_dependency(%q<rack>, [">= 1.3.4"])
@@ -163,11 +153,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, ["~> 0.15.0"])
     end
   else
-    s.add_dependency(%q<milkode>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<termcolor>, [">= 1.2.0"])
     s.add_dependency(%q<rroonga>, [">= 1.1.0"])
     s.add_dependency(%q<rack>, [">= 1.3.4"])

data/test/test_cli.rb

@@ -61,24 +61,12 @@ class TestCLI_Cdstk < Test::Unit::TestCase
     assert_equal @first_default_dir, Dbdir.default_dir
   end
 
-  # def test_list_help
-  #   command("init -h")
-  #   command("add -h")
-  #   command("update -h")
-  #   command("remove -h")
-  #   command("list -h")
-  #   command("pwd -h")
-  #   command("cleanup -h")
-  #   command("rebuild -h")
-  #   command("dump -h")
-  #   command("dir -h")
-  #   command("setdb -h")
-  #   command("mcd -h")
-  #   command("info -h")
-  #   command("ignore -h")
-  #   command("web -h")
-  #   command("grep -h")
-  # end
+  def test_help_with_h_option
+    commands = ["init", "add", "update", "remove", "list", "pwd", "cleanup", "rebuild", "dump", "dir", "setdb", "mcd", "info", "ignore", "web"]
+    commands.each do |cmd|
+      assert_match "Usage:", command("#{ cmd } -h")
+    end
+  end
 
   private
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,84 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-06 00:00:00 +09:00
+date: 2012-05-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: milkode
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: termcolor
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +33,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id006
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: rroonga
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +49,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id007
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: rack
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +65,12 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  requirement: *id008
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: sinatra
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +81,12 @@ dependencies:
         - 2
         - 6
         version: 1.2.6
-  requirement: *id009
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: launchy
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,12 +97,12 @@ dependencies:
         - 3
         - 7
         version: 0.3.7
-  requirement: *id010
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: coderay
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -183,12 +113,12 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  requirement: *id011
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: thin
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -199,12 +129,12 @@ dependencies:
         - 2
         - 10
         version: 1.2.10
-  requirement: *id012
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: archive-zip
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -215,12 +145,12 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  requirement: *id013
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: haml
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -231,12 +161,12 @@ dependencies:
         - 1
         - 2
         version: 3.1.2
-  requirement: *id014
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: sass
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -247,12 +177,12 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  requirement: *id015
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: thor
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -263,7 +193,7 @@ dependencies:
         - 15
         - 0
         version: 0.15.0
-  requirement: *id016
+  requirement: *id011
 description: Line based local source code search engine & grep-command & web-app.
 email: ongaeshi0621@gmail.com
 executables: