myrurema 0.0.1 → 0.0.2

data/Rakefile

@@ -22,24 +22,13 @@ end
 
 desc "install current source as a gem"
 task :dogfood => [:gemspec, :build] do
-  sh "sudo gem install pkg/#{PROJECT_NAME}-#{File.read("VERSION").chomp}.gem"
+  sh "gemi pkg/#{PROJECT_NAME}-#{File.read("VERSION").chomp}.gem"
 end
 
 desc "uninstall the installed gem"
 task :undogfood do
-  sh "sudo gem uninstall #{PROJECT_NAME}"
+  sh "gemi -u #{PROJECT_NAME}"
 end
 
 desc "uninstall, then install current source as gem"
 task :redogfood => [:undogfood, :dogfood]
-
-desc "uninstall temporary gem and install from github"
-task :nodogfood do
-  sh "sudo gem uninstall #{PROJECT_NAME}"
-  sh "sudo gem install yhara-#{PROJECT_NAME}"
-end
-
-desc "check for gem to be built"
-task :stalk do
-  sh "gemstalk yhara #{PROJECT_NAME}"
-end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/rurema

@@ -43,23 +43,31 @@ class Options
            "specify Ruby version (default: #{@rubyver})"){|str|
         @rubyver = str
       }
+      o.on("--version",
+           "show version of myrurema"){
+        puts MyRurema::VERSION
+        exit
+      }
       o.on("--help",
            "show this message"){
         puts o
         exit
       }
     }
-    @query = @optionparser.parse(argv).join(" ")
+    @query, @num = @optionparser.parse(argv)
+    @query = "" if @query.nil?
+    @num = @num.to_i if @num
   end
   attr_reader :dry_run, :ruremadir, :rubyver, :open_browser
-  attr_reader :command, :query
+  attr_reader :command, :query, :num
 
   def usage
     puts @optionparser
   end
 end
 
-class Rurema
+class MyRurema
+  VERSION = File.read((Pathname(__FILE__).dirname/"../VERSION").expand_path)
   SVN_URL = "http://jp.rubyist.net/svn/rurema" 
 
   def initialize(opt=Options.new(ARGV))
@@ -67,10 +75,13 @@ class Rurema
   end
 
   def run
-    if @opt.command
+    case 
+    when @opt.command
       send(@opt.command)
-    elsif @opt.query.empty?
+    when @opt.query.empty?
       @opt.usage
+    when @opt.num
+      search_num(@opt.query, @opt.num, @opt.rubyver)
     else
       search(@opt.query, @opt.rubyver)
     end
@@ -88,20 +99,26 @@ class Rurema
   end
 
   def search(query, ver)
-    unless has_db?(ver)
-      puts "You don't have a database for ruby #{ver}."
-      puts "Make it now? [y/n]"
-      if $stdin.gets.chomp.downcase == "y"
-        init_db(ver)
-      else
-        exit
-      end
-    end
+    should_have_db(ver)
 
     sh "#{bitclust_path/'bin/refe.rb'}" +
          " #{query} -d #{db_path(ver)}", :silent => true
   end
 
+  def search_num(query, num, ver)
+    should_have_db(ver)
+
+    result = `#{bitclust_path/'bin/refe.rb'} #{query} -d #{db_path(ver)}`
+    word = result.split[num-1]
+    if word
+      word.gsub!(/\.#/, ".")    # avoid multi-hit for a module function
+      puts "searching #{word}"
+      search(word, ver)
+    else
+      error "less than #{num} entries found"
+    end
+  end
+
   def server
     th = Thread.new{
       sh "#{bitclust_path/'standalone.rb'}" +
@@ -142,6 +159,18 @@ class Rurema
     @opt.ruremadir / "doctree"
   end
 
+  def should_have_db(ver)
+    unless has_db?(ver)
+      puts "You don't have a database for ruby #{ver}."
+      puts "Make it now? [y/n]"
+      if $stdin.gets.chomp.downcase == "y"
+        init_db(ver)
+      else
+        exit
+      end
+    end
+  end
+
   def has_db?(ver)
     db_path(ver).directory?
   end
@@ -154,6 +183,10 @@ class Rurema
     puts cmd unless opt[:silent]
     system cmd unless @opt.dry_run
   end
+
+  def error(msg)
+    $stderr.puts msg
+  end
 end
 
-Rurema.new.run
+MyRurema.new.run

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: myrurema
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +09:00
+date: 2010-07-02 00:00:00 +09:00
 default_executable: rurema
 dependencies: []