milkode 0.9.9.9 → 1.0.0

data/HISTORY.ja.rdoc

@@ -1,3 +1,18 @@
+=== 1.0.0 2013/05/21
+
+* milk web
+  * 統計情報
+    * 拡張子絞り込みのリンクを追加
+    * unknownの表示形式を変更
+      * 旧: 'hoge.list' -> 'unknown'
+      * 新: 'hoge.list' -> '.list'
+
+* gmilk
+  * Windows環境でgmilkが動かない問題を修正
+
+* etc  
+  * test/unit 2.5.4 で警告が出る箇所を修正
+
 === 0.9.9.9 2013/05/05
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,17 @@
+=== 1.0.0 2013/05/21
+
+* milk web
+  * info
+    * Add extention refinement links
+    * Change unknown view
+      * old: 'hoge.list' -> 'unknown'
+      * new: 'hoge.list' -> '.list'
+
+* gmilk
+  * Windows環境でgmilkが動かない問題を修正
+
+* etc  
+  * test/unit 2.5.4 で警告が出る箇所を修正
 === 0.9.9.9 2013/05/05
 
 * milk web

data/VERSION

@@ -1 +1 @@
-0.9.9.9
+1.0.0

data/bin/gmilk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/grep/cli_grep'
 
-Version = "0.9.9.9"
+Version = "1.0.0"
 Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cli'
 
-Version = "0.9.9.9"
+Version = "1.0.0"
 Milkode::CLI.start(ARGV)

data/lib/milkode/cdweb/app.rb

@@ -29,7 +29,7 @@ set :haml, :format => :html5
 get '/' do
   if Database.validate?
     @setting = WebSetting.new
-    @version = "0.9.9.9"
+    @version = "1.0.0"
 
     @package_num = Database.instance.yaml_package_num
     @file_num = Database.instance.totalRecords

data/lib/milkode/cdweb/lib/info_package.rb

@@ -7,6 +7,7 @@
 
 require 'milkode/cdweb/lib/database'
 require 'milkode/common/plang_detector'
+require 'milkode/cdweb/lib/mkurl'
 
 module Milkode
   class InfoPackage
@@ -26,7 +27,7 @@ EOF
 
       @plang_content = <<EOF
 <table class="table-striped table-bordered table-condensed">
-#{breakdown_detail(records)}
+#{breakdown_detail(name, records)}
 </table>
 EOF
     end
@@ -46,28 +47,47 @@ EOF
       end
     end
 
-    def breakdown_detail(records)
-      sorted_plangs(records).map {|name, count|
+    def breakdown_detail(package_name, records)
+      sorted_plangs(records).map {|name, count, lang|
         percent = (count.to_f / records.size * 100).to_i
-        "<tr><td>#{name}</td><td align=\"right\">#{count}</td><td align=\"right\">#{percent}%</td></tr>"
+
+        params = { :query => lang_to_query(lang) }
+
+        if params[:query] != ""
+          url = "/home/" + Mkurl.new(package_name, params).inherit_query_shead
+          "<tr><td>#{name}</td><td align=\"right\"><a href=\"#{url}\">#{count}</a></td><td align=\"right\">#{percent}%</td></tr>"
+        else
+          "<tr><td>#{name}</td><td align=\"right\">#{count}</td><td align=\"right\">#{percent}%</td></tr>"
+        end
       }.join("\n")
     end
 
+    def lang_to_query(lang)
+      # @memo
+      # この実装には問題がある。Makefileなどの検索クエリが正しくない。
+      # 正しく実装するには AND, OR 検索を実装する必要がある
+      result = []
+      result << lang.suffixs.map{|v|"s:#{v}"}.join(" ")      if lang.suffixs
+      result << lang.filenames.map{|v|"f:#{v}"}.join(" ")    if lang.filenames
+      result << lang.filepatterns.map{|v|"f:#{v}"}.join(" ") if lang.filepatterns
+      result.join(" ")
+    end
+
     def sorted_plangs(records)
       total = {}
       
       records.each do |record|
         lang = PlangDetector.new(record.restpath)
-
+        
         if total[lang.name]
-          total[lang.name] += 1
+          total[lang.name][0] += 1
         else
-          total[lang.name] = 1
+          total[lang.name] = [1, lang]
         end
       end
 
-      total.map {|name, count|
-        [name, count]
+      total.map {|name, data|
+        [name, data[0], data[1]]
       }.sort {|a, b|
         if (a[0] == PlangDetector::UNKNOWN)
           -1

data/lib/milkode/common/plang_detector.rb

@@ -97,13 +97,31 @@ module Milkode
         is_found
       }
 
-      @lang ||= UNKNOWN_LANGUAGE
+      if @lang.nil?
+        if suffix
+          @lang = {:name => "." + suffix, :suffixs => [suffix]}
+        else
+          @lang = UNKNOWN_LANGUAGE
+        end
+      end
     end
 
     def name
       @lang[:name]
     end
 
+    def suffixs
+      @lang[:suffixs]
+    end
+
+    def filenames
+      @lang[:filenames]
+    end
+
+    def filepatterns
+      @lang[:filepatterns]
+    end
+
     def unknown?
       name == UNKNOWN
     end

data/lib/milkode/grep/cli_grep.rb

@@ -111,7 +111,7 @@ EOF
 
       # 現在位置のパッケージを記録
       if option.packages.empty? && !my_option[:all] && !is_abs_path
-        if package_dir_in?(current_dir)
+        if current_dir && package_dir_in?(current_dir)
           option.filePatterns << current_dir
         elsif current_package
           option.strict_packages << current_package.name

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.9.9"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2013-05-05}
+  s.date = %q{2013-05-21}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -140,10 +140,10 @@ Gem::Specification.new do |s|
     "test/data/a_project/cdstk_yaml.rb",
     "test/data/a_project/empty.txt",
     "test/data/abc.zip",
+    "test/data/b_project/dummy_test_dir.rb",
     "test/data/b_project/runner.rb",
-    "test/data/b_project/test_dir.rb",
+    "test/data/b_project2/dummy_test_dir.rb",
     "test/data/b_project2/runner.rb",
-    "test/data/b_project2/test_dir.rb",
     "test/data/c_project/a.txt",
     "test/data/c_project/abc.c",
     "test/data/c_project/abc.h",

data/test/test_document_record.rb

@@ -12,7 +12,7 @@ require 'milkode/database/document_record'
 require 'fileutils'
 
 module Milkode
-  class TestDocumentTable < Test::Unit::TestCase
+  class TestDocumentRecord < Test::Unit::TestCase
     def test_database
       begin
         t_setup

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 9
-  - 9
-  version: 0.9.9.9
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-05 00:00:00 +09:00
+date: 2013-05-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -408,10 +407,10 @@ files:
 - test/data/a_project/cdstk_yaml.rb
 - test/data/a_project/empty.txt
 - test/data/abc.zip
+- test/data/b_project/dummy_test_dir.rb
 - test/data/b_project/runner.rb
-- test/data/b_project/test_dir.rb
+- test/data/b_project2/dummy_test_dir.rb
 - test/data/b_project2/runner.rb
-- test/data/b_project2/test_dir.rb
 - test/data/c_project/a.txt
 - test/data/c_project/abc.c
 - test/data/c_project/abc.h