milkode 0.4.0 → 0.5.0

data/lib/milkode/cdweb/app.rb

@@ -18,7 +18,7 @@ require 'milkode/cdweb/lib/mkurl'
 set :haml, :format => :html5
 
 get '/' do
-  @version = "0.4.0"
+  @version = "0.5.0"
   @package_num = Database.instance.fileList('').size
   @file_num = Database.instance.fileNum
   haml :index
@@ -73,38 +73,16 @@ helpers do
     "<a href='#{'/home?query=' + escape_url(query)}'>#{query}</a>"
   end
 
-  def create_form(path, query, shead)
-    shead = shead || 'directory'
-    
-    # こっちにすると'検索'ボタンを押した時に新しくウィンドウが開く
-    # <form action='' target='_blank' method='post'>
-    <<EOF
-  <script type="text/javascript">
-  function set_pathname() {
-    document.searchform.pathname.value = location.pathname;
-  }
-  </script>
-  <form name="searchform" action='/search' method='post'>
-    <p>
-      <input name='query' size='60' type='text' value='#{query}' />
-      <input type='submit' value='検索' onclick='set_pathname()'><br></input>
-      #{create_radio('all', shead)}
-      <label>全体を検索</label>
-      #{create_radio('package', shead)}
-      <label> #{package_name(path)} 以下</label>
-      #{create_radio('directory', shead)}
-      <label> #{current_name(path)} 以下</label>
-      <input name='pathname' type='hidden' value=''></input>
-    </p>
-  </form>
-EOF
-  end
-
   def create_radio(value, shead)
     str = (value == shead) ? 'checked' : ''
     "<input name='shead' type='radio' value='#{value}' #{str}/>"
   end
 
+  def create_checkbox(name, value)
+    str = (value) ? 'checked' : ''
+    "<input type='checkbox' name='#{name}' value='on' #{str}/>"
+  end
+
   def create_headmenu(path, query, flistpath = '')
     href = Mkurl.new('/home/' + path, params).inherit_query_shead
     flist = File.join("/home/#{path}", flistpath)

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

@@ -212,6 +212,12 @@ module Milkode
                            :offset => offset,
                            :limit => limit)
       
+      # ファイル名でソート
+      # @todo 本当はこっちが望ましい
+      # records = table.sort([{:key => "shortpath", :order => "ascending"}],
+      #                      :offset => offset,
+      #                      :limit => limit)
+
       # パッケージの条件追加
       if (packages.size > 0)
         records.delete_if do |record|

data/lib/milkode/cdweb/lib/grep.rb

@@ -12,6 +12,34 @@ module Milkode
     end
 
     MatchLineResult = Struct.new(:index, :match_datas)
+
+    def match_lines_stopover(patterns, max_match, start_index)
+      result = []
+      patternRegexps = strs2regs(patterns, true)
+      index = start_index
+
+      lines = @content.split($/)
+
+      while (index < lines.size) do
+        line = lines[index]
+
+        match_datas = []
+        patternRegexps.each {|v| match_datas << v.match(line)}
+
+        if (match_datas.all?)
+          result << MatchLineResult.new(index, match_datas)
+          if result.size >= max_match
+            index += 1
+            break
+          end
+        end
+
+        index += 1
+      end
+
+      index = 0 if (index >= lines.size)
+      {:result => result, :next_line => index}
+    end
     
     def match_lines_and(patterns)
       result = []

data/lib/milkode/cdweb/lib/mkurl.rb

@@ -46,7 +46,9 @@ module Milkode
       qparam = []
       qparam << "query=#{escape(@params[:query])}" if (query_inherit and @params[:query])
       qparam << "shead=#{escape(@params[:shead])}" if (shead_inherit and @params[:shead])
+      qparam << "onematch=#{escape(@params[:onematch])}" if (shead_inherit and @params[:onematch])
       qparam << "offset=#{escape(@params[:offset])}" if (offset_inherit and @params[:offset])
+      qparam << "line=#{escape(@params[:line])}" if (offset_inherit and @params[:line])
       qparam.join('&')
     end
   end

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

@@ -32,6 +32,8 @@ module Milkode
       @q = query
       @page = params[:page].to_i || 0
       @offset = params[:offset].to_i
+      @line = params[:line].to_i
+      @is_onematch = params[:onematch]
       fpaths = @q.fpaths
       fpaths << path + "/" unless path == ""
       @records, @total_records, @elapsed = Database.instance.search(@q.keywords, @q.packages, fpaths, @q.suffixs, @offset, LIMIT_NUM)
@@ -47,7 +49,7 @@ module Milkode
     end
 
     def data_range
-      @offset..(next_offset - 1)
+      @offset..(@offset + @end_index)
     end
 
     def html_contents
@@ -60,7 +62,7 @@ module Milkode
 
       return <<EOF
 <div class='pagination'>
-#{pagination_link(next_offset, "next >>")}
+#{pagination_link(next_offset, @next_line, "next >>")}
 </div>
 EOF
     end
@@ -75,22 +77,58 @@ EOF
 
     def grep_contents
       @match_records = []
-      @next_index = @records.size
-      
+      @end_index = @next_index = @records.size
+      @next_line = nil
+
       @records.each_with_index do |record, index|
         if (Util::larger_than_oneline(record.content))
-          grep = Grep.new(record.content)
-          match_line = grep.one_match_and(@q.keywords)
-          @match_records << MatchRecord.new(record, match_line) if match_line
+
+          if @is_onematch
+            grep = Grep.new(record.content)
+            match_line = grep.one_match_and(@q.keywords)
+            @match_records << MatchRecord.new(record, match_line) if match_line
+
+            if @match_records.size >= DISP_NUM
+              @end_index = index
+              @next_index = index + 1
+              break
+            end
+          else
+            break if grep_match_lines_stopover(record, index)
+          end
         else
           @match_records << MatchRecord.new(record, Grep::MatchLineResult.new(0, nil))
+
+          if @match_records.size >= DISP_NUM
+            @end_index = index
+            @next_index = index + 1
+            break
+          end
         end
+      end
+    end
 
-        if @match_records.size >= DISP_NUM
+    def grep_match_lines_stopover(record, index)
+      grep = Grep.new(record.content)      
+      r = grep.match_lines_stopover(@q.keywords, DISP_NUM - @match_records.size, (index == 0) ? @line : 0)
+
+      r[:result].each do |match_line|
+        @match_records << MatchRecord.new(record, match_line) if match_line
+      end
+
+      if @match_records.size >= DISP_NUM
+        if (r[:next_line] == 0)
+          @end_index = index
           @next_index = index + 1
-          break
+        else
+          @end_index = index
+          @next_index = index
+          @next_line = r[:next_line]
         end
+        return true
       end
+
+      return false
     end
 
     def result_match_record(match_record)
@@ -112,9 +150,10 @@ EOF
 EOS
     end
 
-    def pagination_link(offset, label)
+    def pagination_link(offset, line, label)
       tmpp = @params
       tmpp[:offset] = offset.to_s
+      tmpp[:line] = line.to_s
       href = Mkurl.new("", tmpp).inherit_query_shead_offset
       pagination_span("<a href='#{href}' rel='next'>#{label}</a>")
     end

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

@@ -1,11 +1,7 @@
-.header
-  %h1
-    <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
-    Milkode
-    = create_headmenu(@path, params)
+= haml :header_menu
 
 .content
-  = create_form(@path, params[:query], params[:shead])
+  = haml :search_form
 
   .search-summary
     <span class="keyword">#{topic_path(@path, params)}</span> <span class="total-entries">#{@total_records}</span>件（#{@elapsed}秒）

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

@@ -0,0 +1,5 @@
+.header
+  %h1
+    <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
+    Milkode
+    = create_headmenu(@path, params, defined?(flistpath) ? flistpath : '')

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

@@ -1,16 +1,12 @@
-.header
-  %h1
-    <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
-    Milkode
-    = create_headmenu(@path, params)
+= haml :header_menu
 
 .content
-  = create_form(@path, params[:query], params[:shead])
+  = 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 - @range.first + 1}件を検索</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}秒）
     

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

@@ -0,0 +1,22 @@
+:javascript
+  function set_pathname() {
+    document.searchform.pathname.value = location.pathname;
+  }
+%form(name="searchform" action="/search" method="post")
+  %p
+    %input(name="query" size="60" type="text"){:value => params[:query]}
+    %input(type="submit" value="検索" onclick="set_pathname()")
+    %br
+    %label
+      = create_radio('all', params[:shead])
+      全体を検索
+    %label
+      = create_radio('package', params[:shead])
+      = package_name(@path) + '以下'
+    %label
+      = create_radio('directory', params[:shead])
+      = current_name(@path) + '以下'
+    %label
+      = create_checkbox('onematch', params[:onematch])
+      = '1ファイル1マッチ'
+    %input(name="pathname" type="hidden" value="")

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

@@ -1,11 +1,7 @@
-.header
-  %h1
-    <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
-    Milkode
-    = create_headmenu(@path, params, '..')
+= haml :header_menu, locals => {:flistpath => '..'}
 
 .content
-  = create_form(@path, params[:query], params[:shead])
+  = haml :search_form
 
   .search-summary
     <span class="keyword">#{topic_path(@path, params)}</span>（#{@elapsed}秒）

data/lib/milkode/common/ignore_checker.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/03/02
+
+require 'milkode/common/ignore_setting.rb'
+
+module Milkode
+  #
+  # Sample:
+  #   c = IgnoreChecker.new
+  #   c.add IgnoreSetting.new("/", ["/rdoc", "/test/data", "*.lock"])
+  #   c.add IgnoreSetting.new("/pkg", ["*.gem"])
+  #   c.ignore?('/lib/test.rb')  #=> false
+  #   c.ignore?('/pkg/hoge.gem') #=> true
+  #
+  class IgnoreChecker
+    attr_reader :settings
+    
+    def initialize
+      @settings = []
+    end
+
+    def add(setting)
+      @settings << setting
+    end
+
+    def ignore?(path)
+      @settings.any?{|s| s.ignore? path }
+    end
+  end
+end

data/lib/milkode/common/ignore_setting.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/03/02
+
+module Milkode
+  class IgnoreSetting
+    attr_reader :path
+    attr_reader :ignores
+
+    def self.create_from_gitignore(path, str)
+      IgnoreSetting.new(path, parse_gitignore(str))
+    end
+
+    def self.parse_gitignore(str)
+      ignores = str.split($/)
+      ignores.delete_if{|v| v =~ /(\A#.*)|(\A\Z)/}
+      ignores
+    end
+    
+    def initialize(path, ignores)
+      @path = path
+      @ignores = ignores.map{|v| v.sub(/\/\Z/, "")}
+
+      @regexp = @ignores.map do |v|
+        v = "(\/|\\A)" + Regexp.escape(v).gsub('\\*', "[^/]*") + "(\/|\\Z)"
+        Regexp.new(v)
+      end
+    end
+
+    def ignore?(path)
+      return false unless path.start_with?(@path)
+
+      if (path.size == @path.size)
+        false
+      else
+        if (@path == '/')
+          ignore_in?(path)
+        else
+          ignore_in?(path[@path.size..-1])
+        end
+      end
+    end
+
+    private
+
+    def ignore_in?(path)
+      @regexp.each_with_index do |value, index|
+        match = path.match(value)
+        is_match_start_pos = @ignores[index].start_with?('/')
+
+        if match && (!is_match_start_pos || match.begin(0) == 0)
+          return true
+        end
+      end
+      
+      return false
+    end
+  end
+end

data/lib/milkode/grep/cli_grep.rb

@@ -3,8 +3,9 @@
 require 'optparse'
 require 'milkode/findgrep/findgrep'
 require 'milkode/common/dbdir'
-require 'milkode/cdstk/cdstk_yaml'
 require 'milkode/cdstk/cdstk'
+require 'milkode/cdstk/yaml_file_wrapper'
+require 'milkode/cdstk/package'
 
 module Milkode
   class CLI_Grep
@@ -142,28 +143,28 @@ EOF
     private
 
     def self.setup_package(option, my_option, keyword)
-      packages = yaml_load.list( CdstkYaml::Query.new([keyword]) ).map{|v| v['directory']}
-      raise NotFoundPackage.new keyword if (packages.empty?)
-      option.packages += packages
-      my_option[:packages] += packages
+      dirs = yaml_load.contents.find_all {|p| p.name.include? keyword }.map{|p| p.directory}
+      raise NotFoundPackage.new keyword if (dirs.empty?)
+      option.packages += dirs
+      my_option[:packages] += dirs
     end
 
     def self.package_dir_in?(dir)
-      yaml_load.package_root_dir(dir)
+      yaml_load.package_root(dir)
     end
 
     def self.package_root_dir(dir)
-      package_root = yaml_load.package_root_dir(dir)
+      package_root = yaml_load.package_root(dir)
 
       if (package_root)
-        package_root
+        package_root.directory
       else
         raise NotFoundPackage.new dir
       end
     end
 
     def self.yaml_load
-      CdstkYaml.load(Dbdir.select_dbdir)
+      YamlFileWrapper.load(Dbdir.select_dbdir)
     end
 
     class ArgumentParser

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-02-02}
+  s.date = %q{2012-03-09}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
     "bin/milk",
     "lib/milkode/cdstk/cdstk.rb",
     "lib/milkode/cdstk/cdstk_command.rb",
-    "lib/milkode/cdstk/cdstk_yaml.rb",
     "lib/milkode/cdstk/cli_cdstk.rb",
     "lib/milkode/cdstk/cli_cdstksub.rb",
+    "lib/milkode/cdstk/milkode_yaml.rb",
+    "lib/milkode/cdstk/package.rb",
+    "lib/milkode/cdstk/yaml_file_wrapper.rb",
     "lib/milkode/cdweb/app.rb",
     "lib/milkode/cdweb/cli_cdweb.rb",
     "lib/milkode/cdweb/config.ru",
@@ -56,10 +58,12 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/public/images/go-home-5.png",
     "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/search.haml",
+    "lib/milkode/cdweb/views/search_form.haml",
     "lib/milkode/cdweb/views/view.haml",
     "lib/milkode/common/archive-zip.rb",
     "lib/milkode/common/dbdir.rb",
@@ -67,6 +71,8 @@ Gem::Specification.new do |s|
     "lib/milkode/common/display_util.rb",
     "lib/milkode/common/grenfiletest.rb",
     "lib/milkode/common/grensnip.rb",
+    "lib/milkode/common/ignore_checker.rb",
+    "lib/milkode/common/ignore_setting.rb",
     "lib/milkode/common/platform.rb",
     "lib/milkode/common/string_snip.rb",
     "lib/milkode/common/util.rb",
@@ -74,11 +80,14 @@ Gem::Specification.new do |s|
     "lib/milkode/findgrep/result.rb",
     "lib/milkode/grep/cli_grep.rb",
     "milkode.gemspec",
+    "test/data/.gitignore",
     "test/data/a_project/cdstk.rb",
     "test/data/a_project/cdstk_yaml.rb",
     "test/data/abc.zip",
     "test/data/b_project/runner.rb",
     "test/data/b_project/test_dir.rb",
+    "test/data/no_auto_ignore/.gitignore",
+    "test/data/no_auto_ignore/a.txt",
     "test/data/nodir_abc.zip",
     "test/data/nodir_abc_xpi.xpi",
     "test/file_assert.rb",
@@ -89,7 +98,6 @@ Gem::Specification.new do |s|
     "test/test_bin_exec.rb",
     "test/test_cdstk.rb",
     "test/test_cdstk_command.rb",
-    "test/test_cdstk_yaml.rb",
     "test/test_cli_cdstk.rb",
     "test/test_cli_grep.rb",
     "test/test_coderay_wrapper.rb",
@@ -99,10 +107,15 @@ Gem::Specification.new do |s|
     "test/test_dir.rb",
     "test/test_gren_util.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_query.rb",
     "test/test_string_snip.rb",
-    "test/test_util.rb"
+    "test/test_util.rb",
+    "test/test_yaml_file_wrapper.rb"
   ]
   s.homepage = %q{http://github.com/ongaeshi/milkode}
   s.licenses = ["MIT"]