milkode 0.9.9 → 0.9.9.9

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

@@ -0,0 +1,14 @@
+= haml :header_menu
+
+.content
+  .info-package-content
+
+    %h1 <a href="/home">全体</a>の統計
+
+    ~ @summary_content
+
+    %h2 各パッケージ
+
+    ~ @record_content
+
+

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

@@ -0,0 +1,13 @@
+= haml :header_menu
+
+.content
+  .info-package-content
+    %h1 <a href="/info"><img src="/images/info-big.png"/></a> <a href="/home/#{@path}">#{@path}</a>の統計
+
+    %h2 基本情報
+    ~ @summary_content
+    
+    %h2 言語別
+    ~ @plang_content
+
+

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

@@ -4,6 +4,7 @@
   %head
     %meta(charset='utf-8')
     %title= [@title, @setting.home_title].compact.join(' - ')
+    %link(rel="shortcut icon" href="#{@setting.favicon}")
     %link(rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/bootstrap-responsive.min.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/milkode.css"  type="text/css" media="all")

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

@@ -4,8 +4,12 @@
   = haml :search_form
 
   .search-summary
-    <span class="sort-change">#{@sort_change_content}</span> <span class="total-entries">#{@total_records}</span>件（#{@elapsed}秒）
-  .sort_change
+    .sort-change.ss-box
+      #{@sort_change_content}
+    .total-entries.ss-box
+      #{@total_records}</span>件（#{@elapsed}秒）
+    .ss-end
+
   ~ @record_content
 
 

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

@@ -4,11 +4,17 @@
   = haml :search_form
   
   .search-summary
-    <span class="keyword">#{topic_path(@path, params)}</span>
-    <span class="hit-num">#{@total_records}</span>ファイル中</span>
-    <span class="search-range">#{@range.first} - #{@range.last}ファイルを検索</span>
-    <span class="match-num">#{@match_num}</span>件マッチ</span>
-    （#{@elapsed}秒）
-    #{search_summary_hook(@path)}
-    
+    .favstar.ss-box
+      #{favstar(@path)}
+    .keyword.ss-box
+      #{topic_path(@path, params)}
+    .hit-num.ss-box
+      #{@total_records}</span>ファイル中
+    .search-range.ss-box
+      #{@range.first} - #{@range.last}ファイルを検索
+    .match-num.ss-box
+      #{@match_num}</span>件マッチ（#{@elapsed}秒）
+    .search-summary-hook.ss-box
+      #{search_summary_hook(@path)}
+    .ss-end
   ~ @record_content

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

@@ -7,6 +7,7 @@
     %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()")
       %br
       範囲:
@@ -15,5 +16,6 @@
       = create_select_package(@path)
       = create_checkbox('onematch', params[:onematch], '1ファイル1マッチ')
       = create_checkbox('sensitive', params[:sensitive], '大文字／小文字を区別')
+      = create_favorite_list(@package_list)
       
       %input(name="pathname" type="hidden" value="")

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

@@ -4,7 +4,15 @@
   = haml :search_form
 
   .search-summary
-    <span class="keyword">#{topic_path(@path, params)}</span>#{additional_info(@path, params)}（#{@elapsed}秒） #{search_summary_hook(@path)}
+    .favstar.ss-box
+      #{favstar(@path)}
+    .keyword.ss-box
+      #{topic_path(@path, params)}
+    .additional-info.ss-box
+      #{additional_info(@path, params)}（#{@elapsed}秒）
+    .search-summary-hook.ss-box
+      #{search_summary_hook(@path)}
+    .ss-end
   ~ @record_content
 
 

data/lib/milkode/cli.rb

@@ -144,7 +144,8 @@ EOF
     end
 
     desc "fav [package1 package2 ...]", "Add favorite"
-    option :delete, :type => :boolean, :aliases => '-d', :desc => "Delete favorite."
+    option :delete    , :type => :boolean, :aliases => '-d', :desc => "Delete favorite."
+    option :sync_yaml , :type => :boolean, :aliases => '-s', :desc => "Sync yaml with database."
     def fav(*paths)
       cdstk.fav(paths, options)
     end
@@ -208,7 +209,7 @@ EOF
 
       # デフォルトメソッドを上書きして -h を処理
       # defined in /lib/thor/invocation.rb
-      def invoke_task(task, *args)
+      def invoke_command(task, *args)
         if options[:help] && task.name != 'grep'
           CLI.task_help(shell, task.name)
         elsif options[:version] && task.name == 'help'

data/lib/milkode/common/util.rb

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
 require 'rubygems'
-require 'milkode/common/archive-zip'
 require 'fileutils'
 require 'pathname'
 require 'kconv'
-require 'groonga'
 
 module Milkode
   module Util
@@ -16,6 +14,8 @@ module Milkode
     # zipファイルを展開し、展開フォルダ名を返す
     # ファイルが見つからなかった時はnilを返す
     def zip_extract(filename, dst_dir)
+      require 'archive/zip'
+
       raise ZipfileNotFound unless File.exist?(filename)
       
       root_list = root_entrylist(filename)
@@ -55,6 +55,10 @@ module Milkode
       end
     end
 
+    def ruby20?
+      RUBY_VERSION >= '2.0.0'
+    end
+
     def ruby19?
       RUBY_VERSION >= '1.9.0'
     end

data/lib/milkode/database/document_table.rb

@@ -356,6 +356,10 @@ module Milkode
       @table.to_a
     end
 
+    def package_records(name)
+      search(:strict_packages => [name])
+    end
+
     private
 
     def load_content(filename)

data/lib/milkode/database/package_table.rb

@@ -97,6 +97,10 @@ module Milkode
         sorted
       end
     end
+
+    def fav?(name)
+      @table[name].favtime != Time.at(0)
+    end
   end
 end
 

data/lib/milkode/grep/cli_grep.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-require 'optparse'
-require 'milkode/findgrep/findgrep'
-require 'milkode/common/dbdir'
-require 'milkode/cdstk/cdstk'
-require 'milkode/cdstk/yaml_file_wrapper'
-require 'milkode/cdstk/package'
 require 'kconv'
+require 'milkode/cdstk/package'
+require 'milkode/cdstk/yaml_file_wrapper'
+require 'milkode/common/dbdir'
+require 'milkode/common/util'
+require 'milkode/grep/findgrep_option'
+require 'optparse'
 
 module Milkode
   class CLI_Grep
@@ -16,7 +16,7 @@ module Milkode
         arguments = arguments.map{|arg| Kconv.kconv(arg, Kconv::UTF8)}
       end
 
-      option = FindGrep::FindGrep::DEFAULT_OPTION.dup
+      option = FindGrepOption::create_default
 
       # default option
       option.dbFile = Dbdir.groonga_path(Dbdir.default_dir)
@@ -111,10 +111,10 @@ EOF
 
       # 現在位置のパッケージを記録
       if option.packages.empty? && !my_option[:all] && !is_abs_path
-        if (current_package)
-          option.strict_packages << current_package.name
-        elsif (package_dir_in? current_dir)
+        if package_dir_in?(current_dir)
           option.filePatterns << current_dir
+        elsif current_package
+          option.strict_packages << current_package.name
         else
           stdout.puts "fatal: Not package dir '#{current_dir}'."
           return 
@@ -124,6 +124,7 @@ EOF
       if (arguments.size > 0 || my_option[:find_mode])
         # update
         if my_option[:update]
+          require 'milkode/cdstk/cdstk'
           cdstk = Cdstk.new(stdout, Dbdir.select_dbdir)
 
           if (my_option[:all])
@@ -139,35 +140,46 @@ EOF
           stdout.puts
         end
 
-        if (my_option[:count])
-          # count mode
-          option.isSilent = true
-          findGrep = FindGrep::FindGrep.new(arguments, option)
-          records = findGrep.pickupRecords
-          # stdout.puts "#{records.size} records (#{findGrep.time_s})"
-          stdout.puts "#{records.size} records"
-        elsif my_option[:gotoline_data]
-          # gotoline mode
-          basePatterns = option.filePatterns 
-
-          my_option[:gotoline_data].each do |v|
-            if is_abs_path
-              package, restpath = Util::divide_shortpath(v[0][0])
-              # p [package, restpath]
-              option.packages = [package]
-              option.filePatterns = [restpath]
-            else
-              option.filePatterns = basePatterns + v[0]
+        if is_abs_path
+          require 'milkode/grep/fast_gotoline'
+
+          obj = FastGotoline.new(my_option[:gotoline_data], yaml_load)
+          obj.search_and_print(stdout)
+          
+        else
+          require 'milkode/grep/findgrep'
+
+          if (my_option[:count])
+            # count mode
+            option.isSilent = true
+            findGrep = FindGrep.new(arguments, option)
+            records = findGrep.pickupRecords
+            # stdout.puts "#{records.size} records (#{findGrep.time_s})"
+            stdout.puts "#{records.size} records"
+          elsif my_option[:gotoline_data]
+            # gotoline mode
+            basePatterns = option.filePatterns 
+
+            my_option[:gotoline_data].each do |v|
+              if is_abs_path
+                # @memo ここにはこないはず
+                package, restpath = Util::divide_shortpath(v[0][0])
+                # p [package, restpath]
+                option.packages = [package]
+                option.filePatterns = [restpath]
+              else
+                option.filePatterns = basePatterns + v[0]
+              end
+              
+              option.gotoline = v[1]
+              findGrep = FindGrep.new(arguments, option)
+              findGrep.searchAndPrint(stdout)
             end
-            
-            option.gotoline = v[1]
-            findGrep = FindGrep::FindGrep.new(arguments, option)
+          else
+            # search mode
+            findGrep = FindGrep.new(arguments, option)
             findGrep.searchAndPrint(stdout)
           end
-        else
-          # search mode
-          findGrep = FindGrep::FindGrep.new(arguments, option)
-          findGrep.searchAndPrint(stdout)
         end
       else
         stdout.print opt.help

data/lib/milkode/grep/fast_gotoline.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2013/05/03
+
+require 'milkode/common/util'
+
+module Milkode
+  class FastGotoline
+    def initialize(gotolines, yaml)
+      @gotolines = gotolines
+      @yaml      = yaml
+    end
+
+    def search_and_print(stdout)
+      @gotolines.each do |gotoline|
+        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
+          lineno        = gotoline[1]
+          content       = get_text_lineno(path, lineno)
+
+          if content          
+            stdout.puts "#{relative_path}:#{lineno} #{content}"
+          end
+        end
+      end
+    end
+
+    def get_text_lineno(path, no)
+      index = no - 1
+
+      begin
+        open(path, "r") do |file|
+          file.each_with_index do |line, i|
+            return line.chomp if i == index
+          end
+        end
+      rescue Errno::ENOENT
+        # ファイルが見つからない時もnilを返す
+      end
+
+      nil
+    end
+    
+  end
+end
+

data/lib/milkode/{findgrep → grep}/findgrep.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
+
 require 'find'
-require 'milkode/findgrep/result'
 require 'rubygems'
-require 'termcolor'
+# require 'termcolor'
 require 'kconv'
 require 'milkode/common/platform'
 require 'milkode/common/grenfiletest'
@@ -13,59 +13,44 @@ require 'cgi'
 require 'pathname'
 require 'milkode/database/groonga_database'
 
-module FindGrep
+module Milkode
   class FindGrep
-    Option = Struct.new(:patternsNot,
-                        :patternsOr,
-                        :directory,
-                        :depth,
-                        :ignoreCase,
-                        :caseSensitive,
-                        :colorHighlight,
-                        :isSilent,
-                        :debugMode,
-                        :packages,
-                        :strict_packages,
-                        :filePatterns,
-                        :suffixs,
-                        :ignoreFiles,
-                        :ignoreDirs,
-                        :kcode,
-                        :noSnip,
-                        :dbFile,
-                        :groongaOnly,
-                        :isMatchFile,
-                        :dispHtml,
-                        :matchCountLimit,
-                        :keywords,
-                        :gotoline)
-    
-    DEFAULT_OPTION = Option.new([],
-                                [],
-                                ".",
-                                -1,
-                                false,
-                                false,
-                                false,
-                                false,
-                                false,
-                                [],
-                                [],
-                                [],
-                                [],
-                                [],
-                                [],
-                                # Platform.get_shell_kcode,
-                                Kconv::UTF8,
-                                false,
-                                nil,
-                                false,
-                                false,
-                                false,
-                                -1,
-                                [],
-                                -1)
-    
+    class Result
+      attr_accessor :count
+      attr_accessor :search_count
+      attr_accessor :match_file_count
+      attr_accessor :match_count
+      attr_accessor :size
+      attr_accessor :search_size
+      
+      attr_accessor :search_files
+      attr_accessor :match_files
+      attr_accessor :unreadable_files
+      attr_accessor :prune_dirs
+      attr_accessor :ignore_files
+
+      def initialize(start_dir)
+        @start_dir = File.expand_path(start_dir)
+        @count, @search_count, @match_file_count, @match_count, @size, @search_size = 0, 0, 0, 0, 0, 0
+        @start_time = Time.now
+        @search_files, @match_files, @unreadable_files, @prune_dirs, @ignore_files  = [], [], [], [], []
+      end
+
+      def time_stop
+        @end_time = Time.now
+      end
+
+      def time
+        @end_time - @start_time 
+      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 "match : #{@match_file_count} files, #{match_count} hit"
+      end
+    end
+
     class MatchCountOverError < RuntimeError ; end
 
     attr_reader :documents
@@ -80,7 +65,8 @@ module FindGrep
       @ignoreFiles    = strs2regs_simple(option.ignoreFiles)
       @ignoreDirs     = strs2regs_simple(option.ignoreDirs)
       @result         = Result.new(option.directory)
-      open_database if (@option.dbFile)
+      open_database       if @option.dbFile
+      require 'termcolor' if @option.colorHighlight
     end
 
     def open_database()
@@ -90,7 +76,7 @@ module FindGrep
       # データベース開く
       if dbfile.exist?
         if !@grndb || @grndb.closed?
-          @grndb = GroongaDatabase.new
+          @grndb = Milkode::GroongaDatabase.new
           @grndb.open_file(dbfile.to_s)
           @documents = @grndb.documents
           puts "open    : #{dbfile.to_s} open." unless @option.isSilent