milkode 0.6.0 → 0.6.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/VERSION +1 -1
- data/lib/milkode/common/util.rb +23 -4
- data/lib/milkode/grep/cli_grep.rb +14 -3
- data/milkode.gemspec +5 -5
- data/test/test_util.rb +13 -4
- metadata +4 -11
data/Rakefile
CHANGED
@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
|
|
23
23
|
|
24
24
|
# Include your dependencies below. Runtime dependencies are required when using your gem,
|
25
25
|
gem.add_runtime_dependency 'termcolor','>= 1.2.0'
|
26
|
-
gem.add_runtime_dependency 'rroonga','>= 1.1.0'
|
26
|
+
gem.add_runtime_dependency 'rroonga','>= 1.1.0'
|
27
27
|
gem.add_runtime_dependency 'rack','>=1.3.4'
|
28
28
|
gem.add_runtime_dependency 'sinatra', '>=1.2.6'
|
29
29
|
gem.add_runtime_dependency 'launchy', '>=0.3.7'
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.6.
|
1
|
+
0.6.1
|
data/lib/milkode/common/util.rb
CHANGED
@@ -108,13 +108,17 @@ module Milkode
|
|
108
108
|
# parse_gotoline(['a', '123', 'b', 55]) #=> [['a', 'b', '123'], 55]]
|
109
109
|
# parse_gotoline(['a:5']) #=> [['a'], 55]]
|
110
110
|
def parse_gotoline(words)
|
111
|
+
if gotoline_multi?(words)
|
112
|
+
parse_gotoline_multi(words)
|
113
|
+
else
|
114
|
+
[parse_gotoline_single(words)]
|
115
|
+
end
|
116
|
+
end
|
117
|
+
|
118
|
+
def parse_gotoline_single(words)
|
111
119
|
lineno = -1
|
112
120
|
index = -1
|
113
121
|
|
114
|
-
words = words.map{|v|
|
115
|
-
v.split(':')
|
116
|
-
}.flatten
|
117
|
-
|
118
122
|
words.each_with_index do |v, idx|
|
119
123
|
n = v.to_i
|
120
124
|
if (n != 0)
|
@@ -131,6 +135,21 @@ module Milkode
|
|
131
135
|
end
|
132
136
|
end
|
133
137
|
|
138
|
+
def parse_gotoline_multi(words)
|
139
|
+
words.map do |v|
|
140
|
+
a = v.split(':')
|
141
|
+
[[a[0..-2].join(':')], a[-1].to_i]
|
142
|
+
end
|
143
|
+
end
|
144
|
+
|
145
|
+
def gotoline_multi?(words)
|
146
|
+
if (words.join(" ") =~ /:\d+/)
|
147
|
+
true
|
148
|
+
else
|
149
|
+
false
|
150
|
+
end
|
151
|
+
end
|
152
|
+
|
134
153
|
end
|
135
154
|
end
|
136
155
|
|
@@ -46,6 +46,10 @@ Gotoline:
|
|
46
46
|
lib/database.rb:7:xxxxxxxxxxxxxxx
|
47
47
|
database_lib.rb:7:yyyyyyyyyyyyyyy
|
48
48
|
|
49
|
+
gmilk -g lib/database.rb:7 test/test_database.rb:5
|
50
|
+
lib/database.rb:7:xxxxxxxxxxxxxxx
|
51
|
+
test/test_database.rb:5:yyyyyyyyy
|
52
|
+
|
49
53
|
Normal:
|
50
54
|
EOF
|
51
55
|
opt.on('-a', '--all', 'Search all package.') {|v| my_option[:all] = true }
|
@@ -77,10 +81,8 @@ EOF
|
|
77
81
|
my_option[:find_mode] = true unless ap.keywords.empty?
|
78
82
|
|
79
83
|
unless ap.gotowords.empty?
|
80
|
-
r = Util::parse_gotoline(ap.gotowords)
|
81
|
-
option.filePatterns += r[0]
|
82
|
-
option.gotoline = r[1]
|
83
84
|
my_option[:find_mode] = true
|
85
|
+
my_option[:gotoline_data] = Util::parse_gotoline(ap.gotowords)
|
84
86
|
end
|
85
87
|
|
86
88
|
# p ap.arguments
|
@@ -130,6 +132,15 @@ EOF
|
|
130
132
|
records = findGrep.pickupRecords
|
131
133
|
# stdout.puts "#{records.size} records (#{findGrep.time_s})"
|
132
134
|
stdout.puts "#{records.size} records"
|
135
|
+
elsif (my_option[:gotoline_data])
|
136
|
+
# gotoline mode
|
137
|
+
basePatterns = option.filePatterns
|
138
|
+
my_option[:gotoline_data].each do |v|
|
139
|
+
option.filePatterns = basePatterns + v[0]
|
140
|
+
option.gotoline = v[1]
|
141
|
+
findGrep = FindGrep::FindGrep.new(arguments, option)
|
142
|
+
findGrep.searchAndPrint(stdout)
|
143
|
+
end
|
133
144
|
else
|
134
145
|
# search mode
|
135
146
|
findGrep = FindGrep::FindGrep.new(arguments, option)
|
data/milkode.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{milkode}
|
8
|
-
s.version = "0.6.
|
8
|
+
s.version = "0.6.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["ongaeshi"]
|
12
|
-
s.date = %q{2012-
|
12
|
+
s.date = %q{2012-04-05}
|
13
13
|
s.description = %q{Line based local source code search engine & grep-command & web-app.}
|
14
14
|
s.email = %q{ongaeshi0621@gmail.com}
|
15
15
|
s.executables = ["gmilk", "milk"]
|
@@ -134,7 +134,7 @@ Gem::Specification.new do |s|
|
|
134
134
|
s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
|
135
135
|
s.add_development_dependency(%q<rcov>, [">= 0"])
|
136
136
|
s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0"])
|
137
|
-
s.add_runtime_dependency(%q<rroonga>, [">= 1.1.0"
|
137
|
+
s.add_runtime_dependency(%q<rroonga>, [">= 1.1.0"])
|
138
138
|
s.add_runtime_dependency(%q<rack>, [">= 1.3.4"])
|
139
139
|
s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
|
140
140
|
s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
|
@@ -148,7 +148,7 @@ Gem::Specification.new do |s|
|
|
148
148
|
s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
|
149
149
|
s.add_dependency(%q<rcov>, [">= 0"])
|
150
150
|
s.add_dependency(%q<termcolor>, [">= 1.2.0"])
|
151
|
-
s.add_dependency(%q<rroonga>, [">= 1.1.0"
|
151
|
+
s.add_dependency(%q<rroonga>, [">= 1.1.0"])
|
152
152
|
s.add_dependency(%q<rack>, [">= 1.3.4"])
|
153
153
|
s.add_dependency(%q<sinatra>, [">= 1.2.6"])
|
154
154
|
s.add_dependency(%q<launchy>, [">= 0.3.7"])
|
@@ -163,7 +163,7 @@ Gem::Specification.new do |s|
|
|
163
163
|
s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
|
164
164
|
s.add_dependency(%q<rcov>, [">= 0"])
|
165
165
|
s.add_dependency(%q<termcolor>, [">= 1.2.0"])
|
166
|
-
s.add_dependency(%q<rroonga>, [">= 1.1.0"
|
166
|
+
s.add_dependency(%q<rroonga>, [">= 1.1.0"])
|
167
167
|
s.add_dependency(%q<rack>, [">= 1.3.4"])
|
168
168
|
s.add_dependency(%q<sinatra>, [">= 1.2.6"])
|
169
169
|
s.add_dependency(%q<launchy>, [">= 0.3.7"])
|
data/test/test_util.rb
CHANGED
@@ -72,10 +72,19 @@ class TestUtil < Test::Unit::TestCase
|
|
72
72
|
end
|
73
73
|
|
74
74
|
def test_parse_gotoline
|
75
|
-
assert_equal [['a', 'b'], 123], Milkode::Util::parse_gotoline(['a', '123', 'b'])
|
76
|
-
assert_equal [['a', '123', 'b'], 55], Milkode::Util::parse_gotoline(['a', '123', 'b', '55'])
|
77
|
-
assert_equal [['a', 'b'], 1], Milkode::Util::parse_gotoline(['a', 'b'])
|
78
|
-
assert_equal [['a'], 55], Milkode::Util::parse_gotoline(['a:55'])
|
75
|
+
assert_equal [[['a', 'b'], 123]], Milkode::Util::parse_gotoline(['a', '123', 'b'])
|
76
|
+
assert_equal [[['a', '123', 'b'], 55]], Milkode::Util::parse_gotoline(['a', '123', 'b', '55'])
|
77
|
+
assert_equal [[['a', 'b'], 1]], Milkode::Util::parse_gotoline(['a', 'b'])
|
78
|
+
assert_equal [[['a'], 55]], Milkode::Util::parse_gotoline(['a:55'])
|
79
|
+
assert_equal [[['lib/aaa.c'], 8], [['test/bbb.rb'], 9]], Milkode::Util::parse_gotoline(['lib/aaa.c:8', 'test/bbb.rb:9'])
|
80
|
+
assert_equal [[['c:/tmp/ccc.txt'], 99]], Milkode::Util::parse_gotoline(['c:/tmp/ccc.txt:99'])
|
81
|
+
end
|
82
|
+
|
83
|
+
def test_gotoline_multi?
|
84
|
+
assert_equal true, Milkode::Util::gotoline_multi?("test:1".split)
|
85
|
+
assert_equal true, Milkode::Util::gotoline_multi?("test.rb:5 lib.c:10".split)
|
86
|
+
assert_equal false, Milkode::Util::gotoline_multi?("a 123 b".split)
|
87
|
+
assert_equal false, Milkode::Util::gotoline_multi?("c:/user 5".split)
|
79
88
|
end
|
80
89
|
|
81
90
|
def teardown
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: milkode
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 5
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 6
|
9
|
-
-
|
10
|
-
version: 0.6.
|
9
|
+
- 1
|
10
|
+
version: 0.6.1
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- ongaeshi
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2012-
|
18
|
+
date: 2012-04-05 00:00:00 +09:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
@@ -95,13 +95,6 @@ dependencies:
|
|
95
95
|
- 1
|
96
96
|
- 0
|
97
97
|
version: 1.1.0
|
98
|
-
- - <
|
99
|
-
- !ruby/object:Gem::Version
|
100
|
-
hash: 3
|
101
|
-
segments:
|
102
|
-
- 2
|
103
|
-
- 0
|
104
|
-
version: "2.0"
|
105
98
|
requirement: *id005
|
106
99
|
- !ruby/object:Gem::Dependency
|
107
100
|
type: :runtime
|