milkode 0.6.3 → 0.7.0

data/lib/milkode/grep/cli_grep.rb

@@ -115,10 +115,10 @@ EOF
           if (my_option[:all])
             cdstk.update_all
           elsif (my_option[:packages].empty?)
-            cdstk.update_package(package_root_dir(File.expand_path(".")))
+            cdstk.update_for_grep(package_root_dir(File.expand_path(".")))
           else
             my_option[:packages].each do |v|
-              cdstk.update_package(v)
+              cdstk.update_for_grep(v)
             end
           end
           

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.6.3"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-04-19}
+  s.date = %q{2012-05-06}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     "Gemfile",
-    "Gemfile.lock",
     "HISTORY.ja.rdoc",
     "HISTORY.rdoc",
     "LICENSE.txt",
@@ -31,8 +30,6 @@ Gem::Specification.new do |s|
     "bin/milk",
     "lib/milkode/cdstk/cdstk.rb",
     "lib/milkode/cdstk/cdstk_command.rb",
-    "lib/milkode/cdstk/cli_cdstk.rb",
-    "lib/milkode/cdstk/cli_cdstksub.rb",
     "lib/milkode/cdstk/milkode_yaml.rb",
     "lib/milkode/cdstk/package.rb",
     "lib/milkode/cdstk/yaml_file_wrapper.rb",
@@ -67,6 +64,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/views/search.haml",
     "lib/milkode/cdweb/views/search_form.haml",
     "lib/milkode/cdweb/views/view.haml",
+    "lib/milkode/cli.rb",
     "lib/milkode/common/archive-zip.rb",
     "lib/milkode/common/dbdir.rb",
     "lib/milkode/common/dir.rb",
@@ -97,10 +95,9 @@ Gem::Specification.new do |s|
     "test/milkode_test_work.rb",
     "test/rake_test_loader.rb",
     "test/runner.rb",
-    "test/test_bin_exec.rb",
     "test/test_cdstk.rb",
     "test/test_cdstk_command.rb",
-    "test/test_cli_cdstk.rb",
+    "test/test_cli.rb",
     "test/test_cli_grep.rb",
     "test/test_coderay_wrapper.rb",
     "test/test_coderay_wrapper_data.rb",
@@ -131,9 +128,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      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"])
@@ -144,10 +143,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<archive-zip>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<haml>, [">= 3.1.2"])
       s.add_runtime_dependency(%q<sass>, [">= 3.1.3"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.15.0"])
     else
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      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"])
@@ -158,11 +160,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<archive-zip>, [">= 0.4.0"])
       s.add_dependency(%q<haml>, [">= 3.1.2"])
       s.add_dependency(%q<sass>, [">= 3.1.3"])
+      s.add_dependency(%q<thor>, ["~> 0.15.0"])
     end
   else
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    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"])
@@ -173,6 +178,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<archive-zip>, [">= 0.4.0"])
     s.add_dependency(%q<haml>, [">= 3.1.2"])
     s.add_dependency(%q<sass>, [">= 3.1.3"])
+    s.add_dependency(%q<thor>, ["~> 0.15.0"])
   end
 end
 

data/test/milkode_test_work.rb

@@ -32,7 +32,7 @@ class MilkodeTestWork
   def init_db(name)
     dbdir = expand_path(name)
     FileUtils.mkdir_p dbdir
-    Dir.chdir(dbdir) { cdstk.init({}) }
+    Cdstk.new(StringIO.new, dbdir).init({})
   end
 
   def add_package(name, package_path)

data/test/test_cdstk.rb

@@ -9,7 +9,6 @@ require 'rubygems'
 require 'groonga'
 require 'test_helper'
 require 'file_test_utils'
-require 'milkode/cdstk/cli_cdstk.rb'
 require 'milkode/cdstk/cdstk'
 require 'stringio'
 
@@ -39,6 +38,7 @@ class TestCdstk < Test::Unit::TestCase
       obj.add(['../data/nodir_abc.zip'], {})
       obj.add(['../data/nodir_abc_xpi.xpi'], {})
       obj.add(['http://ongaeshi.me/test_data/http_nodir_abc.zip'], {})
+      obj.add(['git://github.com/ongaeshi/duplicate-thing.git'], {})
       assert_raise(OpenURI::HTTPError) { obj.add(['http://ongaeshi.me/test_data/not_found.zip'], {}) }
       obj.add(['../data/no_auto_ignore'], {:no_auto_ignore => true})
 

data/test/{test_cli_cdstk.rb → test_cli.rb}

@@ -5,72 +5,85 @@
 # @author ongaeshi
 # @date   2011/12/03
 
-require 'milkode/cdstk/cli_cdstk.rb'
-require 'milkode/common/dbdir'
+require 'milkode/cli.rb'
 require 'test_helper'
-require 'milkode/cdstk/cdstk_command'
 require 'milkode_test_work'
 
 class TestCLI_Cdstk < Test::Unit::TestCase
   def setup
+    $stdout = StringIO.new
     @first_default_dir = Dbdir.default_dir
     @work = MilkodeTestWork.new({:default_db => true})
     @work.add_package "db1", @work.expand_path("../data/a_project")
-  end
-
-  def test_main
-    t_grep
-    t_mcd
-    t_setdb
-    t_info
+    @orig_stdout = $stdout
   end
 
   def teardown
+    $stdout = @orig_stdout
     @work.teardown
   end
 
-  private
-
-  def t_grep
+  def test_grep
     command("grep")
     command("grep not_found")
     command("grep require -a")
   end
 
-  def t_mcd
+  def test_mcd
     assert_match /mcd/, command("mcd")
   end
-  
-  def t_info
+
+  def test_info
     assert_match /.*packages.*records/, command("info")
   end
-  
-  def t_setdb
-    # 引数無しで現在の値を表示
+
+  def test_setdb_no_arg_disp
     assert_equal @work.expand_path("db1") + "\n", command("setdb")
-    
-    # .milkode_db_dir を書き換えてテスト
+  end
+
+  def test_setdb_milkode_db_dir_rewrite
     open(@work.path(".milkode_db_dir"), "w") {|f| f.print "/a/custom/db" }
     assert_equal "/a/custom/db\n", command("setdb")
+  end
 
-    # データベースではないディレクトリに切り替ようとするとエラー
+  def test_setdb_error_not_database_dir
     assert_match(/fatal:/, command("setdb /a/write/test"))
-    
-    # 切り替え
+  end
+
+  def test_setdb_change
     @work.init_db("db2")
     assert_match "Set default db", command("setdb #{@work.path "db2"}")
+  end
 
-    # リセット
+  def test_setdb_reset
     assert_not_equal @first_default_dir, Dbdir.default_dir
     command("setdb --reset")
     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
+
   private
 
   def command(arg)
-    io = StringIO.new
-    CLI_Cdstk.execute(io, arg.split)
-    io.string
+    CLI.start(arg.split)
+    $stdout.string
   end
 end

data/test/test_yaml_file_wrapper.rb

@@ -64,8 +64,7 @@ class TestYamlFileWrapper < Test::Unit::TestCase
 
     # save
     yaml.save
-    r = open('milkode.yaml'){|f|f.read}
-    assert_equal <<EOF, r if Milkode::Util::ruby19?
+    expected_object = YAML.load <<EOF
 ---
 version: '0.2'
 contents:
@@ -74,6 +73,8 @@ contents:
   - ! '*.bak'
 - directory: /path/to/dir3
 EOF
+    actual_object = open('milkode.yaml'){|f| YAML.load f}
+    assert_equal expected_object, actual_object
   end
 
   def test_save_otherpath
@@ -82,12 +83,13 @@ EOF
     yaml.save
     
     # save
-    r = open('otherpath/milkode.yaml'){|f|f.read}
-    assert_equal <<EOF, r if Milkode::Util::ruby19?
+    expected_object = YAML.load <<EOF
 ---
 version: '0.2'
 contents: []
 EOF
+    actual_object = open('otherpath/milkode.yaml'){|f| YAML.load f}
+    assert_equal expected_object, actual_object
   end
   
   def teardown

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,45 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 +09:00
+date: 2012-05-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
-  name: bundler
+  name: milkode
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        version: "0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: jeweler
+  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        version: "0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: rcov
+  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +60,39 @@ dependencies:
         - 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: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +103,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id004
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: rroonga
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +119,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id005
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: rack
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,12 +135,12 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  requirement: *id006
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: sinatra
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,12 +151,12 @@ dependencies:
         - 2
         - 6
         version: 1.2.6
-  requirement: *id007
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: launchy
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,12 +167,12 @@ dependencies:
         - 3
         - 7
         version: 0.3.7
-  requirement: *id008
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: coderay
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,12 +183,12 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  requirement: *id009
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: thin
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,12 +199,12 @@ dependencies:
         - 2
         - 10
         version: 1.2.10
-  requirement: *id010
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: archive-zip
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -191,12 +215,12 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  requirement: *id011
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: haml
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -207,12 +231,12 @@ dependencies:
         - 1
         - 2
         version: 3.1.2
-  requirement: *id012
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: sass
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -223,7 +247,23 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  requirement: *id013
+  requirement: *id015
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: thor
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 15
+        - 0
+        version: 0.15.0
+  requirement: *id016
 description: Line based local source code search engine & grep-command & web-app.
 email: ongaeshi0621@gmail.com
 executables: 
@@ -237,7 +277,6 @@ extra_rdoc_files:
 files: 
 - .document
 - Gemfile
-- Gemfile.lock
 - HISTORY.ja.rdoc
 - HISTORY.rdoc
 - LICENSE.txt
@@ -248,8 +287,6 @@ files:
 - bin/milk
 - lib/milkode/cdstk/cdstk.rb
 - lib/milkode/cdstk/cdstk_command.rb
-- lib/milkode/cdstk/cli_cdstk.rb
-- lib/milkode/cdstk/cli_cdstksub.rb
 - lib/milkode/cdstk/milkode_yaml.rb
 - lib/milkode/cdstk/package.rb
 - lib/milkode/cdstk/yaml_file_wrapper.rb
@@ -284,6 +321,7 @@ files:
 - lib/milkode/cdweb/views/search.haml
 - lib/milkode/cdweb/views/search_form.haml
 - lib/milkode/cdweb/views/view.haml
+- lib/milkode/cli.rb
 - lib/milkode/common/archive-zip.rb
 - lib/milkode/common/dbdir.rb
 - lib/milkode/common/dir.rb
@@ -314,10 +352,9 @@ files:
 - test/milkode_test_work.rb
 - test/rake_test_loader.rb
 - test/runner.rb
-- test/test_bin_exec.rb
 - test/test_cdstk.rb
 - test/test_cdstk_command.rb
-- test/test_cli_cdstk.rb
+- test/test_cli.rb
 - test/test_cli_grep.rb
 - test/test_coderay_wrapper.rb
 - test/test_coderay_wrapper_data.rb