myrurema 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/rurema

@@ -1,204 +1,4 @@
 #!/usr/bin/env ruby
-require 'optparse'
-require 'pathname'
-require 'shellwords'
-
-class Pathname; alias / +; end
-
-class Options
-  def initialize(argv)
-    @command = nil
-    @open_browser = false
-    @port = nil
-    @dry_run = false
-    @ruremadir = Pathname("~/.rurema").expand_path
-    @rubyver = RUBY_VERSION
-    @query = ""
-
-    @optionparser = OptionParser.new{|o|
-      o.on("--init",
-           "initialize rurema"){
-        @command = :init
-      }
-      o.on("--update",
-           "update documents and database"){
-        @command = :update
-      }
-      o.on("--server",
-           "start web server"){
-        @command = :server 
-      }
-
-      o.on("--port=N",
-           "port number of the web browser (only meaningful with --server)"){|n|
-        @port = n.to_i
-      }
-      o.on("--browser",
-           "open web browser (only meaningful with --server)"){
-        @open_browser = true 
-      }
-      o.on("--dry-run",
-           "show commands only"){
-        @dry_run = true 
-      }
-      o.on("--ruremadir=PATH",
-           "specify rurema directory (default: #{@ruremadir})"){|path|
-        @ruremadir = Pathname(path)
-      }
-      o.on("--rubyver=STR",
-           "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, @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, :num, :port
-
-  def usage
-    puts @optionparser
-  end
-end
-
-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))
-    @opt = opt
-  end
-
-  def run
-    case 
-    when @opt.command
-      send(@opt.command)
-    when @opt.query.empty?
-      @opt.usage
-    when @opt.num
-      search_num(@opt.query, @opt.num, @opt.rubyver)
-    else
-      search(@opt.query, @opt.rubyver)
-    end
-  end
-
-  def init
-    sh "svn co -rHEAD #{SVN_URL}/doctree/trunk #{doctree_path}"
-    sh "svn co -rHEAD #{SVN_URL}/bitclust/trunk #{bitclust_path}"
-    init_db(@opt.rubyver)
-  end
-
-  def update
-    sh "svn up #{doctree_path}"
-    refresh_db(@opt.rubyver)
-  end
-
-  def search(query, ver)
-    should_have_db(ver)
-
-    sh "#{bitclust_path/'bin/refe.rb'}" +
-         " #{Shellwords.escape 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
-    port = @opt.port || default_port(@opt.rubyver)
-    th = Thread.new{
-      sh "#{bitclust_path/'standalone.rb'}" +
-           " --baseurl=http://localhost:#{port}" +
-           " --port=#{port}" +
-           " --database=#{db_path(@opt.rubyver)}" +
-           " --debug"
-    }
-    if @opt.open_browser
-      sleep 1  # wait for the server to start
-      cmd = (/mswin/ =~ RUBY_PLATFORM) ? "start" : "open"
-      sh "#{cmd} http://localhost:#{port}/view/"
-    end
-    th.join
-  end
-  
-  private
-
-  def default_port(ver)
-    "10" + ver.scan(/\d/).join
-  end
-
-  def init_db(ver)
-    sh "#{bitclust_path/'bin/bitclust.rb'}" +
-          " -d #{db_path(ver)} init version=#{ver} encoding=euc-jp"
-
-    refresh_db(ver)
-  end
-
-  def refresh_db(ver)
-    puts "Updating Rurema database:"
-    puts "This will take a few minutes. Please be patient."
-    sh "#{bitclust_path/'bin/bitclust.rb'}" +
-          " -d #{db_path(ver)}" +
-          " update --stdlibtree=#{doctree_path/'refm/api/src'}"
-  end
-
-  def bitclust_path
-    @opt.ruremadir / "bitclust"
-  end
-
-  def doctree_path
-    @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
-
-  def db_path(ver)
-    @opt.ruremadir / "db" / ver
-  end
-
-  def sh(cmd, opt={})
-    puts cmd unless opt[:silent]
-    system cmd unless @opt.dry_run
-  end
-
-  def error(msg)
-    $stderr.puts msg
-  end
-end
+require File.expand_path("../src/myrurema", File.dirname(__FILE__))
 
 MyRurema.new.run

data/main.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'rubygems'
+require 'ruby-station'; RubyStation.parse_argv
+require File.expand_path("src/myrurema", File.dirname(__FILE__))
+
+opt = Options.new(ARGV)
+ruremadir = Pathname(RubyStation.data_dir)
+
+if ruremadir.entries.size == 2
+  opt.command = :init
+  opt.ruremadir = RubyStation.data_dir
+  MyRurema.new(opt).run
+end
+
+opt.command = :server
+opt.ruremadir = RubyStation.data_dir
+opt.port = RubyStation.port
+MyRurema.new(opt).run

data/spec/commands.rb

@@ -0,0 +1,68 @@
+require File.expand_path("../src/myrurema", File.dirname(__FILE__))
+
+class MyRurema
+  def sh(cmd, opt={})
+    @cmds ||= []
+    @cmds << cmd
+  end
+  attr_reader :cmds
+end
+
+CASES = {
+  "rurema --init" => [
+    %r{svn co .*doctree},
+    %r{svn co .*bitclust},
+    %r{bitclust.*init},
+    %r{bitclust.*update},
+  ],
+
+  "rurema --init --rubyver=1.8.7" => [
+    %r{bitclust.*init version=1.8.7}
+  ],
+
+  "rurema --init --ruremadir=/tmp" => [
+    %r{svn co .*/tmp}
+  ],
+
+  "rurema --update" => [
+    %r{svn up},
+    %r{bitclust.*update}
+  ],
+
+  "rurema Array" => [
+    %r{refe.*Array},
+  ],
+
+  "rurema --server" => [
+    %r{standalone},
+  ],
+
+  "rurema --server --port=9898" => [
+    %r{standalone.*--port=9898},
+  ],
+
+  "rurema --server --browser" => [
+    %r{standalone},
+    %r{(start|open) http://localhost:}
+  ],
+}
+
+describe MyRurema do
+  it "should execute expected commands" do
+    CASES.each do |command, expects|
+      opt = Options.new(command.split[1..-1])
+      my = MyRurema.new(opt)
+      my.run
+
+      cmds = my.cmds
+      i = 0
+      expects.each do |pattern|
+        pattern.should satisfy{
+          i = cmds[i..-1].index{|cmd| pattern =~ cmd}
+          not i.nil?
+        }
+        i += 1
+      end
+    end
+  end
+end

data/src/myrurema.rb

@@ -0,0 +1,205 @@
+require 'optparse'
+require 'pathname'
+require 'shellwords'
+
+class Pathname; alias / +; end
+
+class Options
+  def initialize(argv)
+    @command = nil
+    @open_browser = false
+    @port = nil
+    @dry_run = false
+    @ruremadir = Pathname("~/.rurema").expand_path
+    @rubyver = RUBY_VERSION
+    @query = ""
+
+    @optionparser = OptionParser.new{|o|
+      o.on("--init",
+           "initialize rurema"){
+        @command = :init
+      }
+      o.on("--update",
+           "update documents and database"){
+        @command = :update
+      }
+      o.on("--server",
+           "start web server"){
+        @command = :server 
+      }
+
+      o.on("--port=N",
+           "port number of the web browser (only meaningful with --server)"){|n|
+        @port = n.to_i
+      }
+      o.on("--browser",
+           "open web browser (only meaningful with --server)"){
+        @open_browser = true 
+      }
+      o.on("--dry-run",
+           "show commands only"){
+        @dry_run = true 
+      }
+      o.on("--ruremadir=PATH",
+           "specify rurema directory (default: #{@ruremadir})"){|path|
+        @ruremadir = Pathname(path)
+      }
+      o.on("--rubyver=STR",
+           "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, @num = @optionparser.parse(argv)
+    @query = "" if @query.nil?
+    @num = @num.to_i if @num
+  end
+  attr_accessor :dry_run, :ruremadir, :rubyver, :open_browser
+  attr_accessor :command, :query, :num, :port
+
+  def ruremadir=(dir)
+    @ruremadir = Pathname(dir)
+  end
+
+  def usage
+    puts @optionparser
+  end
+end
+
+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))
+    @opt = opt
+  end
+
+  def run
+    case 
+    when @opt.command
+      send(@opt.command)
+    when @opt.query.empty?
+      @opt.usage
+    when @opt.num
+      search_num(@opt.query, @opt.num, @opt.rubyver)
+    else
+      search(@opt.query, @opt.rubyver)
+    end
+  end
+
+  def init
+    sh "svn co -rHEAD #{SVN_URL}/doctree/trunk #{doctree_path}"
+    sh "svn co -rHEAD #{SVN_URL}/bitclust/trunk #{bitclust_path}"
+    init_db(@opt.rubyver)
+  end
+
+  def update
+    sh "svn up #{doctree_path}"
+    refresh_db(@opt.rubyver)
+  end
+
+  def search(query, ver)
+    should_have_db(ver)
+
+    sh "#{bitclust_path/'bin/refe.rb'}" +
+         " #{Shellwords.escape 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
+    port = @opt.port || default_port(@opt.rubyver)
+    th = Thread.new{
+      sh "#{bitclust_path/'standalone.rb'}" +
+           " --baseurl=http://localhost:#{port}" +
+           " --port=#{port}" +
+           " --database=#{db_path(@opt.rubyver)}" +
+           " --debug"
+    }
+    if @opt.open_browser
+      sleep 1  # wait for the server to start
+      cmd = (/mswin/ =~ RUBY_PLATFORM) ? "start" : "open"
+      sh "#{cmd} http://localhost:#{port}/view/"
+    end
+    th.join
+  end
+  
+  private
+
+  def default_port(ver)
+    "10" + ver.scan(/\d/).join
+  end
+
+  def init_db(ver)
+    sh "#{bitclust_path/'bin/bitclust.rb'}" +
+          " -d #{db_path(ver)} init version=#{ver} encoding=euc-jp"
+
+    refresh_db(ver)
+  end
+
+  def refresh_db(ver)
+    puts "Updating Rurema database:"
+    puts "This will take a few minutes. Please be patient."
+    sh "#{bitclust_path/'bin/bitclust.rb'}" +
+          " -d #{db_path(ver)}" +
+          " update --stdlibtree=#{doctree_path/'refm/api/src'}"
+  end
+
+  def bitclust_path
+    @opt.ruremadir / "bitclust"
+  end
+
+  def doctree_path
+    @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
+
+  def db_path(ver)
+    @opt.ruremadir / "db" / ver
+  end
+
+  def sh(cmd, opt={})
+    puts cmd unless opt[:silent]
+    system cmd unless @opt.dry_run
+  end
+
+  def error(msg)
+    $stderr.puts msg
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: myrurema
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 +09:00
+date: 2010-09-01 00:00:00 +09:00
 default_executable: rurema
 dependencies: []
 
@@ -33,6 +33,9 @@ files:
 - VERSION
 - bin/rurema
 - features/basic_commands.feature
+- main.rb
+- spec/commands.rb
+- src/myrurema.rb
 has_rdoc: true
 homepage: http://github.com/yhara/myrurema
 licenses: []
@@ -67,5 +70,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tool for Rurema (the new Japanese Ruby reference manual)
-test_files: []
-
+test_files: 
+- spec/commands.rb