コミット: 3ffaeead65a729c5d6203eaf2a56050c3269402b - shogi-server (git)

shogi-server source

コミットメタ情報

• リビジョン: 3ffaeead65a729c5d6203eaf2a56050c3269402b (tree)
• 日時: 2014-12-13 16:28:41
• 作者: Daigo Moriwaki <daigo@debi...>
• コミッター: Daigo Moriwaki

ログメッセージ

Merge remote-tracking branch 'origin/wdoor-stable'

Conflicts:
changelog

変更サマリ

• modified: changelog
• modified: csa-file-filter
• modified: mk_game_results
• modified: mk_html
• modified: mk_rate
• modified: shogi-server
• modified: shogi-server-profile
• modified: shogi_server/login.rb
• modified: test/baseclient.rb
• modified: utils/statistics.rb
• modified: webserver

差分

--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
[phone]  Daigo Moriwaki <daigo at debian dot org>
+
+	* Ruby 2.0:
+	  - Ruby 2.0.0 or later is recommended to use with shogi-server
+	    since Ruby 1.8 reached its End-of-Life on the end of July, 2014.
+	* [shogi-server]
+	  - Addressed a warning of duplicated range in a regular expression.
+
 2014-10-13  Daigo Moriwaki <daigo at debian dot org>
 
 	* [shogi-server]

--- a/csa-file-filter
+++ b/csa-file-filter
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 # $Id$
 #
 # Author:: Daigo Moriwaki
@@ -50,9 +50,9 @@
 # 
 # Sample Command lines that isntall prerequires will work on Debian.
 # 
-# * Ruby 1.9.3 or 1.8.7 including RDoc
+# * Ruby 2.0.0 or later including RDoc
 # 
-#   $ sudo aptitude install ruby ruby1.9.1
+#   $ sudo aptitude install ruby ruby
 # 
 # == Example
 #

--- a/mk_game_results
+++ b/mk_game_results
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 # $Id$
 #
 # Author:: Daigo Moriwaki
@@ -35,9 +35,9 @@
 #
 # Sample Command lines that isntall prerequires will work on Debian.
 #
-# * Ruby 1.9.3 or 1.8.7
+# * Ruby 2.0.0 or later
 #
-#   $ sudo aptitude install ruby1.9.1
+#   $ sudo aptitude install ruby
 #
 # == Run
 #

--- a/mk_html
+++ b/mk_html
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 # $Id$
 #
 # Author:: Daigo Moriwaki
@@ -41,9 +41,9 @@
 #
 # == Prerequire
 #
-# * Ruby 1.9.3 or 1.8.7
+# * Ruby 2.0.0 or later
 #
-#   $ sudo aptitude install ruby ruby1.9.1
+#   $ sudo aptitude install ruby ruby
 #
 # == Example
 #

--- a/mk_rate
+++ b/mk_rate
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 # $Id$
 #
 # Author:: Daigo Moriwaki
@@ -76,9 +76,9 @@
 #
 # Sample Command lines that install prerequires will work on Debian.
 #
-# * Ruby 1.9.3 or 1.8.7 (including Rubygems)
+# * Ruby 2.0.0 or later (including Rubygems)
 #
-#   $ sudo aptitude install ruby1.9.1
+#   $ sudo aptitude install ruby
 #
 # * Ruby bindings for the GNU Scientific Library (GSL[http://rb-gsl.rubyforge.org/])
 #
@@ -86,7 +86,7 @@
 #
 # * RGL: {Ruby Graph Library}[http://rubyforge.org/projects/rgl/]
 #
-#   $ sudo gem1.9.1 install rgl
+#   $ sudo gem install rgl
 #
 # == Examples
 #

--- a/shogi-server
+++ b/shogi-server
@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/ruby
 # $Id$
 #
 # Author:: NABEYA Kenichi, Daigo Moriwaki

--- a/shogi-server-profile
+++ b/shogi-server-profile
@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/ruby
 # $Id$
 #
 # Author:: Daigo Moriwaki
@@ -38,7 +38,7 @@
 #
 # * {ruby-prof}[http://rubyforge.org/projects/ruby-prof/]
 #
-#   $ sudo gem1.9.1 install ruby-prof
+#   $ sudo gem install ruby-prof
 #
 # == Run
 #

--- a/shogi_server/login.rb
+++ b/shogi_server/login.rb
@@ -79,7 +79,7 @@ class Login
   end
 
   def Login.good_identifier?(str)
-    if str =~ /\A[\w\d_@\-\.]{1,#{Max_Identifier_Length}}\z/
+    if str =~ /\A[\w@\-\.]{1,#{Max_Identifier_Length}}\z/
       return true
     else
       return false

--- a/test/baseclient.rb
+++ b/test/baseclient.rb
@@ -35,21 +35,25 @@ class SocketPlayer
 
   def reader
     @thread = Thread.new do
-      Thread.pass
-      loop do 
-#        break if @socket.closed?
-        if r = select([@socket], nil, nil, 10)
-          str = r[0].first.gets
-          break if str.nil?
-          @mutex.synchronize do
-            if %r!^[\+\-]\d{4}\w{2},T\d+$! =~ str
-                @received_moves += 1
+      begin
+        Thread.pass
+        loop do 
+          break if @socket.closed?
+          if r = select([@socket], nil, nil, 10)
+            str = r[0].first.gets
+            break if str.nil?
+            @mutex.synchronize do
+              if %r!^[\+\-]\d{4}\w{2},T\d+$! =~ str
+                  @received_moves += 1
+              end
+              @message << str
             end
-            @message << str
+          else
+            raise "timed out"
           end
-        else
-          raise "timed out"
         end
+      rescue IOError
+        $stderr.puts "\nReader thread interrupted"
       end
     end
   end
@@ -123,8 +127,8 @@ class SocketPlayer
   end
 
   def logout
-    stop_reader
     @socket.puts "LOGOUT"
+    @socket.close
   end
 
 end

--- a/utils/statistics.rb
+++ b/utils/statistics.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 # This program shows statistics of CSA kifu files like following: 
 #   - Monthly #games and #players
 #   - Game results

--- a/webserver
+++ b/webserver
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 
 ## Copyright (C) 2007-2012 Daigo Moriwaki <daigo at debian dot org>
 ##