gren 0.2.4 → 0.3.0

data/History.ja.txt

@@ -1,3 +1,11 @@
+=== 0.3.0 2010/11/02
+
+* grenweb
+  * webベースのソースコード検索エンジンを追加
+
+* mkgrendb
+  * 結果表示画面に追加されたファイルの数を追加
+
 === 0.2.4 2010/10/09
 
 * mkgrendb

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.3.0 2010/11/02
+
+* grenweb
+* mkgrendb
+
+=== 0.2.4 2010/10/09
+
+* mkgrendb
+* grendb
+
 === 0.2.3 2010/09/25
 
 * mkgrendb

data/Manifest.txt

@@ -6,6 +6,7 @@ README.rdoc
 Rakefile
 bin/gren
 bin/grendb
+bin/grenweb
 bin/mkgrendb
 lib/common/display_util.rb
 lib/common/grenfiletest.rb
@@ -17,8 +18,20 @@ lib/findgrep/findgrep.rb
 lib/findgrep/result.rb
 lib/gren.rb
 lib/gren/cli.rb
-lib/gren/findgrep.rb
 lib/grendb/cli.rb
+lib/grenweb/cli.rb
+lib/grenweb/database.rb
+lib/grenweb/grenweb.ru
+lib/grenweb/grep.rb
+lib/grenweb/help.rb
+lib/grenweb/home.rb
+lib/grenweb/html_renderer.rb
+lib/grenweb/public/css/gren.css
+lib/grenweb/public/images/gren-icon-mini.png
+lib/grenweb/public/images/gren-icon.png
+lib/grenweb/query.rb
+lib/grenweb/searcher.rb
+lib/grenweb/viewer.rb
 lib/mkgrendb/cli.rb
 lib/mkgrendb/mkgrendb.rb
 rake_rdoc_custom.rb
@@ -26,9 +39,10 @@ script/console
 script/destroy
 script/generate
 test/test_gren.rb
-test/test_gren_cli.rb
 test/test_gren_util.rb
-test/test_grendb_cli.rb
+test/test_grenweb_cli.rb
+test/test_grenweb_html_renderer.rb
+test/test_grenweb_query.rb
+test/test_grenweb_searcher.rb
 test/test_helper.rb
-test/test_mkgrendb_cli.rb
 test/test_string_snip.rb

data/Rakefile

@@ -20,7 +20,12 @@ $hoe = Hoe.spec 'gren' do
   self.rubyforge_name       = self.name # TODO this is default value
 
   # 必要とするgem
-  self.extra_deps         = [['termcolor','>= 1.2.0'], ['rroonga','>= 1.0.0']]
+  self.extra_deps         = [
+                             ['termcolor','>= 1.2.0'],
+                             ['rroonga','>= 1.0.0'],
+                             ['rack','>=1.2.1'],
+                             ['launchy', '>=0.3.7']
+                            ]
 
   # 本来はnewgemの中で設定されるべき(後で報告した方がいいかも)
   self.extra_rdoc_files << "README.rdoc"

data/bin/grenweb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+#
+#  Created on 2010-10-10.
+#  Copyright (c) 2010. All rights reserved.
+
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/gren")
+require "grenweb/cli"
+
+Version = "0.3.0"
+Grenweb::CLI.execute(STDOUT, ARGV)

data/lib/common/util.rb

@@ -70,7 +70,7 @@ module Gren
       operator_start_index = group[0].size
       limit = ALPHABET_DISP_NUM
 
-      print (array.size > limit) ? "｜  " :  "↓  "
+      print((array.size > limit) ? "｜  " :  "↓  ")
       
       counter = 0
       array.each_with_index do |v, index|
@@ -78,13 +78,13 @@ module Gren
           limit = OPERATOR_DISP_NUM
           counter = 0
           puts
-          print (array.size - index > limit) ? "｜  " : "↓  "
+          print((array.size - index > limit) ? "｜  " : "↓  ")
         end
 
         if (counter >= limit)
           counter = 0
           puts
-          print (array.size - index > limit) ? "｜  " : "↓  "
+          print((array.size - index > limit) ? "｜  " : "↓  ")
         end
 
         print v + ", "

data/lib/findgrep/findgrep.rb

@@ -10,6 +10,7 @@ require File.join(File.dirname(__FILE__), '../common/grensnip')
 require 'groonga'
 require File.join(File.dirname(__FILE__), '../common/util')
 include Gren
+require 'cgi'
 
 module FindGrep
   class FindGrep
@@ -29,8 +30,9 @@ module FindGrep
                         :noSnip,
                         :dbFile,
                         :groongaOnly,
-                        :isMatchFile)
-
+                        :isMatchFile,
+                        :dispHtml)
+    
     DEFAULT_OPTION = Option.new([],
                                 [],
                                 ".",
@@ -47,8 +49,11 @@ module FindGrep
                                 false,
                                 nil,
                                 false,
+                                false,
                                 false)
     
+    attr_reader :documents
+    
     def initialize(patterns, option)
       @patterns = patterns
       @option = option
@@ -59,6 +64,22 @@ module FindGrep
       @ignoreFiles = strs2regs(option.ignoreFiles)
       @ignoreDirs = strs2regs(option.ignoreDirs)
       @result = Result.new(option.directory)
+      open_database if (@option.dbFile)
+    end
+
+    def open_database()
+      # データベース開く
+      dbfile = Pathname(File.expand_path(@option.dbFile))
+      
+      if dbfile.exist?
+        Groonga::Database.open(dbfile.to_s)
+        puts "open    : #{dbfile} open."
+      else
+        raise "error    : #{dbfile.to_s} not found!!"
+      end
+      
+      # ドキュメントを取
+      @documents = Groonga::Context.default["documents"]
     end
 
     def strs2regs(strs, ignore = false)
@@ -82,7 +103,7 @@ module FindGrep
 
       @result.time_stop
       
-      unless (@option.isSilent)
+      if (!@option.isSilent && !@option.dispHtml)
         if (@option.debugMode)
           stdout.puts
           stdout.puts "--- search --------"
@@ -108,21 +129,8 @@ module FindGrep
     end
 
     def searchFromDB(stdout, dir)
-      # データベース開く
-      dbfile = Pathname(File.expand_path(@option.dbFile))
-      
-      if dbfile.exist?
-        Groonga::Database.open(dbfile.to_s)
-        puts "open    : #{dbfile} open."
-      else
-        raise "error    : #{dbfile.to_s} not found!!"
-      end
-      
-      # ドキュメントを検索
-      documents = Groonga::Context.default["documents"]
-
       # 全てのパターンを検索
-      table = documents.select do |record|
+      table = @documents.select do |record|
         expression = nil
 
         # キーワード
@@ -154,10 +162,11 @@ module FindGrep
       end
       
       # タイムスタンプでソート
-      records = table.sort([{:key => "timestamp", :order => "descending"}])
+      records = table.sort([{:key => "_score", :order => "descending"},
+                            {:key => "timestamp", :order => "descending"}])
 
       # データベースにヒット
-      stdout.puts "Found   : #{records.size} records."
+      stdout.puts "Found   : #{records.size} records." unless (@option.dispHtml)
 
       # 検索にヒットしたファイルを実際に検索
       records.each do |record|
@@ -316,13 +325,25 @@ module FindGrep
         result, match_datas = match?(line)
 
         if ( result )
-          header = "#{path}:#{index + 1}:"
-          line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
-
-          unless (@option.colorHighlight)
-            stdout.puts header + line
+          unless (@option.dispHtml)
+            header = "#{path}:#{index + 1}:"
+            line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
+
+            unless (@option.colorHighlight)
+              stdout.puts header + line
+            else
+              stdout.puts HighLine::BLUE + header + HighLine::CLEAR + GrenSnip::coloring(line, match_datas)
+            end
           else
-            stdout.puts HighLine::BLUE + header + HighLine::CLEAR + GrenSnip::coloring(line, match_datas)
+            line_no = index + 1
+            line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
+            
+            stdout.puts <<EOF
+<h2><a href="../::view#{path}">#{path}</a></h2>
+<pre>
+#{line_no} : #{CGI.escapeHTML(line)}
+</pre>
+EOF
           end
 
           unless match_file

data/lib/gren.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Gren
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/lib/grenweb/cli.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+require 'optparse'
+require 'rubygems'
+require 'rack'
+require 'fileutils'
+require File.join(File.dirname(__FILE__), 'database')
+require 'launchy'
+
+module Grenweb
+  class CLI
+    def self.execute(stdout, arguments=[])
+      option = {
+        :Port => 9292,
+        :DbFile => ENV['GRENDB_DEFAULT_DB'],
+      }
+      
+      opt = OptionParser.new("#{File.basename($0)}")
+      opt.on('--db [GREN_DB_FILE]', 'Search from the grendb database.') {|v| option[:DbFile] = v }
+      opt.on('-p', '--port PORT', 'use PORT (default: 9292)') {|v| option[:Port] = v }
+      opt.on('--no-browser', 'No launch browser.') {|v| option[:NoBrowser] = true }
+      opt.parse!(arguments)
+
+      # webサーバー起動
+      stdout.puts <<EOF
+Start up grenweb !!
+URL : http://localhost:#{option[:Port]}
+DB  : #{option[:DbFile]}
+----------------------------------------
+EOF
+
+      # 使用するデータベースの位置設定
+      Database.setup(option[:DbFile])
+      
+      # サーバースクリプトのある場所へ移動
+      FileUtils.cd(File.dirname(__FILE__))
+      
+      # ブラウザ起動
+      Launchy.open("http://localhost:#{option[:Port]}") unless (option[:NoBrowser])
+      
+      # サーバー起動
+      Rack::Server.start(
+                         :environment => "development",
+                         :pid         => nil,
+                         :Port        => option[:Port],
+                         :Host        => "0.0.0.0",
+                         :AccessLog   => [],
+                         :config      => "grenweb.ru"
+                         )
+
+    end
+  end
+end

data/lib/grenweb/database.rb

@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief  Grenwebで使用するデータベース
+# @author ongaeshi
+# @date   2010/10/17
+
+require 'groonga'
+require 'pathname'
+require 'singleton'
+
+module Grenweb
+  class Database
+    include Singleton
+
+    def self.setup(dbFile)
+      @@dbFile = dbFile
+    end
+
+    def initialize
+      open(@@dbFile)
+    end
+
+    def open(dbFile)
+      dbfile = Pathname(File.expand_path(dbFile))
+      
+      if dbfile.exist?
+        Groonga::Database.open(dbfile.to_s)
+      else
+        raise "error    : #{dbfile.to_s} not found!!"
+      end
+      
+      @documents = Groonga::Context.default["documents"]
+    end
+
+    def record(shortpath)
+      before = Time.now
+      table = @documents.select { |record| record.shortpath == shortpath }
+      elapsed = Time.now - before
+      return table.records[0], elapsed
+    end
+
+    def fileNum
+      @documents.select.size
+    end
+
+    def search(patterns, packages, fpaths, suffixs, page = 0, limit = -1)
+      before = Time.now
+
+      # 全てのパターンを検索
+      if (fpaths.include?("*"))
+        records, total_records = selectAll(page, limit)
+      else
+        records, total_records = searchMain(patterns, packages, fpaths, suffixs, page, limit)
+      end
+      
+      # 検索にかかった時間
+      elapsed = Time.now - before
+
+      # 結果
+      return records, total_records, elapsed
+    end
+
+    def selectAll(page, limit)
+      table = @documents.select
+
+      # マッチ数
+      total_records = table.size
+
+      # 2010/10/29 ongaeshi
+      # 本当はこのようにgroongaAPIでソートしたいのだが上手くいかなかった
+      #       # ファイル名順にソート
+      #       records = table.sort([{:key => "shortpath", :order => "descending"}],
+      #                            :offset => page * limit,
+      #                            :limit => limit)
+      
+      # ソート
+      records = table.records.sort_by{|record| record.shortpath.downcase }[page * limit, limit]
+
+      return records, total_records
+    end
+
+    def searchMain(patterns, packages, fpaths, suffixs, page, limit)
+      table = @documents.select do |record|
+        expression = nil
+
+        # キーワード
+        patterns.each do |word|
+          sub_expression = record.content =~ word
+          if expression.nil?
+            expression = sub_expression
+          else
+            expression &= sub_expression
+          end
+        end
+        
+        # パッケージ(OR)
+        pe = package_expression(record, packages) 
+        if (pe)
+          if expression.nil?
+            expression = pe
+          else
+            expression &= pe
+          end
+        end
+        
+        # ファイルパス
+        fpaths.each do |word|
+          sub_expression = record.path =~ word
+          if expression.nil?
+            expression = sub_expression
+          else
+            expression &= sub_expression
+          end
+        end
+
+        # 拡張子(OR)
+        se = suffix_expression(record, suffixs) 
+        if (se)
+          if expression.nil?
+            expression = se
+          else
+            expression &= se
+          end
+        end
+        
+        # 検索式
+        expression
+      end
+
+      # マッチ数
+      total_records = table.size
+      
+      # スコアとタイムスタンプでソート
+      records = table.sort([{:key => "_score", :order => "descending"},
+                            {:key => "timestamp", :order => "descending"}],
+                           :offset => page * limit,
+                           :limit => limit)
+
+      return records, total_records
+    end
+    private :searchMain
+
+    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, suffixs)
+      sub = nil
+      
+      suffixs.each do |word|
+        e = record.suffix =~ word
+        if sub.nil?
+          sub = e
+        else
+          sub |= e
+        end
+      end
+
+      sub
+    end
+    private :suffix_expression
+    
+  end
+end