milkode 0.9.0 → 0.9.1

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-07-09}
+  s.date = %q{2012-08-05}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -52,7 +52,23 @@ Gem::Specification.new do |s|
     "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/jquery.multiselect.css",
+    "lib/milkode/cdweb/public/css/jquery.multiselect.filter.css",
     "lib/milkode/cdweb/public/css/milkode.css",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_222222_256x240.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_2e83ff_256x240.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_454545_256x240.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_888888_256x240.png",
+    "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png",
+    "lib/milkode/cdweb/public/css/smoothness/jquery-ui-1.8.22.custom.css",
     "lib/milkode/cdweb/public/images/MilkodeIcon135.png",
     "lib/milkode/cdweb/public/images/directory.png",
     "lib/milkode/cdweb/public/images/document-new-4.png",
@@ -62,7 +78,12 @@ Gem::Specification.new do |s|
     "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/jquery-1.7.2.min.js",
+    "lib/milkode/cdweb/public/js/jquery-ui-1.8.22.custom.min.js",
+    "lib/milkode/cdweb/public/js/jquery.multiselect.filter.min.js",
+    "lib/milkode/cdweb/public/js/jquery.multiselect.min.js",
     "lib/milkode/cdweb/public/js/milkode.js",
+    "lib/milkode/cdweb/views/error.haml",
     "lib/milkode/cdweb/views/filelist.haml",
     "lib/milkode/cdweb/views/header_menu.haml",
     "lib/milkode/cdweb/views/help.haml",
@@ -100,6 +121,8 @@ Gem::Specification.new do |s|
     "test/data/abc.zip",
     "test/data/b_project/runner.rb",
     "test/data/b_project/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/data/b_project2/runner.rb

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/03/11
+
+require 'test/unit'
+Test::Unit::AutoRunner.run(true, '.')
+
+

data/test/data/b_project2/test_dir.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/02/20
+
+require 'milkode/common/dir'
+require 'test/unit'
+require 'file_test_utils'
+
+class TestDir < Test::Unit::TestCase
+  include FileTestUtils
+
+  def test_emptydir?
+    assert_equal true, Dir.emptydir?(".")
+    assert_equal false, Dir.emptydir?("..")
+  end
+end
+
+

data/test/test_cdweb_app.rb

@@ -61,7 +61,7 @@ class TestCdwebApp < Test::Unit::TestCase
 
   def t_not_found
     get '/not_found'
-    assert_equal 404, last_response.status
+    assert_equal 200, last_response.status
   end
 
   def t_view_empty_file

data/test/test_cli_grep.rb

@@ -25,6 +25,7 @@ class TestCLI_Grep < Test::Unit::TestCase
     t_cache
     t_case_sensitive
     t_keyword
+    t_db
   end
 
   def teardown
@@ -92,6 +93,11 @@ class TestCLI_Grep < Test::Unit::TestCase
     CLI_Grep.execute(io, "a b -k -p a_project c d".split)
     CLI_Grep.execute(io, "a b -k c d -l e -k f".split)
   end
+
+  def t_db
+    io = StringIO.new
+    CLI_Grep.execute(io, "--db #{@work.path("db1")} -a db_dir_expand".split)
+  end
 end
 
 

data/test/test_document_table.rb

@@ -31,6 +31,7 @@ module Milkode
         t_remove_match_path
         t_add_package_name
         t_shortpath_below
+        t_search_strict_packages
       ensure
         t_cleanup
       end
@@ -40,6 +41,7 @@ module Milkode
       @obj = GroongaDatabase.new
       @tmp_dir = expand("groonga_database_work")
       @b_project = expand('data/b_project')
+      @b_project2 = expand('data/b_project2')
       @c_project = expand('data/c_project')
     end
 
@@ -300,6 +302,19 @@ module Milkode
       @documents.remove_all
     end
 
+    def t_search_strict_packages
+      @documents.add(@b_project, 'runner.rb')
+      @documents.add(@b_project2, 'runner.rb')
+
+      records = @documents.search(:packages => ['b_project'])
+      assert_equal 2, records.size
+
+      records = @documents.search(:strict_packages => ['b_project'])
+      assert_equal 1, records.size
+
+      @documents.remove_all
+    end
+
     private
 
     def touch(filename, timestamp)

data/test/test_ignore_setting.rb

@@ -110,4 +110,29 @@ EOF
     assert_equal true,  is.ignore?("/doc/lib")
     assert_equal true,  is.ignore?("/doc/lib/test")
   end
+
+  def test_not_ignore
+    is = IgnoreSetting.new "/", ["/*", "!/bin"]
+    assert_equal true,   is.ignore?("/tmp")
+    assert_equal false,  is.ignore?("/bin")
+
+    is = IgnoreSetting.new "/", ["/*", "!/path/to/dir"]
+    assert_equal false,  is.ignore?("/path") # 途中も除外してはいけない
+    assert_equal false,  is.ignore?("/path/to")
+    assert_equal true ,  is.ignore?("/path/to/a") # 除外対象
+    assert_equal false,  is.ignore?("/path/to/dir")
+
+    is = IgnoreSetting.new "/", ["/*", "!/path/to/*/dir"]
+    assert_equal false,  is.ignore?("/path")
+    assert_equal false,  is.ignore?("/path/to")
+    assert_equal false,  is.ignore?("/path/to/lib")
+    assert_equal true,  is.ignore?("/path/to/lib/a")
+    assert_equal false,  is.ignore?("/path/to/bin")
+    assert_equal true,  is.ignore?("/path/to/bin/a")
+    assert_equal false,  is.ignore?("/path/to/lib/dir")
+    
+    is = IgnoreSetting.new "/", ["/*", "!path/to/dir"]
+    assert_equal false,  is.ignore?("/path/to/dir")
+    assert_equal false,  is.ignore?("hoge/path/to/dir")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 +09:00
+date: 2012-08-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -281,7 +281,23 @@ files:
 - 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/jquery.multiselect.css
+- lib/milkode/cdweb/public/css/jquery.multiselect.filter.css
 - lib/milkode/cdweb/public/css/milkode.css
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-icons_222222_256x240.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-icons_2e83ff_256x240.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-icons_454545_256x240.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-icons_888888_256x240.png
+- lib/milkode/cdweb/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png
+- lib/milkode/cdweb/public/css/smoothness/jquery-ui-1.8.22.custom.css
 - lib/milkode/cdweb/public/images/MilkodeIcon135.png
 - lib/milkode/cdweb/public/images/directory.png
 - lib/milkode/cdweb/public/images/document-new-4.png
@@ -291,7 +307,12 @@ files:
 - 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/jquery-1.7.2.min.js
+- lib/milkode/cdweb/public/js/jquery-ui-1.8.22.custom.min.js
+- lib/milkode/cdweb/public/js/jquery.multiselect.filter.min.js
+- lib/milkode/cdweb/public/js/jquery.multiselect.min.js
 - lib/milkode/cdweb/public/js/milkode.js
+- lib/milkode/cdweb/views/error.haml
 - lib/milkode/cdweb/views/filelist.haml
 - lib/milkode/cdweb/views/header_menu.haml
 - lib/milkode/cdweb/views/help.haml
@@ -329,6 +350,8 @@ files:
 - test/data/abc.zip
 - test/data/b_project/runner.rb
 - test/data/b_project/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