milkode 1.3.0 → 1.4.0

data/Gemfile

@@ -15,6 +15,7 @@ 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'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/bin/gmilk

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

data/bin/milk

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

data/lib/milkode/cdstk/cdstk.rb

@@ -119,6 +119,10 @@ module Milkode
     def add(dirs, options)
       update_display_info(options)
 
+      if options[:from_file]
+        dirs = File.read(options[:from_file]).split("\n")
+      end
+
       print_result do
         # データベースを開く
         db_open
@@ -131,7 +135,8 @@ module Milkode
 
             # YAMLに追加
             package = Package.create(dir, options[:ignore])
-            add_yaml(package)
+            skip_add = options[:from_file] && @yaml.find_name(package.name)
+            add_yaml(package) unless skip_add
 
             # オプション設定
             is_update_with_git_pull   = git_protocol?(options, v)
@@ -139,7 +144,13 @@ module Milkode
             set_yaml_options(package, options, is_update_with_git_pull, is_update_with_svn_update)
 
             # アップデート
-            update_dir_in(dir) unless options[:empty]
+            unless options[:empty]
+              if skip_add
+                update_package_in(package, options)
+              else
+                update_dir_in(dir)
+              end
+            end
           end
         rescue AddError => e
           error_alert(e.message)
@@ -281,17 +292,23 @@ module Milkode
     end
 
     def git_clone_in(url, options)
-      alert("git", url)
-
       dst_dir  = File.join(@db_dir, "packages/git")
       name     = options[:name] || File.basename(url).sub(/\.git\Z/, "")
       filename = File.join(dst_dir, name)
 
-      # git output progress to stderr.
-      # `git clone #{url} #{filename} 2>&1`
+      unless File.exist?(filename)
+        # git output progress to stderr.
+        # `git clone #{url} #{filename} 2>&1`
 
-      # with output
-      system("git clone #{url} #{filename}")
+        # with output
+        if options[:branch_name]
+          alert("git", "#{url} (#{options[:branch_name]})")
+          system("git clone #{url} #{filename} -b #{options[:branch_name]}")
+        else
+          alert("git", url)
+          system("git clone #{url} #{filename}")
+        end
+      end
 
       filename
     end

data/lib/milkode/cdweb/app.rb

@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
-#
-# @file 
-# @brief
-# @author ongaeshi
-# @date   2011/06/25
-
 require 'rubygems'
 require 'sinatra'
+require 'sass'
+require 'haml'
+require 'i18n'
+
 if ENV['MILKODE_SINATRA_RELOADER']
   require 'sinatra/reloader'
   also_reload '../../**/*.rb'
 end
-require 'sass'
-require 'haml'
 
 $LOAD_PATH.unshift '../..'
 require 'milkode/common/util'
@@ -25,7 +21,10 @@ require 'milkode/cdweb/lib/info_home'
 require 'milkode/cdweb/lib/info_package'
 require 'sinatra/url_for'
 
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locales', '*.yml').to_s]
+
 set :haml, :format => :html5
+enable :sessions
 
 get '/js/:filename' do
   content_type :js
@@ -44,7 +43,7 @@ end
 get '/' do
   if Database.validate?
     @setting = WebSetting.new
-    @version = "1.3.0"
+    @version = "1.4.0"
 
     @package_num = Database.instance.yaml_package_num
     @file_num = Database.instance.totalRecords
@@ -107,7 +106,7 @@ post '/command' do
   when 'favorite'
     Database.instance.set_fav(params[:name], params[:favorited] == 'true')
     @package_list = PackageList.new(Database.instance.grndb, url_for(''))
-    "お気に入り: " + @package_list.favorite_list({})
+    t(:favorite) + ": " + @package_list.favorite_list({})
   end
 end
 
@@ -117,18 +116,19 @@ get '/home*' do |path|
   record = Database.instance.record(path)
   @package_list = PackageList.new(Database.instance.grndb, url_for(''))
   suburl = url_for('')
+  update_locale
 
   if path.empty?
     if (params[:query] and !params[:query].empty?)
-      search(path, params, before, suburl)
+      search(path, params, before, suburl, @locale)
     else
-      packages(params, before, suburl)
+      packages(params, before, suburl, @locale)
     end
   elsif (record)
     view(record, params, before)
   else
     if (params[:query] and !params[:query].empty?)
-      search(path, params, before, suburl)
+      search(path, params, before, suburl, @locale)
     else
       filelist(path, params, before, suburl)
     end
@@ -192,9 +192,9 @@ helpers do
     value ||= "package"
 
     data = [
-            ['all'      , '全て'        ],
-            ['package'  , 'パッケージ'  ],
-            ['directory', 'ディレクトリ'],
+            ['all'      , t(:all)      ],
+            ['package'  , t(:package)  ],
+            ['directory', t(:directory)],
            ]
 
     <<EOF
@@ -239,27 +239,28 @@ EOF
     flist = File.join("#{suburl}/home/#{path}", flistpath)
 
     package_name = ""
-    modal_body = "全てのパッケージを更新しますか？"
+    modal_body = t(:update_all)
 
     if (path != "")
       package_name = path.split('/')[0]
-      modal_body = "#{package_name} を更新しますか？"
+      update_locale
+      modal_body = I18n.t(:update_package, {package_name: package_name, locale: @locale})
     end
 
     info_path = "#{suburl}/info"
     info_path = File.join(info_path, package_name) if package_name != ""
 
     <<EOF
-    #{headicon('go-home-5.png', suburl)}<a href="#{suburl}/home" class="headmenu">ホーム</a>&nbsp;
-    #{headicon('directory.png', suburl)}<a href="#{flist}" class="headmenu">ディレクトリ</a>
-    #{headicon('view-refresh-4.png', suburl)}<a href="#updateModal" class="headmenu" data-toggle="modal">パッケージを更新</a>&nbsp;
-    #{headicon('info.png', suburl)}<a href="#{info_path}" class="headmenu">統計情報</a>&nbsp;
-    #{headicon('help.png', suburl)}<a href="#{suburl}/help" class="headmenu">ヘルプ</a>
+    #{headicon('go-home-5.png', suburl)}<a href="#{suburl}/home" class="headmenu">#{t(:home)}</a>&nbsp;
+    #{headicon('directory.png', suburl)}<a href="#{flist}" class="headmenu">#{t(:directory)}</a>
+    #{headicon('view-refresh-4.png', suburl)}<a href="#updateModal" class="headmenu" data-toggle="modal">#{t(:update_packages)}</a>&nbsp;
+    #{headicon('info.png', suburl)}<a href="#{info_path}" class="headmenu">#{t(:stats)}</a>&nbsp;
+    #{headicon('help.png', suburl)}<a href="#{suburl}/help" class="headmenu">#{t(:help)}</a>
 
     <div id="updateModal" class="modal hide fade">
       <div class="modal-header">
         <a href="#" class="close" data-dismiss="modal">&times;</a>
-        <h3>パッケージを更新</h3>
+        <h3>#{t(:update_packages)}</h3>
       </div>
       <div class="modal-body">
         <h4>#{modal_body}</h4>
@@ -292,7 +293,7 @@ EOF
   def create_favorite_list(package_list)
     <<EOF
       <div class="favorite_list">
-        お気に入り:
+        #{t(:favorite)}:
         #{package_list.favorite_list(params)}
       </div>
     </div>
@@ -399,6 +400,32 @@ EOF
   def search_summary_hook(path)
     goto_github_project(path)
   end
+
+  ## for I18N
+  def ua_locale
+    # Pulls the browser's language
+    @env["HTTP_ACCEPT_LANGUAGE"][0,2]
+  end
+
+  def update_locale
+    unless @locale
+      begin
+        # Support session
+        @locale = params[:locale] || session[:locale] || ua_locale || 'en'
+        session[:locale] = @locale
+      rescue NameError          # 'session' variable can't find during testing
+        @locale = 'en'
+      end
+        
+      # Reload with sinatra-reloader
+      I18n.reload! if ENV['MILKODE_SINATRA_RELOADER']
+    end
+  end
+
+  def t(*args)
+    update_locale
+    I18n.t(*args, locale: @locale)
+  end
 end
 
 class Array

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

@@ -56,7 +56,7 @@ module Milkode
     haml :view
   end
 
-  def search(path, params, before, suburl)
+  def search(path, params, before, suburl, locale)
     @setting = WebSetting.new
     @path = path
     query = Query.new(params[:query])
@@ -73,7 +73,7 @@ module Milkode
       if Util::gotoline_keyword?(query.keywords[0])
         searcher = SearchGotoLine.new(path, params, query, suburl)
       else
-        searcher = SearchContents.new(path, params, query, suburl)
+        searcher = SearchContents.new(path, params, query, suburl, locale)
 
         if searcher.directjump?
           redirect searcher.directjump_url
@@ -105,24 +105,25 @@ module Milkode
     haml :filelist
   end
 
-  def packages(params, before, suburl)
+  def packages(params, before, suburl, locale)
     @setting = WebSetting.new
     @title = "Package List"
     @path = ""
     packages = Database.instance.packages(params["sort"])
     @total_records = packages.size
+    @locale = locale
 
     @sort_change_content =
       [
-       sort_change_content(params["sort"], '名前'),
+       sort_change_content(params["sort"], I18n.t(:name, locale: @locale)),
        '|',
-       sort_change_content(params["sort"], '最近使った', 'viewtime'),
+       sort_change_content(params["sort"], I18n.t(:recently_viewed, locale: @locale), 'viewtime'),
        '|',
-       sort_change_content(params["sort"], '追加順'    , 'addtime'),
+       sort_change_content(params["sort"], I18n.t(:added, locale: @locale), 'addtime'),
        '|',
-       sort_change_content(params["sort"], '更新順'    , 'updatetime'),
+       sort_change_content(params["sort"], I18n.t(:updated, locale: @locale), 'updatetime'),
        '|',
-       sort_change_content(params["sort"], 'お気に入り', 'favtime'),
+       sort_change_content(params["sort"], I18n.t(:favorite, locale: @locale), 'favtime'),
       ].join("\n")
 
     @record_content = packages.map do |v|

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

@@ -87,11 +87,11 @@ module Milkode
       end
 
       # 検索
-      result, total_records = [], 0
+      records, total_records, result = [], 0, nil
 
       begin
         unless is_not_search
-          result, total_records = @documents.search_with_match(
+          records, total_records, result = @documents.search_with_match(
             :patterns  => patterns,
             :keywords  => keywords,
             :paths     => paths,
@@ -108,7 +108,7 @@ module Milkode
       end
 
       # 結果
-      return result.map{|r| DocumentRecord.new(r)}, total_records
+      return records.map{|r| DocumentRecord.new(r)}, total_records, result
     end
 
     def selectAll(offset, limit)

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

@@ -26,7 +26,11 @@ module Milkode
 
     DEFAULT_WIDE_MATCH_RANGE = 7 # 未指定時のワイド検索範囲
 
-    def initialize(path, params, query, suburl)
+    FILTER_BY_PACKAGE_NUM = 5
+    FILTER_BY_SUFFIX_NUM  = 8
+    FILTER_BY_DIRECTORIES_FILES = 200
+
+    def initialize(path, params, query, suburl, locale)
       @path             = path
       @params           = params
       @q                = query
@@ -37,11 +41,12 @@ module Milkode
       @is_sensitive     = params[:sensitive] == 'on'
       @suburl           = suburl
       @homeurl          = @suburl + "/home/"
+      @locale           = locale
 
       @searcher_fuzzy_gotoline = nil
 
       # 検索1 : クエリーそのまま
-      @records, @total_records = Database.instance.search(@q.keywords, @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages, @offset, LIMIT_NUM)
+      @records, @total_records, result = Database.instance.search(@q.keywords, @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages, @offset, LIMIT_NUM)
       grep_contents(@q.keywords, @q.wide_match_range)
 
       # 検索2 : マッチしなかった時におすすめクエリーがある場合
@@ -92,6 +97,36 @@ module Milkode
           @match_files, t = Database.instance.search([], @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages + @q.keywords, @offset, MATH_FILE_LIMIT)
         end
       end
+
+      # Search4 : Drilldown
+      begin 
+        @drilldown_packages    = DocumentTable.drilldown(result, "package", FILTER_BY_PACKAGE_NUM)
+        @drilldown_directories = make_drilldown_directories(result)
+        @drilldown_suffixs     = DocumentTable.drilldown(result, "suffix", FILTER_BY_SUFFIX_NUM)
+      rescue Groonga::InvalidArgument
+        @drilldown_packages = @drilldown_directories = @drilldown_suffixs = []
+      end
+    end
+
+    def make_drilldown_directories(result)
+      # Return empty if root path
+      return [] if @path == ""
+
+      # Drilldown
+      files = DocumentTable.drilldown(result, "restpath")
+      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')
+      }.find_all {|v|
+        v.include?("/")                                                                 # Extract directory
+      }.map {|v|
+        v.split("/")[0]                                                                 # 'to/file' -> 'to'
+      }.inject(Hash.new(0)) {|hash, v| 
+        hash[v] += 1; hash                                                              # Collect hash
+      }.map {|key, value|
+        [value, key]                                                                    # To Array
+      }.to_a
     end
 
     def query
@@ -137,9 +172,12 @@ EOF
     def recommended_contents
       contents = []
 
-      str = recommended_query_contents
+      str = drilldown_contents
       contents << str unless str.empty?
 
+      # str = recommended_query_contents
+      # contents << str unless str.empty?
+
       str = match_files_contents
       contents << str unless str.empty?
 
@@ -318,8 +356,11 @@ EOF
       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
         dt = <<EOS
-    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{path}</a>#{result_refinement(record)}</dt>
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{path}</a></dt>
 EOS
         @prev = path
       else
@@ -373,24 +414,64 @@ EOS
       refinements = []
 
       # 拡張子で絞り込み
-      refinements << "<a href='#{refinement_suffix(record.suffix)}'>.#{record.suffix}で絞り込み</a>" if record.suffix
+      refinements << "<a href='#{refinement_suffix(record.suffix)}'>.#{record.suffix}</a>" if record.suffix
 
       # ディレクトリで絞り込み
       path    = Util::relative_path(record.shortpath, @path)
       dirname = path.to_s.split('/')[-2]
-      refinements << "<a href='#{refinement_directory(record.shortpath + '/..')}'>#{dirname}/以下で再検索</a>" if dirname
+      refinements << "<a href='#{refinement_directory(record.shortpath + '/..')}'>#{dirname}/</a>" if dirname
 
       unless refinements.empty?
         space1            = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
         space2            = '&nbsp;&nbsp;,&nbsp;&nbsp;'
 
         <<EOF
-#{space1}<span id="result-refinement">[#{refinements.join(space2)}]</span>
+# #{space1}<span id="result-refinement">#{I18n.t(:filter, {locale: @locale})} [#{refinements.join(space2)}]</span>
 EOF
       else
         ''
       end
+    end
+
+    def refinement_pathdir(dir)
+      refinement_directory(File.join(@path, dir))
+    end
+
+    def drilldown_contents
+      contents = []
+      
+      result = drilldown_content(@drilldown_packages, I18n.t(:filter_by_package, {locale: @locale}), method(:refinement_directory))
+      contents << result unless result.empty?
+
+      result = drilldown_content(@drilldown_directories, I18n.t(:filter_by_directory, {locale: @locale}), method(:refinement_pathdir), '', '/', true)
+      contents << result unless result.empty?
+
+      result = drilldown_content(@drilldown_suffixs, I18n.t(:filter_by_suffix, {locale: @locale}), method(:refinement_suffix), '.')
+      contents << result unless result.empty?
+
+      unless contents.empty?
+        contents.join + "<hr>\n"
+      else
+        ""
+      end
+    end
+
+    def drilldown_content(array, title, to_url, prefix = "", suffix = "", disp_if_one = false)
+      unless array.empty? || (!disp_if_one && array.size == 1)
+        contents = []
 
+        array.each_with_index do |v, index|
+          if v[0] != 0
+            contents << "<strong><a href=\"#{to_url.call(v[1])}\" #{v[1]}(#{v[0]})>#{prefix + v[1] + suffix}</a></strong> (#{v[0]})"
+          else
+            contents << "..."
+          end
+        end
+
+        "<div class=\"filter_list\">#{title}: " + contents.join("&nbsp;&nbsp;&nbsp;") + "</div>"
+      else
+        ""
+      end
     end
 
   end

data/lib/milkode/cdweb/lib/web_setting.rb

@@ -7,6 +7,7 @@
 
 require 'milkode/cdweb/lib/database'
 require 'yaml'
+require 'i18n'
 
 module Milkode
   class WebSetting
@@ -51,9 +52,9 @@ module Milkode
 
     hash_method :favicon
     
-    def about_milkode
+    def about_milkode(locale)
       if (@data[:display_about_milkode])
-        ', <a href="http://milkode.ongaeshi.me">milkodeについて</a>'
+        ', <a href="http://milkode.ongaeshi.me">'+I18n.t(:about_milkode, locale: locale)+'</a>'
       else
         ''
       end

data/lib/milkode/cdweb/locales/en.yml

@@ -0,0 +1,35 @@
+en:
+  search: Search
+  name: Name
+  recently_viewed: Viewed
+  added: New
+  updated: Updated
+  favorite: Favorites
+  packages: packages
+  files: files
+  help: Help
+  about_milkode: About Milkode
+  new_tab: New Tab
+  target: Target
+  package: Package
+  clear: Clear
+  onematch: one file one match
+  case_sensitive: case sensitive
+  total_files: files
+  searched: searched
+  matched_num: matched
+  sec: sec.
+  home: Home
+  directory: Directory
+  update_packages: Update Packages
+  stats: Stats
+  all: all
+  english: English
+  japanese: Japanese
+  update_all: Update all packages?
+  update_package: 'Update %{package_name}?'
+  filter: Filter
+  item: items
+  filter_by_package: Filter by Package
+  filter_by_suffix: Filter by Suffix
+  filter_by_directory: Filter by Directory

data/lib/milkode/cdweb/locales/ja.yml

@@ -0,0 +1,35 @@
+ja:
+  search: 検索
+  name: 名前
+  recently_viewed: 最近使った
+  added: 追加
+  updated: 更新
+  favorite: お気に入り
+  packages: のパッケージ
+  files: のファイル
+  help: ヘルプ
+  about_milkode: milkodeについて
+  new_tab: 新規タブ
+  target: 範囲
+  package: パッケージ
+  clear: クリア
+  onematch: 1ファイル1マッチ
+  case_sensitive: 大文字／小文字を区別
+  total_files: ファイル中
+  searched: ファイルを検索
+  matched_num: 件マッチ
+  sec: 秒
+  home: ホーム
+  directory: ディレクトリ
+  update_packages: パッケージを更新
+  stats: 統計情報
+  all: 全て
+  english: 英語
+  japanese: 日本語
+  update_all: 全てのパッケージを更新しますか？
+  update_package: '%{package_name} を更新しますか？'
+  filter: 絞り込み
+  item: 件
+  filter_by_package: パッケージで絞り込み
+  filter_by_suffix: 拡張子で絞り込み
+  filter_by_directory: ディレクトリで絞り込み

data/lib/milkode/cdweb/views/filelist.haml

@@ -9,7 +9,7 @@
     .keyword.ss-box
       #{topic_path(@path, params)}
     .total-entries.ss-box
-      #{@total_records}件（#{@elapsed}秒）
+      #{@total_records} #{t(:item)}（#{@elapsed}#{t(:sec)})
     .search-summary-hook.ss-box
       #{search_summary_hook(@path)}
     .ss-end

data/lib/milkode/cdweb/views/index.haml

@@ -25,7 +25,7 @@
           .form
             %form(method="post" action="#{url_for '/search'}")
               %input(name="query" type="text" style="width: 419px;")
-              %input(type="submit" value="検索")
+              %input(type="submit" value="#{t(:search)}")
               %input(name='pathname' type='hidden' value='#{url_for '/home'}')
 
       .row
@@ -35,16 +35,20 @@
 
       .row
         .span3
-          %h2 最近使った
+          %h2
+            = t(:recently_viewed)
           = @package_list.top_view
         .span3
-          %h2 追加
+          %h2
+            = t(:added)
           = @package_list.top_add
         .span3
-          %h2 更新
+          %h2
+            = t(:updated)
           = @package_list.top_update
         .span3
-          %h2 お気に入り
+          %h2
+            = t(:favorite)
           = @package_list.top_fav
 
       %hr
@@ -52,17 +56,18 @@
       .row
         .span4.offset4
           .footer
-            <a href="#{url_for '/home'}">#{@package_num}</a>のパッケージ<br>
-            <a href="#{url_for '/home?query=f:*'}">#{@file_num}</a>のファイル<br>
-            <a href="#{url_for '/help'}">ヘルプ</a>
-            = @setting.about_milkode
+            <a href="#{url_for '/home'}">#{@package_num}</a> #{t(:packages)}<br>
+            <a href="#{url_for '/home?query=f:*'}">#{@file_num}</a> #{t(:files)}<br>
+            [<a href="#{url_for '/?locale=en'}">#{t(:english)}</a> | <a href="#{url_for '/?locale=ja'}">#{t(:japanese)}</a>]<br>
+            <a href="#{url_for '/help'}">#{t(:help)}</a>
+            = @setting.about_milkode(@locale)
 
     %script(type='text/javascript' src='#{url_for '/js/jquery-1.7.2.min.js'}')
     %script(type='text/javascript' src='#{url_for '/js/jquery-ui-1.8.22.custom.min.js'}')
     %script(type='text/javascript' src='#{url_for '/js/jquery.multiselect.min.js'}')
     %script(type='text/javascript' src='#{url_for '/js/jquery.multiselect.filter.min.js'}')
     %script(type='text/javascript' src='#{url_for '/js/milkode.js'}')
-            
+
 
     
 

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

@@ -274,3 +274,6 @@ label.ui-corner-all {
     background-color: #FFEE55;
 }
 
+.filter_list {
+    margin-top: 3px;
+}

data/lib/milkode/cdweb/views/packages.haml

@@ -7,7 +7,7 @@
     .sort-change.ss-box
       #{@sort_change_content}
     .total-entries.ss-box
-      #{@total_records}</span>件（#{@elapsed}秒）
+      #{@total_records} #{t(:item)}（#{@elapsed}#{t(:sec)}）
     .ss-end
 
   ~ @record_content

data/lib/milkode/cdweb/views/search.haml

@@ -9,11 +9,12 @@
     .keyword.ss-box
       #{topic_path(@path, params)}
     .hit-num.ss-box
-      #{@total_records}</span>ファイル中
+      #{@total_records}</span>
+      = t(:total_files)
     .search-range.ss-box
-      #{@range.first} - #{@range.last}ファイルを検索
+      #{@range.first} - #{@range.last} #{t(:searched)}
     .match-num.ss-box
-      #{@match_num}</span>件マッチ（#{@elapsed}秒）
+      #{@match_num}</span> #{t(:matched_num)}（#{@elapsed}#{t(:sec)}）
     .search-summary-hook.ss-box
       #{search_summary_hook(@path)}
     .ss-end

data/lib/milkode/cdweb/views/search_form.haml

@@ -6,16 +6,16 @@
   %form(name="searchform" action="#{url_for '/search'}" method="post")
     %p
       %input#query(name="query" size="70" type="text" style="width: 419px;"){:value => params[:query]}
-      %input#search(type="submit" name="search" value="検索" onclick="set_pathname()")
-      %input#newtab(type="submit" name="newtab" value="新規タブ" onclick="open_newtab(); return false;")
-      %input#clear(type="submit" name="clear" value="クリア" onclick="set_pathname()")
+      %input#search(type="submit" name="search" value="#{t(:search)}" onclick="set_pathname()")
+      %input#newtab(type="submit" name="newtab" value="#{t(:new_tab)}" onclick="open_newtab(); return false;")
+      %input#clear(type="submit" name="clear" value="#{t(:clear)}" onclick="set_pathname()")
       %br
-      範囲:
+      = t(:target) + ":"
       = create_select_shead(params[:shead])
-      パッケージ:
+      = t(:package) + ":"
       = create_select_package(@path)
-      = create_checkbox('onematch', params[:onematch], '1ファイル1マッチ')
-      = create_checkbox('sensitive', params[:sensitive], '大文字／小文字を区別')
+      = create_checkbox('onematch', params[:onematch], t(:onematch))
+      = create_checkbox('sensitive', params[:sensitive], t(:case_sensitive))
       = create_favorite_list(@package_list)
       
       %input(name="pathname" type="hidden" value="")

data/lib/milkode/cli.rb

@@ -32,17 +32,20 @@ Samples:
   milk add /path/to/addon.xpi
   milk add http://example.com/urlfile.zip
   milk add git://github.com/ongaeshi/milkode.git
+  milk add git://github.com/ongaeshi/milkode.git -b develop -n milkode_develop
 EOF
+    option :branch_name,    :type => :string,  :aliases => '-b',   :desc => 'Branch name.'
     option :empty,          :type => :boolean,                     :desc => 'Add empty package.'
     option :ignore,         :type => :array,   :aliases => '-i',   :desc => 'Ignore path.'
     option :name,           :type => :string,  :aliases => '-n',   :desc => 'Rename package.'
     option :no_auto_ignore, :type => :boolean, :aliases => '--ni', :desc => 'Disable auto ignore.'
     option :protocol,       :type => :string,  :aliases => '-p',   :desc => 'Specify protocol. (git, svn)'
+    option :from_file,      :type => :string,                      :desc => 'Import from file'
     
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
     
     def add(*args)
-      if args.empty?
+      if args.empty? && !options[:from_file]
         CLI.task_help(shell, "add")
       else
         cdstk.add(args, options)

data/lib/milkode/common/util.rb

@@ -187,11 +187,11 @@ module Milkode
     end
 
     def git_url?(src)
-      (src =~ /^(:?git[:@])|(:?ssh:)/) != nil
+      (src =~ /^(?:git[:@])|(?:ssh:)|(?:\.git\Z)/) != nil
     end
 
     def svn_url?(src)
-      (src =~ /^(:?svn|svn\+ssh):\/\//) != nil
+      (src =~ /^(?:svn|svn\+ssh):\/\//) != nil
     end
 
     # StringIO patch
@@ -250,7 +250,7 @@ module Milkode
         pos = 0
 
         loop do 
-          r = src.match(/#{keyword}/i, pos) do |m|
+          r = src.match(/#{Regexp.escape(keyword)}/i, pos) do |m|
             s = m.begin(0)
             l = keyword.length
             e = s+l
@@ -305,6 +305,27 @@ module Milkode
         nil
       end
     end
+
+    def str2kcode(str)
+      case str.downcase
+      when 'none'
+        Kconv::NOCONV
+      when 'jis'
+        Kconv::JIS
+      when 'sjis'
+        Kconv::SJIS
+      when 'euc'
+        Kconv::EUC
+      when 'ascii'
+        Kconv::ASCII
+      when 'utf8'
+        Kconv::UTF8
+      when 'utf16'
+        Kconv::UTF16
+      else
+        nil
+      end
+    end    
     
   end
 end

data/lib/milkode/database/document_table.rb

@@ -11,25 +11,57 @@ require 'milkode/common/util'
 module Milkode
   class DocumentTable
     def self.define_schema
-      Groonga::Schema.define do |schema|
-        schema.create_table("documents", :type => :hash) do |table|          
-          table.string("path")
-          table.string("package")
-          table.string("restpath")
-          table.text("content")
-          table.time("timestamp")
-          table.text("suffix")
+      begin
+        Groonga::Schema.define do |schema|
+          schema.create_table("documents", :type => :hash) do |table|          
+            table.string("path")
+            table.string("package")
+            table.string("restpath")
+            table.text("content")
+            table.time("timestamp")
+            table.string("suffix")
+          end
+
+          schema.create_table("terms",
+                              :type => :patricia_trie,
+                              :key_normalize => true,
+                              :default_tokenizer => "TokenBigramSplitSymbolAlphaDigit") 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
+      rescue Groonga::Schema::ColumnCreationWithDifferentOptions
+        puts <<EOF
+WARNING: Milkode database is old. (Renewal at 1.4.0)
+Can't get the new features. Please execute rebuild command.
+
+  $ milk rebuild --all
+
+EOF
+
+        Groonga::Schema.define do |schema|
+          schema.create_table("documents", :type => :hash) do |table|          
+            table.string("path")
+            table.string("package")
+            table.string("restpath")
+            table.text("content")
+            table.time("timestamp")
+            table.text("suffix")
+          end
 
-        schema.create_table("terms",
-                            :type => :patricia_trie,
-                            :key_normalize => true,
-                            :default_tokenizer => "TokenBigramSplitSymbolAlphaDigit") 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)
+          schema.create_table("terms",
+                              :type => :patricia_trie,
+                              :key_normalize => true,
+                              :default_tokenizer => "TokenBigramSplitSymbolAlphaDigit") 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
     end
@@ -299,8 +331,8 @@ module Milkode
                                         :offset => offset,
                                         :limit => limit)
 
-      # 検索結果のレコード(limitの影響を受ける), 総マッチ数(limitの影響を受けない)
-      return records, result.size
+      # 検索結果のレコード(limitの影響を受ける), 総マッチ数(limitの影響を受けない), result(Groonga::Hash)
+      return records, result.size, result
     end
 
     # マッチしたレコードのみを返す
@@ -308,6 +340,11 @@ module Milkode
       records, match_total = search_with_match(options)
       records
     end
+
+    def self.drilldown(result, column, num = nil)
+      drilled = result.group(column).map {|record| [record.n_sub_records, record.key]}.sort_by {|a| a[0]}.reverse
+      num ? drilled[0, num] : drilled
+    end
     
     def select_all_sort_by_shortpath(offset = 0, limit = -1)
       result = @table.select

data/lib/milkode/grep/cli_grep.rb

@@ -79,6 +79,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('-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 } 

data/lib/milkode/grep/findgrep.rb

@@ -345,6 +345,11 @@ module Milkode
             
             line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
 
+            if @option.output_kcode != Kconv::UTF8
+              header = Kconv.kconv(header, @option.output_kcode)
+              line   = Kconv.kconv(line, @option.output_kcode)
+            end
+
             unless (@option.colorHighlight)
               stdout.puts header + line
             else

data/lib/milkode/grep/findgrep_option.rb

@@ -23,6 +23,7 @@ module Milkode
                         :ignoreFiles,
                         :ignoreDirs,
                         :kcode,
+                        :output_kcode,
                         :noSnip,
                         :dbFile,
                         :groongaOnly,
@@ -49,6 +50,7 @@ module Milkode
                  [],
                  [],
                  Kconv::UTF8, # Platform.get_shell_kcode,
+                 Kconv::UTF8,
                  false,
                  nil,
                  false,

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "milkode"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = "2013-10-28"
+  s.date = "2013-11-28"
   s.description = "Line based local source code search engine & grep-command & web-app."
   s.email = "ongaeshi0621@gmail.com"
   s.executables = ["gmilk", "milk"]
@@ -53,6 +53,8 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb",
     "lib/milkode/cdweb/lib/search_gotoline.rb",
     "lib/milkode/cdweb/lib/web_setting.rb",
+    "lib/milkode/cdweb/locales/en.yml",
+    "lib/milkode/cdweb/locales/ja.yml",
     "lib/milkode/cdweb/public/css/auth-buttons.css",
     "lib/milkode/cdweb/public/css/auth-icons.png",
     "lib/milkode/cdweb/public/css/bootstrap-responsive.min.css",
@@ -217,6 +219,7 @@ Gem::Specification.new do |s|
       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_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
@@ -234,6 +237,7 @@ Gem::Specification.new do |s|
       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<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -252,6 +256,7 @@ Gem::Specification.new do |s|
     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<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/test/test_cli.rb

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

data/test/test_util.rb

@@ -101,6 +101,7 @@ class TestUtil < Test::Unit::TestCase
     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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milkode
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolor
@@ -193,6 +193,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +334,8 @@ files:
 - lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb
 - lib/milkode/cdweb/lib/search_gotoline.rb
 - lib/milkode/cdweb/lib/web_setting.rb
+- lib/milkode/cdweb/locales/en.yml
+- lib/milkode/cdweb/locales/ja.yml
 - lib/milkode/cdweb/public/css/auth-buttons.css
 - lib/milkode/cdweb/public/css/auth-icons.png
 - lib/milkode/cdweb/public/css/bootstrap-responsive.min.css