milkode 0.9.5 → 0.9.6

data/lib/milkode/grep/cli_grep.rb

@@ -60,7 +60,7 @@ EOF
       opt.on('-c', '--count', 'Disp count num.') {|v| my_option[:count] = true }
       opt.on('--cache', 'Search only db.') {|v| option.groongaOnly = true }
       opt.on('--color', 'Color highlight.') {|v| option.colorHighlight = true}
-      opt.on('--cs', '--case-sensitive', 'Case sensitivity.') {|v| my_option[:case_sensitive] = true }
+      opt.on('--cs', '--case-sensitive', 'Case sensitivity.') {|v| option.caseSensitive = true }
       opt.on('-d DIR', '--directory DIR', 'Start directory. (deafult:".")') {|v| current_dir = File.expand_path(v); my_option[:find_mode] = true} 
       opt.on('--db DB_DIR', "Specify dbdir. (Use often with '-a')") {|v| option.dbFile = Dbdir.groonga_path(v) }
       opt.on('-f FILE_PATH', '--file-path FILE_PATH', 'File path. (Enable multiple call)') {|v| option.filePatterns << v; my_option[:find_mode] = true }
@@ -116,9 +116,6 @@ EOF
       end
 
       if (arguments.size > 0 || my_option[:find_mode])
-        # ignore?
-        option.ignoreCase = true if Util::ignore_case?(arguments, my_option[:case_sensitive])
-
         # update
         if my_option[:update]
           cdstk = Cdstk.new(stdout, Dbdir.select_dbdir)

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-12-09}
+  s.date = %q{2012-12-28}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/lib/query.rb",
     "lib/milkode/cdweb/lib/search_contents.rb",
     "lib/milkode/cdweb/lib/search_files.rb",
+    "lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb",
     "lib/milkode/cdweb/lib/search_gotoline.rb",
     "lib/milkode/cdweb/lib/web_setting.rb",
     "lib/milkode/cdweb/public/css/bootstrap-responsive.min.css",
@@ -74,6 +75,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/public/images/MilkodeIcon135.png",
     "lib/milkode/cdweb/public/images/directory.png",
     "lib/milkode/cdweb/public/images/document-new-4.png",
+    "lib/milkode/cdweb/public/images/favicon.ico",
     "lib/milkode/cdweb/public/images/file.png",
     "lib/milkode/cdweb/public/images/go-home-5.png",
     "lib/milkode/cdweb/public/images/help.png",
@@ -121,6 +123,7 @@ Gem::Specification.new do |s|
     "lib/milkode/grep/cli_grep.rb",
     "milkode.gemspec",
     "test/data/.gitignore",
+    "test/data/.gitignore.sjis",
     "test/data/a_project/cdstk.rb",
     "test/data/a_project/cdstk_yaml.rb",
     "test/data/a_project/empty.txt",
@@ -138,6 +141,8 @@ Gem::Specification.new do |s|
     "test/data/c_project/to/file.rb",
     "test/data/ignore_test/.gitignore",
     "test/data/ignore_test/a.txt",
+    "test/data/ignore_test_sjis/.gitignore",
+    "test/data/ignore_test_sjis/a.txt",
     "test/data/no_auto_ignore/.gitignore",
     "test/data/no_auto_ignore/a.txt",
     "test/data/nodir_abc.zip",
@@ -189,7 +194,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<rroonga>, [">= 1.1.0", "< 2.1.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.3.4"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
@@ -204,7 +209,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
-      s.add_dependency(%q<rroonga>, [">= 1.1.0"])
+      s.add_dependency(%q<rroonga>, [">= 1.1.0", "< 2.1.0"])
       s.add_dependency(%q<rack>, [">= 1.3.4"])
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_dependency(%q<launchy>, [">= 0.3.7"])
@@ -220,7 +225,7 @@ Gem::Specification.new do |s|
     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<rroonga>, [">= 1.1.0", "< 2.1.0"])
     s.add_dependency(%q<rack>, [">= 1.3.4"])
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])
     s.add_dependency(%q<launchy>, [">= 0.3.7"])

data/test/data/.gitignore.sjis

@@ -0,0 +1,46 @@
+# -----------------------------
+# ��UTF-8�̃t�@�C����ǂݍ��ރe�X�g
+# -----------------------------
+
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/test/data/ignore_test_sjis/.gitignore

@@ -0,0 +1,2 @@
+# ���{��(SJIS)
+*.bak

data/test/data/ignore_test_sjis/a.txt

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

data/test/test_cdstk.rb

@@ -42,7 +42,8 @@ class TestCdstk < Test::Unit::TestCase
       # obj.add(['git@github.com:ongaeshi/kodeworld.git'], {})
       assert_raise(OpenURI::HTTPError) { obj.add(['http://ongaeshi.me/test_data/not_found.zip'], {}) }
       obj.add(['../data/no_auto_ignore'], {:no_auto_ignore => true})
-
+      obj.add(['git://github.com/ongaeshi/duplicate-thing.git'], {:protocol => 'git', :name => 'ddd'})
+      
       FileUtils.touch('last1.txt')
       obj.add(['last1.txt'], {})
       FileUtils.touch('atodekesu.txt')

data/test/test_ignore_setting.rb

@@ -104,6 +104,15 @@ EOF
     end
   end
 
+  def test_create_from_gitignore_sjis
+    Dir.chdir(File.join(File.dirname(__FILE__))) do
+      str = Milkode::Util::load_content($stdout, "data/.gitignore.sjis") # sjis -> utf-8
+      is  = IgnoreSetting.create_from_gitignore("/doc", str)
+      assert_equal "/doc", is.path
+      assert_equal ["coverage", "rdoc", "doc", ".yardoc", ".bundle", "pkg"], is.ignores
+    end
+  end
+
   def test_last_slash
     is = IgnoreSetting.new "/doc", ["/lib/"]
 

data/test/test_query.rb

@@ -72,6 +72,12 @@ module Milkode
       assert_equal q.conv_keywords_to_fpath_or_packages.query_string, 'fp:array fp:test s:rb'
     end
 
+    def test_gotolines
+      q = create_query("g:test.rb:11 a.rb")
+      assert_equal q.gotolines, ['test.rb:11']
+      assert_equal q.keywords , ['a.rb']
+    end
+
     def create_query(query)
       Query.new(query)
     end

data/test/test_updater.rb

@@ -22,6 +22,9 @@ module Milkode
       FileUtils.cp_r @work.expand_path("../data/ignore_test"), @work.expand_path(".")
       @work.add_package "db1", @work.expand_path("ignore_test")
       
+      FileUtils.cp_r @work.expand_path("../data/ignore_test_sjis"), @work.expand_path(".")
+      @work.add_package "db1", @work.expand_path("ignore_test_sjis")
+      
       @grndb = GroongaDatabase.new
       @grndb.open(@work.expand_path("db1"))
     end
@@ -32,6 +35,7 @@ module Milkode
       t_add_file
       t_update_file
       t_local_gitignore
+      t_local_gitignore_sjis
       t_global_ignore
       t_no_auto_ignore
       t_silent_mode
@@ -45,7 +49,7 @@ module Milkode
     private
 
     def t_pre_check
-      assert_equal    2, @grndb.packages.size
+      assert_equal    3, @grndb.packages.size
       assert_not_nil  @grndb.packages['a_project']
     end
 
@@ -78,6 +82,14 @@ module Milkode
       result_test updater.result, 3, 1, 0
     end
 
+    def t_local_gitignore_sjis
+      FileUtils.touch(@work.expand_path("ignore_test_sjis/b.bak")) # *.bak は除外対象
+      FileUtils.touch(@work.expand_path("ignore_test_sjis/b.txt"))
+      updater = Updater.new(@grndb, 'ignore_test_sjis')
+      updater.exec
+      result_test updater.result, 3, 1, 0
+    end
+
     def t_global_ignore
       FileUtils.touch(@work.expand_path("ignore_test/c.txt"))
 

data/test/test_util.rb

@@ -102,6 +102,16 @@ class TestUtil < Test::Unit::TestCase
     assert_equal  true, Milkode::Util::git_url?('ssh:foo@bar/baz.git')
   end
 
+  def test_svn_url?
+    assert_equal  true, Milkode::Util::svn_url?('svn://ongaeshi.me/svn/trunk/')
+    assert_equal  true, Milkode::Util::svn_url?('svn+ssh://ongaeshi.me/svn/trunk/')
+    assert_equal false, Milkode::Util::svn_url?('svna://ongaeshi.me/svn/trunk/')
+    assert_equal false, Milkode::Util::svn_url?('http:://ongaeshi.me')
+    assert_equal false, Milkode::Util::svn_url?('git://github.com/ongaeshi/milkode.git')
+    assert_equal false, Milkode::Util::svn_url?('git@github.com:ongaeshi/milkode.git')
+    assert_equal false, Milkode::Util::svn_url?('ssh:foo@bar/baz.git')
+  end
+
   def test_divide_shortpath
     package, restpath = Milkode::Util::divide_shortpath('package/to/a.txt')
     assert_equal 'package', package

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-09 00:00:00 +09:00
+date: 2012-12-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,14 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -284,6 +292,7 @@ files:
 - lib/milkode/cdweb/lib/query.rb
 - lib/milkode/cdweb/lib/search_contents.rb
 - lib/milkode/cdweb/lib/search_files.rb
+- lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb
 - lib/milkode/cdweb/lib/search_gotoline.rb
 - lib/milkode/cdweb/lib/web_setting.rb
 - lib/milkode/cdweb/public/css/bootstrap-responsive.min.css
@@ -311,6 +320,7 @@ files:
 - lib/milkode/cdweb/public/images/MilkodeIcon135.png
 - lib/milkode/cdweb/public/images/directory.png
 - lib/milkode/cdweb/public/images/document-new-4.png
+- lib/milkode/cdweb/public/images/favicon.ico
 - lib/milkode/cdweb/public/images/file.png
 - lib/milkode/cdweb/public/images/go-home-5.png
 - lib/milkode/cdweb/public/images/help.png
@@ -358,6 +368,7 @@ files:
 - lib/milkode/grep/cli_grep.rb
 - milkode.gemspec
 - test/data/.gitignore
+- test/data/.gitignore.sjis
 - test/data/a_project/cdstk.rb
 - test/data/a_project/cdstk_yaml.rb
 - test/data/a_project/empty.txt
@@ -375,6 +386,8 @@ files:
 - test/data/c_project/to/file.rb
 - test/data/ignore_test/.gitignore
 - test/data/ignore_test/a.txt
+- test/data/ignore_test_sjis/.gitignore
+- test/data/ignore_test_sjis/a.txt
 - test/data/no_auto_ignore/.gitignore
 - test/data/no_auto_ignore/a.txt
 - test/data/nodir_abc.zip