milkode 1.1.0 → 1.2.0

data/HISTORY.ja.rdoc

@@ -1,3 +1,27 @@
+=== 1.2.0 2013/08/07
+
+* milk web
+  * Hightlight filename keywords
+  * Not show file infomation when same file name continue
+  * Delete auto search feature 'w:0' and 'fp:a b'
+  * Bugfix relative URL (clippy, 同名ファイルへのリンク) (thanks nicklegr)
+
+* milk
+  * milk update
+    * Remove ignored files with update
+  * milk ignore
+    * Support global ignore. 'milk ignore --global ~/.gitignore'
+  * milk config
+    * Add 'milk config KEY VALUE' command.
+    * e.g. 'milk config update_with_ctags_e true'
+  * milk remove
+    * Faster DocumentTable#remove_records
+    * Not remove package non exist filename
+  * milk cleanup
+    * Add milk cleanup options. -p, -a
+  * milk add
+    * 'milk add' can't use already exist package
+
 === 1.1.0 2013/06/26
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,27 @@
+=== 1.2.0 2013/08/07
+
+* milk web
+  * Hightlight filename keywords
+  * Not show file infomation when same file name continue
+  * Delete auto search feature 'w:0' and 'fp:a b'
+  * Bugfix relative URL (clippy, Link for same file name) (thanks nicklegr)
+
+* milk
+  * milk update
+    * Remove ignored files with update
+  * milk ignore
+    * Support global ignore. 'milk ignore --global ~/.gitignore'
+  * milk config
+    * Add 'milk config KEY VALUE' command.
+    * e.g. 'milk config update_with_ctags_e true'
+  * milk remove
+    * Faster DocumentTable#remove_records
+    * Not remove package non exist filename
+  * milk cleanup
+    * Add milk cleanup options. -p, -a
+  * milk add
+    * 'milk add' can't use already exist package
+
 === 1.1.0 2013/06/26
 
 * milk web

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bin/gmilk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/grep/cli_grep'
 
-Version = "1.1.0"
+Version = "1.2.0"
 Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cli'
 
-Version = "1.1.0"
+Version = "1.2.0"
 Milkode::CLI.start(ARGV)

data/lib/milkode/cdstk/cdstk.rb

@@ -1,42 +1,38 @@
 # -*- coding: utf-8 -*-
 
-require 'yaml'
-require 'pathname'
-require 'rubygems'
 require 'fileutils'
-require 'pathname'
-require 'milkode/common/grenfiletest'
-require 'milkode/common/util'
-require 'milkode/common/dir'
-include Milkode
 require 'kconv'
+require 'open-uri'
+require 'pathname'
+require 'rubygems'
+require 'yaml'
 begin
   require 'readline'
 rescue LoadError
   $no_readline = true
 end
-require 'open-uri'
 require 'milkode/cdstk/cdstk_command'
-require 'milkode/cdstk/yaml_file_wrapper'
 require 'milkode/cdstk/package'
+require 'milkode/cdstk/yaml_file_wrapper'
+require 'milkode/common/array_diff'
+require 'milkode/common/dir'
+require 'milkode/common/grenfiletest'
 require 'milkode/common/ignore_checker'
-require 'milkode/database/groonga_database'
+require 'milkode/common/plang_detector'
+require 'milkode/common/util'
 require 'milkode/database/document_record'
-require 'milkode/common/array_diff'
+require 'milkode/database/groonga_database'
 require 'milkode/database/updater'
-require 'milkode/common/plang_detector'
 
 module Milkode
   class IgnoreError < RuntimeError ; end
   class AddError    < RuntimeError ; end
   class ConvertError < RuntimeError ; end
 
+  
   class Cdstk
-    # バイグラムでトークナイズする。連続する記号・アルファベット・数字は一語として扱う。
-    # DEFAULT_TOKENIZER = "TokenBigram"
-
-    # 記号・アルファベット・数字もバイグラムでトークナイズする。
-    DEFAULT_TOKENIZER = "TokenBigramSplitSymbolAlphaDigit"
+    # Parameters
+    CONFIG_LJUST = 20           # Display parameter for 'milk config'
 
     def initialize(io = $stdout, db_dir = ".")
       @db_dir = db_dir
@@ -198,28 +194,23 @@ module Milkode
       update_dir_in(dir)
     end
 
-    # yamlにパッケージを追加
     def add_yaml(package)
-      # すでに同名パッケージがある
+      # Already exist package
       if @yaml.find_name(package.name)
-        warning_alert("already exist '#{package.name}'.")
-        return
+        raise AddError, "package named '#{package.name}' already exist."
       end
 
-      # ファイルが存在しない
+      # File not exist
       unless File.exist?(package.directory)
-        error_alert("not found '#{package.directory}'.")
-        return
+        raise AddError, "not found '#{package.directory}'."
       end
 
-      # YAML更新
+      # Save yaml
       @yaml.add(package)
       @yaml.save
 
-      # データベースを開く
+      # Sync yaml -> db
       db_open
-
-      # yamlファイルと同期する
       @grndb.yaml_sync(@yaml.contents)
     end
 
@@ -357,7 +348,7 @@ module Milkode
 
             unless package
               path = File.expand_path(arg)
-              package = @yaml.package_root(path)
+              package = @yaml.package_root(path) if File.exist?(path)
             end
             
             if (package)
@@ -520,25 +511,62 @@ module Milkode
       end
     end
 
-    def cleanup(options)
-      # cleanup開始
-      if (options[:force] or yes_or_no("cleanup contents? (yes/no)"))
-        print_result do 
-          # yamlファイルのクリーンアップ
-          @yaml.contents.find_all {|v| !File.exist? v.directory }.each do |p|
-            @yaml.remove(p)
-            alert("rm_package", p.directory)
-            @package_count += 1
-          end
-          @yaml.save
+    def cleanup(args, options)
+      update_display_info(options)
 
-          # データベースを開く
+      if (options[:all])
+        cleanup_all(options)
+      elsif (options[:packages])
+        cleanup_packages
+      else
+        print_result do
           db_open
+          args.each do |arg|
+            package = @yaml.find_name(arg) || @yaml.find_dir(arg)
 
-          # yamlファイルと同期する
-          @grndb.yaml_sync(@yaml.contents)
+            unless package
+              path = File.expand_path(arg)
+              package = @yaml.package_root(path) if File.exist?(path)
+            end
+            
+            if (package)
+              @documents.cleanup_package_name(package.name) # TODO: Support ignore_checker
+            else
+              @out.puts "Not found package '#{arg}'."
+              return
+            end
+          end
+        end
+      end
+    end
+
+    # Remove non exist pakcages
+    def cleanup_packages
+      print_result do
+        cleanup_packages_in
+      end
+    end
+
+    def cleanup_packages_in
+        @yaml.contents.find_all {|v| !File.exist? v.directory }.each do |p|
+          @yaml.remove(p)
+          alert("rm_package", p.directory)
+          @package_count += 1
+        end
+        @yaml.save
+
+        db_open
+
+        @grndb.yaml_sync(@yaml.contents)
+    end
+
+    def cleanup_all(options)
+      if (options[:force] or yes_or_no("cleanup contents? (yes/no)"))
+        print_result do
+          # Remove non exist packages
+          cleanup_packages_in
           
-          # データベースのクリーンアップ
+          # @todo Remove ignore files
           @documents.cleanup do |record|
             alert("rm_record", record.path)
             @file_count += 1
@@ -889,18 +917,32 @@ EOF
           r
         end
       else
-        dir = File.expand_path('.')
-        r = @yaml.package_root(dir)
-        if r.nil?
-          @out.puts "Not registered '#{dir}'."
-          []
-        else
-          [r]
-        end
+        [find_package_current_dir].compact
       end
     end
 
+    def find_package_current_dir
+      dir = File.expand_path('.')
+      package = @yaml.package_root(dir)
+      @out.puts "Not registered '#{dir}'." if package.nil?
+      package
+    end
+
     def ignore(args, options)
+      if options[:global]
+        if args.size > 0
+          @yaml.set_global_gitignore(args[0])
+          @yaml.save
+          @out.puts "Set '#{args[0]}'"
+        else
+          if @yaml.global_gitignore
+            @out.puts @yaml.global_gitignore
+          end
+        end
+
+        return
+      end
+
       current_dir = File.expand_path('.')
 
       if (options[:package])
@@ -978,6 +1020,65 @@ EOF
       end
     end
 
+    def config(args, options)
+      if args.empty?
+        config_print
+      else
+        config_set(args, options)
+      end
+    end
+
+    def config_print
+      package = find_package_current_dir
+
+      return if package.nil?
+
+      @out.puts "Ignore:"
+      package.ignore.each do |v|
+        @out.puts "  #{v}"
+      end
+
+      @out.puts "Options:"
+      package.options.each do |key, value|
+        @out.puts "  #{(key.to_s + ':').ljust(CONFIG_LJUST)} #{value}"
+      end
+    end
+
+    def config_set(args, options)
+      package = find_package_current_dir
+      return if package.nil?
+
+      opt = package.options
+
+      if options[:delete]
+        opt.delete(args[0].to_sym)
+      else
+        if args.size == 2
+          opt[args[0].to_sym] = config_to_value(args[1])
+        else
+          @out.puts("[usage] milk config KEY VALUE")
+        end
+      end
+      
+      package.set_options(opt)
+
+      @yaml.save
+    end
+
+    # config_to_value('true')  #=> true
+    # config_to_value('false') #=> false
+    # config_to_value('abc')   #=> 'abc'
+    def config_to_value(v)
+      case v
+      when 'true'
+        true
+      when 'false'
+        false
+      else
+        v
+      end
+    end
+
     private
 
     def git_protocol?(options, src)
@@ -1016,16 +1117,23 @@ EOF
     end
 
     def updater_exec(package, is_update_with_git_pull, is_update_with_svn_update, is_no_clean)
-      alert("package", package.name )
+      alert("package", package.name)
 
       updater = Updater.new(@grndb, package.name)
+
+      updater.set_global_gitignore(@yaml.global_gitignore) if @yaml.global_gitignore
       updater.set_package_ignore IgnoreSetting.new("/", package.ignore)
       updater.enable_no_auto_ignore         if package.options[:no_auto_ignore]
+
       updater.enable_silent_mode            if @is_silent
       updater.enable_display_info           if @is_display_info
+      updater.enable_no_clean               if is_no_clean
+
       updater.enable_update_with_git_pull   if is_update_with_git_pull
       updater.enable_update_with_svn_update if is_update_with_svn_update
-      updater.enable_no_clean               if is_no_clean
+      updater.enable_update_with_ctags      if package.options[:update_with_ctags]
+      updater.enable_update_with_ctags_e    if package.options[:update_with_ctags_e]
+
       updater.exec
 
       @package_count += 1
@@ -1053,7 +1161,7 @@ EOF
       # データベースからも削除
       # dir = File.expand_path(dir)
 
-      alert("rm_package", dir)
+      alert("rm_package", package.name)
       @package_count += 1
 
       @documents.remove_match_path(dir) do |record|

data/lib/milkode/cdstk/milkode_yaml.rb

@@ -78,10 +78,13 @@ EOF
     # 指定ディレクトリの所属するパッケージのルートディレクトリを得る。
     # 見つからない場合はnilを返す。
     def package_root(dir)
-      nd = Util::normalize_filename dir
-      @contents.find do |v|
-        v if nd =~ /^#{Regexp.escape(v.directory)}(:?\/|\Z)/
-      end
+      nd = Util::normalize_filename(dir)
+
+      @contents.find_all {|v|
+        nd =~ /^#{Regexp.escape(v.directory)}(:?\/|\Z)/
+      }.max_by {|v|
+        v.directory.length
+      }
     end
 
     # マイグレーション
@@ -100,6 +103,14 @@ EOF
       end
     end
 
+    def global_gitignore
+      @data['global_gitignore']
+    end
+
+    def set_global_gitignore(filename)
+      @data['global_gitignore'] = filename
+    end
+
     private
 
     def parse_contents

data/lib/milkode/cdstk/yaml_file_wrapper.rb

@@ -98,5 +98,13 @@ module Milkode
         save
       end
     end
+
+    def global_gitignore
+      @data.global_gitignore
+    end
+
+    def set_global_gitignore(filename)
+      @data.set_global_gitignore(filename)
+    end
   end
 end

data/lib/milkode/cdweb/app.rb

@@ -44,7 +44,7 @@ end
 get '/' do
   if Database.validate?
     @setting = WebSetting.new
-    @version = "1.1.0"
+    @version = "1.2.0"
 
     @package_num = Database.instance.yaml_package_num
     @file_num = Database.instance.totalRecords
@@ -333,7 +333,7 @@ EOF
 
       if (result)
         path2 = path.gsub(/#{suffix}\Z/, result)
-        " (<a href='#{Mkurl.new(File.join('/home', path2), params).inherit_query_shead}'>#{result}</a>) "
+        " (<a href='#{url_for Mkurl.new(File.join('/home', path2), params).inherit_query_shead}'>#{result}</a>) "
       else
         ''
       end

data/lib/milkode/cdweb/lib/database.rb

@@ -218,10 +218,18 @@ module Milkode
 
     def update_in(package)
       updater = Updater.new(@grndb, package.name)
+
+      yaml = yaml_load
+      
+      updater.set_global_gitignore(yaml.global_gitignore) if yaml.global_gitignore
       updater.set_package_ignore IgnoreSetting.new("/", package.ignore)
       updater.enable_no_auto_ignore         if package.options[:no_auto_ignore]
+      
       updater.enable_update_with_git_pull   if package.options[:update_with_git_pull]
       updater.enable_update_with_svn_update if package.options[:update_with_svn_update]
+      updater.enable_update_with_ctags      if package.options[:update_with_ctags]
+      updater.enable_update_with_ctags_e    if package.options[:update_with_ctags_e]
+
       updater.exec
       updater.result
     end

data/lib/milkode/cdweb/lib/search_contents.rb

@@ -63,22 +63,23 @@ module Milkode
       if @match_records.empty? && recommended_wide_match_range?
         grep_contents(@q.keywords, DEFAULT_WIDE_MATCH_RANGE)
 
-        if @match_records.empty?
-          grep_contents(@q.keywords, 0)
-        end
+        # 検索範囲0の自動マッチは混乱をまねくのでやめる
+        # if @match_records.empty?
+        #   grep_contents(@q.keywords, 0)
+        # end
       end
 
-      # 先頭をファイル名とみなす
-      if @match_records.empty? && recommended_fpath_or_packages?
-        # おすすめクエリーに変換
-        q2 = @q.conv_head_keyword_to_fpath_or_packages
+      # 先頭をファイル名とみなす自動マッチは混乱をまねくのでやめる
+      # if @match_records.empty? && recommended_fpath_or_packages?
+      #   # おすすめクエリーに変換
+      #   q2 = @q.conv_head_keyword_to_fpath_or_packages
         
-        # 検索
-        @records, @total_records = Database.instance.search(q2.keywords, q2.multi_match_keywords, q2.packages, path, q2.fpaths, q2.suffixs, q2.fpath_or_packages, @offset, LIMIT_NUM)
+      #   # 検索
+      #   @records, @total_records = Database.instance.search(q2.keywords, q2.multi_match_keywords, q2.packages, path, q2.fpaths, q2.suffixs, q2.fpath_or_packages, @offset, LIMIT_NUM)
         
-        # 再grep
-        grep_contents(q2.keywords, q2.wide_match_range)
-      end
+      #   # 再grep
+      #   grep_contents(q2.keywords, q2.wide_match_range)
+      # end
       
       # 検索3 : マッチするファイル
       @match_files = []
@@ -124,6 +125,8 @@ module Milkode
         # 近接マッチ無効
         # g << [m]
       end
+
+      @prev = nil
       
       <<EOF
 #{recommended_contents}
@@ -311,9 +314,20 @@ EOF
       coderay.set_range(first_index..last_index)
 
       url = @homeurl + record_link(record)
+
+      path = Util::relative_path(record.shortpath, @path)
+
+      if path != @prev
+        dt = <<EOS
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{path}</a>#{result_refinement(record)}</dt>
+EOS
+        @prev = path
+      else
+        dt = "    <dt class='result-record-empty'></dt>"
+      end
       
       <<EOS
-    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a>#{result_refinement(record)}</dt>
+    #{dt}
     <dd>
 #{coderay.to_html_anchorlink(url)}
     </dd>
@@ -333,8 +347,11 @@ EOS
     end
 
     def result_record(record)
+      filename = Util::relative_path(record.shortpath, @path).to_s
+      filename = Util::highlight_keywords(filename, @q.keywords, 'highlight-filename')
+      
       <<EOS
-    <dt class='result-file'>#{file_or_dirimg(true, @suburl)}<a href='#{@homeurl + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-file'>#{file_or_dirimg(true, @suburl)}<a href='#{@homeurl + record_link(record)}'>#{filename}</a></dt>
 EOS
     end
 

data/lib/milkode/cdweb/lib/search_files.rb

@@ -78,8 +78,11 @@ EOF
     end
 
     def result_record(record)
+      filename = Util::relative_path(record.shortpath, @path).to_s
+      filename = Util::highlight_keywords(filename, @q.fpaths + @q.fpath_or_packages, 'highlight-filename')
+
       <<EOS
-    <dt class='result-file'>#{file_or_dirimg(true, @suburl)}<a href='#{@homeurl + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-file'>#{file_or_dirimg(true, @suburl)}<a href='#{@homeurl + record_link(record)}'>#{filename}</a></dt>
 EOS
     end
 

data/lib/milkode/cdweb/views/milkode.js

@@ -100,13 +100,13 @@ function clippy_text(text, bgcolor) {
     '            width="110"' +
     '            height="14"' +
     '            id="clippy" >' +
-    '    <param name="movie" value="/flash/clippy.swf"/>' +
+    '    <param name="movie" value="<%= url_for "/flash/clippy.swf" %>"/>' +
     '    <param name="allowScriptAccess" value="always" />' +
     '    <param name="quality" value="high" />' +
     '    <param name="scale" value="noscale" />' +
     '    <param NAME="FlashVars" value="text=' + text + '">' +
     '    <param name="bgcolor" value="#FFFFFF">' +
-    '    <embed src="/flash/clippy.swf"' +
+    '    <embed src="<%= url_for "/flash/clippy.swf" %>"' +
     '           width="110"' +
     '           height="14"' +
     '           name="clippy"' +
@@ -139,7 +139,7 @@ function lineno_setup(path, lineno) {
   // copy text button
   $("#lineno-path").html(directpath + clippy_text(directpath, '#FFFFFF'));
   $("#lineno-body").html(n_lineno_dom.html());
-  $("#lineno-copyall").html("Lineno + Text" + clippy_text(directpath + " " + escapeHTML(n_lineno_dom.text()), '#F5F5F5'));
+  $("#lineno-copyall").html("Line No. + Text" + clippy_text(directpath + " " + escapeHTML(n_lineno_dom.text()), '#F5F5F5'));
 }
 
 function open_newtab() {

data/lib/milkode/cdweb/views/milkode.scss

@@ -42,8 +42,12 @@ div.search-summary {
 
 dt.result-record {
     font-size: 105%;
+    margin-top: 5px;
 }
 
+dt.result-record-empty {
+    margin-top: 5px;
+}
 dt.result-file {
     font-size: 95%;
 }
@@ -264,3 +268,9 @@ label.ui-corner-all {
      background-position: 0px;
 }
 
+/* */
+
+.highlight-filename {
+    background-color: #d0ff9c;
+}
+

data/lib/milkode/cli.rb

@@ -83,10 +83,13 @@ EOF
       cdstk.pwd(options)
     end
 
-    desc "cleanup", "Creanup garbage recoeds"
+    desc "cleanup keyword_or_path1 [keyword_or_path2 ...]", "Cleanup garbage records"
+    option :all, :type => :boolean, :aliases => '-a', :desc => 'Cleanup all.'
     option :force, :type => :boolean, :aliases => '-f', :desc => 'Force cleanup.'
-    def cleanup
-      cdstk.cleanup(options)
+    option :packages, :type => :boolean, :aliases => '-p', :desc => 'Cleanup non exist packages.'
+    option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
+    def cleanup(*args)
+      cdstk.cleanup(args, options)
     end
 
     desc "rebuild [keyword1 keyword2]", "Rebuild database"
@@ -135,6 +138,7 @@ 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 :global, :type => :boolean, :desc => "Set global .gitignore file."
     def ignore(*paths)
       begin
         cdstk.ignore(paths, options)
@@ -203,6 +207,23 @@ EOF
       cdstk.files(args, options)
     end
 
+    desc "config [options] KEY VALUE", <<EOF
+Config package settings.
+
+  $ milk coinfig no_auto_ignore true
+
+Configs:
+  no_auto_ignore           # Not add package's .gitignore
+  update_with_ctags        # Update with 'ctags -R'
+  update_with_ctags_e      # Update with 'ctags -R -e'
+  update_with_git_pull     # Update with 'git pull'
+  update_with_svn_update   # Update with 'svn update'
+EOF
+    option :delete, :type => :boolean, :aliases => '-d', :desc => "Delete key."
+    def config(*args)
+      cdstk.config(args, options)
+    end
+
     # --------------------------------------------------------------------------
     
     no_tasks do

data/lib/milkode/common/util.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'pathname'
 require 'kconv'
 require 'open3'
+require 'strscan'
 
 module Milkode
   module Util
@@ -240,6 +241,28 @@ module Milkode
         false
       end
     end
+
+    def highlight_keywords(src, keywords, css_class)
+      if keywords.empty?
+        src
+      else
+        highlight_keywords_sub(src, keywords, css_class, 0)
+      end
+    end
+
+    def highlight_keywords_sub(src, keywords, css_class, index)
+      keyword = keywords[index]
+
+      array = src.split(keyword)
+
+      if index + 1 <= keywords.size
+        array = array.map do |subsrc|
+          highlight_keywords_sub(subsrc, keywords, css_class, index + 1)
+        end
+      end
+      
+      array.join("<span class='#{css_class}'>#{keyword}</span>")
+    end
   end
 end
 

data/lib/milkode/database/document_table.rb

@@ -35,34 +35,40 @@ module Milkode
     end
 
     # レコードをまとめて削除する
-    #   検索結果にマッチしたレコード等をまとめて削除
-    #   削除前にインデックスを削除し、削除後にインデックスを再度追加してい
-    #   大量のレコードを削除する場合に高速に動作する
+    #   過去の方法
+    #     検索結果にマッチしたレコード等をまとめて削除
+    #     削除前にインデックスを削除し、削除後にインデックスを再度追加してい
+    #     大量のレコードを削除する場合に高速に動作する
+    #
+    #   現在の方法
+    #     上記の方法がかえって遅くなったので元に戻す
+    #     普通に速くなった気がする
+    # 
     def remove_records(records, &block)
-      Groonga::Schema.define do |schema|
-        schema.change_table("terms") do |table|
-          table.remove_index("documents.path")
-          table.remove_index("documents.package")
-          table.remove_index("documents.restpath")
-          table.remove_index("documents.content")
-          table.remove_index("documents.suffix")
-        end
-      end
+      # Groonga::Schema.define do |schema|
+      #   schema.change_table("terms") do |table|
+      #     table.remove_index("documents.path")
+      #     table.remove_index("documents.package")
+      #     table.remove_index("documents.restpath")
+      #     table.remove_index("documents.content")
+      #     table.remove_index("documents.suffix")
+      #   end
+      # end
 
       records.each do |record|
         yield record if block
         record.key.delete
       end
 
-      Groonga::Schema.define do |schema|
-        schema.change_table("terms") do |table|
-          table.index("documents.path", :with_position => true)
-          table.index("documents.package", :with_position => true)
-          table.index("documents.restpath", :with_position => true)
-          table.index("documents.content", :with_position => true)
-          table.index("documents.suffix", :with_position => true)
-        end
-      end
+      # Groonga::Schema.define do |schema|
+      #   schema.change_table("terms") do |table|
+      #     table.index("documents.path", :with_position => true)
+      #     table.index("documents.package", :with_position => true)
+      #     table.index("documents.restpath", :with_position => true)
+      #     table.index("documents.content", :with_position => true)
+      #     table.index("documents.suffix", :with_position => true)
+      #   end
+      # end
     end
     
     def initialize(table)
@@ -326,13 +332,13 @@ module Milkode
     end
 
     # 指定されたパッケージのクリーンアップ
-    def cleanup_package_name(package_name)
+    def cleanup_package_name(package_name, ignore_checker = nil)
       # クリーンアップ対象のファイルを検索
       result = @table.select { |record| record.package == package_name }
 
-      # 存在しないファイルの削除
+      # 存在しない＆無視ファイルの削除
       result.each do |r|
-        unless File.exist? r.path
+        if !File.exist?(r.path) || (ignore_checker && ignore_checker.ignore?("/#{r.restpath}"))
           yield r if block_given?
           # p r.restpath
           remove(r.path)

data/lib/milkode/database/updater.rb

@@ -35,13 +35,28 @@ module Milkode
         Dir.chdir(@package.directory) { system("svn update") }
       end
 
+      # Add global .gitignore
+      if @options[:global_gitignore]
+        add_global_gitignore(@options[:global_gitignore])
+      end
+
+      # update
+      update_dir(@package.directory)
+
       # cleanup
       unless @options[:no_clean]
-        @grndb.documents.cleanup_package_name(@package_name)
+        @grndb.documents.cleanup_package_name(@package_name, @current_ignore)
       end
       
-      # update
-      update_dir(@package.directory)
+      # ctags
+      if @options[:update_with_ctags]
+        Dir.chdir(@package.directory) { system("ctags -R") }
+      end
+
+      # ctags -e
+      if @options[:update_with_ctags_e]
+        Dir.chdir(@package.directory) { system("ctags -R -e") }
+      end
 
       # 更新時刻の更新
       @grndb.packages.touch(@package_name, :updatetime)
@@ -71,10 +86,22 @@ module Milkode
       @options[:update_with_svn_update] = true
     end
 
+    def enable_update_with_ctags
+      @options[:update_with_ctags] = true      
+    end
+
+    def enable_update_with_ctags_e
+      @options[:update_with_ctags_e] = true      
+    end
+
     def enable_no_clean
       @options[:no_clean] = true      
     end
 
+    def set_global_gitignore(filename)
+      @options[:global_gitignore] = filename 
+    end
+
     class Result
       attr_reader :file_count
       attr_reader :add_count
@@ -227,6 +254,14 @@ module Milkode
       end
     end
 
+    def add_global_gitignore(filename)
+      if File.exist? filename
+        alert_info("add_ignore", filename)
+        str = Util::load_content($stdout, filename)
+        @current_ignore.add IgnoreSetting.create_from_gitignore("/", str)
+      end
+    end
+
     def alert_info(title, msg)
       alert(title, msg) if @options[:display_info]
     end

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2013-06-26}
+  s.date = %q{2013-08-07}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]

data/test/test_cdstk.rb

@@ -32,8 +32,8 @@ class TestCdstk < Test::Unit::TestCase
       obj.init({})
       
       io.puts('--- add ---')
-      obj.add(['../../lib/milkode/findgrep', '../../lib/milkode/common'], {})
-      obj.add(['../../lib/milkode/findgrep'], {})
+      obj.add(['../../lib/milkode/grep', '../../lib/milkode/common'], {})
+      obj.add(['../../lib/milkode/grep'], {})
       obj.add(['../data/abc.zip'], {})
       obj.add(['../data/nodir_abc.zip'], {})
       obj.add(['../data/nodir_abc_xpi.xpi'], {})
@@ -80,7 +80,7 @@ class TestCdstk < Test::Unit::TestCase
       obj.list(['com'], {:verbose => false})
 
       io.puts('--- cleanup ---')
-      obj.cleanup({:force=>true})
+      obj.cleanup([], {:force=>true})
 
       io.puts('--- rebuild ---')
       obj.rebuild([], {:all => true})

data/test/test_milkode_yaml.rb

@@ -190,4 +190,31 @@ EOF
     assert_equal nil           , obj.package_root('/hoge/a/dir1/dir3')
     assert_equal '/path/to/dir', obj.package_root('/path/to/dir').directory
   end
+
+  def test_global_gitignore_empty
+    obj = MilkodeYaml.new(SRC)
+    assert_equal nil, obj.global_gitignore
+  end
+    
+  def test_global_gitignore_read
+    obj = MilkodeYaml.new(<<EOF)
+---
+version: '0.2'
+global_gitignore: '/path/to/.gitignore'
+contents:
+  - directory: /a/dir1
+EOF
+
+    assert_equal '/path/to/.gitignore', obj.global_gitignore
+  end
+
+  def test_global_gitignore_set
+    # set
+    obj = MilkodeYaml.new(SRC)
+    obj.set_global_gitignore('/path/to/.gitignore')
+
+    # reload
+    obj = MilkodeYaml.new(obj.dump)
+    assert_equal '/path/to/.gitignore', obj.global_gitignore
+  end
 end

data/test/test_updater.rb

@@ -107,8 +107,7 @@ module Milkode
       updater = Updater.new(@grndb, 'ignore_test')
       updater.enable_no_auto_ignore
       updater.exec
-      # result_test updater.result, 6, 2, 0
-      result_test updater.result, 5, 1, 0
+      result_test updater.result, 5, 4, 0
     end
 
     def t_silent_mode

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-26 00:00:00 +09:00
+date: 2013-08-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency