milkode 0.6.0 → 0.6.1

data/Rakefile

@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
 
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   gem.add_runtime_dependency 'termcolor','>= 1.2.0'
-  gem.add_runtime_dependency 'rroonga','>= 1.1.0','<2.0'
+  gem.add_runtime_dependency 'rroonga','>= 1.1.0'
   gem.add_runtime_dependency 'rack','>=1.3.4'
   gem.add_runtime_dependency 'sinatra', '>=1.2.6'
   gem.add_runtime_dependency 'launchy', '>=0.3.7'

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/milkode/common/util.rb

@@ -108,13 +108,17 @@ module Milkode
     # parse_gotoline(['a', '123', 'b', 55]) #=> [['a', 'b', '123'], 55]]
     # parse_gotoline(['a:5']) #=> [['a'], 55]]
     def parse_gotoline(words)
+      if gotoline_multi?(words)
+        parse_gotoline_multi(words)
+      else
+        [parse_gotoline_single(words)]
+      end
+    end
+
+    def parse_gotoline_single(words)
       lineno = -1
       index = -1
 
-      words = words.map{|v|
-        v.split(':')
-      }.flatten
-
       words.each_with_index do |v, idx|
         n = v.to_i
         if (n != 0)
@@ -131,6 +135,21 @@ module Milkode
       end
     end
 
+    def parse_gotoline_multi(words)
+      words.map do |v|
+        a = v.split(':')
+        [[a[0..-2].join(':')], a[-1].to_i]
+      end
+    end
+
+    def gotoline_multi?(words)
+      if (words.join(" ") =~ /:\d+/)
+        true
+      else
+        false
+      end
+    end
+
   end
 end
 

data/lib/milkode/grep/cli_grep.rb

@@ -46,6 +46,10 @@ Gotoline:
       lib/database.rb:7:xxxxxxxxxxxxxxx
       database_lib.rb:7:yyyyyyyyyyyyyyy
 
+      gmilk -g lib/database.rb:7 test/test_database.rb:5
+      lib/database.rb:7:xxxxxxxxxxxxxxx
+      test/test_database.rb:5:yyyyyyyyy
+
 Normal:
 EOF
       opt.on('-a', '--all', 'Search all package.') {|v| my_option[:all] = true }
@@ -77,10 +81,8 @@ EOF
         my_option[:find_mode] = true unless ap.keywords.empty?
 
         unless ap.gotowords.empty?
-          r = Util::parse_gotoline(ap.gotowords)
-          option.filePatterns += r[0]
-          option.gotoline = r[1]
           my_option[:find_mode] = true
+          my_option[:gotoline_data] = Util::parse_gotoline(ap.gotowords)
         end
 
         # p ap.arguments
@@ -130,6 +132,15 @@ EOF
           records = findGrep.pickupRecords
           # stdout.puts "#{records.size} records (#{findGrep.time_s})"
           stdout.puts "#{records.size} records"
+        elsif (my_option[:gotoline_data])
+          # gotoline mode
+          basePatterns = option.filePatterns 
+          my_option[:gotoline_data].each do |v|
+            option.filePatterns = basePatterns + v[0]
+            option.gotoline = v[1]
+            findGrep = FindGrep::FindGrep.new(arguments, option)
+            findGrep.searchAndPrint(stdout)
+          end
         else
           # search mode
           findGrep = FindGrep::FindGrep.new(arguments, option)

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-03-29}
+  s.date = %q{2012-04-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"]
@@ -134,7 +134,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<rroonga>, [">= 1.1.0", "< 2.0"])
+      s.add_runtime_dependency(%q<rroonga>, [">= 1.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"])
@@ -148,7 +148,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<termcolor>, [">= 1.2.0"])
-      s.add_dependency(%q<rroonga>, [">= 1.1.0", "< 2.0"])
+      s.add_dependency(%q<rroonga>, [">= 1.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"])
@@ -163,7 +163,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<termcolor>, [">= 1.2.0"])
-    s.add_dependency(%q<rroonga>, [">= 1.1.0", "< 2.0"])
+    s.add_dependency(%q<rroonga>, [">= 1.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/test_util.rb

@@ -72,10 +72,19 @@ class TestUtil < Test::Unit::TestCase
   end
 
   def test_parse_gotoline
-    assert_equal [['a', 'b'], 123],       Milkode::Util::parse_gotoline(['a', '123', 'b']) 
-    assert_equal [['a', '123', 'b'], 55], Milkode::Util::parse_gotoline(['a', '123', 'b', '55'])
-    assert_equal [['a', 'b'], 1], Milkode::Util::parse_gotoline(['a', 'b'])
-    assert_equal [['a'], 55],    Milkode::Util::parse_gotoline(['a:55'])
+    assert_equal [[['a', 'b'], 123]],       Milkode::Util::parse_gotoline(['a', '123', 'b']) 
+    assert_equal [[['a', '123', 'b'], 55]], Milkode::Util::parse_gotoline(['a', '123', 'b', '55'])
+    assert_equal [[['a', 'b'], 1]], Milkode::Util::parse_gotoline(['a', 'b'])
+    assert_equal [[['a'], 55]],    Milkode::Util::parse_gotoline(['a:55'])
+    assert_equal [[['lib/aaa.c'], 8], [['test/bbb.rb'], 9]],    Milkode::Util::parse_gotoline(['lib/aaa.c:8', 'test/bbb.rb:9'])
+    assert_equal [[['c:/tmp/ccc.txt'], 99]],    Milkode::Util::parse_gotoline(['c:/tmp/ccc.txt:99'])
+  end
+  
+  def test_gotoline_multi?
+    assert_equal true,  Milkode::Util::gotoline_multi?("test:1".split)
+    assert_equal true,  Milkode::Util::gotoline_multi?("test.rb:5 lib.c:10".split)
+    assert_equal false,  Milkode::Util::gotoline_multi?("a 123 b".split)
+    assert_equal false,  Milkode::Util::gotoline_multi?("c:/user 5".split)
   end
   
   def teardown

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 +09:00
+date: 2012-04-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,13 +95,6 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
   requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :runtime