milkode 0.7.1 → 0.8.0

data/lib/milkode/database/groonga_database.rb

@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/05/28
+
+require 'rubygems'
+require 'groonga'
+require 'milkode/common/dbdir'
+require 'fileutils'
+require 'milkode/database/package_table.rb'
+require 'milkode/database/document_table.rb'
+require 'milkode/database/document_record.rb'
+
+module Milkode
+  class GroongaDatabase
+    def initialize
+      @database = nil
+    end
+
+    # ディレクトリを指定して開く
+    def open(base_dir)
+      open_file Dbdir.groonga_path(base_dir)
+    end
+
+    # データベースファイルを指定して開く
+    def open_file(filename)
+      if File.exist?(filename)
+        @database = Groonga::Database.open(filename)
+        compatible?(filename)
+        define_schema
+      else
+        FileUtils.mkdir_p(File.dirname filename)
+        @database = Groonga::Database.create(:path => filename)
+        define_schema
+      end
+
+      @packages = nil
+      @documents = nil
+
+      if block_given?
+        begin
+          yield self
+        ensure
+          close unless closed?
+        end
+      end
+    end
+
+    # あらかじめ GroongaDatabase#open しておく必要がある
+    def yaml_sync(yaml_contents)
+      yaml_contents.each do |yp|
+        packages.add(yp.name, yp.directory, yp.options) if packages[yp.name].nil?
+      end
+    end
+
+    def close
+      @database.close
+      @database = nil
+    end
+
+    def closed?
+      @database.nil? or @database.closed?
+    end
+
+    def documents
+      @documents ||= DocumentTable.new(Groonga["documents"])
+    end
+
+    def packages
+      @packages ||= PackageTable.new(Groonga["packages"])
+    end
+
+    def compatible?(filename, no_exit = nil)
+      unless Groonga["documents"] && Groonga["packages"]
+        unless no_exit
+          puts <<EOF
+Milkode repository is old -> #{filename}.
+Please rebuild repository, 
+
+  milk rebuild --all
+
+See 'milk --help' or http://milkode.ongaeshi.me .
+EOF
+          exit -1
+        else
+          nil
+        end
+      else
+        true
+      end
+    end
+    
+    private
+
+    def define_schema
+      DocumentTable.define_schema
+      PackageTable.define_schema
+    end
+
+  end
+end
+
+

data/lib/milkode/database/package_table.rb

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/05/29
+
+module Milkode
+  class PackageTable
+    include Enumerable
+
+    def self.define_schema
+      Groonga::Schema.define do |schema|
+        schema.create_table("packages", :type => :hash) do |table|
+          table.string("name")
+          table.string("directory")
+          table.time("addtime")
+          table.time("updatetime")
+          table.time("viewtime")
+          table.time("favtime")
+        end
+      end
+    end
+
+    def initialize(table)
+      @table = table
+    end
+
+    def size
+      @table.size
+    end
+
+    def add(name, directory, options)
+      @table.add(name,
+                 :name => name,
+                 :directory => directory,
+                 :addtime => Time.now,
+                 :favtime => options[:fav] ? Time.now : Time.at(0))
+    end
+
+    def remove(name)
+      @table[name].delete
+    end
+
+    def remove_all
+      self.each do |r|
+        r.record_id.delete
+      end
+    end
+
+    def [](name)
+      @table[name]
+    end
+
+    def each
+      @table.select.each do |r|
+        yield r
+      end
+    end
+
+    def sort(kind, order = "descending")
+      @table.sort([{:key => kind, :order => order}])
+    end
+
+    def dump
+      self.each do |r|
+        p [r.name, r.addtime, r.updatetime, r.viewtime, r.favtime]
+      end
+    end
+
+    def touch(name, kind, time = Time.now)
+      @table[name][kind] = time
+    end
+
+    def touch_if(name, kind, time = Time.now)
+      record = @table[name]
+
+      if record
+        record[kind] = time
+      else
+        nil
+      end
+    end
+
+    def favs
+      sorted = sort('favtime')
+      zero_time = Time.at(0)
+      index = sorted.find_index {|v| v.favtime == zero_time}
+      unless index.nil?
+        sorted[0...index]
+      else
+        sorted
+      end
+    end
+  end
+end
+
+

data/lib/milkode/findgrep/findgrep.rb

@@ -7,11 +7,11 @@ require 'kconv'
 require 'milkode/common/platform'
 require 'milkode/common/grenfiletest'
 require 'milkode/common/grensnip'
-require 'groonga'
 require 'milkode/common/util'
 include Gren
 require 'cgi'
 require 'pathname'
+require 'milkode/database/groonga_database'
 
 module FindGrep
   class FindGrep
@@ -79,18 +79,20 @@ module FindGrep
     end
 
     def open_database()
-      # データベース開く
+      # データベースファイル
       dbfile = Pathname(File.expand_path(@option.dbFile))
-      
+
+      # データベース開く
       if dbfile.exist?
-        Groonga::Database.open(dbfile.to_s)
-        puts "open    : #{dbfile} open." unless @option.isSilent
+        if !@grndb || @grndb.closed?
+          @grndb = GroongaDatabase.new
+          @grndb.open_file(dbfile.to_s)
+          @documents = @grndb.documents
+          puts "open    : #{dbfile.to_s} open." unless @option.isSilent
+        end
       else
         raise "error    : #{dbfile.to_s} not found!!"
       end
-      
-      # ドキュメントを取
-      @documents = Groonga::Context.default["documents"]
     end
 
     def strs2regs(strs, ignore = false)
@@ -205,124 +207,18 @@ module FindGrep
     end
 
     def searchDatabase
-      # 全てのパターンを検索
-      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
-
-        # キーワード(絞り込むための手がかり)
-        @option.keywords.each do |word|
-          sub_expression = record.content =~ word
-          sub_expression |= record.path =~ word
-          if expression.nil?
-            expression = sub_expression
-          else
-            expression &= sub_expression
-          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
-          if expression.nil?
-            expression = sub_expression
-          else
-            expression &= sub_expression
-          end
-        end
-
-        # 拡張子(OR)
-        se = suffix_expression(record) 
-        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"}])
-
-      # ファイル名でソート
-      table.sort([{:key => "shortpath", :order => "ascending"}])
+      @documents.search(
+        :patterns  => @patterns,
+        :keywords  => @option.keywords,
+        :paths     => @option.filePatterns,
+        :packages  => @option.packages,
+        # :restpaths => ,
+        :suffixs   => @option.suffixs
+        # :offset    => ,
+        # :limit     => ,
+      )
     end
 
-    def and_expression(key, list)
-      sub = nil
-      
-      list.each do |word|
-        e = key =~ word
-        if sub.nil?
-          sub = e
-        else
-          sub &= e
-        end
-      end
-
-      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
-      
-      @option.suffixs.each do |word|
-        e = record.suffix =~ word
-        if sub.nil?
-          sub = e
-        else
-          sub |= e
-        end
-      end
-
-      sub
-    end
-    private :suffix_expression
-      
-
     def searchFromDir(stdout, dir, depth)
       if (@option.depth != -1 && depth > @option.depth)
         return

data/lib/milkode/grep/cli_grep.rb

@@ -154,7 +154,9 @@ EOF
     private
 
     def self.setup_package(option, my_option, keyword)
-      dirs = yaml_load.contents.find_all {|p| p.name.include? keyword }.map{|p| p.directory}
+      # @memo package指定が簡単になった
+      # dirs = yaml_load.contents.find_all {|p| p.name.include? keyword }.map{|p| p.directory}
+      dirs = yaml_load.contents.find_all {|p| p.name.include? keyword }.map{|p| p.name}
       raise NotFoundPackage.new keyword if (dirs.empty?)
       option.packages += dirs
       my_option[:packages] += dirs

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-05-15}
+  s.date = %q{2012-06-20}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -42,10 +42,13 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/lib/database.rb",
     "lib/milkode/cdweb/lib/grep.rb",
     "lib/milkode/cdweb/lib/mkurl.rb",
+    "lib/milkode/cdweb/lib/package_list.rb",
     "lib/milkode/cdweb/lib/query.rb",
     "lib/milkode/cdweb/lib/search_contents.rb",
     "lib/milkode/cdweb/lib/search_files.rb",
     "lib/milkode/cdweb/lib/web_setting.rb",
+    "lib/milkode/cdweb/public/css/bootstrap-responsive.min.css",
+    "lib/milkode/cdweb/public/css/bootstrap.min.css",
     "lib/milkode/cdweb/public/css/coderay-patch.css",
     "lib/milkode/cdweb/public/css/coderay.css",
     "lib/milkode/cdweb/public/css/milkode.css",
@@ -55,17 +58,22 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/public/images/file.png",
     "lib/milkode/cdweb/public/images/go-home-5.png",
     "lib/milkode/cdweb/public/images/help.png",
+    "lib/milkode/cdweb/public/img/glyphicons-halflings-white.png",
+    "lib/milkode/cdweb/public/img/glyphicons-halflings.png",
+    "lib/milkode/cdweb/public/js/bootstrap.min.js",
     "lib/milkode/cdweb/public/js/milkode.js",
     "lib/milkode/cdweb/views/filelist.haml",
     "lib/milkode/cdweb/views/header_menu.haml",
     "lib/milkode/cdweb/views/help.haml",
     "lib/milkode/cdweb/views/index.haml",
     "lib/milkode/cdweb/views/layout.haml",
+    "lib/milkode/cdweb/views/packages.haml",
     "lib/milkode/cdweb/views/search.haml",
     "lib/milkode/cdweb/views/search_form.haml",
     "lib/milkode/cdweb/views/view.haml",
     "lib/milkode/cli.rb",
     "lib/milkode/common/archive-zip.rb",
+    "lib/milkode/common/array_diff.rb",
     "lib/milkode/common/dbdir.rb",
     "lib/milkode/common/dir.rb",
     "lib/milkode/common/display_util.rb",
@@ -76,6 +84,10 @@ Gem::Specification.new do |s|
     "lib/milkode/common/platform.rb",
     "lib/milkode/common/string_snip.rb",
     "lib/milkode/common/util.rb",
+    "lib/milkode/database/document_record.rb",
+    "lib/milkode/database/document_table.rb",
+    "lib/milkode/database/groonga_database.rb",
+    "lib/milkode/database/package_table.rb",
     "lib/milkode/findgrep/findgrep.rb",
     "lib/milkode/findgrep/result.rb",
     "lib/milkode/grep/cli_grep.rb",
@@ -86,6 +98,13 @@ Gem::Specification.new do |s|
     "test/data/abc.zip",
     "test/data/b_project/runner.rb",
     "test/data/b_project/test_dir.rb",
+    "test/data/c_project/a.txt",
+    "test/data/c_project/abc.c",
+    "test/data/c_project/abc.h",
+    "test/data/c_project/b.txt",
+    "test/data/c_project/c.txt",
+    "test/data/c_project/cc.txt",
+    "test/data/c_project/to/file.rb",
     "test/data/no_auto_ignore/.gitignore",
     "test/data/no_auto_ignore/a.txt",
     "test/data/nodir_abc.zip",
@@ -104,14 +123,19 @@ Gem::Specification.new do |s|
     "test/test_database.rb",
     "test/test_dbdir.rb",
     "test/test_dir.rb",
+    "test/test_document_record.rb",
+    "test/test_document_table.rb",
     "test/test_findgrep.rb",
     "test/test_gren_util.rb",
+    "test/test_groonga_database.rb",
     "test/test_helper.rb",
     "test/test_ignore_checker.rb",
     "test/test_ignore_setting.rb",
     "test/test_milkode_yaml.rb",
     "test/test_mkurl.rb",
     "test/test_package.rb",
+    "test/test_package_list.rb",
+    "test/test_package_table.rb",
     "test/test_query.rb",
     "test/test_string_snip.rb",
     "test/test_util.rb",
@@ -139,6 +163,8 @@ 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.15.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<termcolor>, [">= 1.2.0"])
       s.add_dependency(%q<rroonga>, [">= 1.1.0"])
@@ -151,6 +177,8 @@ 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.15.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<termcolor>, [">= 1.2.0"])
@@ -164,6 +192,8 @@ 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.15.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end