milkode 0.9.2 → 0.9.3

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-09-07}
+  s.date = %q{2012-10-06}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -75,6 +75,8 @@ 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/images/view-refresh-4.png",
+    "lib/milkode/cdweb/public/images/waiting.gif",
     "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",
@@ -103,6 +105,7 @@ Gem::Specification.new do |s|
     "lib/milkode/common/grensnip.rb",
     "lib/milkode/common/ignore_checker.rb",
     "lib/milkode/common/ignore_setting.rb",
+    "lib/milkode/common/plang_detector.rb",
     "lib/milkode/common/platform.rb",
     "lib/milkode/common/string_snip.rb",
     "lib/milkode/common/util.rb",
@@ -110,6 +113,7 @@ Gem::Specification.new do |s|
     "lib/milkode/database/document_table.rb",
     "lib/milkode/database/groonga_database.rb",
     "lib/milkode/database/package_table.rb",
+    "lib/milkode/database/updater.rb",
     "lib/milkode/findgrep/findgrep.rb",
     "lib/milkode/findgrep/result.rb",
     "lib/milkode/grep/cli_grep.rb",
@@ -130,6 +134,8 @@ Gem::Specification.new do |s|
     "test/data/c_project/c.txt",
     "test/data/c_project/cc.txt",
     "test/data/c_project/to/file.rb",
+    "test/data/ignore_test/.gitignore",
+    "test/data/ignore_test/a.txt",
     "test/data/no_auto_ignore/.gitignore",
     "test/data/no_auto_ignore/a.txt",
     "test/data/nodir_abc.zip",
@@ -162,8 +168,10 @@ Gem::Specification.new do |s|
     "test/test_package.rb",
     "test/test_package_list.rb",
     "test/test_package_table.rb",
+    "test/test_plang_detector.rb",
     "test/test_query.rb",
     "test/test_string_snip.rb",
+    "test/test_updater.rb",
     "test/test_util.rb",
     "test/test_yaml_file_wrapper.rb"
   ]

data/test/data/ignore_test/.gitignore

@@ -0,0 +1 @@
+*.bak

data/test/data/ignore_test/a.txt

@@ -0,0 +1 @@
+a

data/test/test_cli.rb

@@ -34,7 +34,8 @@ class TestCLI < Test::Unit::TestCase
   end
 
   def test_info
-    assert_match /.*packages.*records/, command("info")
+    # assert_match /.*packages.*records/, command("info")
+    assert_match /Not registered/, command("info")
   end
 
   def test_setdb_no_arg_disp

data/test/test_plang_detector.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/09/29
+
+require 'milkode/common/plang_detector'
+require 'test_helper'
+
+module Milkode
+  class TestPlangDetector < Test::Unit::TestCase
+    def test_name
+      assert_equal 'ActionScript', PlangDetector.new('Dummy.as').name
+      assert_equal 'C'           , PlangDetector.new('a.c').name
+      assert_equal 'C'           , PlangDetector.new('a.h').name
+      assert_equal 'C#'          , PlangDetector.new('AssemblyInfo.cs').name
+      assert_equal 'C++'         , PlangDetector.new('path/to/file.hpp').name
+      assert_equal 'Ruby'        , PlangDetector.new('template.rb').name
+      assert_equal 'README'      , PlangDetector.new('readme.txt').name
+      assert_equal 'JavaScript'  , PlangDetector.new('main.js').name
+    end
+
+    def test_unknown
+      assert_equal 'unknown', PlangDetector.new('').name
+      assert_equal 'unknown', PlangDetector.new('.').name
+      assert_equal 'unknown', PlangDetector.new('abcdefg').name
+    end
+  end
+end
+
+

data/test/test_updater.rb

@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/09/12
+
+require 'test_helper'
+require 'milkode/database/updater'
+require 'milkode_test_work'
+require 'fileutils'
+require 'milkode/common/ignore_checker'
+
+module Milkode
+  class TestUpdater < Test::Unit::TestCase
+    def setup
+      @work = MilkodeTestWork.new({:default_db => true})
+
+      FileUtils.cp_r @work.expand_path("../data/a_project"), @work.expand_path("a_project")
+      @work.add_package "db1", @work.expand_path("a_project")
+
+      FileUtils.cp_r @work.expand_path("../data/ignore_test"), @work.expand_path(".")
+      @work.add_package "db1", @work.expand_path("ignore_test")
+      
+      @grndb = GroongaDatabase.new
+      @grndb.open(@work.expand_path("db1"))
+    end
+    
+    def test_update
+      t_pre_check
+      t_update
+      t_add_file
+      t_update_file
+      t_local_gitignore
+      t_global_ignore
+      t_no_auto_ignore
+      t_silent_mode
+      # t_display_info # ONにすると標準出力されてしまうため
+    end
+
+    def teardown
+      @work.teardown
+    end
+
+    private
+
+    def t_pre_check
+      assert_equal    2, @grndb.packages.size
+      assert_not_nil  @grndb.packages['a_project']
+    end
+
+    def t_update
+      updater = Updater.new(@grndb, 'a_project')
+      updater.exec
+      result_test updater.result, 3, 0, 0
+    end
+
+    def t_add_file
+      FileUtils.touch(@work.expand_path("a_project/aaa"), :mtime => Time.now - 1)
+      updater = Updater.new(@grndb, 'a_project')
+      updater.exec
+      result_test updater.result, 4, 1, 0
+    end
+
+    def t_update_file
+      FileUtils.copy @work.expand_path("../data/c_project/a.txt"), @work.expand_path("a_project/aaa")
+      FileUtils.touch(@work.expand_path("a_project/aaa"))
+      updater = Updater.new(@grndb, 'a_project')
+      updater.exec
+      result_test updater.result, 4, 0, 1
+    end
+
+    def t_local_gitignore
+      FileUtils.touch(@work.expand_path("ignore_test/b.bak")) # *.bak は除外対象
+      FileUtils.touch(@work.expand_path("ignore_test/b.txt"))
+      updater = Updater.new(@grndb, 'ignore_test')
+      updater.exec
+      result_test updater.result, 3, 1, 0
+    end
+
+    def t_global_ignore
+      FileUtils.touch(@work.expand_path("ignore_test/c.txt"))
+
+      updater = Updater.new(@grndb, 'ignore_test')
+      updater.exec
+      result_test updater.result, 4, 1, 0
+
+      updater = Updater.new(@grndb, 'ignore_test')
+      updater.set_package_ignore(IgnoreSetting.new("/", ["*.txt"])) # *.txt を除外設定
+      updater.exec
+      result_test updater.result, 1, 0, 0
+    end
+
+    def t_no_auto_ignore
+      updater = Updater.new(@grndb, 'ignore_test')
+      updater.enable_no_auto_ignore
+      updater.exec
+      result_test updater.result, 6, 2, 0
+    end
+
+    def t_silent_mode
+      updater = Updater.new(@grndb, 'ignore_test')
+      updater.enable_silent_mode
+      updater.exec
+      result_test updater.result, 4, 0, 0
+    end
+
+    def t_display_info
+      updater = Updater.new(@grndb, 'ignore_test')
+      updater.enable_display_info
+      updater.exec
+      result_test updater.result, 4, 0, 0
+    end
+
+    def result_test(result, file_count, add_count, update_count)
+      assert_equal file_count, result.file_count 
+      assert_equal add_count, result.add_count 
+      assert_equal update_count, result.update_count 
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 +09:00
+date: 2012-10-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -304,6 +304,8 @@ files:
 - 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/images/view-refresh-4.png
+- lib/milkode/cdweb/public/images/waiting.gif
 - 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
@@ -332,6 +334,7 @@ files:
 - lib/milkode/common/grensnip.rb
 - lib/milkode/common/ignore_checker.rb
 - lib/milkode/common/ignore_setting.rb
+- lib/milkode/common/plang_detector.rb
 - lib/milkode/common/platform.rb
 - lib/milkode/common/string_snip.rb
 - lib/milkode/common/util.rb
@@ -339,6 +342,7 @@ files:
 - lib/milkode/database/document_table.rb
 - lib/milkode/database/groonga_database.rb
 - lib/milkode/database/package_table.rb
+- lib/milkode/database/updater.rb
 - lib/milkode/findgrep/findgrep.rb
 - lib/milkode/findgrep/result.rb
 - lib/milkode/grep/cli_grep.rb
@@ -359,6 +363,8 @@ files:
 - test/data/c_project/c.txt
 - test/data/c_project/cc.txt
 - test/data/c_project/to/file.rb
+- test/data/ignore_test/.gitignore
+- test/data/ignore_test/a.txt
 - test/data/no_auto_ignore/.gitignore
 - test/data/no_auto_ignore/a.txt
 - test/data/nodir_abc.zip
@@ -391,8 +397,10 @@ files:
 - test/test_package.rb
 - test/test_package_list.rb
 - test/test_package_table.rb
+- test/test_plang_detector.rb
 - test/test_query.rb
 - test/test_string_snip.rb
+- test/test_updater.rb
 - test/test_util.rb
 - test/test_yaml_file_wrapper.rb
 has_rdoc: true