milkode 0.9.9 → 0.9.9.9

data/lib/milkode/grep/findgrep_option.rb

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2013/05/03
+
+module Milkode
+  class FindGrepOption
+    Option = Struct.new(:patternsNot,
+                        :patternsOr,
+                        :directory,
+                        :depth,
+                        :ignoreCase,
+                        :caseSensitive,
+                        :colorHighlight,
+                        :isSilent,
+                        :debugMode,
+                        :packages,
+                        :strict_packages,
+                        :filePatterns,
+                        :suffixs,
+                        :ignoreFiles,
+                        :ignoreDirs,
+                        :kcode,
+                        :noSnip,
+                        :dbFile,
+                        :groongaOnly,
+                        :isMatchFile,
+                        :dispHtml,
+                        :matchCountLimit,
+                        :keywords,
+                        :gotoline)
+
+    def self.create_default
+      Option.new([],
+                 [],
+                 ".",
+                 -1,
+                 false,
+                 false,
+                 false,
+                 false,
+                 false,
+                 [],
+                 [],
+                 [],
+                 [],
+                 [],
+                 [],
+                 Kconv::UTF8, # Platform.get_shell_kcode,
+                 false,
+                 nil,
+                 false,
+                 false,
+                 false,
+                 -1,
+                 [],
+                 -1)
+    end
+  end
+end
+

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.9"
+  s.version = "0.9.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2013-03-26}
+  s.date = %q{2013-05-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"]
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/lib/command.rb",
     "lib/milkode/cdweb/lib/database.rb",
     "lib/milkode/cdweb/lib/grep.rb",
+    "lib/milkode/cdweb/lib/info_home.rb",
+    "lib/milkode/cdweb/lib/info_package.rb",
     "lib/milkode/cdweb/lib/mkurl.rb",
     "lib/milkode/cdweb/lib/package_list.rb",
     "lib/milkode/cdweb/lib/query.rb",
@@ -82,6 +84,10 @@ 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/info-big.png",
+    "lib/milkode/cdweb/public/images/info.png",
+    "lib/milkode/cdweb/public/images/milkode-directpath-copy.gif",
+    "lib/milkode/cdweb/public/images/milkode-star.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",
@@ -97,13 +103,14 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/views/header_menu.haml",
     "lib/milkode/cdweb/views/help.haml",
     "lib/milkode/cdweb/views/index.haml",
+    "lib/milkode/cdweb/views/info_home.haml",
+    "lib/milkode/cdweb/views/info_package.haml",
     "lib/milkode/cdweb/views/layout.haml",
     "lib/milkode/cdweb/views/packages.haml",
     "lib/milkode/cdweb/views/search.haml",
     "lib/milkode/cdweb/views/search_form.haml",
     "lib/milkode/cdweb/views/view.haml",
     "lib/milkode/cli.rb",
-    "lib/milkode/common/archive-zip.rb",
     "lib/milkode/common/array_diff.rb",
     "lib/milkode/common/dbdir.rb",
     "lib/milkode/common/dir.rb",
@@ -122,9 +129,10 @@ Gem::Specification.new do |s|
     "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",
+    "lib/milkode/grep/fast_gotoline.rb",
+    "lib/milkode/grep/findgrep.rb",
+    "lib/milkode/grep/findgrep_option.rb",
     "milkode.gemspec",
     "test/data/.gitignore",
     "test/data/.gitignore.sjis",
@@ -200,7 +208,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
       s.add_runtime_dependency(%q<rroonga>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<rack>, [">= 1.3.4", "~> 1.4.0"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.5.2"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
       s.add_runtime_dependency(%q<coderay>, [">= 1.0.5"])
@@ -208,15 +216,16 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<archive-zip>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<haml>, [">= 3.1.2"])
       s.add_runtime_dependency(%q<sass>, [">= 3.1.3"])
-      s.add_runtime_dependency(%q<thor>, ["~> 0.15.0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.18.1"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<sinatra-reloader>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 2.5.4"])
     else
       s.add_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
       s.add_dependency(%q<rroonga>, [">= 1.1.0"])
-      s.add_dependency(%q<rack>, [">= 1.3.4", "~> 1.4.0"])
+      s.add_dependency(%q<rack>, [">= 1.5.2"])
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_dependency(%q<launchy>, [">= 0.3.7"])
       s.add_dependency(%q<coderay>, [">= 1.0.5"])
@@ -224,16 +233,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<archive-zip>, [">= 0.4.0"])
       s.add_dependency(%q<haml>, [">= 3.1.2"])
       s.add_dependency(%q<sass>, [">= 3.1.3"])
-      s.add_dependency(%q<thor>, ["~> 0.15.0"])
+      s.add_dependency(%q<thor>, [">= 0.18.1"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<sinatra-reloader>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 2.5.4"])
     end
   else
     s.add_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
     s.add_dependency(%q<rroonga>, [">= 1.1.0"])
-    s.add_dependency(%q<rack>, [">= 1.3.4", "~> 1.4.0"])
+    s.add_dependency(%q<rack>, [">= 1.5.2"])
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])
     s.add_dependency(%q<launchy>, [">= 0.3.7"])
     s.add_dependency(%q<coderay>, [">= 1.0.5"])
@@ -241,11 +251,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<archive-zip>, [">= 0.4.0"])
     s.add_dependency(%q<haml>, [">= 3.1.2"])
     s.add_dependency(%q<sass>, [">= 3.1.3"])
-    s.add_dependency(%q<thor>, ["~> 0.15.0"])
+    s.add_dependency(%q<thor>, [">= 0.18.1"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<sinatra-reloader>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 2.5.4"])
   end
 end
 

data/test/test_cli.rb

@@ -11,7 +11,7 @@ require 'milkode_test_work'
 
 class TestCLI < Test::Unit::TestCase
   def setup
-    $stdout = StringIO.new
+    $stdout = @stringio = StringIO.new
     @first_default_dir = Dbdir.default_dir
     @work = MilkodeTestWork.new({:default_db => true})
     @work.add_package "db1", @work.expand_path("../data/a_project")
@@ -65,8 +65,10 @@ class TestCLI < Test::Unit::TestCase
   def test_fav
     command("fav")
     command("fav a_not_found_package_xxxxxxx")
+    @stringio.string = ""
     # command("fav package")
     # command("fav -d package")
+    assert_equal "", command("fav --sync-yaml")
   end
 
   def test_help_with_h_option

data/test/test_cli_grep.rb

@@ -5,7 +5,7 @@
 # @author ongaeshi
 # @date   2011/12/03
 
-require 'milkode/grep/cli_grep.rb'
+require 'milkode/grep/cli_grep'
 require 'test_helper'
 require 'milkode_test_work'
 

data/test/test_findgrep.rb

@@ -7,9 +7,9 @@
 
 require 'test_helper'
 require 'file_assert'
-require 'milkode/findgrep/findgrep'
+require 'milkode/grep/findgrep'
 
-module FindGrep
+module Milkode
   class TestFindGrep < Test::Unit::TestCase
     def test_basic
 

data/test/test_milkode_yaml.rb

@@ -19,7 +19,7 @@ contents:
 - directory: /a/dir1
 - directory: /path/to/dir
   ignore:
-  - ! '*.bak'
+  - '*.bak'
   - /rdoc
 - directory: /a/b/c
 EOF
@@ -36,7 +36,21 @@ EOF
 
   def test_dump
     obj = MilkodeYaml.new(SRC)
-    assert_equal SRC, obj.dump if Milkode::Util::ruby19?
+    if Milkode::Util::ruby20?
+      assert_equal SRC, obj.dump
+    elsif Milkode::Util::ruby19?
+      assert_equal <<EOF, obj.dump
+---
+version: '0.2'
+contents:
+- directory: /a/dir1
+- directory: /path/to/dir
+  ignore:
+  - ! '*.bak'
+  - /rdoc
+- directory: /a/b/c
+EOF
+    end
   end
 
   def test_version
@@ -75,7 +89,19 @@ EOF
 
     assert_equal 2, obj.contents.size
 
-    assert_equal <<EOF, obj.dump if Milkode::Util::ruby19?
+    if Milkode::Util::ruby20?
+      assert_equal <<EOF, obj.dump
+---
+version: '0.2'
+contents:
+- directory: /a/dir1
+- directory: /path/to/dir
+  ignore:
+  - '*.bak'
+  - /rdoc
+EOF
+    elsif Milkode::Util::ruby19?
+      assert_equal <<EOF, obj.dump
 ---
 version: '0.2'
 contents:
@@ -85,6 +111,8 @@ contents:
   - ! '*.bak'
   - /rdoc
 EOF
+    end
+
   end
 
   def test_migrate
@@ -117,7 +145,21 @@ EOF
     p = Package.create(p.directory, p.ignore + ['*.a'])
     obj.update(p)
 
-    assert_equal <<EOF, obj.dump if Milkode::Util::ruby19?
+    if Milkode::Util::ruby20?
+      assert_equal <<EOF, obj.dump
+---
+version: '0.2'
+contents:
+- directory: /a/dir1
+- directory: /path/to/dir
+  ignore:
+  - '*.bak'
+  - /rdoc
+  - '*.a'
+- directory: /a/b/c
+EOF
+    elsif Milkode::Util::ruby19?
+      assert_equal <<EOF, obj.dump
 ---
 version: '0.2'
 contents:
@@ -129,6 +171,8 @@ contents:
   - ! '*.a'
 - directory: /a/b/c
 EOF
+    end
+
 
     p = Package.create("not_found")
     assert_raise(RuntimeError) { obj.update(p) }

data/test/test_query.rb

@@ -88,6 +88,8 @@ module Milkode
       assert_equal 6     , create_query("w:5 w:6").wide_match_range
       assert_equal 0     , create_query("w:0").wide_match_range
       assert_equal 0     , create_query("w:aaa").wide_match_range
+      assert_equal 0     , create_query("w:日本語").wide_match_range
+      assert_equal false , create_query("w:日本語").wide_match_range_empty?
     end
 
     private

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
   - 9
-  version: 0.9.9
+  - 9
+  version: 0.9.9.9
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-26 00:00:00 +09:00
+date: 2013-05-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,21 +67,13 @@ dependencies:
     none: false
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
-        version: 1.3.4
-    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -201,14 +194,14 @@ dependencies:
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 85
         segments: 
         - 0
-        - 15
-        - 0
-        version: 0.15.0
+        - 18
+        - 1
+        version: 0.18.1
   requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -266,6 +259,22 @@ dependencies:
         - 0
         version: "0"
   requirement: *id015
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: test-unit
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 5
+        - 4
+        version: 2.5.4
+  requirement: *id016
 description: Line based local source code search engine & grep-command & web-app.
 email: ongaeshi0621@gmail.com
 executables: 
@@ -302,6 +311,8 @@ files:
 - lib/milkode/cdweb/lib/command.rb
 - lib/milkode/cdweb/lib/database.rb
 - lib/milkode/cdweb/lib/grep.rb
+- lib/milkode/cdweb/lib/info_home.rb
+- lib/milkode/cdweb/lib/info_package.rb
 - lib/milkode/cdweb/lib/mkurl.rb
 - lib/milkode/cdweb/lib/package_list.rb
 - lib/milkode/cdweb/lib/query.rb
@@ -341,6 +352,10 @@ 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/info-big.png
+- lib/milkode/cdweb/public/images/info.png
+- lib/milkode/cdweb/public/images/milkode-directpath-copy.gif
+- lib/milkode/cdweb/public/images/milkode-star.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
@@ -356,13 +371,14 @@ files:
 - lib/milkode/cdweb/views/header_menu.haml
 - lib/milkode/cdweb/views/help.haml
 - lib/milkode/cdweb/views/index.haml
+- lib/milkode/cdweb/views/info_home.haml
+- lib/milkode/cdweb/views/info_package.haml
 - lib/milkode/cdweb/views/layout.haml
 - lib/milkode/cdweb/views/packages.haml
 - lib/milkode/cdweb/views/search.haml
 - lib/milkode/cdweb/views/search_form.haml
 - lib/milkode/cdweb/views/view.haml
 - lib/milkode/cli.rb
-- lib/milkode/common/archive-zip.rb
 - lib/milkode/common/array_diff.rb
 - lib/milkode/common/dbdir.rb
 - lib/milkode/common/dir.rb
@@ -381,9 +397,10 @@ files:
 - 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
+- lib/milkode/grep/fast_gotoline.rb
+- lib/milkode/grep/findgrep.rb
+- lib/milkode/grep/findgrep_option.rb
 - milkode.gemspec
 - test/data/.gitignore
 - test/data/.gitignore.sjis