milkode 1.5.0 → 1.6.0

data/Gemfile

@@ -10,12 +10,13 @@ gem 'rack'        , '>= 1.5.2'
 gem 'sinatra'     , '>= 1.2.6'
 gem 'launchy'     , '>= 0.3.7'
 gem 'coderay'     , '>= 1.0.5'
-gem 'thin'        , '>= 1.2.10'
+gem 'thin'        , '>= 1.2.10', '< 2.0.0'
 gem 'archive-zip' , '>= 0.4.0'
 gem 'haml'        , '>= 3.1.2'
 gem 'sass'        , '>= 3.1.3'
 gem 'thor'        , '>= 0.18.1'
 gem 'i18n'        , '~> 0.6.5'
+gem 'whichr'      , '~> 0.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/HISTORY.ja.rdoc

@@ -1,3 +1,20 @@
+=== 1.6.0 2014/04/13
+
+* milk
+  * #57 Use "rescue Error::EACCESS" instead of FileTest.readable? for Windows (thanks kazuna)
+  * #58 Use whichr in Util.exist_command? (thanks kazuna)
+
+* gmilk
+  * #61 Without displaying stacktrace when pressed Ctrl+C on gmilk (thanks msmhrt)
+  * Support ENV['GMILK_OPTIONS']
+
+* etc
+  * #64 thin < 2.0.0 in Gemfile (thanks MaskedW)
+  * Add TravisCI Button
+  * README.rdoc -> README.md
+  * Util::func -> Util.func
+  * Rewrite summary and description
+
 === 1.5.0 2014/02/08
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,20 @@
+=== 1.6.0 2014/04/13
+
+* milk
+  * #57 Use "rescue Error::EACCESS" instead of FileTest.readable? for Windows (thanks kazuna)
+  * #58 Use whichr in Util.exist_command? (thanks kazuna)
+
+* gmilk
+  * #61 Without displaying stacktrace when pressed Ctrl+C on gmilk (thanks msmhrt)
+  * Support ENV['GMILK_OPTIONS']
+
+* etc
+  * #64 thin < 2.0.0 in Gemfile (thanks MaskedW)
+  * Add TravisCI Button
+  * README.rdoc -> README.md
+  * Util::func -> Util.func
+  * Rewrite summary and description
+
 === 1.5.0 2014/02/08
 
 * milk web

data/README.md

@@ -0,0 +1,21 @@
+# Milkode
+
+[![Build Status](https://travis-ci.org/ongaeshi/milkode.svg?branch=develop)](https://travis-ci.org/ongaeshi/milkode)
+
+Milkode is "Line Based" local source code search engine written by Ruby. It have command line interface and web application. It will accelerate the code reading of your life.
+
+Milkode is "見るコード". "See a code" is meaning.
+
+[Honyomi](https://github.com/ongaeshi/honyomi) are brothers.
+
+![milk-web-01.jpg](http://milkode.ongaeshi.me/images/milk-web-01.jpg)
+
+## DOCUMENTS
+
+* [Milkode - line based local source code search engine](http://milkode.ongaeshi.me/)
+
+## HISTORY
+
+* [History.rdoc](https://github.com/ongaeshi/milkode/blob/master/HISTORY.rdoc)
+* [更新履歴](https://github.com/ongaeshi/milkode/blob/master/HISTORY.ja.rdoc)
+

data/Rakefile

@@ -16,8 +16,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "milkode"
   gem.homepage = "http://github.com/ongaeshi/milkode"
   gem.license = "MIT"
-  gem.summary = %Q{Line based local source code search engine & grep-command & web-app.}
-  gem.description = %Q{Line based local source code search engine & grep-command & web-app.}
+  gem.summary = %Q{Line based local source code search engine.}
+  gem.description = %Q{Milkode is line based local source code search engine. It have command line interface and web application. It will accelerate the code reading of your life.}
   gem.email = "ongaeshi0621@gmail.com"
   gem.authors = ["ongaeshi"]
   # Dependencies move to 'Gemfile'

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/bin/gmilk

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

data/bin/milk

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

data/lib/milkode/cdstk/cdstk.rb

@@ -255,7 +255,7 @@ module Milkode
       when '.zip', '.xpi'
         alert("extract", "#{src}")
         zip_dir = File.join(@db_dir, "packages/#{ext.sub(".", "")}")
-        result = File.join(zip_dir, Util::zip_extract(src, zip_dir))
+        result = File.join(zip_dir, Util.zip_extract(src, zip_dir))
       else
         src
       end
@@ -989,7 +989,7 @@ EOF
         if options[:package]
           add_ignore = args.map {|v| v.sub(/^.\//, "") }
         else
-          path = Util::relative_path(File.expand_path('.'), package.directory).to_s
+          path = Util.relative_path(File.expand_path('.'), package.directory).to_s
           add_ignore = args.map {|v| File.join(path, v).sub(/^.\//, "") }
         end
 
@@ -1025,7 +1025,7 @@ EOF
       packages.each do |package|
         package_records(package.name).each do |record|
           if options[:relative]
-            @out.puts Util::relative_path(record.path, basedir)
+            @out.puts Util.relative_path(record.path, basedir)
           else
             if options[:all]
               @out.puts record.path
@@ -1099,11 +1099,11 @@ EOF
     private
 
     def git_protocol?(options, src)
-      options[:protocol] == 'git' || Util::git_url?(src)
+      options[:protocol] == 'git' || Util.git_url?(src)
     end
 
     def svn_protocol?(options, src)
-      options[:protocol] == 'svn' || Util::svn_url?(src)
+      options[:protocol] == 'svn' || Util.svn_url?(src)
     end
 
     def db_file
@@ -1154,8 +1154,8 @@ EOF
       updater.exec
 
       # Is github repository ?
-      if Util::exist_command?('git') && File.exist?(File.join(package.directory, ".git"))
-        repo_name = Dir.chdir(package.directory) { Util::github_repo(`git config --get remote.origin.url`) }
+      if Util.exist_command?('git') && File.exist?(File.join(package.directory, ".git"))
+        repo_name = Dir.chdir(package.directory) { Util.github_repo(`git config --get remote.origin.url`) }
 
         if repo_name && repo_name != package.options[:github]
           dst = package.options
@@ -1220,7 +1220,7 @@ EOF
       r << "#{@file_count} records" if @file_count > 0
       r << "#{@add_count} add" if @add_count > 0
       r << "#{@update_count} update" if @update_count > 0
-      alert('result', "#{r.join(', ')}. (#{Gren::Util::time_s(time)})")
+      alert('result', "#{r.join(', ')}. (#{Gren::Util.time_s(time)})")
     end
 
     def milkode_info
@@ -1265,7 +1265,7 @@ EOF
     end
       
     def alert(title, msg)
-      if (Util::platform_win?)
+      if (Util.platform_win?)
         @out.puts "#{title.ljust(10)} : #{Kconv.kconv(msg, Kconv::SJIS)}"
       else
         @out.puts "#{title.ljust(10)} : #{msg}"

data/lib/milkode/cdstk/milkode_yaml.rb

@@ -78,7 +78,7 @@ EOF
     # 指定ディレクトリの所属するパッケージのルートディレクトリを得る。
     # 見つからない場合はnilを返す。
     def package_root(dir)
-      nd = Util::normalize_filename(dir)
+      nd = Util.normalize_filename(dir)
 
       @contents.find_all {|v|
         nd =~ /^#{Regexp.escape(v.directory)}(:?\/|\Z)/

data/lib/milkode/cdstk/package.rb

@@ -88,8 +88,8 @@ module Milkode
     private
 
     def normalize
-      if (Util::platform_win?)
-        @hash['directory'] = Util::normalize_filename(directory)
+      if (Util.platform_win?)
+        @hash['directory'] = Util.normalize_filename(directory)
       end
     end
     

data/lib/milkode/cdweb/app.rb

@@ -43,7 +43,7 @@ end
 get '/' do
   if Database.validate?
     @setting = WebSetting.new
-    @version = "1.5.0"
+    @version = "1.6.0"
 
     @package_num = Database.instance.yaml_package_num
     @file_num = Database.instance.totalRecords
@@ -82,8 +82,8 @@ post '/search*' do
 
     query = Query.new(params[:query])
     # gotolineモードで1つだけ渡された時は直接ジャンプ
-    if query.keywords.size == 1 && Milkode::Util::gotoline_keyword?(query.keywords[0])
-      gotoline = Milkode::Util::parse_gotoline(query.keywords)[0]
+    if query.keywords.size == 1 && Milkode::Util.gotoline_keyword?(query.keywords[0])
+      gotoline = Milkode::Util.parse_gotoline(query.keywords)[0]
       path2 = File.join(url_for('/home'), gotoline[0][0])
       redirect Mkurl.new(path2, params).inherit_query_shead + "#n#{gotoline[1]}"
     else

data/lib/milkode/cdweb/lib/coderay_html2.rb

@@ -65,7 +65,7 @@ module Encoders
       r << "class=\"highlight-line\"" if is_highlight
       attr = r.join(" ")
 
-      line = Milkode::Util::highlight_keywords(line, options[:keywords], 'highlight-filename') if is_highlight
+      line = Milkode::Util.highlight_keywords(line, options[:keywords], 'highlight-filename') if is_highlight
       
       "<span #{attr}>#{line}</span>"
     end

data/lib/milkode/cdweb/lib/command.rb

@@ -23,9 +23,9 @@ module Milkode
 
     q = params[:query] && Query.new(params[:query]) 
 
-    if (Util::larger_than_oneline(record.content) && q && !q.keywords.empty?)
-      if Util::gotoline_keyword?(q.keywords[0])
-        gotolines = Util::parse_gotoline(q.keywords)
+    if (Util.larger_than_oneline(record.content) && q && !q.keywords.empty?)
+      if Util.gotoline_keyword?(q.keywords[0])
+        gotolines = Util.parse_gotoline(q.keywords)
         match_lines = []
         gotolines.each do |v|
           if v[0][0][1..-1] == record.shortpath
@@ -70,7 +70,7 @@ module Milkode
       end
 
     elsif (query.keywords.size > 0)
-      if Util::gotoline_keyword?(query.keywords[0])
+      if Util.gotoline_keyword?(query.keywords[0])
         searcher = SearchGotoLine.new(path, params, query, suburl)
       else
         searcher = SearchContents.new(path, params, query, suburl, locale)

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

@@ -66,7 +66,7 @@ module Milkode
 
       # パッケージ名未指定の時は現在位置を検索条件に追加
       if packages.empty? && current_path != ''
-        package, restpath = Util::divide_shortpath(current_path)
+        package, restpath = Util.divide_shortpath(current_path)
 
         grn_package = @grndb.packages[package]
         if grn_package
@@ -183,7 +183,7 @@ module Milkode
     end
 
     def touch_viewtime(path)
-      package, restpath = Util::divide_shortpath(path)
+      package, restpath = Util.divide_shortpath(path)
       @grndb.packages.touch_if(package, :viewtime) if package
     end
 

data/lib/milkode/cdweb/lib/grep.rb

@@ -70,7 +70,7 @@ module Milkode
 
       strs.each do |v|
         option = 0
-        option |= Regexp::IGNORECASE if (!is_sensitive && Util::downcase?(v))
+        option |= Regexp::IGNORECASE if (!is_sensitive && Util.downcase?(v))
         regs   << Regexp.new(Regexp.escape(v), option)
       end
 

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

@@ -117,7 +117,7 @@ module Milkode
       return [] if files.size > FILTER_BY_DIRECTORIES_FILES
       
       files.map {|v|
-        Util::relative_path(v[1], @path.split("/")[1..-1].join("/")).to_s               # 'path/to/file' ->  'to/file' (@path == 'path')
+        Util.relative_path(v[1], @path.split("/")[1..-1].join("/")).to_s               # 'path/to/file' ->  'to/file' (@path == 'path')
       }.find_all {|v|
         v.include?("/")                                                                 # Extract directory
       }.map {|v|
@@ -189,7 +189,7 @@ EOF
     end
 
     def recommended_fuzzy_gotoline?
-      @q.keywords.size == 1 && @q.only_keywords && Util::fuzzy_gotoline_keyword?(@q.keywords[0])
+      @q.keywords.size == 1 && @q.only_keywords && Util.fuzzy_gotoline_keyword?(@q.keywords[0])
     end
 
     def recommended_wide_match_range?
@@ -296,7 +296,7 @@ EOF
       @next_line = nil
 
       @records.each_with_index do |record, index|
-        if (Util::larger_than_oneline(record.content))
+        if (Util.larger_than_oneline(record.content))
           if grep_match_lines_stopover(record, index, keywords, wide_match_range)
             break
           end
@@ -353,7 +353,7 @@ EOF
 
       url = @homeurl + record_link(record)
 
-      path = Util::relative_path(record.shortpath, @path)
+      path = Util.relative_path(record.shortpath, @path)
 
       if path != @prev
 #         dt = <<EOS
@@ -388,8 +388,8 @@ EOS
     end
 
     def result_record(record)
-      filename = Util::relative_path(record.shortpath, @path).to_s
-      filename = Util::highlight_keywords(filename, @q.keywords, 'highlight-filename')
+      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)}'>#{filename}</a></dt>
@@ -417,7 +417,7 @@ EOS
       refinements << "<a href='#{refinement_suffix(record.suffix)}'>.#{record.suffix}</a>" if record.suffix
 
       # ディレクトリで絞り込み
-      path    = Util::relative_path(record.shortpath, @path)
+      path    = Util.relative_path(record.shortpath, @path)
       dirname = path.to_s.split('/')[-2]
       refinements << "<a href='#{refinement_directory(record.shortpath + '/..')}'>#{dirname}/</a>" if dirname
 

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

@@ -78,8 +78,8 @@ 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')
+      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)}'>#{filename}</a></dt>

data/lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb

@@ -32,7 +32,7 @@ module Milkode
       @homeurl = @suburl + "/home/"
 
       # 検索クエリを解析
-      gotolines = Util::parse_gotoline(@q.gotolines + @q.keywords)
+      gotolines = Util.parse_gotoline(@q.gotolines + @q.keywords)
       @gotoline = gotolines[0]
 
       # 検索
@@ -129,7 +129,7 @@ EOF
       url = @homeurl + record_link(record)
       
       <<EOS
-    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util.relative_path record.shortpath, @path}</a></dt>
     <dd>
 #{coderay.to_html_anchorlink(url)}
     </dd>

data/lib/milkode/cdweb/lib/search_gotoline.rb

@@ -33,7 +33,7 @@ module Milkode
       @homeurl = @suburl + "/home/"
 
       # 検索クエリを解析
-      @gotolines = Util::parse_gotoline(@q.keywords)
+      @gotolines = Util.parse_gotoline(@q.keywords)
 
       # レコードをピックアップ
       @records = []
@@ -118,7 +118,7 @@ EOF
       url = @homeurl + record_link(record)
       
       <<EOS
-    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util.relative_path record.shortpath, @path}</a></dt>
     <dd>
 #{coderay.to_html_anchorlink(url)}
     </dd>

data/lib/milkode/common/util.rb

@@ -6,6 +6,7 @@ require 'pathname'
 require 'kconv'
 require 'open3'
 require 'strscan'
+require 'whichr'
 
 module Milkode
   module Util
@@ -116,7 +117,7 @@ module Milkode
     end
 
     def ignore_case?(pattens, is_sensitive)
-      !is_sensitive && (pattens.all? {|v| Util::downcase? v})
+      !is_sensitive && (pattens.all? {|v| Util.downcase? v})
     end
 
     def gotoline_keyword?(keyword)
@@ -235,11 +236,15 @@ module Milkode
 
     # 指定したコマンドが存在するか？
     def exist_command?(command)
-      begin
-        Open3.capture3('type', command)[2].exited?
-      rescue Errno::ENOENT
-        false
-      end
+      # open3 : Not working on Pure Windows
+      # begin
+      #   Open3.capture3('type', command)[2].exited?
+      # rescue Errno::ENOENT
+      #   false
+      # end
+
+      # whichr
+      !(RubyWhich.new.which(command).empty?)
     end
 
     def highlight_keywords(src, keywords, css_class)

data/lib/milkode/database/document_table.rb

@@ -124,12 +124,12 @@ EOF
     def add(package_dir, restpath, package_name = nil)
       filename  = File.join(package_dir, restpath)           # フルパスの作成
       filename  = File.expand_path(filename)                 # 絶対パスに変換
-      path      = Util::filename_to_utf8(filename)           # データベースに格納する時のファイル名はutf8
+      path      = Util.filename_to_utf8(filename)           # データベースに格納する時のファイル名はutf8
       package   = package_name || File.basename(package_dir)
-      package   = Util::filename_to_utf8(package)
-      restpath  = Util::filename_to_utf8(restpath)
+      package   = Util.filename_to_utf8(package)
+      restpath  = Util.filename_to_utf8(restpath)
       suffix    = File.extname(path).sub('.', "")
-      timestamp = Util::truncate_nsec(File.mtime(filename)) # OSへの問い合わせは変換前のファイル名で
+      timestamp = Util.truncate_nsec(File.mtime(filename)) # OSへの問い合わせは変換前のファイル名で
 
       record = @table[path]
 
@@ -173,7 +173,7 @@ EOF
 
     # shortpathの一致するレコードを取得
     def find_shortpath(shortpath)
-      package, restpath = Util::divide_shortpath(shortpath)
+      package, restpath = Util.divide_shortpath(shortpath)
       result = @table.select { |record| (record.package == package) & (record.restpath == restpath) }
       return result.records[0]
     end
@@ -183,7 +183,7 @@ EOF
       if (shortpath.nil? || shortpath.empty?)
         @table.select.records
       else
-        package, restpath = Util::divide_shortpath(shortpath)
+        package, restpath = Util.divide_shortpath(shortpath)
 
         if (restpath.nil? || restpath.empty?)
           @table.select { |record| record.package == package }.to_a
@@ -406,7 +406,7 @@ EOF
     private
 
     def load_content(filename)
-      Util::load_content($stdout, filename)
+      Util.load_content($stdout, filename)
     end
 
     def package_expression(record, packages)

data/lib/milkode/database/updater.rb

@@ -205,9 +205,6 @@ module Milkode
         # 除外ディレクトリならばパス
         next if ignoreDir?(fpath, next_path)
 
-        # 読み込み不可ならばパス
-        next unless FileTest.readable?(fpath)
-
         # ファイルならば中身を探索、ディレクトリならば再帰
         case File.ftype(fpath)
         when "directory"
@@ -229,9 +226,14 @@ module Milkode
     end
 
     def ignoreFile?(fpath, mini_path)
-      GrenFileTest::ignoreFile?(fpath) ||
-        GrenFileTest::binary?(fpath) ||
-        package_ignore?(fpath, mini_path)
+      begin
+        GrenFileTest::ignoreFile?(fpath) ||
+          GrenFileTest::binary?(fpath) ||
+          package_ignore?(fpath, mini_path)
+      rescue Errno::EACCES      # Can't read file
+        alert_info("skip", "Permission denied - #{fpath}")
+        true
+      end
     end
 
     def package_ignore?(fpath, mini_path)
@@ -248,7 +250,7 @@ module Milkode
       
       if File.exist? filename
         alert_info("add_ignore", filename)
-        str = Util::load_content($stdout, filename)
+        str = Util.load_content($stdout, filename)
         @current_ignore.add IgnoreSetting.create_from_gitignore(path, str)
       end
     end
@@ -256,7 +258,7 @@ module Milkode
     def add_global_gitignore(filename)
       if File.exist? filename
         alert_info("add_ignore", filename)
-        str = Util::load_content($stdout, filename)
+        str = Util.load_content($stdout, filename)
         @current_ignore.add IgnoreSetting.create_from_gitignore("/", str)
       end
     end
@@ -266,7 +268,7 @@ module Milkode
     end
 
     def alert(title, msg)
-      if (Util::platform_win?)
+      if (Util.platform_win?)
         @out.puts "#{title.ljust(10)} : #{Kconv.kconv(msg, Kconv::SJIS)}"
       else
         @out.puts "#{title.ljust(10)} : #{msg}"

data/lib/milkode/grep/cli_grep.rb

@@ -14,8 +14,19 @@ module Milkode
     AUTO_EXTERNAL_RECORD_NUM = 500
 
     def self.execute(stdout, arguments=[])
+      begin
+        execute_in(stdout, arguments)
+      rescue Interrupt
+        puts
+      end
+    end
+
+    def self.execute_in(stdout, arguments)
+      # Add ENV['GMILK_OPTIONS'] value
+      arguments += ENV['GMILK_OPTIONS'].split if ENV['GMILK_OPTIONS']
+      
       # 引数の文字コードをUTF-8に変換
-      if (Util::platform_win?)
+      if (Util.platform_win?)
         arguments = arguments.map{|arg| Kconv.kconv(arg, Kconv::UTF8)}
       end
 
@@ -79,7 +90,7 @@ EOF
       opt.on('-n NUM', 'Limits the number of match to show.') {|v| option.matchCountLimit = v.to_i }
       opt.on('--no-external', 'Disable auto external.') {|v| my_option[:no_external] = true }
       opt.on('--no-snip', 'There being a long line, it does not snip.') {|v| option.noSnip = true }
-      opt.on('-o ENCODE', '--output-encode ENCODE', 'Specify output encode(none, jis, sjis, euc, ascii, utf8, utf16). Default is "utf8"') {|v| option.output_kcode = Util::str2kcode(v) }
+      opt.on('-o ENCODE', '--output-encode ENCODE', 'Specify output encode(none, jis, sjis, euc, ascii, utf8, utf16). Default is "utf8"') {|v| option.output_kcode = Util.str2kcode(v) }
       opt.on('-p PACKAGE', '--package PACKAGE', 'Specify search package.') {|v| setup_package(option, my_option, v) }
       opt.on('-r', '--root', 'Search from package root.') {|v| current_dir = package_root_dir(File.expand_path(".")); my_option[:find_mode] = true }
       opt.on('-s SUFFIX', '--suffix SUFFIX', 'Suffix.') {|v| option.suffixs << v; my_option[:find_mode] = true } 
@@ -101,7 +112,7 @@ EOF
 
         unless ap.gotowords.empty?
           my_option[:find_mode] = true
-          my_option[:gotoline_data] = Util::parse_gotoline(ap.gotowords)
+          my_option[:gotoline_data] = Util.parse_gotoline(ap.gotowords)
         end
 
         # p ap.arguments
@@ -189,7 +200,7 @@ EOF
             my_option[:gotoline_data].each do |v|
               if is_abs_path
                 # @memo ここにはこないはず
-                package, restpath = Util::divide_shortpath(v[0][0])
+                package, restpath = Util.divide_shortpath(v[0][0])
                 # p [package, restpath]
                 option.packages = [package]
                 option.filePatterns = [restpath]
@@ -210,8 +221,8 @@ EOF
               findGrep.searchAndPrint2(stdout, records)
             else
               # レコード数が多い時は"-e grep"で検索
-              if Util::exist_command?('cat') && Util::exist_command?('grep') && Util::exist_command?('xargs')
-                $stderr.puts "Number of records is large. Use auto external tool (gmilk -e grep)"
+              if Util.exist_command?('cat') && Util.exist_command?('grep') && Util.exist_command?('xargs')
+                $stderr.puts "Because number of records is large, Milkode use external tool. (Same as 'gmilk -e grep')"
                 search_external_tool(arguments, option, records, 'grep -n', 'grep')
               else
                 findGrep.searchAndPrint2(stdout, records)
@@ -330,7 +341,7 @@ EOF
 
       def after
         if @arguments.first
-          if Util::gotoline_keyword? @arguments[0]
+          if Util.gotoline_keyword? @arguments[0]
             @state = :gotoline
           end
         end

data/lib/milkode/grep/fast_gotoline.rb

@@ -16,12 +16,12 @@ module Milkode
 
     def search_and_print(stdout)
       @gotolines.each do |gotoline|
-        package_name, restpath = Util::divide_shortpath(gotoline[0][0])
+        package_name, restpath = Util.divide_shortpath(gotoline[0][0])
         package                = @yaml.find_name(package_name)
 
         if package
           path          = File.join(package.directory, restpath)
-          relative_path = Util::relative_path(path, Dir.pwd).to_s
+          relative_path = Util.relative_path(path, Dir.pwd).to_s
           lineno        = gotoline[1]
           content       = get_text_lineno(path, lineno)
 

data/lib/milkode/grep/findgrep.rb

@@ -45,8 +45,8 @@ module Milkode
       end
 
       def print(stdout)
-        stdout.puts "dir   : #{@start_dir} (#{Gren::Util::time_s(time)})"
-        stdout.puts "files : #{@search_count} in #{@count} (#{Gren::Util::size_s(@search_size)} in #{Gren::Util::size_s(@size)})"
+        stdout.puts "dir   : #{@start_dir} (#{Gren::Util.time_s(time)})"
+        stdout.puts "files : #{@search_count} in #{@count} (#{Gren::Util.size_s(@search_size)} in #{Gren::Util.size_s(@size)})"
         stdout.puts "match : #{@match_file_count} files, #{match_count} hit"
       end
     end
@@ -91,7 +91,7 @@ module Milkode
 
       strs.each do |v|
         option = 0
-        option |= Regexp::IGNORECASE if (@option.ignoreCase || (!@option.caseSensitive && Milkode::Util::downcase?(v)))
+        option |= Regexp::IGNORECASE if (@option.ignoreCase || (!@option.caseSensitive && Milkode::Util.downcase?(v)))
         regs << Regexp.new(v, option)
       end
 
@@ -155,7 +155,7 @@ module Milkode
     end
 
     def time_s
-      Gren::Util::time_s(@result.time)
+      Gren::Util.time_s(@result.time)
     end
 
     def searchFromDB(stdout, records, dir)
@@ -167,7 +167,7 @@ module Milkode
         if (@option.gotoline > 0)
           records.each do |record|
             if FileTest.exist?(record.path)
-              relative_path = Milkode::Util::relative_path(record.path, Dir.pwd).to_s
+              relative_path = Milkode::Util.relative_path(record.path, Dir.pwd).to_s
               line = getTextLineno(relative_path, @option.gotoline)
               stdout.puts "#{relative_path}:#{@option.gotoline}:#{line}" if (line)
               @result.match_file_count += 1
@@ -185,7 +185,7 @@ module Milkode
         else
           records.each do |record|
             path = record.path
-            relative_path = Milkode::Util::relative_path(path, Dir.pwd).to_s
+            relative_path = Milkode::Util.relative_path(path, Dir.pwd).to_s
             stdout.puts relative_path
             @result.match_file_count += 1
             raise MatchCountOverError if (0 < @option.matchCountLimit && @option.matchCountLimit <= @result.match_file_count)
@@ -340,7 +340,7 @@ module Milkode
         if ( result )
           unless (@option.dispHtml)
             # header = "#{path}:#{index + 1}:"
-            rpath = Milkode::Util::relative_path(path, Dir.pwd).to_s
+            rpath = Milkode::Util.relative_path(path, Dir.pwd).to_s
             header = "#{rpath}:#{index + 1}:"
             
             line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
@@ -391,7 +391,7 @@ EOF
     def self.file2lines(file, kcode)
       data = file.read
       
-      unless Milkode::Util::ruby19?
+      unless Milkode::Util.ruby19?
         if (kcode != Kconv::NOCONV)
           file_kcode = Kconv::guess(data)
 

data/milkode.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = "milkode"
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = "2014-02-08"
-  s.description = "Line based local source code search engine & grep-command & web-app."
+  s.date = "2014-04-13"
+  s.description = "Milkode is line based local source code search engine. It have command line interface and web application. It will accelerate the code reading of your life."
   s.email = "ongaeshi0621@gmail.com"
   s.executables = ["gmilk", "milk"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "HISTORY.ja.rdoc",
     "HISTORY.rdoc",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/gmilk",
@@ -202,7 +202,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"
-  s.summary = "Line based local source code search engine & grep-command & web-app."
+  s.summary = "Line based local source code search engine."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -214,12 +214,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
       s.add_runtime_dependency(%q<coderay>, [">= 1.0.5"])
-      s.add_runtime_dependency(%q<thin>, [">= 1.2.10"])
+      s.add_runtime_dependency(%q<thin>, ["< 2.0.0", ">= 1.2.10"])
       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.18.1"])
       s.add_runtime_dependency(%q<i18n>, ["~> 0.6.5"])
+      s.add_runtime_dependency(%q<whichr>, ["~> 0.3"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
@@ -232,12 +233,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_dependency(%q<launchy>, [">= 0.3.7"])
       s.add_dependency(%q<coderay>, [">= 1.0.5"])
-      s.add_dependency(%q<thin>, [">= 1.2.10"])
+      s.add_dependency(%q<thin>, ["< 2.0.0", ">= 1.2.10"])
       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.18.1"])
       s.add_dependency(%q<i18n>, ["~> 0.6.5"])
+      s.add_dependency(%q<whichr>, ["~> 0.3"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -251,12 +253,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])
     s.add_dependency(%q<launchy>, [">= 0.3.7"])
     s.add_dependency(%q<coderay>, [">= 1.0.5"])
-    s.add_dependency(%q<thin>, [">= 1.2.10"])
+    s.add_dependency(%q<thin>, ["< 2.0.0", ">= 1.2.10"])
     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.18.1"])
     s.add_dependency(%q<i18n>, ["~> 0.6.5"])
+    s.add_dependency(%q<whichr>, ["~> 0.3"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/test/test_cli.rb

@@ -26,9 +26,9 @@ class TestCLI < Test::Unit::TestCase
   def test_add
     # system("type git")
     command("add")
-    assert_not_match /error/, command("add git@github.com:ongaeshi/mini-repo-git.git")
-    assert_not_match /error/, command("add git@github.com:ongaeshi/mini-repo-git.git -n mrg-develop -b develop")
-    # assert_match     /error/, command("add git@github.com:ongaeshi/mini-repo-git.git -n mrg-developa -b developa") # not found branch
+    assert_not_match /error/, command("add git://github.com/ongaeshi/mini-repo-git.git")
+    assert_not_match /error/, command("add git://github.com/ongaeshi/mini-repo-git.git -n mrg-develop -b develop")
+    # assert_match     /error/, command("add git://github.com/ongaeshi/mini-repo-git.git -n mrg-developa -b developa") # not found branch
   end
 
   def test_grep

data/test/test_ignore_setting.rb

@@ -106,7 +106,7 @@ EOF
 
   def test_create_from_gitignore_sjis
     Dir.chdir(File.join(File.dirname(__FILE__))) do
-      str = Milkode::Util::load_content($stdout, "data/.gitignore.sjis") # sjis -> utf-8
+      str = Milkode::Util.load_content($stdout, "data/.gitignore.sjis") # sjis -> utf-8
       is  = IgnoreSetting.create_from_gitignore("/doc", str)
       assert_equal "/doc", is.path
       assert_equal ["coverage", "rdoc", "doc", ".yardoc", ".bundle", "pkg"], is.ignores

data/test/test_milkode_yaml.rb

@@ -36,9 +36,9 @@ EOF
 
   def test_dump
     obj = MilkodeYaml.new(SRC)
-    if Milkode::Util::ruby20?
+    if Milkode::Util.ruby20?
       assert_equal SRC, obj.dump
-    elsif Milkode::Util::ruby19?
+    elsif Milkode::Util.ruby19?
       assert_equal <<EOF, obj.dump
 ---
 version: '0.2'
@@ -75,7 +75,7 @@ EOF
 
     assert_equal 1, obj.contents.size
 
-    assert_equal <<EOF, obj.dump  if Milkode::Util::ruby19?
+    assert_equal <<EOF, obj.dump  if Milkode::Util.ruby19?
 ---
 version: '0.2'
 contents:
@@ -89,7 +89,7 @@ EOF
 
     assert_equal 2, obj.contents.size
 
-    if Milkode::Util::ruby20?
+    if Milkode::Util.ruby20?
       assert_equal <<EOF, obj.dump
 ---
 version: '0.2'
@@ -100,7 +100,7 @@ contents:
   - '*.bak'
   - /rdoc
 EOF
-    elsif Milkode::Util::ruby19?
+    elsif Milkode::Util.ruby19?
       assert_equal <<EOF, obj.dump
 ---
 version: '0.2'
@@ -122,7 +122,7 @@ EOF
     obj = MilkodeYaml.new(V_0_1)
     assert_equal true, obj.migrate
 
-    assert_equal <<EOF, obj.dump if Milkode::Util::ruby19?
+    assert_equal <<EOF, obj.dump if Milkode::Util.ruby19?
 ---
 version: '0.2'
 contents:
@@ -145,7 +145,7 @@ EOF
     p = Package.create(p.directory, p.ignore + ['*.a'])
     obj.update(p)
 
-    if Milkode::Util::ruby20?
+    if Milkode::Util.ruby20?
       assert_equal <<EOF, obj.dump
 ---
 version: '0.2'
@@ -158,7 +158,7 @@ contents:
   - '*.a'
 - directory: /a/b/c
 EOF
-    elsif Milkode::Util::ruby19?
+    elsif Milkode::Util.ruby19?
       assert_equal <<EOF, obj.dump
 ---
 version: '0.2'

data/test/test_package_table.rb

@@ -165,7 +165,7 @@ module Milkode
 
     def t_touch
       r = @packages.add("r1", "", {})
-      t = Util::truncate_nsec(Time.now)
+      t = Util.truncate_nsec(Time.now)
 
       assert_not_equal t, r.updatetime
       assert_not_equal t, r.viewtime

data/test/test_util.rb

@@ -14,13 +14,13 @@ class TestUtil < Test::Unit::TestCase
   include FileTestUtils
 
   def test_zip_extract
-    Milkode::Util::zip_extract('../data/abc.zip', '.')
+    Milkode::Util.zip_extract('../data/abc.zip', '.')
     assert File.exist?('abc')
     assert File.exist?('abc/a.txt')
     assert File.exist?('abc/b.txt')
     assert File.exist?('abc/c.txt')
     
-    Milkode::Util::zip_extract('../data/nodir_abc.zip', '.')
+    Milkode::Util.zip_extract('../data/nodir_abc.zip', '.')
     assert File.exist?('nodir_abc')
     assert File.exist?('nodir_abc/a.txt')
     assert File.exist?('nodir_abc/b.txt')
@@ -29,17 +29,17 @@ class TestUtil < Test::Unit::TestCase
 
   # Remove because fail test on single test
   # def test_root_entrylist
-  #   assert_equal ['abc/'], Milkode::Util::root_entrylist('../data/abc.zip')
-  #   assert_equal ['a.txt', 'b.txt', 'c.txt'], Milkode::Util::root_entrylist('../data/nodir_abc.zip')
+  #   assert_equal ['abc/'], Milkode::Util.root_entrylist('../data/abc.zip')
+  #   assert_equal ['a.txt', 'b.txt', 'c.txt'], Milkode::Util.root_entrylist('../data/nodir_abc.zip')
   # end
 
   def test_platform
-    if (Milkode::Util::platform_osx?)
-      assert_equal Milkode::Util::shell_kcode, Kconv::UTF8
+    if (Milkode::Util.platform_osx?)
+      assert_equal Milkode::Util.shell_kcode, Kconv::UTF8
     end
 
-    if (Milkode::Util::platform_win?)
-      assert_equal Milkode::Util::shell_kcode, Kconv::SJIS
+    if (Milkode::Util.platform_win?)
+      assert_equal Milkode::Util.shell_kcode, Kconv::SJIS
     end
   end
 
@@ -55,92 +55,92 @@ class TestUtil < Test::Unit::TestCase
   end
 
   def test_filename_to_utf8
-    if (Milkode::Util::ruby19?)
-      assert_equal Encoding::UTF_8, Milkode::Util::filename_to_utf8('ダミー').encoding
-      assert_equal Encoding::UTF_8, Milkode::Util::filename_to_utf8(create_filename_str('ダミー')).encoding
+    if (Milkode::Util.ruby19?)
+      assert_equal Encoding::UTF_8, Milkode::Util.filename_to_utf8('ダミー').encoding
+      assert_equal Encoding::UTF_8, Milkode::Util.filename_to_utf8(create_filename_str('ダミー')).encoding
     else
       # 実行だけはしておく
-      Milkode::Util::filename_to_utf8('ダミー')
-      Milkode::Util::filename_to_utf8(create_filename_str('ダミー'))
+      Milkode::Util.filename_to_utf8('ダミー')
+      Milkode::Util.filename_to_utf8(create_filename_str('ダミー'))
     end
   end
 
   def test_downcase?
-    assert !Milkode::Util::downcase?("DUMMY")
-    assert Milkode::Util::downcase?("dummy")    
-    assert !Milkode::Util::downcase?("Dummy")
-    assert !Milkode::Util::downcase?("dummyNode")    
+    assert !Milkode::Util.downcase?("DUMMY")
+    assert Milkode::Util.downcase?("dummy")    
+    assert !Milkode::Util.downcase?("Dummy")
+    assert !Milkode::Util.downcase?("dummyNode")    
   end
 
   def test_ignore_case?
-    assert_equal true,  Milkode::Util::ignore_case?(['a', 'b'], false)
-    assert_equal false, Milkode::Util::ignore_case?(['a', 'b'], true)
-    assert_equal false, Milkode::Util::ignore_case?(['a', 'B'], false)
-    assert_equal false, Milkode::Util::ignore_case?(['A', 'b'], true)
+    assert_equal true,  Milkode::Util.ignore_case?(['a', 'b'], false)
+    assert_equal false, Milkode::Util.ignore_case?(['a', 'b'], true)
+    assert_equal false, Milkode::Util.ignore_case?(['a', 'B'], false)
+    assert_equal false, Milkode::Util.ignore_case?(['A', 'b'], true)
   end
 
   def test_parse_gotoline
-    assert_equal [[['a', 'b'], 123]],       Milkode::Util::parse_gotoline(['a', '123', 'b']) 
-    assert_equal [[['a', '123', 'b'], 55]], Milkode::Util::parse_gotoline(['a', '123', 'b', '55'])
-    assert_equal [[['a', 'b'], 1]], Milkode::Util::parse_gotoline(['a', 'b'])
-    assert_equal [[['a'], 55]],    Milkode::Util::parse_gotoline(['a:55'])
-    assert_equal [[['lib/aaa.c'], 8], [['test/bbb.rb'], 9]],    Milkode::Util::parse_gotoline(['lib/aaa.c:8', 'test/bbb.rb:9'])
-    assert_equal [[['c:/tmp/ccc.txt'], 99]],    Milkode::Util::parse_gotoline(['c:/tmp/ccc.txt:99'])
-    assert_equal [[['/milkode/hoge.rb'], 99]],    Milkode::Util::parse_gotoline(['/milkode/hoge.rb:99'])
+    assert_equal [[['a', 'b'], 123]],       Milkode::Util.parse_gotoline(['a', '123', 'b']) 
+    assert_equal [[['a', '123', 'b'], 55]], Milkode::Util.parse_gotoline(['a', '123', 'b', '55'])
+    assert_equal [[['a', 'b'], 1]], Milkode::Util.parse_gotoline(['a', 'b'])
+    assert_equal [[['a'], 55]],    Milkode::Util.parse_gotoline(['a:55'])
+    assert_equal [[['lib/aaa.c'], 8], [['test/bbb.rb'], 9]],    Milkode::Util.parse_gotoline(['lib/aaa.c:8', 'test/bbb.rb:9'])
+    assert_equal [[['c:/tmp/ccc.txt'], 99]],    Milkode::Util.parse_gotoline(['c:/tmp/ccc.txt:99'])
+    assert_equal [[['/milkode/hoge.rb'], 99]],    Milkode::Util.parse_gotoline(['/milkode/hoge.rb:99'])
   end
   
   def test_gotoline_multi?
-    assert_equal true,  Milkode::Util::gotoline_multi?("test:1".split)
-    assert_equal true,  Milkode::Util::gotoline_multi?("test.rb:5 lib.c:10".split)
-    assert_equal false,  Milkode::Util::gotoline_multi?("a 123 b".split)
-    assert_equal false,  Milkode::Util::gotoline_multi?("c:/user 5".split)
+    assert_equal true,  Milkode::Util.gotoline_multi?("test:1".split)
+    assert_equal true,  Milkode::Util.gotoline_multi?("test.rb:5 lib.c:10".split)
+    assert_equal false,  Milkode::Util.gotoline_multi?("a 123 b".split)
+    assert_equal false,  Milkode::Util.gotoline_multi?("c:/user 5".split)
   end
 
   def test_git_url?
-    assert_equal false, Milkode::Util::git_url?('http:://ongaeshi.me')
-    assert_equal  true, Milkode::Util::git_url?('git://github.com/ongaeshi/milkode.git')
-    assert_equal  true, Milkode::Util::git_url?('git@github.com:ongaeshi/milkode.git')
-    assert_equal  true, Milkode::Util::git_url?('ssh:foo@bar/baz.git')
-    assert_equal  true, Milkode::Util::git_url?('https://github.com/ongaeshi/milkode.git')
+    assert_equal false, Milkode::Util.git_url?('http:://ongaeshi.me')
+    assert_equal  true, Milkode::Util.git_url?('git://github.com/ongaeshi/milkode.git')
+    assert_equal  true, Milkode::Util.git_url?('git@github.com:ongaeshi/milkode.git')
+    assert_equal  true, Milkode::Util.git_url?('ssh:foo@bar/baz.git')
+    assert_equal  true, Milkode::Util.git_url?('https://github.com/ongaeshi/milkode.git')
   end
 
   def test_svn_url?
-    assert_equal  true, Milkode::Util::svn_url?('svn://ongaeshi.me/svn/trunk/')
-    assert_equal  true, Milkode::Util::svn_url?('svn+ssh://ongaeshi.me/svn/trunk/')
-    assert_equal false, Milkode::Util::svn_url?('svna://ongaeshi.me/svn/trunk/')
-    assert_equal false, Milkode::Util::svn_url?('http:://ongaeshi.me')
-    assert_equal false, Milkode::Util::svn_url?('git://github.com/ongaeshi/milkode.git')
-    assert_equal false, Milkode::Util::svn_url?('git@github.com:ongaeshi/milkode.git')
-    assert_equal false, Milkode::Util::svn_url?('ssh:foo@bar/baz.git')
+    assert_equal  true, Milkode::Util.svn_url?('svn://ongaeshi.me/svn/trunk/')
+    assert_equal  true, Milkode::Util.svn_url?('svn+ssh://ongaeshi.me/svn/trunk/')
+    assert_equal false, Milkode::Util.svn_url?('svna://ongaeshi.me/svn/trunk/')
+    assert_equal false, Milkode::Util.svn_url?('http:://ongaeshi.me')
+    assert_equal false, Milkode::Util.svn_url?('git://github.com/ongaeshi/milkode.git')
+    assert_equal false, Milkode::Util.svn_url?('git@github.com:ongaeshi/milkode.git')
+    assert_equal false, Milkode::Util.svn_url?('ssh:foo@bar/baz.git')
   end
 
   def test_divide_shortpath
-    package, restpath = Milkode::Util::divide_shortpath('package/to/a.txt')
+    package, restpath = Milkode::Util.divide_shortpath('package/to/a.txt')
     assert_equal 'package', package
     assert_equal 'to/a.txt', restpath
 
-    package, restpath = Milkode::Util::divide_shortpath('/package/to/a.txt')
+    package, restpath = Milkode::Util.divide_shortpath('/package/to/a.txt')
     assert_equal 'package', package
     assert_equal 'to/a.txt', restpath
   end
       
   def test_highlight_keywords
-    assert_equal "stringstr", Milkode::Util::highlight_keywords("stringstr", [], 'attr')
-    assert_equal "<span class='attr'>str</span>ing", Milkode::Util::highlight_keywords("string", ["str"], 'attr')
-    assert_equal "<span class='attr'>str</span>ing<span class='attr'>str</span>", Milkode::Util::highlight_keywords("stringstr", ["str"], 'attr')
-    assert_equal "<span class='attr'>stri</span>ng<span class='attr'>str</span>", Milkode::Util::highlight_keywords("stringstr", ["str", "i", "s"], 'attr')
-    assert_equal "abc<span class='attr'>d</span>", Milkode::Util::highlight_keywords("abcd", ["d"], 'attr')
-    assert_equal "<span class='attr'>日本</span>語a<span class='attr'>bc</span>dで<span class='attr'>す</span>", Milkode::Util::highlight_keywords("日本語abcdです", ["bc", "日本", "す"], 'attr')
-    assert_equal "<span><span class='attr'>span</span></span>", Milkode::Util::highlight_keywords("<span>span</span>", ["span"], 'attr')
+    assert_equal "stringstr", Milkode::Util.highlight_keywords("stringstr", [], 'attr')
+    assert_equal "<span class='attr'>str</span>ing", Milkode::Util.highlight_keywords("string", ["str"], 'attr')
+    assert_equal "<span class='attr'>str</span>ing<span class='attr'>str</span>", Milkode::Util.highlight_keywords("stringstr", ["str"], 'attr')
+    assert_equal "<span class='attr'>stri</span>ng<span class='attr'>str</span>", Milkode::Util.highlight_keywords("stringstr", ["str", "i", "s"], 'attr')
+    assert_equal "abc<span class='attr'>d</span>", Milkode::Util.highlight_keywords("abcd", ["d"], 'attr')
+    assert_equal "<span class='attr'>日本</span>語a<span class='attr'>bc</span>dで<span class='attr'>す</span>", Milkode::Util.highlight_keywords("日本語abcdです", ["bc", "日本", "す"], 'attr')
+    assert_equal "<span><span class='attr'>span</span></span>", Milkode::Util.highlight_keywords("<span>span</span>", ["span"], 'attr')
   end
 
  def test_github_repo
-    assert_equal 'ongaeshi/firelink', Milkode::Util::github_repo('git@github.com:ongaeshi/firelink.git')
-    assert_equal 'ongaeshi/milkode' , Milkode::Util::github_repo('git@github.com:ongaeshi/milkode.git')
-    assert_equal 'ongaeshi/milkode' , Milkode::Util::github_repo('git://github.com/ongaeshi/milkode.git')
-    assert_equal 'ongaeshi/milkode' , Milkode::Util::github_repo('https://github.com/ongaeshi/milkode.git')
-    assert_equal 'ongaeshi/milkode' , Milkode::Util::github_repo('http://github.com/ongaeshi/milkode.git')
-    assert_equal nil                , Milkode::Util::github_repo('https://ongaeshi.me/ongaeshi/milkode.git')
+    assert_equal 'ongaeshi/firelink', Milkode::Util.github_repo('git@github.com:ongaeshi/firelink.git')
+    assert_equal 'ongaeshi/milkode' , Milkode::Util.github_repo('git@github.com:ongaeshi/milkode.git')
+    assert_equal 'ongaeshi/milkode' , Milkode::Util.github_repo('git://github.com/ongaeshi/milkode.git')
+    assert_equal 'ongaeshi/milkode' , Milkode::Util.github_repo('https://github.com/ongaeshi/milkode.git')
+    assert_equal 'ongaeshi/milkode' , Milkode::Util.github_repo('http://github.com/ongaeshi/milkode.git')
+    assert_equal nil                , Milkode::Util.github_repo('https://ongaeshi.me/ongaeshi/milkode.git')
   end
 
  def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milkode
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolor
@@ -118,6 +118,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.10
@@ -126,6 +129,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.10
@@ -209,6 +215,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
+- !ruby/object:Gem::Dependency
+  name: whichr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -289,7 +311,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.4
-description: Line based local source code search engine & grep-command & web-app.
+description: Milkode is line based local source code search engine. It have command
+  line interface and web application. It will accelerate the code reading of your
+  life.
 email: ongaeshi0621@gmail.com
 executables:
 - gmilk
@@ -297,7 +321,7 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - .travis.yml
@@ -305,7 +329,7 @@ files:
 - HISTORY.ja.rdoc
 - HISTORY.rdoc
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/gmilk
@@ -502,5 +526,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Line based local source code search engine & grep-command & web-app.
+summary: Line based local source code search engine.
 test_files: []

data/README.rdoc

@@ -1,6 +0,0 @@
-= milkode
-
-Line based local source code search engine & web-app.
-
-* {History.rdoc}[https://github.com/ongaeshi/milkode/blob/master/HISTORY.rdoc]
-* {更新履歴}[https://github.com/ongaeshi/milkode/blob/master/HISTORY.ja.rdoc]