cricinfo 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.2 2010-07-14
+
+* updated match regex
+* added bin/cricinfo script with 'list' command
+
 === 0.0.1 2010-03-14
 
 * 1 major enhancement:

data/Manifest.txt

@@ -2,6 +2,7 @@
 ./Manifest.txt
 ./README.rdoc
 ./Rakefile
+./bin/cricinfo
 ./lib/cricinfo/game.rb
 ./lib/cricinfo/innings.rb
 ./lib/cricinfo/scores.rb

data/README.rdoc

@@ -13,7 +13,11 @@ An interface to cricinfo.com game data (current games only).
 == SYNOPSIS:
 
   c = CricInfo::Scores.new
-  c.games.each { |g| puts game.summary }
+  c.games.each { |game| puts game.summary }
+
+  game = c.games.first
+  puts game.inns1.runs
+  puts game.inns1.wickets
 
 == INSTALL:
 

data/bin/cricinfo

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'cricinfo'
+
+def error(message)
+  puts "ERROR: #{message}"
+end
+
+def usage(exit = true)
+  puts "usage: cricinfo <command>"
+  exit 1 if exit
+end
+
+begin
+  command = ARGV[0]
+  usage unless command
+
+  case command
+  when 'list'
+    c = CricInfo::Scores.new
+    c.games.each { |game| puts game.summary }
+  else
+    error("unrecognised command #{command}")
+    usage
+  end
+
+end

data/lib/cricinfo.rb

@@ -8,6 +8,16 @@ require 'cricinfo/game'
 require 'cricinfo/scores'
 
 module CricInfo
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end
 
+# array monkey patch
+# http://snippets.dzone.com/posts/show/3332
+class Array
+  def permutations
+    return [self] if size < 2
+    perm = []
+    each { |e| (self - [e]).permutations.each { |p| perm << ([e] + p) } }
+    perm
+  end
+end

data/lib/cricinfo/game.rb

@@ -13,15 +13,25 @@ module CricInfo
 
     include GameTypes
 
-    attr_reader :inns1, :inns2
-    attr_accessor :start_time, :name, :type
+    attr_accessor :start_time, :name, :type, :innings
+    # team1 is the team batting first (first innings)
+    attr_accessor :team1, :team2
 
     def initialize
-      @inns1 = Innings.new
-      @inns2 = Innings.new
+      @innings = []
       @type = GAMETYPE_ODI  # assume ODI by default
     end
 
+    def inns1; @innings[0]; end
+    def inns2; @innings[1]; end
+    def inns3; @innings[2]; end
+    def inns4; @innings[3]; end
+
+    def add_innings
+      @innings.push(Innings.new)
+      @innings[-1]
+    end
+
     def type_string
       gtype = ["Unknown game type", "Test match", "ODI", "T20"]
       type >= 0 && type <= GAMETYPE_T20 ? gtype[type] : gtype[0]
@@ -30,11 +40,8 @@ module CricInfo
     # returns a string summarising the game data
     def summary
       out = ''
-      out += "%s: %s v %s (%s)\n" % [name, inns1.team, inns2.team, type_string]
-      if(!start_time)
-        out += inns1.summary if inns1.summary
-        out += inns2.summary if inns2.summary
-      end
+      out += "%s: %s v %s (%s)\n" % [name, team1, team2, type_string]
+      out += innings.collect { |i| i.summary }.join
       out
     end
 

data/lib/cricinfo/innings.rb

@@ -7,7 +7,8 @@ module CricInfo
     # returns a string summarising the innings data
     def summary
       return '' unless overs || runs  # overs can be blank if innings over
-      out = "%s %d/%d" % [team, runs, wickets]
+      out = "%s %d" % [team, runs]
+      out += "/%d" % [wickets] if wickets
       out += " declared" if declared
       out += " (%s ov)" % [overs] if overs
       out += "\n"

data/lib/cricinfo/scores.rb

@@ -1,3 +1,4 @@
+
 module CricInfo
   class Scores
     include CricInfo::GameTypes
@@ -6,10 +7,11 @@ module CricInfo
     SCORES_PATH = "/s/2497/Scores"
 
     # match name, team1, team2, inningsdata, start_time
-    RE_MATCH = /matchId=\d+">(.+?):\s*(\w+)\s+v\s+(\w+)<\/a>.*?<\/tr>(.*?)<\/tr>(.*?Start time (.*?)\s*<\/b>)?/
+    RE_MATCH = /matchId=.*?">(.+?):\s*(\w+)\s+v\s+(\w+)<\/a>.*?<\/tr>(.*?)<\/tr>(.*?Start time (.*?)\s*<\/b>)?/
 
-    # team1/2, runs, wickets, declared, overs (overs optional)
-    RE_INNINGS = /<b>\s*(\w+)\s*<\/b>\s*<b>\s*(\d+)\/(\d+)(d)?\s*(\(([\d\.]+))?/
+    # team1/2, i1runs, i1wickets, i1decl, i2wickets, i2decl, overs
+    # (overs optional)
+    RE_INNINGS = /<b>\s*(\w+)\s*<\/b>\s*<b>\s*(\d+)(?:\/(\d+))?(d)?(?:\s*&amp;\s*(\d+)\/(\d+)(d)?)?\s*(?:\(([\d\.]+))?/
 
     # start_time (e.g. Start time 09:30 GMT)
     RE_START = /<b>\s*Start\s+time\s+(.*?)\s*<\/b>/
@@ -32,33 +34,28 @@ module CricInfo
 
         game = Game.new
         game.name = match_name
-        inns_count = 0
         game.type = GAMETYPE_TEST if match_name.match(/Test/)
-        game.inns1.team = team1
-        game.inns2.team = team2
+        game.team1 = team1
+        game.team2 = team2
         game.start_time = start ? Time.parse(start) : nil
 
         # parse innings data
-        idata.scan(RE_INNINGS) do |team, runs, wickets, declared, junk, overs|
-          inns_count += 1
-          inns = inns_count == 1 ? game.inns1 : game.inns2
-
-          if inns_count == 1 && game.inns1.team != team
-            # need to switch innings teams
-            # (order is different to that shown in match name)
-            tmp = game.inns1.team
-            game.inns1.team = game.inns2.team
-            game.inns2.team = tmp
-          end
-
-          game.type = GAMETYPE_TEST if overs.to_f > Game::OVERS_ODI
-
-          inns.runs = runs.to_i
-          inns.wickets = wickets.to_i
-          inns.overs = overs
-          inns.declared = declared ? true : false
+        idata.scan(RE_INNINGS) do |data|
+          team, i1runs, i1wickets, i1decl, i2runs, i2wickets, i2decl, overs = *data
+          game.type = GAMETYPE_TEST if overs && overs.to_f > Game::OVERS_ODI
+          inns1 = add_innings(game, team, i1runs, i1wickets, i1decl)
+          inns2 = add_innings(game, team, i2runs, i2wickets, i2decl)
+
+          # overs given applies to the last innings
+          inns = inns2 ? inns2 : inns1
+          inns.overs = overs ? overs : nil
         end
 
+        # rorder innings: attempt to guess innings order.
+        # find first valid permutation of innings order.
+        list = game.innings.permutations.detect { |i| valid_innings_order(i) }
+        game.innings = list if list
+
         @games.push(game)
       end
 
@@ -66,6 +63,40 @@ module CricInfo
 
     private
 
+    # return true if the order of the list of innings is valid.
+    def valid_innings_order(list)
+      return true if list.length <= 1
+
+      # any innings with overs attached must be the last innings.
+      over_inns = list.detect { |i| i.overs }
+      return false if over_inns && over_inns != list[-1]
+
+      # the first and second innings must be different teams.
+      return false if list[0].team == list[1].team
+
+      # - a team can only bat twice in a row if it is following on.
+      # -- (a team can only follow on if it is > 200 runs behind)
+      (1...list.length).each do |i|
+        if list[i].team == list[i - 1].team
+          # team batted twice
+          return false unless list[i - 2].runs > list[i - 1].runs + 200
+        end
+      end
+
+      return true  # innings order is valid
+    end
+
+    def add_innings(game, team, runs, wickets, decl)
+      return unless runs
+
+      inns = game.add_innings
+      inns.team = team
+      inns.runs = runs.to_i
+      inns.wickets = wickets ? wickets.to_i : 10
+      inns.declared = decl ? true : false
+      inns
+    end
+
     def self.fetch_score_data
       Net::HTTP.get(SCORES_HOST, SCORES_PATH) || ''
     end

data/spec/cricinfo_scores_spec.rb

@@ -6,7 +6,7 @@ describe CricInfo::Scores do
   FIXTURE_PATH = File.dirname(__FILE__) + '/fixtures'
 
   # Scores1.html
-  it "should initialize and parse score data" do
+  it "should initialize and parse score data 1" do
     CricInfo::Scores.should_receive(:fetch_score_data).and_return(fixture(1))
     c = CricInfo::Scores.new
     c.should_not be_nil
@@ -15,15 +15,15 @@ describe CricInfo::Scores do
     game = c.games[0]
     game.name.should == "5th ODI"
     game.type.should == GAMETYPE_ODI
-    game.inns1.team.should == "NZ"
-    game.inns2.team.should == "AUS"
+    game.team1.should == "NZ"
+    game.team2.should == "AUS"
     game.inns1.runs.should == 219
     game.inns1.wickets.should == 8
     game.inns1.overs.should == "46.4"
   end
   
   # Scores4.html
-  it "should initialize and parse score data" do
+  it "should initialize and parse score data 4" do
     CricInfo::Scores.should_receive(:fetch_score_data).and_return(fixture(4))
     c = CricInfo::Scores.new
     c.should_not be_nil
@@ -32,8 +32,8 @@ describe CricInfo::Scores do
     game = c.games[1]
     game.name.should == "5th ODI"
     game.type.should == GAMETYPE_ODI
-    game.inns1.team.should == "NZ"
-    game.inns2.team.should == "AUS"
+    game.team1.should == "NZ"
+    game.team2.should == "AUS"
     game.inns1.runs.should == 241
     game.inns1.wickets.should == 9
     game.inns2.runs.should == 129
@@ -41,24 +41,64 @@ describe CricInfo::Scores do
     game.inns2.overs.should == "33.3"
 
     game = c.games[0]  # not started
-    game.inns1.team.should == "MUMB"
-    game.inns2.team.should == "RTHAN"
+    game.team1.should == "MUMB"
+    game.team2.should == "RTHAN"
     game.start_time.should == Time.parse("09:30 GMT")
   end
 
   # Scores5.html
-  it "should initialize and parse score data" do
+  it "should initialize and parse score data 5" do
     CricInfo::Scores.should_receive(:fetch_score_data).and_return(fixture(5))
     c = CricInfo::Scores.new
     c.should_not be_nil
 
     c.games.length.should == 1
     game = c.games[0]  # BAN v ENG
-    game.inns1.team.should == "ENG"  # note: order different to game name
+    game.team1.should == "BAN"
+    game.team2.should == "ENG"
+    game.inns1.team.should == "ENG"  # note: order different to game team names
     game.inns2.team.should == "BAN"
     game.inns1.declared.should == true
   end
 
+  # Scores6.html
+  # 3 innings
+  it "should initialize and parse score data 6" do
+    CricInfo::Scores.should_receive(:fetch_score_data).and_return(fixture(6))
+    c = CricInfo::Scores.new
+    c.should_not be_nil
+
+    c.games.length.should == 2
+    game = c.games[1]  # BAN v ENG
+    game.innings.length.should == 3
+
+    game.inns1.team.should == "ENG"
+    game.inns2.team.should == "BAN"
+    game.inns3.team.should == "ENG"
+  end
+
+  # Scores7.html  (doctored from Scores6.html)
+  # 4 innings
+  it "should initialize and parse score data 7" do
+    CricInfo::Scores.should_receive(:fetch_score_data).and_return(fixture(7))
+    c = CricInfo::Scores.new
+    c.should_not be_nil
+
+    c.games.length.should == 2
+    game = c.games[1]  # BAN v ENG
+    game.innings.length.should == 4
+
+    game.inns1.team.should == "ENG"
+    game.inns1.runs.should == 599
+    game.inns1.wickets.should == 6
+    game.inns1.declared.should == true
+    game.inns2.team.should == "BAN"
+    game.inns2.runs.should == 296
+    game.inns2.wickets.should == 10
+    game.inns3.team.should == "ENG"
+    game.inns4.team.should == "BAN"
+  end
+
   private
 
   def fixture(number)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cricinfo
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Andrew S Williams
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 +10:30
+date: 2010-07-14 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        - 3
         version: 2.3.3
-    version: 
+  type: :development
+  version_requirements: *id001
 description: An interface to cricinfo.com game data (current games only).
 email: 
 - sobakasu@gmail.com
@@ -37,6 +49,7 @@ files:
 - ./Manifest.txt
 - ./README.rdoc
 - ./Rakefile
+- ./bin/cricinfo
 - ./lib/cricinfo/game.rb
 - ./lib/cricinfo/innings.rb
 - ./lib/cricinfo/scores.rb
@@ -63,21 +76,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: cricinfo
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An interface to cricinfo.com game data (current games only).