myrurema 0.1.0 → 0.2.0

data/HISTORY

@@ -1,3 +1,8 @@
+2011-10-05 version 0.2.0
+
+  * new: ask which method to show if several methods are found
+  * new: --list
+
 2010-09-01 version 0.1.0
 
   * new: --preview

data/README.mkd

@@ -60,11 +60,15 @@ ruremaコマンドにメソッド名やクラス名を与えると、リファ
 
 引数によっては、複数の候補が表示されることもあります。
 
-    $ rurema index
-
-最後に数字を付けることで、指定した番号の候補を表示できます。
-
-    $ rurema index 1
+    $ rurema each_w
+    (1)Enumerable#each_with_index (2)Enumerable#each_with_object
+    (3)Matrix#each_with_index (4)Prime::PseudoPrimeGenerator#each_with_index
+    which one? > 
+
+(バージョン0.2.0から、上のようにどれを表示するか聞いてくるように
+なりました。外部プログラムから呼び出す場合などは、--no-askを付けると
+従来通りの表示になります。この場合は、最後に数字を付けることで、
+指定した番号の候補を表示できます。(例：$ rurema each_w 3))
 
 ### ローカルWebサーバの起動
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/spec/commands.rb

@@ -64,6 +64,9 @@ CASES = {
     %r{bc-tohtml},
     %r{(start|open) .*rurema_preview.html}
   ],
+  "rurema --list" => [
+    %r{refe.*-l},
+  ],
 }
 
 describe MyRurema do

data/src/myrurema.rb

@@ -11,12 +11,17 @@ class Options
     @open_browser = false
     @port = nil
     @dry_run = false
+    @no_ask = false
     @ruremadir = Pathname("~/.rurema").expand_path
     @rubyver = RUBY_VERSION
 
     @optionparser = OptionParser.new{|o|
+      o.banner = [
+        "Usage: rurema [options] <method name or class name>",
+      ].join("\n")
+
       o.on("--init",
-           "initialize rurema"){
+           "initialize rurema system"){
         @command = :init
       }
       o.on("--update",
@@ -31,8 +36,12 @@ class Options
            "render a reference as HTML"){
         @command = :preview 
       }
+      o.on("--list",
+           "list all classes"){
+        @command = :list 
+      }
 
-      o.on("----"){}
+      o.on("---- (OPTIONS)"){}
 
       o.on("--port=N",
            "port number of the web browser (only meaningful with --server)"){|n|
@@ -46,6 +55,10 @@ class Options
            "show commands only"){
         @dry_run = true 
       }
+      o.on("--no-ask",
+           "do not ask keyboard input"){
+        @no_ask = true 
+      }
       o.on("--ruremadir=PATH",
            "specify rurema directory (default: #{@ruremadir})"){|path|
         @ruremadir = Pathname(path)
@@ -55,7 +68,7 @@ class Options
         @rubyver = str
       }
 
-      o.on("-----"){}
+      o.on("----- (INFO)"){}
 
       o.on("--version",
            "show version of myrurema"){
@@ -70,8 +83,8 @@ class Options
     }
     @rest_args = @optionparser.parse(argv)
   end
-  attr_accessor :dry_run, :ruremadir, :rubyver, :open_browser
-  attr_accessor :command, :port, :rest_args
+  attr_accessor :dry_run, :no_ask, :ruremadir, :rubyver,
+                :open_browser, :command, :port, :rest_args
 
   def ruremadir=(dir)
     @ruremadir = Pathname(dir)
@@ -120,8 +133,33 @@ class MyRurema
   def search(query, ver)
     should_have_db(ver)
 
-    sh "#{bitclust_path/'bin/refe.rb'}" +
-         " #{Shellwords.escape query} -d #{db_path(ver)}", :silent => true
+    cmd = "#{bitclust_path/'bin/refe.rb'}" +
+            " #{Shellwords.escape query} -d #{db_path(ver)}"
+    sh cmd, :silent => true do |txt|
+      if txt.lines.count < 10 and
+         txt.lines.first(2).join =~ /#{query}.*#{query}/m and
+         !@opt.no_ask
+
+        words = {}
+        k = 0
+        puts txt.lines.map{|line|
+          line.gsub(/(\S+)/){|str|
+            k+=1
+            words[k] = str
+            "(#{k})#{str}"
+          }
+        }
+        print "which one? > "
+        line = $stdin.gets or (puts; exit)
+        n = line.to_i
+
+        puts "searching #{words[n]}"
+        puts
+        search(words[n].sub(/\.#/, "."), ver)
+      else
+        puts txt
+      end
+    end
   end
 
   def search_num(query, num, ver)
@@ -138,6 +176,13 @@ class MyRurema
     end
   end
 
+  def list
+    should_have_db(@opt.rubyver)
+
+    sh "#{bitclust_path/'bin/refe.rb'}" +
+         " -l -d #{db_path(@opt.rubyver)}", :silent => true
+  end
+
   def server
     port = @opt.port || default_port(@opt.rubyver)
     th = Thread.new{
@@ -226,9 +271,15 @@ class MyRurema
     @opt.ruremadir / "db" / ver
   end
 
-  def sh(cmd, opt={})
+  def sh(cmd, opt={}, &block)
     puts cmd unless opt[:silent]
-    system cmd unless @opt.dry_run
+    return if @opt.dry_run
+
+    if block
+      block.call(`#{cmd}`)
+    else
+      system cmd
+    end
   end
 
   def error(msg)

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: myrurema
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Yutaka HARA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-01 00:00:00 +09:00
-default_executable: rurema
+date: 2011-10-05 00:00:00.000000000 Z
 dependencies: []
-
 description: A tool for Rurema (the new Japanese Ruby reference manual)
 email: yutaka.hara/at/gmail.com
-executables: 
+executables:
 - rurema
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.mkd
-files: 
+files:
 - HISTORY
 - README.mkd
 - Rakefile
@@ -37,39 +28,28 @@ files:
 - main.rb
 - spec/commands.rb
 - src/myrurema.rb
-has_rdoc: true
 homepage: http://github.com/yhara/myrurema
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A tool for Rurema (the new Japanese Ruby reference manual)
-test_files: 
-- spec/commands.rb
+test_files: []