myrurema 0.3.3 → 0.3.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1aee083a05c5bdab23da838eed8a253c29000b9a
+  data.tar.gz: 7100a799249c4506087b87925187bf6881d9826c
+SHA512:
+  metadata.gz: 2010dcb887849e16c9a80b507452c63c70dd12df910bd2103692b4c20361b89526cb92e56137152ded8ef2267872ca500ede413ebed03592e412dc87e87aa208
+  data.tar.gz: 8fdd6b9bee100e7ea85458a3667f332aa9cf888682461e1892f51dba5dc5bbade9ddff74491f20882c0f60c0fc3a261dbd58c5b776329a16cf39d15a448a4023

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    myrurema (0.3.0)
-      launchy (~> 2.0.5)
+    myrurema (0.3.4)
+      launchy (~> 2.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.3.4)
     diff-lcs (1.1.3)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
+    launchy (2.3.0)
+      addressable (~> 2.3)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -25,4 +25,4 @@ PLATFORMS
 
 DEPENDENCIES
   myrurema!
-  rspec (> 2.0)
+  rspec (>= 2.0)

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
+
+task default: :test
+
+task :test do
+  sh "bundle exec rspec spec/commands.rb"
+end

data/lib/myrurema.rb

@@ -7,14 +7,14 @@ require 'launchy'
 require 'myrurema/options'
 require 'myrurema/version'
 
-# Extend Pathname so that you can write 
+# Extend Pathname so that you can write
 #   foo / "bar"    #=> Pathname("foo/bar")
 # instead of
 #   foo + "bar"
 class Pathname; alias / +; end
 
 class MyRurema
-  SVN_URL = "http://jp.rubyist.net/svn/rurema" 
+  SVN_URL = "http://jp.rubyist.net/svn/rurema"
 
   def initialize(opt=Options.new(ARGV))
     @opt = opt
@@ -30,8 +30,8 @@ class MyRurema
             else
               nil
             end
-      
-      case 
+
+      case
       when query.empty?
         if num
           search(num, @opt.rubyver)
@@ -67,11 +67,7 @@ class MyRurema
             " #{args} -d #{db_path(ver)}"
     sh cmd, :silent => true do |txt|
       lines = txt.lines.to_a
-      if lines.count < 10 and
-         lines.first(2).join =~ /#{query}.*#{query}/m and
-         lines[1] !~ /^--- / and   # ad hoc :-(  see Issue #2
-         !@opt.no_ask
-
+      if candidate_list_responded?(lines, query)
         words = {}
         k = 0
         puts lines.map{|line|
@@ -160,9 +156,20 @@ class MyRurema
       sh "cd #{doctree_path/'refm/api/src'}"
     end
   end
-  
+
   private
 
+  def candidate_list_responded?(lines, query)
+    return false if @opt.no_ask
+
+    # if first several words are results of AND search
+    lines.first(2).join.split(/\s+/).all? do |word|
+      query.all? do |q|
+        word =~ Regexp.new(q, 'i')
+      end
+    end
+  end
+
   def default_port(ver)
     "10" + ver.scan(/\d/).join
   end

data/lib/myrurema/version.rb

@@ -1,4 +1,4 @@
 class MyRurema
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end
 

data/myrurema.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = MyRurema::VERSION
 
-  gem.add_dependency("launchy", "~> 2.0.5")
+  gem.add_dependency("launchy", "~> 2.3")
   gem.add_development_dependency("rspec", ">= 2.0")
 end

data/spec/commands.rb

@@ -19,16 +19,22 @@ CASES = {
   "rurema --init" => [
     %r{svn co -rHEAD .*/doctree/trunk .*},
     %r{svn co -rHEAD .*/bitclust/trunk .*},
-    %r{.*/bin/bitclust -d .* init version=.* encoding=euc-jp},
+    %r{.*/bin/bitclust -d .* init version=.* encoding=utf-8},
     %r{.*/bin/bitclust -d .* update --stdlibtree=.*/refm/api/src},
   ],
 
   "rurema --init --rubyver=1.8.7" => [
-    %r{bitclust.*init version=1.8.7}
+    %r{.},
+    %r{.},
+    %r{bitclust.*init version=1.8.7},
+    %r{.},
   ],
 
   "rurema --init --ruremadir=/tmp" => [
-    %r{svn co .*/tmp}
+    %r{svn co .*/tmp},
+    %r{.},
+    %r{.},
+    %r{.},
   ],
 
   "rurema --update" => [
@@ -85,14 +91,9 @@ describe MyRurema do
       my = MyRurema.new(opt)
       my.run
 
-      cmds = my.cmds
-      i = 0
-      expects.each do |pattern|
-        cmds[i..-1].should satisfy{|ary|
-          ary.any?{|s| pattern =~ s}
-        }
-
-        i = cmds[i..-1].index{|cmd| pattern =~ cmd} + 1
+      # Get commands executed with `sh()`
+      my.cmds.zip(expects).each do |cmd, pattern|
+        cmd.should match(pattern)
       end
     end
   end

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: myrurema
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors:
 - Yutaka HARA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2153563060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153563060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153562560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2153562560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: myrurema provides a command 'rurema', which helps searching/browsing/writing
   the Japanese Ruby documents (a.k.a Rurema http://bugs.ruby-lang.org/projects/rurema/wiki
   .)
@@ -58,27 +63,26 @@ files:
 - spec/commands.rb
 homepage: http://github.com/yhara/myrurema
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for Rurema (the new Japanese Ruby reference manual)
 test_files:
 - features/basic_commands.feature