cmd-matcher 0.0.1 → 0.0.2

data/README

@@ -1,3 +1,24 @@
-== cmd-matcher
+== cmd_matcher
+  command line response to hash
+usage:
 
-You should document your project here.
+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
+  })
+puts cm.matches[:total]
+puts cm.matches[:type][0]
+puts cm.matches[:type][1]
+  

data/Rakefile

@@ -13,13 +13,13 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'cmd-matcher'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
-  s.summary = 'Your summary here'
+  s.summary = 'command line response to hash'
   s.description = s.summary
-  s.author = ''
-  s.email = ''
+  s.author = 'YuZhenpin'
+  s.email = 'yuzhenpin@126.com'
   # s.executables = ['your_executable_here']
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,lib,spec}/**/*")
   s.require_path = "lib"

data/lib/cmd_matcher.rb

@@ -1,26 +1,90 @@
 class CmdMatcher
+  attr_reader :matches
+  
   def initialize
     @matchers = []
+    @matches = {}
   end
   
   def has(line, opt = {})
-    
-  end
-  
-  def head(line, opt = {})
-    
+    @matchers << [line, opt]
   end
   
   def has_one(line, opt = {})
-    
+    arg = opt.clone
+    arg[:at_most] = nil
+    arg[:at_least] = nil
+    has(line, arg)
   end
   
   def has_many(line, opt = {})
-    
+    arg = opt.clone
+    arg[:at_most] = nil
+    arg[:at_least] = 1
+    has(line, arg)
   end
   
   def match(prompts)
-    
+    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
+        else
+          return false
+        end
+      else
+        times = 0
+        while true
+          if line_match(lines, expect, opt)
+            lines.shift
+            times += 1
+          else
+            if opt[:at_least] && opt[:at_least] > times
+              return false
+            end
+            
+            if opt[:at_most] && opt[:at_most] < times
+              return false
+            end
+           
+            break
+          end
+        end
+      end
+    }
+    return true
+  end
+  
+  def line_match(lines, expect, opt = {})
+    if expect.is_a?(Regexp)
+      line_regex(lines, expect, opt)
+    else
+      line_equal(lines, expect, opt)
+    end
+  end
+  
+  def line_regex(lines, expect, opt = {})
+    line = lines[0]
+    line_matcher = LineMatcher.new(expect, opt)
+    if line_matcher.match(line)
+      line_matcher.append_to(@matches)
+      return true
+    else
+      puts "<expect>#{expect},\n <but got>#{line}" if $DEBUG
+      return false
+    end
+  end
+  
+  def line_equal(lines, expect, opt = {})
+    line = lines[0]
+    line_equaler = LineEqualer.new(expect, opt)
+    if line_equaler.match(line)
+      return true
+    else
+      puts "<expect>#{expect},\n <but got>#{line}" if $DEBUG
+      return false
+    end
   end
   
   class LineMatcher
@@ -29,6 +93,11 @@ class CmdMatcher
       @names = opt[:names] || []
       @matcher = matcher
       @matches = nil
+      if opt[:at_most] && opt[:at_most] > 1 or opt[:at_least]
+        @has_many = true
+      else
+        @has_many = false
+      end
     end
     
     def match(line)
@@ -36,10 +105,24 @@ class CmdMatcher
       return false unless m
       @matches = {}
       @names.each_with_index {|name, index|
-        @matches[name] = m[index + 1]
+        if @has_many
+          @matches[name] = [m[index + 1]]
+        else
+          @matches[name] = m[index + 1]
+        end
       }
       return true
     end
+    
+    def append_to(matches)
+      @names.each {|name|
+        if matches[name].is_a?(Array)
+          matches[name] += @matches[name]
+        else
+          matches[name] = @matches[name]
+        end
+      }
+    end
   end
   
   class LineEqualer < LineMatcher
@@ -47,12 +130,4 @@ class CmdMatcher
       @matcher.strip == line.strip
     end
   end
-end
-
-cm = CmdMatcher.new
-ao.reply :head => "++++++++++++++++++++++++++++++++++"
-ao.reply :has_one => "sn   type  id"
-ao.reply :has_one => "++++++++++++++++++++++++++++++++++"
-ao.reply :has_many => /(\d)\s*(trunk|access)(\d+)/, :name => [:sn, :type, :id]
-ao.reply :has => "++++++++++++++++++++++++++++++++++", :at_last => 1
-ao.reply :has => "++++++++++++++++++++++++++++++++++", :at_most => 1
+end

data/spec/cmd_matcher_spec.rb

@@ -0,0 +1,30 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require "rubygems"
+require 'cmd-matcher'
+
+describe "CmdMatcher" do
+  it "should desc" do
+    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
+      }).should == true
+    cm.matches[:total].should == "2"
+    cm.matches[:type][0].should == "trunk"
+    cm.matches[:type][1].should == "access"
+  end
+end
+

data/spec/line_matcher_spec.rb

@@ -1,17 +1,50 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
-$LOAD_PATH << 'I:\RailsInstaller\Ruby1.8.7\lib\ruby\gems\1.8\gems\cmd-matcher\lib'
+require "rubygems"
+require 'cmd-matcher'
 
-require 'cmd_matcher'
-
-describe LineMatcher do
-  before(:each) do
-    @line_matcher = LineMatcher.new
+describe "LineMatcher" do
+  it "should match one" do
+    line_matcher = CmdMatcher::LineMatcher.new(/vlan\s*(\d+)/, :names => [:vlan])
+    line_matcher.match("vlan 10").should == true
+    line_matcher.matches[:vlan].should == "10"
   end
-
-  it "should desc" do
-    # TODO
+  
+  it "should match at_most 1" do
+    line_matcher = CmdMatcher::LineMatcher.new(
+      /vlan\s*(\d+)/, 
+      :names => [:vlan],
+      :at_most => 1
+    )
+    line_matcher.match("vlan 10").should == true
+    line_matcher.matches[:vlan].should == "10"
+  end
+  
+  it "should match at_most 2" do
+    line_matcher = CmdMatcher::LineMatcher.new(
+      /vlan\s*(\d+)/, 
+      :names => [:vlan],
+      :at_most => 2
+    )
+    line_matcher.match("vlan 10").should == true
+    line_matcher.matches[:vlan].should == ["10"]
+  end
+  
+  it "should match at_least" do
+    line_matcher = CmdMatcher::LineMatcher.new(
+      /vlan\s*(\d+)/, 
+      :names => [:vlan],
+      :at_least => 1
+    )
+    line_matcher.match("vlan 10").should == true
+    line_matcher.matches[:vlan].should == ["10"]
+  end
+  
+  it "should equal" do
+    line_matcher = CmdMatcher::LineEqualer.new("hello world")
+    line_matcher.match("hello world").should == true
+    line_matcher.matches == nil
   end
 end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: cmd-matcher
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- ""
+- YuZhenpin
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,8 +18,8 @@ cert_chain: []
 date: 2012-04-30 00:00:00 Z
 dependencies: []
 
-description: Your summary here
-email: ""
+description: command line response to hash
+email: yuzhenpin@126.com
 executables: []
 
 extensions: []
@@ -32,6 +32,7 @@ files:
 - README
 - Rakefile
 - lib/cmd_matcher.rb
+- spec/cmd_matcher_spec.rb
 - spec/line_matcher_spec.rb
 homepage: 
 licenses: []
@@ -65,6 +66,6 @@ rubyforge_project:
 rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: Your summary here
+summary: command line response to hash
 test_files: []