cmd_matcher 0.0.2 → 0.0.4

data/Rakefile

@@ -13,7 +13,7 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'cmd_matcher'
-  s.version = '0.0.2'
+  s.version = '0.0.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'command line response to hash'

data/lib/cmd_matcher.rb

@@ -1,15 +1,24 @@
 class CmdMatcher
   attr_reader :matches
   
+  # match command line prompt line by line
   def initialize
     @matchers = []
     @matches = {}
   end
   
+  ## options
+  #    :names => hash keys
+  #    :at_most => has xxx lines at most
+  #    :at_least => has xxx lines at least
+  #    :no_newline => match line more than 1 times
   def has(line, opt = {})
     @matchers << [line, opt]
   end
   
+  ## options
+  #    :names => hash keys
+  #    :no_newline => match line more than 1 times
   def has_one(line, opt = {})
     arg = opt.clone
     arg[:at_most] = nil
@@ -17,10 +26,14 @@ class CmdMatcher
     has(line, arg)
   end
   
+  ## options
+  #    :names => hash keys
+  #    :at_least => has xxx lines at least
+  #    :no_newline => match line more than 1 times
   def has_many(line, opt = {})
     arg = opt.clone
     arg[:at_most] = nil
-    arg[:at_least] = 1
+    arg[:at_least] ||= 1
     has(line, arg)
   end
   
@@ -28,16 +41,29 @@ class CmdMatcher
     lines = prompts.split("\n")
     @matchers.each {|expect, opt|
       if opt[:at_most] == nil && opt[:at_least] == nil
-        if line_match(lines, expect, opt)
-          lines.shift
+        if m = line_match(lines, expect, opt)
+          if opt[:no_newline]
+            line = lines[0]
+            index = line.index(m)
+            lines[0] = line[index + m.size..-1]
+          else
+            lines.shift
+          end
         else
           return false
         end
       else
         times = 0
         while true
-          if line_match(lines, expect, opt)
-            lines.shift
+          if m = line_match(lines, expect, opt)
+            if opt[:no_newline]
+              line = lines[0]
+              index = line.index(m)
+              lines[0] = line[index + m.size..-1]
+            else
+              lines.shift 
+            end
+            
             times += 1
           else
             if opt[:at_least] && opt[:at_least] > times
@@ -56,6 +82,7 @@ class CmdMatcher
     return true
   end
   
+  private
   def line_match(lines, expect, opt = {})
     if expect.is_a?(Regexp)
       line_regex(lines, expect, opt)
@@ -66,10 +93,14 @@ class CmdMatcher
   
   def line_regex(lines, expect, opt = {})
     line = lines[0]
+    unless line
+      puts lines.inspect
+    end
+      
     line_matcher = LineMatcher.new(expect, opt)
-    if line_matcher.match(line)
+    if m = line_matcher.match(line)
       line_matcher.append_to(@matches)
-      return true
+      return m[0]
     else
       puts "<expect>#{expect},\n <but got>#{line}" if $DEBUG
       return false
@@ -80,7 +111,7 @@ class CmdMatcher
     line = lines[0]
     line_equaler = LineEqualer.new(expect, opt)
     if line_equaler.match(line)
-      return true
+      return line
     else
       puts "<expect>#{expect},\n <but got>#{line}" if $DEBUG
       return false
@@ -101,6 +132,7 @@ class CmdMatcher
     end
     
     def match(line)
+      return false unless line
       m = line.match(@matcher)
       return false unless m
       @matches = {}
@@ -111,7 +143,7 @@ class CmdMatcher
           @matches[name] = m[index + 1]
         end
       }
-      return true
+      return m
     end
     
     def append_to(matches)

data/spec/cmd_matcher_benchmark.rb

@@ -0,0 +1,28 @@
+require "rubygems"
+require "benchmark"
+require 'cmd_matcher'
+
+n = 10000
+
+Benchmark.bm do |x|
+  x.report {
+    n.times { |i| 
+      cm = CmdMatcher.new
+      cm.has_one "++++++++++++++++++++++++++++++++++"
+      cm.has_one "sn   type  id"
+      cm.has_one "++++++++++++++++++++++++++++++++++"
+      cm.has_many /(\d+)\s+(trunk|access)\s+(\d+)/, :names => [:sn, :type, :id]
+      cm.has "++++++++++++++++++++++++++++++++++", :at_most => 1
+      cm.has_one /total\s*(\d+)/, :names => [:total]
+    
+      cm.match(%Q{++++++++++++++++++++++++++++++++++
+sn   type  id
+++++++++++++++++++++++++++++++++++
+1 trunk 100
+2 access 200
+++++++++++++++++++++++++++++++++++
+total 2
+        })
+    }
+  }
+end

data/spec/cmd_matcher_spec.rb

@@ -3,7 +3,7 @@
 
 require "rubygems"
 require 'cmd_matcher'
-
+$DEBUG = true
 describe "CmdMatcher" do
   it "should desc" do
     cm = CmdMatcher.new
@@ -26,5 +26,16 @@ total 2
     cm.matches[:type][0].should == "trunk"
     cm.matches[:type][1].should == "access"
   end
+  
+  it "should no newline" do
+    cm = CmdMatcher.new
+    cm.has_one /hello (\w+), and/, :no_newline => true, :names => [:name]
+    cm.has_many /(\w+)/, :names => [:other], :no_newline => true
+    
+    cm.match(%Q{hello world, and a b c d e}).should == true
+    cm.matches[:name].should == "world"
+    cm.matches[:other][0].should == "a"
+    cm.matches[:other][1].should == "b"
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cmd_matcher
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - YuZhenpin
@@ -32,6 +32,7 @@ files:
 - README
 - Rakefile
 - lib/cmd_matcher.rb
+- spec/cmd_matcher_benchmark.rb
 - spec/cmd_matcher_spec.rb
 - spec/line_matcher_spec.rb
 homepage: