milkode 0.2.4 → 0.2.9

data/lib/milkode/cdstk/cli_cdstksub.rb

@@ -33,6 +33,15 @@ EOF
       opt
     end
 
+    def self.setup_update
+      options = {:force => false}
+
+      opt = OptionParser.new("#{File.basename($0)} update [keyword1 keyword2 ...]")
+      opt.on('--all', 'Update all.') { options[:all] = true }
+
+      return opt, options
+    end
+
     def self.setup_remove
       options = {:force => false}
 
@@ -45,7 +54,7 @@ EOF
     def self.setup_list
       options = {:verbose => false}
 
-      opt = OptionParser.new("#{File.basename($0)} list package1 [package2 ...]")
+      opt = OptionParser.new("#{File.basename($0)} list package1 [package2 ...]") # @todo コメント修正
       opt.on('-v', '--verbose', 'Be verbose.') { options[:verbose] = true }
 
       return opt, options
@@ -98,5 +107,31 @@ EOF
       
       return opts, options
     end
+
+    def self.setup_dir
+      options = {}
+      
+      opt = OptionParser.new("#{File.basename($0)} dir")
+      opt.on('--top', 'XXX') {|v| options[:top] = true }
+
+      return opt, options
+    end
+
+    def self.setup_setdb
+      options = {}
+      
+      opt = OptionParser.new("#{File.basename($0)} setdb")
+      opt.on('--reset', 'Reset default db.') {|v| options[:reset] = true }
+
+      return opt, options
+    end
+
+    def self.setup_mcd
+      options = {}
+      
+      opt = OptionParser.new("#{File.basename($0)} mcd")
+
+      return opt, options
+    end
   end
 end

data/lib/milkode/cdweb/app.rb

@@ -18,7 +18,7 @@ require 'milkode/cdweb/lib/mkurl'
 set :haml, :format => :html5
 
 get '/' do
-  @version = "0.2.4"
+  @version = "0.2.9"
   @package_num = Database.instance.fileList('').size
   @file_num = Database.instance.fileNum
   haml :index

data/lib/milkode/cdweb/lib/coderay_wrapper.rb

@@ -8,8 +8,8 @@
 require 'rubygems'
 require 'coderay'
 require 'coderay/helpers/file_type'
-require 'nokogiri'
 require 'milkode/common/util'
+require 'milkode/cdweb/lib/my_nokogiri'
 
 module Milkode
   class CodeRayWrapper
@@ -58,7 +58,7 @@ module Milkode
              )
 
       if (is_ornament?)
-        html_doc = Nokogiri::HTML(html)
+        html_doc = MyNokogiri::HTML(html)
         add_spanid(html_doc)
       else
         html
@@ -76,7 +76,7 @@ module Milkode
              )
 
       if (is_ornament?)
-        html_doc = Nokogiri::HTML(html)
+        html_doc = MyNokogiri::HTML(html)
         anchor = create_anchorlink(html_doc.at_css("table.CodeRay td.code pre").inner_html)
         body = add_spanid(html_doc)
         anchor + body
@@ -86,9 +86,8 @@ module Milkode
     end
 
     def add_spanid(html_doc)
-      table = html_doc.at_css("table.CodeRay")
-      
       # preに<span id="行番号"> を付ける
+      table = html_doc.at_css("table.CodeRay")
       pre = table.at_css("td.code pre")
       pre.inner_html = add_spanid_in(pre.inner_html)
       

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

@@ -109,6 +109,8 @@ module Milkode
         is_file = parts.length == base_depth + 1
         path = parts[0, base_depth + 1].join("/")
         [path, is_file]
+      }.sort_by {|parts|
+        [if parts[1] then 1 else 0 end, parts[0].downcase]
       }.uniq
       
       paths

data/lib/milkode/cdweb/lib/my_nokogiri.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/12/02
+
+require 'hpricot'
+require 'nokogiri'
+require 'milkode/common/util'
+
+module Hpricot
+  class Elements
+    alias_method :at_css, :search
+  end
+  
+  module Traverse
+    alias_method :at_css, :search
+  end
+end
+
+module Milkode
+  class MyNokogiri
+    def self.HTML(html)
+      if Util::ruby19?
+        Nokogiri::HTML(html)
+      else
+        Hpricot(html)
+      end
+    end
+  end
+end
+
+

data/lib/milkode/common/dbdir.rb

@@ -11,8 +11,29 @@ module Milkode
   module Dbdir
     module_function
 
+    @@milkode_db_dir = File.expand_path('~/.milkode_db_dir')
+
+    def milkode_db_dir
+      @@milkode_db_dir
+    end
+
+    def set_milkode_db_dir(dir)
+      @@milkode_db_dir = dir
+    end
+
+    def tmp_milkode_db_dir(path)
+      old_path = Dbdir.milkode_db_dir
+      Dbdir.set_milkode_db_dir path
+      yield
+      Dbdir.set_milkode_db_dir old_path
+    end
+
     def default_dir
-      if (ENV['MILKODE_DEFAULT_DIR'])
+      path = @@milkode_db_dir
+
+      if (File.exist? path)
+        File.read path
+      elsif (ENV['MILKODE_DEFAULT_DIR'])
         File.expand_path ENV['MILKODE_DEFAULT_DIR']
       else
         File.expand_path '~/.milkode'
@@ -34,6 +55,14 @@ module Milkode
     def dbdir?(path = '.')
       FileTest.exist? yaml_path(path)
     end
+
+    def select_dbdir
+      if (Dbdir.dbdir?('.') || !Dbdir.dbdir?(Dbdir.default_dir))
+        '.'
+      else
+        Dbdir.default_dir
+      end
+    end
   end
 end
 

data/lib/milkode/common/util.rb

@@ -45,9 +45,13 @@ module Milkode
     end
 
     def relative_path(path, basedir)
-      path = Pathname.new(path)
-      basedir = Pathname.new(basedir)
-      path.relative_path_from(basedir)
+      path = Pathname.new(normalize_filename path)
+      basedir = Pathname.new(normalize_filename basedir)
+      begin
+        path.relative_path_from(basedir)
+      rescue ArgumentError
+        path
+      end
     end
 
     def ruby19?
@@ -87,6 +91,14 @@ module Milkode
     def larger_than_oneline(content)
       content.count("\n") > 1
     end
+
+    def normalize_filename(str)
+      if platform_win?
+        str.gsub(/\A([a-z]):/) { "#{$1.upcase}:" }
+      else
+        str
+      end
+    end
   end
 end
 

data/lib/milkode/findgrep/findgrep.rb

@@ -11,6 +11,7 @@ require 'groonga'
 require 'milkode/common/util'
 include Gren
 require 'cgi'
+require 'pathname'
 
 module FindGrep
   class FindGrep
@@ -22,6 +23,7 @@ module FindGrep
                         :colorHighlight,
                         :isSilent,
                         :debugMode,
+                        :packages,
                         :filePatterns,
                         :suffixs,
                         :ignoreFiles,
@@ -31,7 +33,8 @@ module FindGrep
                         :dbFile,
                         :groongaOnly,
                         :isMatchFile,
-                        :dispHtml)
+                        :dispHtml,
+                        :matchCountLimit)
     
     DEFAULT_OPTION = Option.new([],
                                 [],
@@ -45,13 +48,17 @@ module FindGrep
                                 [],
                                 [],
                                 [],
+                                [],
                                 Platform.get_shell_kcode,
                                 false,
                                 nil,
                                 false,
                                 false,
-                                false)
+                                false,
+                                -1)
     
+    class MatchCountOverError < RuntimeError ; end
+
     attr_reader :documents
     
     def initialize(patterns, option)
@@ -73,7 +80,7 @@ module FindGrep
       
       if dbfile.exist?
         Groonga::Database.open(dbfile.to_s)
-        puts "open    : #{dbfile} open."
+        puts "open    : #{dbfile} open." unless @option.isSilent
       else
         raise "error    : #{dbfile.to_s} not found!!"
       end
@@ -143,6 +150,16 @@ module FindGrep
           end
         end
         
+        # パッケージ(OR)
+        pe = package_expression(record, @option.packages)
+        if (pe)
+          if expression.nil?
+            expression = pe
+          else
+            expression &= pe
+          end
+        end
+        
         # パス
         @option.filePatterns.each do |word|
           sub_expression = record.path =~ word
@@ -155,26 +172,49 @@ module FindGrep
 
         # 拡張子(OR)
         se = suffix_expression(record) 
-        expression &= se if (se)
+        if (se)
+          if expression.nil?
+            expression = se
+          else
+            expression &= se
+          end
+        end
         
         # 検索式
         expression
       end
       
+      # @todo オプションで出来るようにする？
       # タイムスタンプでソート
-      records = table.sort([{:key => "_score", :order => "descending"},
-                            {:key => "timestamp", :order => "descending"}])
+      # records = table.sort([{:key => "_score", :order => "descending"},
+      #                       {:key => "timestamp", :order => "descending"}])
+
+      # ファイル名でソート
+      records = table.sort([{:key => "shortpath", :order => "ascending"}])
 
       # データベースにヒット
-      stdout.puts "Found   : #{records.size} records." unless (@option.dispHtml)
+      stdout.puts "Found   : #{records.size} records." if (!@option.dispHtml && !@option.isSilent)
 
       # 検索にヒットしたファイルを実際に検索
-      records.each do |record|
-        if (@option.groongaOnly)
-          searchGroongaOnly(stdout, record)
+      begin
+        if (@patterns.size > 0)
+          records.each do |record|
+            if (@option.groongaOnly)
+              searchGroongaOnly(stdout, record)
+            else
+              searchFile(stdout, record.path, record.path) if FileTest.exist?(record.path)
+            end
+          end
         else
-          searchFile(stdout, record.path, record.path) if FileTest.exist?(record.path)
+          records.each do |record|
+            path = record.path
+            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)
+          end
         end
+      rescue MatchCountOverError
       end
     end
 
@@ -193,6 +233,24 @@ module FindGrep
       sub
     end
 
+    def package_expression(record, packages)
+      sub = nil
+
+      # @todo 専用カラム package が欲しいところ
+      #       でも今でもpackageはORとして機能してるからいいっちゃいい
+      packages.each do |word|
+        e = record.path =~ word
+        if sub.nil?
+          sub = e
+        else
+          sub |= e
+        end
+      end
+
+      sub
+    end
+    private :package_expression
+
     def suffix_expression(record)
       sub = nil
       
@@ -239,7 +297,7 @@ module FindGrep
           searchFromDir(stdout, fpath, depth + 1)
         when "file"
           searchFile(stdout, fpath, fpath_disp)
-        end          
+        end
       end
     end
     private :searchFromDir
@@ -314,7 +372,7 @@ module FindGrep
       
       @result.search_files << record.path if (@option.debugMode)
 
-      searchData(stdout, record.content, record.path)
+      searchData(stdout, record.content.split("\n"), record.path)
     end
     private :searchGroongaOnly
 
@@ -326,7 +384,10 @@ module FindGrep
 
         if ( result )
           unless (@option.dispHtml)
-            header = "#{path}:#{index + 1}:"
+            # header = "#{path}:#{index + 1}:"
+            rpath = Milkode::Util::relative_path(path, Dir.pwd).to_s
+            header = "#{rpath}:#{index + 1}:"
+            
             line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
 
             unless (@option.colorHighlight)
@@ -354,24 +415,31 @@ EOF
           end
 
           @result.match_count += 1
+         if (0 < @option.matchCountLimit && @option.matchCountLimit <= @result.match_count)
+           raise MatchCountOverError
+         end
         end
       }
     end
     private :searchData
 
     def file2data(file)
-        data = file.read
-
+      data = file.read
+      
+      unless Milkode::Util::ruby19?
         if (@option.kcode != Kconv::NOCONV)
           file_kcode = Kconv::guess(data)
 
           if (file_kcode != @option.kcode)
-#            puts "encode!! #{fpath} : #{@option.kcode} <- #{file_kcode}"
+            #            puts "encode!! #{fpath} : #{@option.kcode} <- #{file_kcode}"
             data = data.kconv(@option.kcode, file_kcode)
           end
         end
+      else
+        data = data.kconv(@option.kcode)
+      end
 
-        data = data.split("\n");
+      data = data.split("\n");
     end
     private :file2data
 

data/lib/milkode/findgrep/result.rb

@@ -34,8 +34,8 @@ module FindGrep
     end
 
     def print(stdout)
-      stdout.puts "dir   : #{@start_dir} (#{Util::time_s(time)})"
-      stdout.puts "files : #{@search_count} in #{@count} (#{Util::size_s(@search_size)} in #{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