milkode 0.3.0 → 0.4.0

data/HISTORY.ja.rdoc

@@ -1,3 +1,10 @@
+=== 0.4.0 2012/02/02
+
+* gmilk 
+  * -iオプションの復活
+  * -gオプションの追加(Goto line mode)
+  * -cオプションを追加(マッチ数のみを表示)
+
 === 0.3.0 2012/01/20
 
 * gmilk

data/HISTORY.rdoc

@@ -1,3 +1,10 @@
+=== 0.4.0 2012/02/02
+
+* gmilk 
+  * Revert -i option
+  * Add -g option (Goto line mode)
+  * Add -c option (Disp count num)
+
 === 0.3.0 2012/01/20
 
 * gmilk

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/gmilk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/grep/cli_grep'
 
-Version = "0.3.0"
+Version = "0.4.0"
 Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cdstk/cli_cdstk'
 
-Version = "0.3.0"
+Version = "0.4.0"
 Milkode::CLI_Cdstk.execute(STDOUT, ARGV)

data/lib/milkode/cdweb/app.rb

@@ -18,7 +18,7 @@ require 'milkode/cdweb/lib/mkurl'
 set :haml, :format => :html5
 
 get '/' do
-  @version = "0.3.0"
+  @version = "0.4.0"
   @package_num = Database.instance.fileList('').size
   @file_num = Database.instance.fileNum
   haml :index

data/lib/milkode/common/util.rb

@@ -103,7 +103,34 @@ module Milkode
     def downcase?(str)
       str == str.downcase
     end
-      
+
+    # parse_gotoline(['a', '123', 'b']) #=> [['a', 'b'], 123]]
+    # parse_gotoline(['a', '123', 'b', 55]) #=> [['a', 'b', '123'], 55]]
+    # parse_gotoline(['a:5']) #=> [['a'], 55]]
+    def parse_gotoline(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)
+          lineno = n
+          index = idx
+        end
+      end
+
+      if (lineno == -1)
+        [words, 1]              # 行番号らしきものは見つからなかった
+      else
+        words.delete_at(index)
+        [words, lineno]        
+      end
+    end
+
   end
 end
 

data/lib/milkode/findgrep/findgrep.rb

@@ -35,7 +35,8 @@ module FindGrep
                         :isMatchFile,
                         :dispHtml,
                         :matchCountLimit,
-                        :keywords)
+                        :keywords,
+                        :gotoline)
     
     DEFAULT_OPTION = Option.new([],
                                 [],
@@ -57,7 +58,8 @@ module FindGrep
                                 false,
                                 false,
                                 -1,
-                                [])
+                                [],
+                                -1)
     
     class MatchCountOverError < RuntimeError ; end
 
@@ -139,7 +141,13 @@ module FindGrep
 
     def pickupRecords
       raise unless @option.dbFile
-      searchDatabase
+      records = searchDatabase
+      @result.time_stop
+      records
+    end
+
+    def time_s
+      Gren::Util::time_s(@result.time)
     end
 
     def searchFromDB(stdout, dir)
@@ -151,7 +159,17 @@ module FindGrep
 
       # 検索にヒットしたファイルを実際に検索
       begin
-        if (@patterns.size > 0)
+        if (@option.gotoline > 0)
+          records.each do |record|
+            if FileTest.exist?(record.path)
+              relative_path = Milkode::Util::relative_path(record.path, Dir.pwd).to_s
+              line = getTextLineno(relative_path, @option.gotoline)
+              stdout.puts "#{relative_path}:#{@option.gotoline}:#{line}" if (line)
+              @result.match_file_count += 1
+              raise MatchCountOverError if (0 < @option.matchCountLimit && @option.matchCountLimit <= @result.match_file_count)
+            end
+          end
+        elsif (@patterns.size > 0)
           records.each do |record|
             if (@option.groongaOnly)
               searchGroongaOnly(stdout, record)
@@ -172,6 +190,20 @@ module FindGrep
       end
     end
 
+    def getTextLineno(path, no)
+      index = no - 1
+
+      open(path, "r") do |file|
+        lines = file2data(file)
+
+        if (index < lines.size)
+          lines[index]
+        else
+          nil
+        end
+      end
+    end
+
     def searchDatabase
       # 全てのパターンを検索
       table = @documents.select do |record|

data/lib/milkode/grep/cli_grep.rb

@@ -34,16 +34,27 @@ Stateful:
     -l,                              Change state 'line'. (Match line words.)
     -k,                              Change state 'keyword'. (Match file-content or file-path.)
     First state is 'line'.
-    Example: gmilk line1 line2 -k keyword1 keyword2 -l line3 -k keyword3 ...
+    Example:
+      gmilk line1 line2 -k keyword1 keyword2 -l line3 -k keyword3 ...
+
+Gotoline:
+    -g,                              Go to line mode.
+    Enter a file name and line number. If you omit the line number jumps to the line:1.
+    Example:
+      gmilk -g database lib 7
+      lib/database.rb:7:xxxxxxxxxxxxxxx
+      database_lib.rb:7:yyyyyyyyyyyyyyy
 
 Normal:
 EOF
       opt.on('-a', '--all', 'Search all package.') {|v| my_option[:all] = true }
+      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('-d DIR', '--directory DIR', 'Start directory. (deafult:".")') {|v| current_dir = File.expand_path(v); my_option[:find_mode] = true} 
       opt.on('-f FILE_PATH', '--file-path FILE_PATH', 'File path. (Enable multiple call)') {|v| option.filePatterns << v; my_option[:find_mode] = true }
+      opt.on('-i', '--ignore', 'Ignore case.') {|v| option.ignoreCase = true}
       opt.on('-n NUM', 'Limits the number of match to show.') {|v| option.matchCountLimit = v.to_i }
       opt.on('--no-snip', 'There being a long line, it does not snip.') {|v| option.noSnip = true }
       opt.on('-p PACKAGE', '--package PACKAGE', 'Specify search package.') {|v| setup_package(option, my_option, v) }
@@ -60,11 +71,20 @@ EOF
         ap.after
 
         arguments = ap.arguments
+
         option.keywords = ap.keywords
         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
+        end
+
         # p ap.arguments
         # p ap.keywords
+        # p ap.gotowords
 
       rescue NotFoundPackage => e
         stdout.puts "fatal: Not found package '#{e}'."
@@ -102,9 +122,18 @@ EOF
           stdout.puts
         end
 
-        # findgrep
-        findGrep = FindGrep::FindGrep.new(arguments, option)
-        findGrep.searchAndPrint(stdout)
+        if (my_option[:count])
+          # count mode
+          option.isSilent = true
+          findGrep = FindGrep::FindGrep.new(arguments, option)
+          records = findGrep.pickupRecords
+          # stdout.puts "#{records.size} records (#{findGrep.time_s})"
+          stdout.puts "#{records.size} records"
+        else
+          # search mode
+          findGrep = FindGrep::FindGrep.new(arguments, option)
+          findGrep.searchAndPrint(stdout)
+        end
       else
         stdout.print opt.help
       end
@@ -140,17 +169,20 @@ EOF
     class ArgumentParser
       attr_reader :arguments
       attr_reader :keywords
+      attr_reader :gotowords
       
       def initialize(arguments)
         @arguments = arguments
-        @keywords = []
         @state = :line
+        @keywords = []
+        @gotowords = []
       end
 
       def prev
         @arguments.map! do |v|
           v.gsub("-l", ":l").
-            gsub("-k", ":k")
+            gsub("-k", ":k").
+            gsub("-g", ":g")            
         end
       end
 
@@ -165,6 +197,11 @@ EOF
           when ":k"
             @state = :keyword
             next
+          when ":g"
+            @state = :gotoline
+            @gotowords += result
+            result = []
+            next
           end
 
           case @state
@@ -172,6 +209,8 @@ EOF
             result << v
           when :keyword
             @keywords << v
+          when :gotoline
+            @gotowords << v
           end
         end
 

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-01-20}
+  s.date = %q{2012-02-02}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -107,42 +107,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ongaeshi/milkode}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Line based local source code search engine & grep-command & web-app.}
-  s.test_files = [
-    "test/data/a_project/cdstk.rb",
-    "test/data/a_project/cdstk_yaml.rb",
-    "test/data/b_project/runner.rb",
-    "test/data/b_project/test_dir.rb",
-    "test/file_assert.rb",
-    "test/file_test_utils.rb",
-    "test/milkode_test_work.rb",
-    "test/rake_test_loader.rb",
-    "test/runner.rb",
-    "test/test_bin_exec.rb",
-    "test/test_cdstk.rb",
-    "test/test_cdstk_command.rb",
-    "test/test_cdstk_yaml.rb",
-    "test/test_cli_cdstk.rb",
-    "test/test_cli_grep.rb",
-    "test/test_coderay_wrapper.rb",
-    "test/test_coderay_wrapper_data.rb",
-    "test/test_database.rb",
-    "test/test_dbdir.rb",
-    "test/test_dir.rb",
-    "test/test_gren_util.rb",
-    "test/test_helper.rb",
-    "test/test_mkurl.rb",
-    "test/test_query.rb",
-    "test/test_string_snip.rb",
-    "test/test_util.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])

data/test/test_util.rb

@@ -70,6 +70,13 @@ class TestUtil < Test::Unit::TestCase
     assert !Milkode::Util::downcase?("Dummy")
     assert !Milkode::Util::downcase?("dummyNode")    
   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'])
+  end
   
   def teardown
     teardown_custom(true)

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  segments_generated: true
+  version: 0.4.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,217 +16,262 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 +09:00
+date: 2012-02-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: bundler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
+        segments_generated: true
         version: 1.0.0
-  name: bundler
   requirement: *id001
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
         - 2
+        segments_generated: true
         version: 1.5.2
-  name: jeweler
   requirement: *id002
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rcov
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: rcov
   requirement: *id003
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: termcolor
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
         - 0
+        segments_generated: true
         version: 1.2.0
-  name: termcolor
   requirement: *id004
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: rroonga
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
         - 0
+        segments_generated: true
         version: 1.1.0
-  name: rroonga
   requirement: *id005
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: rack
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 3
         - 4
+        segments_generated: true
         version: 1.3.4
-  name: rack
   requirement: *id006
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: sinatra
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 2
         - 6
+        segments_generated: true
         version: 1.2.6
-  name: sinatra
   requirement: *id007
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: launchy
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 3
         - 7
+        segments_generated: true
         version: 0.3.7
-  name: launchy
   requirement: *id008
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: coderay
   version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
         - 8
+        segments_generated: true
         version: 0.9.8
-  name: coderay
   requirement: *id009
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: thin
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
         - 10
+        segments_generated: true
         version: 1.2.10
-  name: thin
   requirement: *id010
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: archive-zip
   version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
         - 0
+        segments_generated: true
         version: 0.4.0
-  name: archive-zip
   requirement: *id011
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: haml
   version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 1
         - 2
+        segments_generated: true
         version: 3.1.2
-  name: haml
   requirement: *id012
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: sass
   version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 3
         - 1
         - 3
+        segments_generated: true
         version: 3.1.3
-  name: sass
   requirement: *id013
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: nokogiri
   version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
+        segments_generated: true
         version: 1.5.0
-  name: nokogiri
   requirement: *id014
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: hpricot
   version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 8
         - 2
+        segments_generated: true
         version: 0.8.2
-  name: hpricot
   requirement: *id015
-  prerelease: false
-  type: :runtime
 description: Line based local source code search engine & grep-command & web-app.
 email: ongaeshi0621@gmail.com
 executables: 
@@ -331,50 +378,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Line based local source code search engine & grep-command & web-app.
-test_files: 
-- test/data/a_project/cdstk.rb
-- test/data/a_project/cdstk_yaml.rb
-- test/data/b_project/runner.rb
-- test/data/b_project/test_dir.rb
-- test/file_assert.rb
-- test/file_test_utils.rb
-- test/milkode_test_work.rb
-- test/rake_test_loader.rb
-- test/runner.rb
-- test/test_bin_exec.rb
-- test/test_cdstk.rb
-- test/test_cdstk_command.rb
-- test/test_cdstk_yaml.rb
-- test/test_cli_cdstk.rb
-- test/test_cli_grep.rb
-- test/test_coderay_wrapper.rb
-- test/test_coderay_wrapper_data.rb
-- test/test_database.rb
-- test/test_dbdir.rb
-- test/test_dir.rb
-- test/test_gren_util.rb
-- test/test_helper.rb
-- test/test_mkurl.rb
-- test/test_query.rb
-- test/test_string_snip.rb
-- test/test_util.rb
+test_files: []
+