dragongoserver 0.0.1 → 0.0.3

data/History.txt

@@ -1,4 +1,9 @@
-== 0.0.1 2007-08-28
-
+== 0.0.3 2008-01-01
+* 1 enhancement:
+  * new option -ml/--missing-loop in dgs script
+== 0.0.2 2007-12-29
+* 1 bug-fix:
+  * missing file dragongoserver/dragongoserver.rb fixed
+== 0.0.1 2007-12-29
 * 1 major enhancement:
   * Initial release

data/Manifest.txt

@@ -7,6 +7,7 @@ bin/dgs
 config/hoe.rb
 config/requirements.rb
 lib/dragongoserver.rb
+lib/dragongoserver/dragongoserver.rb
 lib/dragongoserver/version.rb
 log/debug.log
 script/destroy

data/bin/dgs

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'lib/dragongoserver/version'
-require 'lib/dragongoserver/dragongoserver'
+require 'dragongoserver'
 require 'choice'
 
 version = Dragongoserver::VERSION::STRING
-#oputs "dgs 0.1.0"
 Choice.options do
   header ''
   header 'Specific options:'
@@ -36,10 +34,24 @@ Choice.options do
     desc 'Show waiting games'
   end
 
+  option :waitingloop do
+    short '-wl'
+    long '--waiting-loop'
+    desc 'Show waiting games in an intelligent endless loop'
+  end
+
+  option :running do
+    short '-r'
+    long '--running'
+    desc 'Show running games'
+  end
+
 end
 
 #p Choice.choices
 opt_waiting = Choice.choices['waiting'] # true/false
+opt_running = Choice.choices['running'] # true/false
+opt_waitingloop = Choice.choices['waitingloop'] # true/false
 if opt_waiting
   dgs = Dgs.new
   waiting_games = dgs.waiting_games
@@ -48,3 +60,106 @@ if opt_waiting
     puts game_id
   }
 end
+if opt_running
+  dgs = Dgs.new
+  running_games = dgs.running_games
+  if running_games.size > 0
+    puts "you have a total of #{running_games.size} running games"
+    puts "running games:"
+    running_games.each { |game_id|
+      puts game_id
+    }
+  else
+    puts "you have no running games"
+  end
+end
+ def plural(n)
+   if n == 1
+     ""
+   else
+     "s"
+   end
+end
+   def neue_zuege?(dgs)
+
+      w = dgs.waiting_games
+p w
+      #if dgs.waiting_games.size > 0 # @page.body.include?(NO_GAMES)
+      if w.size > 0 # @page.body.include?(NO_GAMES)
+        true
+      else
+        false
+      end
+    end
+
+  def dringende_zuege(dgs=nil)
+    false # TODO:
+  end
+
+  $nur_dringende = false # TODO:
+  $min_secs = 60*1
+  $secs = $min_secs
+  $count = 0
+
+  def schleife
+    dgs = Dgs.new
+    # dgs.login
+    #page = dgs.page
+    $dringend = false
+    changes = false
+    if $nur_dringende 
+      if dringende_zuege?(dgs)
+        $dringend = true
+        changes = true
+      else
+        changes = false
+      end
+    elsif neue_zuege? dgs
+      changes = true
+    else
+      # puts "keine neuen Zuege"
+      puts "no waiting moves"
+      #
+    end
+    if changes
+      $count = 0
+      # puts "neue Zuege, neue Methode"
+      puts "waiting games"
+      $secs = $secs / 2
+      if $secs < $min_secs
+        $secs = $min_secs
+      end
+      # puts "vermindere Abfrageintervall auf #{$secs} Sekunden(n)"
+      puts "decreasing request interval to #{$secs} seconds"
+      # puts "neue Zuege"
+      puts "waiting games"
+      if $dringend
+        $osd.puts("DRINGENDE Spiele")
+      end
+      # puts("Deine Mitspieler bei Dragon Go Server warten auf deine Spielzuege")
+      puts("Your opponents at Dragon Go Server are waiting for your moves")
+      #-- $osd.puts("Deine Mitspieler bei Dragon Go Server warten auf deine Spielzuege")
+      #-- $osd.flush
+    else
+      $count+=1
+      if $count >= 3
+        $secs = $secs*2
+      #  puts "erhoehe Abfrageintervall auf #{$secs} Sekunden(n)"
+      puts "increasing request interval to #{$secs} seconds"
+        $count = 0
+      end
+    end
+  end
+if opt_waitingloop
+  while 1
+    # $osd = IO.popen("osd_cat -p middle -f -adobe-helvetica-*-*-*-*-24-*-*-*-    *-*-*-* -s 3 -S lightgray --delay=60","w+")
+    #-- $osd = IO.popen("osd_cat -p middle -f -sony-fixed-medium-*-normal-*-24-*-*    -*-*-*-*-* -s 3 -S lightgray --delay=60","w+")
+    schleife
+    #-- $osd.close_write
+    #-- $osd.close
+    # puts "warte #{$secs} Sekunden (#{$secs/60} Minuten)"
+    puts "waiting #{$secs} seconds (#{$secs/60} minute#{plural($secs/60)})"
+    sleep($secs)
+ end
+
+end

data/lib/dragongoserver.rb

@@ -1,7 +1,7 @@
 # $:.unshift File.dirname(__FILE__)
 
-#module Dragongoserver
-#end
+module Dragongoserver
+end
 
-require 'dragongoserver/version.rb'
-require 'dragongoserver/dragongoserver.rb'
+require 'dragongoserver/version'
+require 'dragongoserver/dragongoserver'

data/lib/dragongoserver/dragongoserver.rb

@@ -0,0 +1,145 @@
+require 'rubygems'
+require 'mechanize'
+require 'gorank'
+
+class Dgs
+  LOGGED_IN="Sorry, you have to be logged in to do that"
+  YOUR_TURN="Your turn to move in the following games"
+  DGS_STATUS_PAGE = 'http://www.dragongoserver.net/status.php/'
+  DGS_INDEX_PAGE  = 'http://www.dragongoserver.net/index.php'
+  USER_AGENT_ALIAS = 'Mac Safari' # should work with every browser type
+
+  attr_reader :username
+
+  def initialize(username=nil,password=nil)
+    @username = username
+    @password = password
+    if @username == nil or @password == nil
+       @username = ENV['DGS_USERNAME']
+       @password = ENV['DGS_PASSWORD']
+       if @username == nil or @password == nil
+         raise "username and/or password not set"
+       end
+    end
+  end
+
+  def waiting_games
+    games = []
+    @home = DGS_STATUS_PAGE
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = USER_AGENT_ALIAS
+
+    page = agent.get(@home)
+    if page.body.include?(LOGGED_IN)
+      # dann erst zum Einloggen gehen
+      page = login(agent)
+    end
+
+    # muss kommen, sonst sind wir noch nicht auf der richtigen Seite
+    if !page.body.include?(YOUR_TURN)
+      raise "PageError: #{DGS_STATUS_PAGE} not found"
+    end
+    page.body.each {|line|
+      if line =~ /gid=([0-9]+)"/
+        games << $1.to_i
+      end
+    }
+    # aus Bequemlichkeitsgruenden (gid= kommt mehrfach vor): uniq    
+    games.uniq
+  end
+
+# http://www.dragongoserver.net/show_games.php?uid=10737
+  def running_games
+    games = []
+    @home = 'http://www.dragongoserver.net/show_games.php?uid=10737' #TODO:
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = USER_AGENT_ALIAS
+
+    page = agent.get(@home)
+    if page.body.include?(LOGGED_IN)
+      page = login(agent)
+    end
+
+    if !page.body.include?(YOUR_TURN)
+      raise "PageError: #{DGS_STATUS_PAGE} not found"
+    end
+
+    page = agent.click page.links.text('Show running games')
+    page.body.each {|line|
+      if line =~ /gid=([0-9]+)"/
+        games << $1.to_i
+      end
+    }
+    # aus Bequemlichkeitsgruenden (gid= kommt mehrfach vor): uniq    
+    games.uniq
+  end
+
+  def get_rank
+    @home = DGS_STATUS_PAGE
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = USER_AGENT_ALIAS
+
+    page = agent.get(@home)
+    if page.body.include?(LOGGED_IN)
+      page = login(agent)
+    end
+
+    if !page.body.include?(YOUR_TURN)
+      raise "PageError: #{DGS_STATUS_PAGE} not found"
+    end
+    a = show_regexp(page.body, /(\d+)&nbsp;(kyu|dan)/)
+    num = a[0]
+    what = a[1].to_sym
+    myRank = GoRank.new num, what
+    myRank
+  end
+
+  def userid
+    @home = DGS_STATUS_PAGE
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = USER_AGENT_ALIAS
+
+    page = agent.get(@home)
+    if page.body.include?(LOGGED_IN)
+      page = login(agent)
+    end
+
+    if !page.body.include?(YOUR_TURN)
+      raise "PageError: #{DGS_STATUS_PAGE} not found"
+    end
+    # Link 'http://www.dragongoserver.net/ratinggraph.php?uid=10737'
+    # enthaelt die Userid
+    #p page.links
+    page.links.each { |link|
+      if link.href =~ /ratinggraph/
+        p link
+        a = show_regexp(link.href, /^ratinggraph.php\?uid=(\d+)$/)
+        @userid = a[0].to_i
+        break
+      end
+    }
+    @userid
+  end
+
+private
+
+  def show_regexp(a, re)
+    if a =~ re
+      return ["#$1", "#$2"]
+    else
+      "no match"
+    end
+  end
+
+  def login(agent)
+    @home = DGS_INDEX_PAGE
+    page = agent.get(@home)
+    form = page.forms.with.name("loginform").first
+    form.fields.find {|f| f.name == 'userid'}.value = @username
+    form.fields.find {|f| f.name == 'passwd'}.value = @password
+    page = agent.submit(form, form.buttons.first)
+    return page
+  end
+
+
+end

data/lib/dragongoserver/version.rb

@@ -2,7 +2,7 @@ module Dragongoserver #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_dragongoserver.rb

@@ -48,6 +48,11 @@ class TestDragongoserver < Test::Unit::TestCase
     assert_equal zlist.uniq, zlist
   end
 
+  def test_bug_duplicate_numbers_running_games
+    zlist = @dgs.running_games
+    assert_equal zlist.uniq, zlist
+  end
+
   def test_running_games
     zlist = @dgs.running_games
     assert zlist.kind_of?(Array)
@@ -55,8 +60,8 @@ class TestDragongoserver < Test::Unit::TestCase
 
   # programm 'dgs' should be found
   def test_bin_dgs_version
-    assert_equal "dgs 0.0.1\n", `#{BIN_PREFIX}dgs -v`  
-    assert_equal "dgs 0.0.1\n", `#{BIN_PREFIX}dgs --version`  
+    assert_equal "dgs " + Dragongoserver::VERSION::STRING + "\n", `#{BIN_PREFIX}dgs -v`  
+    assert_equal "dgs " + Dragongoserver::VERSION::STRING + "\n", `#{BIN_PREFIX}dgs --version`  
   end
 
   # test waiting moves for me
@@ -68,4 +73,29 @@ class TestDragongoserver < Test::Unit::TestCase
   def test_dgs_userid
     assert_equal MY_USERID, @dgs.userid, "userid should be #{MY_USERID}"
   end
+  
+  # test my running games
+  def test_bin_dgs_running
+    expected = "you have a total of 29 running games
+366511
+372651
+366534
+340021
+244839
+366494
+369415
+369412
+369306
+369303
+366535"
+
+    assert_equal expected, `#{BIN_PREFIX}dgs -r`
+    assert_equal expected, `#{BIN_PREFIX}dgs -running`
+  end
+
+  def test_bin_dgs_add_game
+    assert_equal "Games was added to the waitingroom", `#{BIN_PREFIX}dgs --add-game`
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragongoserver
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-29 00:00:00 +01:00
+date: 2008-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/dragongoserver.rb
+- lib/dragongoserver/dragongoserver.rb
 - lib/dragongoserver/version.rb
 - log/debug.log
 - script/destroy