shogi-ruby 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 129ab7f9ea2e8b0576a5f13e10b62d42d3ce7ed4
-  data.tar.gz: 5c914717d7a5d59858dd430f01cb9af3981b59d5
+  metadata.gz: 4320fa829ed79f026c8b76c8f5fd0e2ddcf3c97c
+  data.tar.gz: 3b76644ca595aa8959a7653a64ea2e2ff3f1e775
 SHA512:
-  metadata.gz: be4d6e244dc785666b37505396cf344b5f542b942b075fba215d90e852b145cc0b14194bc4c623303b83e83f1edc4528dad7cd034df0331c1df05f2a99cbae67
-  data.tar.gz: b2dec598efa163be2daf9b803c4d3ca371fa68245018d12199ec8a36ae633ada7f190087d6441f87bdd7aa302d0f673a6e978f0dccd3f0ea7a4552f1520a9c17
+  metadata.gz: a741c74750a5cebfe61b59bf9c3c55e9b5767f5c839153671e16ddcf7dc1d42b064396d535b55f82cc6fefa6c42225be148804d0b18691a1a765dc7fece5b458
+  data.tar.gz: 7403f3f64862a3499b6ed7cc5dc20d0d9d22d5f650022b94cfa129c708db6a89ad069b5728fc61909685473a63b7d517cfa4e842239162eec599ed32e6759e28

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.1
-  - jruby-19mode
+  - 2.3.3
+  - 2.4.1
   - jruby-head
   - rbx-2
   - ruby-head

data/NEWS.ja.md

@@ -1,5 +1,49 @@
 # お知らせ
 
+## 0.1.0: 2017-08-31
+
+### 変更点
+
+* 改良
+  * SFEN（USI）形式の出力をサポートしました。[Shigeaki Matsumuraさんがパッチ提供]
+    * Added `Game#to_usi`.
+    * Added `Game#to_sfen` (the alias of `Game#to_usi`)
+    * Added `Board#to_usi`.
+    * Added `Board#to_sfen`. (the alias of `Board#to_usi`)
+    * Added `Board#usi_captured`.
+    * Added `Board#sfen_captured`. (the alias of `Board#usi_captured`)
+  * Ruby 2.0.0のサポートをやめました。
+* TODO
+  * SFEN（USI）形式の入力（`Board#move_by_usi`）をサポートする
+
+### Thanks
+
+* Shigeaki Matsumuraさん
+
+## 0.0.9: 2016-06-24
+
+### Changes
+
+* Improvements
+  * Improved mevement error detection. [Patch by Shigeaki Matsumura]
+  * Implemented Nifu restriction in `move_by_csa`. [Patch by Toru YAGI]
+
+### Thanks
+
+* Shigeaki Matsumura
+* Toru YAGI
+
+## 0.0.8: 2015-05-31
+
+### Changes
+
+  * Improvements
+    *  Supported Bundler.require (require "shogi-ruby").
+    *  Added Board.register and Cell.register as plugin system.
+    *  Removed a deprecated method `move_from_csa`.
+  * Fixes
+    *  Fixed error messages.
+
 ## 0.0.7: 2013-10-29
 
 ### 変更点

data/NEWS.md

@@ -1,5 +1,25 @@
 # NEWS
 
+## 0.1.0: 2017-08-31
+
+### Changes
+
+* Improvements
+  * Supported SFEN (USI) output. [Patch by Shigeaki Matsumura]
+    * Added `Game#to_usi`.
+    * Added `Game#to_sfen` (the alias of `Game#to_usi`)
+    * Added `Board#to_usi`.
+    * Added `Board#to_sfen`. (the alias of `Board#to_usi`)
+    * Added `Board#usi_captured`.
+    * Added `Board#sfen_captured`. (the alias of `Board#usi_captured`)
+  * Droped Ruby 2.0.0 support.
+* TODO
+  * Support SFEN (USI) input (`Board#move_by_usi`).
+
+### Thanks
+
+* Shigeaki Matsumura
+
 ## 0.0.9: 2016-06-24
 
 ### Changes

data/README.md

@@ -34,7 +34,7 @@ Ruby用の将棋ライブラリです。
 * 行きどころのない駒のチェック
 * 詰みチェック
 * 手番チェック
-* USI形式との相互変換
+* USI形式との相互変換（盤面の出力のみ対応）
 
 ## Installation
 
@@ -52,7 +52,7 @@ Or install it yourself as:
 
 ## Ruby Version
 
-Ruby 2.0.0 or later.
+Ruby 2.1 or later.
 
 ## Usage
 

data/lib/shogi/format/usi/board.rb

@@ -29,6 +29,33 @@ module Shogi
             usi_row
           }.join("/") << "\n"
         end
+        alias_method :to_sfen, :to_usi
+
+        def usi_captured
+          ['+', '-'].map do |prefix|
+            caps = @captured
+                   .select { |x| x[0] == prefix }
+                   .map { |x| x[1..-1] }
+                   .group_by { |x| x }
+                   .map { |w, ws| [w, ws.length] }
+                   .to_h
+            [Piece::HI,
+             Piece::KA,
+             Piece::KI,
+             Piece::GI,
+             Piece::KE,
+             Piece::KY,
+             Piece::FU].map do |type|
+              n = caps[type::CSA_NAME] || 0
+              usi = type::USI_NAME
+              usi = usi.downcase if prefix == '-'
+              "#{n}#{usi}" if n > 0
+            end.join
+          end.join.tap do |x|
+            return '-' if x == ''
+          end
+        end
+        alias_method :sfen_captured, :usi_captured
       end
     end
   end

data/lib/shogi/game.rb

@@ -16,6 +16,13 @@ module Shogi
       @board.to_csa << turn << "\n"
     end
 
+    def to_usi
+      t = @turn == '+' ? 'b' : 'w'
+      next_num = @kifu.size + 1
+      @board.to_usi.chomp + " #{t} #{@board.usi_captured} #{next_num}"
+    end
+    alias_method :to_sfen, :to_usi
+
     def move(movement_lines, format=@default_format)
       movement_lines.each_line do |movement|
         movement.chomp!

data/lib/shogi/version.rb

@@ -1,3 +1,3 @@
 module Shogi
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/shogi-ruby.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("test-unit-rr")
+  spec.add_development_dependency("terminal-notifier")
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
 end

data/test/test-board.rb

@@ -133,28 +133,28 @@ lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL
       @board.move("+2726AA")
     end
     assert_raise Shogi::MoveError do
-      assert_false(@board.move("+2726HI"))
+      @board.move("+2726HI")
     end
     assert_raise Shogi::MoveError do
-      assert_false(@board.move("+2827HI"))
+      @board.move("+2827HI")
     end
     assert_raise Shogi::MovementError do
-      assert_false(@board.move("+2826HI"))
+      @board.move("+2826HI")
     end
     assert_raise Shogi::MoveError do
-      assert_false(@board.move("+2625FU"))
+      @board.move("+2625FU")
     end
     assert_raise Shogi::MovementError do
-      assert_false(@board.move("+2725FU"))
+      @board.move("+2725FU")
     end
     assert_raise Shogi::MoveError do
-      assert_false(@board.move("-4131KI"))
+      @board.move("-4131KI")
     end
     assert_raise Shogi::MovementError do
-      assert_false(@board.move("+8855KA"))
+      @board.move("+8855KA")
     end
     assert_raise Shogi::MovementError do
-      assert_false(@board.move("-1115KY"))
+      @board.move("-1115KY")
     end
 
     assert_nothing_raised do
@@ -178,7 +178,7 @@ P-
     EOT
 
     assert_raise Shogi::MovementError do
-      assert_false(@board.move("+8833UM").move("-2233KA").move("+0016FU"))
+      @board.move("+8833UM").move("-2233KA").move("+0016FU")
     end
   end
 
@@ -243,7 +243,7 @@ P-00KA
     @board.move("+7776FU", :csa)
     @board.move("-3334FU", :csa)
     assert_raise Shogi::MovementError do
-      assert_false(@board.move("+2726TO", :csa))
+      @board.move("+2726TO", :csa)
     end
     assert_nothing_raised do
       @board.move("+8822UM", :csa)

data/test/test-sfen.rb

@@ -0,0 +1,29 @@
+require 'shogi/board'
+require 'stringio'
+
+class SFENTest < Test::Unit::TestCase
+  def test_sfen_1
+    @game = Shogi::Game.new
+    assert_equal('lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL b - 1', @game.to_sfen)
+  end
+
+  def test_sfen_2
+    @game = Shogi::Game.new
+    @game.move('+7776FU', :csa)
+    @game.move('-3334FU', :csa)
+    @game.move('+2726FU', :csa)
+    @game.move('-8384FU', :csa)
+    @game.move('+2625FU', :csa)
+    @game.move('-8485FU', :csa)
+    @game.move('+6978KI', :csa)
+    @game.move('-4132KI', :csa)
+    @game.move('+2524FU', :csa)
+    @game.move('-2324FU', :csa)
+    @game.move('+2824HI', :csa)
+    @game.move('-8586FU', :csa)
+    @game.move('+8786FU', :csa)
+    @game.move('-8286HI', :csa)
+    @game.move('+2434HI', :csa)
+    assert_equal('lnsgk1snl/6gb1/p1pppp2p/6R2/9/1rP6/P2PPPP1P/1BG6/LNS1KGSNL w 3P2p 16', @game.to_sfen)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shogi-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,7 @@ files:
 - test/test-cell.rb
 - test/test-game.rb
 - test/test-piece.rb
+- test/test-sfen.rb
 homepage: https://github.com/myokoym/shogi-ruby
 licenses:
 - MIT
@@ -144,4 +159,4 @@ test_files:
 - test/test-cell.rb
 - test/test-game.rb
 - test/test-piece.rb
-has_rdoc: 
+- test/test-sfen.rb