milkode 0.5.0 → 0.5.1

data/HISTORY.ja.rdoc

@@ -1,3 +1,45 @@
+=== 0.5.0 2012/03/09
+
+* milk
+  * 仕様を見直して使い勝手を大幅に改善
+  * milk add
+    * パッケージ内の.gitignoreを自動で読み込み、検索対象から外すように
+    * .gitignoreを読み込みたくない場合は --no-auto-ignore オプションを指定して下さい
+    * 大量に表示されるメッセージを抑制 (-vオプションで表示)
+    * 除外対象を指定する -i オプションを追加
+    * 'milk add .' の時に 'package : .' -> 'package : milkode' に
+  * milk ignore
+    * 検索対象に含めないファイルやディレクトリを指定することが出来る
+    * milk ignore --test で.gitignoreも含めて除外される可能性のあるファイルとディレクトリを表示
+    * milk ignore -p PACKAGE_NAME でパッケージ指定
+    * milk ignore -d IGNORE_PATH .. で除外対象から削除
+  * milk init
+    * milk init 'a_dir' でディレクトリを自動で掘ってくれるように。
+    * milk init --setdb オプションを追加
+  * milk rebuild
+    * 正確にパッケージ名を指定しなければリビルド出来ないように
+    * 引数無しで実行すると現在位置のパッケージをリビルド
+  * milk remove
+    * 正確にパッケージ名を指定しなければ削除出来ないように
+    * 引数無しで実行すると現在位置のパッケージを削除
+  * milk update
+    * 大量に表示されるメッセージを抑制 (-vオプションで表示)
+    * 'milk update NOT_EXIST_PACKAGE'の時に milkode_info が表示されないように
+  * milk setdb
+    * milk setdb --default でデフォルトデータベースに戻るように (milk setdb --reset と同義)
+  * milk pwd
+    * パッケージ名も表示するように 'milkode in ~/.milkode'
+
+* milk web
+  * ファイル毎のすべてのマッチを検索し、結果に表示するようにした (Fix #12) (thanks tomykaira, miau)
+  * ラジオボタンとラベルをタグ付け (Fix #15) (thanks tomykaira, miau)
+  * 1ファイル1マッチ'チェックボックスを追加。
+
+* lib
+  * CdstkYamlを削除
+  * Package, MilkodeYaml, YamlFileWrapperを追加。
+  * 古いバージョンのmilkode.yamlにアクセスしたら自動でアップグレードするように。
+
 === 0.4.0 2012/02/02
 
 * gmilk 

data/HISTORY.rdoc

@@ -1,3 +1,27 @@
+=== 0.5.0 2012/03/09
+
+* milk
+  * Review the specifications and significantly improve ease of use
+  * milk add
+    * Reads automatic .gitignore in the package, to ignore from the search
+    * If you do not want to load the .gitignore please specify '--no-auto-ignore'
+  * milk ignore
+    * Can specify the directories and files not included in the search
+  * milk init
+  * milk rebuild
+  * milk remove
+  * milk update
+  * milk setdb
+  * milk pwd
+
+* milk web
+  * Find all the matches every file so that the displayed results (Fix #12) (thanks tomykaira, miau)
+
+* lib
+  * Delete CdstkYaml
+  * Add Package, MilkodeYaml, YamlFileWrapper
+  * milkode.yaml version up, 0.1 -> '0.2'.
+
 === 0.4.0 2012/02/02
 
 * gmilk 

data/Rakefile

@@ -55,7 +55,7 @@ end
  
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.test_files = FileList['test/**/test_*.rb']
   test.verbose = true
 end
 
@@ -78,7 +78,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/milkode/cdweb/app.rb

@@ -19,22 +19,34 @@ set :haml, :format => :html5
 
 get '/' do
   @version = "0.5.0"
-  @package_num = Database.instance.fileList('').size
-  @file_num = Database.instance.fileNum
+  @package_num = Database.instance.yaml_package_num
+  @file_num = Database.instance.totalRecords
   haml :index
 end
 
+def package_path(path)
+  path.split('/')[0,3].join('/')
+end
+
 post '/search*' do
   path = unescape(params[:pathname])
-  
-  case params[:shead]
-  when 'all'
-    path = "/home"
-  when 'package'
-    path = path.split('/')[0,3].join('/')
-  end
 
-  redirect Mkurl.new("#{path}", params).inherit_query_shead
+  if params[:clear]
+    redirect Mkurl.new("#{path}", params).inherit_shead
+  else
+    case params[:shead]
+    when 'all'
+      path = "/home"
+    when 'package'
+      path = package_path(path)
+    when 'directory'
+      # do nothing
+    else
+      path = package_path(path)
+    end
+
+    redirect Mkurl.new("#{path}", params).inherit_query_shead
+  end
 end
 
 get '/home*' do |path|

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

@@ -10,6 +10,7 @@ require 'pathname'
 require 'singleton'
 require 'groonga'
 require 'milkode/common/dbdir'
+require 'milkode/cdstk/yaml_file_wrapper'
 include Milkode
 
 module Milkode
@@ -22,8 +23,16 @@ module Milkode
       @@db_dir = db_dir
     end
 
+    attr_reader :yaml
+
     def initialize
-      open(@@db_dir || Dbdir.default_dir)
+      db_dir = @@db_dir || Dbdir.default_dir
+      open(db_dir)
+      @yaml = YamlFileWrapper.load_if(db_dir)
+    end
+
+    def yaml_reload
+      @yaml = YamlFileWrapper.load_if(@@db_dir || Dbdir.default_dir)
     end
 
     def open(db_dir)
@@ -43,10 +52,6 @@ module Milkode
       return table.records[0]
     end
 
-    def fileNum
-      @documents.select.size
-    end
-    
     def search(patterns, packages, fpaths, suffixs, offset = 0, limit = -1)
       # @todo fpathを厳密に検索するには、検索結果からさらに先頭からのパスではないものを除外する
       records, total_records = searchMain(patterns, packages, fpaths, suffixs, offset, limit)
@@ -88,10 +93,20 @@ module Milkode
       @documents.select.size      
     end
 
+    # yamlからパッケージの総数を得る
+    def yaml_package_num
+      @yaml.contents.size
+    end
+    
     # @sample test/test_database.rb:43 TestDatabase#t_fileList
     def fileList(base)
       base_parts = base.split("/")
       base_depth = base_parts.length
+
+      # 'depth==0'の時はMilkodeYaml#contentsからファイルリストを生成して高速化
+      if (base_depth == 0)
+        return @yaml.contents.sort_by{|v| v.name}.map{|v| [v.name, false] }
+      end
       
       # shortpathにマッチするものだけに絞り込む
       if (base == "")
@@ -149,7 +164,7 @@ module Milkode
         end
       end
     end
-    
+
     private 
 
     def reopen_patch
@@ -213,7 +228,7 @@ module Milkode
                            :limit => limit)
       
       # ファイル名でソート
-      # @todo 本当はこっちが望ましい
+      # @todo 本当はこっちが望ましいが、パッケージ検索を正確にしないことには出来ない
       # records = table.sort([{:key => "shortpath", :order => "ascending"}],
       #                      :offset => offset,
       #                      :limit => limit)

data/lib/milkode/cdweb/public/css/milkode.css

@@ -71,3 +71,20 @@ a.headmenu {
     font-weight: normal;
 }
 
+input#query {
+    height: 24px;
+    font-size: 12px;
+}
+
+input#search {
+    margin-left: 10px;
+    width: 80px;
+    font-size: 20px;
+}
+
+input#clear {
+    margin-left: 0px;
+    width: 80px;
+    font-size: 18px;
+}
+

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

@@ -4,8 +4,9 @@
   }
 %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()")
+    %input#query(name="query" size="70" type="text"){:value => params[:query]}
+    %input#search(type="submit" name="search" value="検索" onclick="set_pathname()")
+    %input#clear(type="submit" name="clear" value="クリア" onclick="set_pathname()")
     %br
     %label
       = create_radio('all', params[:shead])

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.5.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-03-09}
+  s.date = %q{2012-02-02}
   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,11 +31,9 @@ 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",
@@ -58,12 +56,10 @@ 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",
@@ -71,8 +67,6 @@ 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",
@@ -80,14 +74,11 @@ 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",
@@ -98,6 +89,7 @@ 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",
@@ -107,15 +99,10 @@ 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_yaml_file_wrapper.rb"
+    "test/test_util.rb"
   ]
   s.homepage = %q{http://github.com/ongaeshi/milkode}
   s.licenses = ["MIT"]

data/test/test_database.rb

@@ -33,6 +33,9 @@ module Milkode
 
       # データベースのセットアップ
       Database.setup('.')
+
+      # yamlファイルのリロード
+      Database.instance.yaml_reload
     end
 
     def test_database
@@ -49,7 +52,7 @@ module Milkode
 
     def t_fileList
       db = Database.instance
-      assert_equal [['lib', false], ['test', false], ["notfound.file", true]], db.fileList('')
+      assert_equal [['lib', false], ["notfound.file", false], ['test', false]], db.fileList('')
       assert db.fileList('test').include? ['test/test_database.rb', true]
       assert_equal ['lib/milkode', false],              db.fileList('lib')[0]
       assert_equal ['lib/milkode/cdstk/cdstk.rb', true],      db.fileList('lib/milkode/cdstk')[0]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  segments_generated: true
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - ongaeshi
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 +09:00
+date: 2012-03-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +32,6 @@ dependencies:
         - 1
         - 0
         - 0
-        segments_generated: true
         version: 1.0.0
   requirement: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,7 +48,6 @@ dependencies:
         - 1
         - 5
         - 2
-        segments_generated: true
         version: 1.5.2
   requirement: *id002
 - !ruby/object:Gem::Dependency 
@@ -65,7 +62,6 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id003
 - !ruby/object:Gem::Dependency 
@@ -82,7 +78,6 @@ dependencies:
         - 1
         - 2
         - 0
-        segments_generated: true
         version: 1.2.0
   requirement: *id004
 - !ruby/object:Gem::Dependency 
@@ -99,7 +94,6 @@ dependencies:
         - 1
         - 1
         - 0
-        segments_generated: true
         version: 1.1.0
   requirement: *id005
 - !ruby/object:Gem::Dependency 
@@ -116,7 +110,6 @@ dependencies:
         - 1
         - 3
         - 4
-        segments_generated: true
         version: 1.3.4
   requirement: *id006
 - !ruby/object:Gem::Dependency 
@@ -133,7 +126,6 @@ dependencies:
         - 1
         - 2
         - 6
-        segments_generated: true
         version: 1.2.6
   requirement: *id007
 - !ruby/object:Gem::Dependency 
@@ -150,7 +142,6 @@ dependencies:
         - 0
         - 3
         - 7
-        segments_generated: true
         version: 0.3.7
   requirement: *id008
 - !ruby/object:Gem::Dependency 
@@ -167,7 +158,6 @@ dependencies:
         - 0
         - 9
         - 8
-        segments_generated: true
         version: 0.9.8
   requirement: *id009
 - !ruby/object:Gem::Dependency 
@@ -184,7 +174,6 @@ dependencies:
         - 1
         - 2
         - 10
-        segments_generated: true
         version: 1.2.10
   requirement: *id010
 - !ruby/object:Gem::Dependency 
@@ -201,7 +190,6 @@ dependencies:
         - 0
         - 4
         - 0
-        segments_generated: true
         version: 0.4.0
   requirement: *id011
 - !ruby/object:Gem::Dependency 
@@ -218,7 +206,6 @@ dependencies:
         - 3
         - 1
         - 2
-        segments_generated: true
         version: 3.1.2
   requirement: *id012
 - !ruby/object:Gem::Dependency 
@@ -235,7 +222,6 @@ dependencies:
         - 3
         - 1
         - 3
-        segments_generated: true
         version: 3.1.3
   requirement: *id013
 - !ruby/object:Gem::Dependency 
@@ -252,7 +238,6 @@ dependencies:
         - 1
         - 5
         - 0
-        segments_generated: true
         version: 1.5.0
   requirement: *id014
 - !ruby/object:Gem::Dependency 
@@ -269,7 +254,6 @@ dependencies:
         - 0
         - 8
         - 2
-        segments_generated: true
         version: 0.8.2
   requirement: *id015
 description: Line based local source code search engine & grep-command & web-app.
@@ -398,7 +382,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -408,7 +391,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []