jkf 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365393f77c09c5ca61d79d520d1e8700449f66b9c5f8dd98f3c533d08b5205d6
-  data.tar.gz: de3a842b9d14005cfff7e9e4d41129b58d0fd9713b91def327e3e579c227498c
+  metadata.gz: e28e629f7c141b7493f9a9e978f6339b8e5730b9fc1539ce7617fe3847e96da6
+  data.tar.gz: 16766fef773477ba942d1832e1d40b94328b4006177e8871c15874133688d059
 SHA512:
-  metadata.gz: 290f7bd7bec9ccf530ae186a6ee5293827be45fb4b9c3e719d355044b00695d3656e62fd47111d7a7c031ed007d369b51f45518ba48b71a9e80b82dba2b093db
-  data.tar.gz: c6d9965c4d109352d9fab43dbc17647ded822e02ea24ff41755194c70f8523d7636b43b04df891e127d070bf235c93a63815749adda2b0780260f66778122442
+  metadata.gz: 9540ce1699ffa3ca96b1e56ed58fd1b9495b084e61d2c548896f689f46ad50d169cf56f775b9091ab7b968d0541b29f2f6f4934bf48e62d2bcba70a274c688b6
+  data.tar.gz: 2fd77c3f1183380b7819d7946c1b4cd6b897b089e5714fa7ca8f50da9205cce3c4493b1fecca359b84b9213c123a8a49a198869544c45350afb5588b6205673e

data/.dir-locals.el

@@ -0,0 +1,4 @@
+;;; Directory Local Variables            -*- no-byte-compile: t -*-
+;;; For more information see (info "(emacs) Directory Variables")
+
+((nil . ((grep-find-ignored-directories . ("coverage")))))

data/.github/workflows/release.yaml

@@ -0,0 +1,31 @@
+# https://guides.rubygems.org/trusted-publishing/releasing-gems/
+name: Release
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
+
+    environment: release
+
+    steps:
+      # Set up
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 0.5.4 - 2026-05-02
+
+Revert project links.
+Enable Trusted Publishing.
+
+## 0.5.3 - 2025-07-21
+
+Update project links.
+
 ## 0.5.2 - 2024-10-26
 
 This is a maintenance release.

data/Gemfile

@@ -2,21 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake'
-
 group :development do
-  gem 'redcarpet'
   gem 'yard'
-
-  gem 'guard-rubocop'
-  gem 'rubocop', '~> 1.63'
-  gem 'rubocop-performance'
-  gem 'rubocop-rake', '~> 0.6.0'
-  gem 'rubocop-rspec', '~> 3.1'
 end
 
 group :test do
-  gem 'guard-rspec'
   gem 'rspec', '~> 3.0'
   gem 'simplecov'
 end

data/LICENSE.txt

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2016 iyuuya
+Copyright (c) 2025 gemmaro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,5 @@
 # jkf gem
 
-[![Gem Version](https://badge.fury.io/rb/jkf.svg)](https://badge.fury.io/rb/jkf) [![Build Status](https://travis-ci.org/iyuuya/jkf.svg?branch=master)](https://travis-ci.org/iyuuya/jkf) [![CI](https://github.com/iyuuya/jkf/actions/workflows/ci.yml/badge.svg)](https://github.com/iyuuya/jkf/actions/workflows/ci.yml)
-
 jkf gemは[JSON棋譜フォーマット (JKF)][jkf]をRubyに移植したものです。
 柿木形式（[棋譜ファイル KIF 形式][kakinoki]、KI2）、[CSA標準棋譜ファイル形式][csa]の構文解析とJKFへの変換、JKFからKIF, KI2, CSAへの変換に対応しています。
 
@@ -55,9 +53,9 @@ csa = csa_converter.convert(jkf) #=> String
 
 ## 貢献
 
-バグレポートやプルリクエストは[GitHubのリポジトリ][repo]でよろしくお願いします。
+バグレポートやプルリクエストは[リポジトリ][repo]でよろしくお願いします。
 
-[repo]: https://github.com/iyuuya/jkf
+[repo]: https://github.com/gemmaro/jkf
 
 Guixで開発されている場合は`guix shell`で`rake test`によるテスト実行ができます。
 
@@ -68,6 +66,12 @@ POTファイルの生成には`rdoc --format pot`とします。
 このPOTファイルから各言語のPOファイルを初期化できます。
 例えば`msginit -i doc/rdoc.pot -o po/en.rdoc.po --locale en_US.UTF-8`です。
 
+## 謝辞
+
+このプロジェクトは[GitHubのiyuuya/jkf](https://github.com/iyuuya/jkf)を元にしています。
+そこから[GitHubのgemmaro/jkf](https://github.com/gemmaro/jkf)にフォークされました。
+現在の開発はこのGitHubリポジトリに移っています（一時期[SourceForge](https://sourceforge.net/projects/ruby-jkf/)を試していましたがTrusted PublishingのためにGitHubに戻します）。
+
 ## 利用許諾
 
 ライセンスは[MIT License][mit]です。

data/jkf.gemspec

@@ -5,12 +5,12 @@ require 'jkf/version'
 Gem::Specification.new do |spec|
   spec.name = 'jkf'
   spec.version = Jkf::VERSION
-  spec.authors = ['iyuuya', 'gemmaro']
+  spec.authors = %w[iyuuya gemmaro]
   spec.email = ['i.yuuya@gmail.com', 'gemmaro.dev@gmail.com']
 
   spec.summary = 'Shogi formats parser and converter'
-  spec.description = 'The jkf gem provides parsers and converters (generaters) for several shogi formats.'
-  spec.homepage = 'https://github.com/iyuuya/jkf'
+  spec.description = 'The jkf gem provides parsers and converters (generaters) for several shogi formats, including json-kifu-format, KIF, KI2, and CSA.'
+  spec.homepage = 'https://github.com/gemmaro/jkf'
   spec.license = 'MIT'
 
   spec.required_ruby_version = '>= 3.0'
@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
     'rubygems_mfa_required' => 'true',
     'documentation_uri' => 'https://www.rubydoc.info/gems/jkf'
   }
+
+  spec.add_development_dependency "rake"
 end

data/lib/jkf/converter/base.rb

@@ -3,7 +3,7 @@ module Jkf
     # Base of Converter
     class Base
       # start convert
-      # 
+      #
       # @param [String, Hash] jkf
       # @return [String] kif or ki2 or csa text
       def convert(jkf)

data/lib/jkf/converter/csa.rb

@@ -8,38 +8,34 @@ module Jkf
 
       def convert_root(jkf)
         result = version
-        result += convert_information(jkf['header']) if jkf['header']
-        result += convert_initial(jkf['initial']) if jkf['initial']
-        result += convert_moves(jkf['moves']) if jkf['moves']
+        result << convert_information(jkf['header']) if jkf['header']
+        result << convert_initial(jkf['initial']) if jkf['initial']
+        result << convert_moves(jkf['moves']) if jkf['moves']
         result
       end
 
       def convert_information(header)
         result = ''
-        if header['先手'] || header['下手']
-          result += 'N+' + (header.delete('先手') || header.delete('下手') || '') + "\n"
-        end
-        if header['後手'] || header['上手']
-          result += 'N-' + (header.delete('後手') || header.delete('上手') || '') + "\n"
-        end
-        header.each { |(k, v)| result += "$#{csa_header_key(k)}:#{v}\n" }
+        result << 'N+' + (header.delete('先手') || header.delete('下手') || '') + "\n" if header['先手'] || header['下手']
+        result << 'N-' + (header.delete('後手') || header.delete('上手') || '') + "\n" if header['後手'] || header['上手']
+        header.each { |(k, v)| result << "$#{csa_header_key(k)}:#{v}\n" }
         result
       end
 
       def convert_initial(initial)
         result = ''
         data = initial['data'] || {}
-        result += if initial['preset'] == 'OTHER'
+        result << if initial['preset'] == 'OTHER'
                     convert_board(data['board'])
                   else
                     convert_preset(initial['preset'])
                   end
         # 持駒
         if data['hands']
-          result += convert_hands(data['hands'], 0)
-          result += convert_hands(data['hands'], 1)
+          result << convert_hands(data['hands'], 0)
+          result << convert_hands(data['hands'], 1)
         end
-        result += csa_color(data['color']) + "\n" if data['color']
+        result << csa_color(data['color']) + "\n" if data['color']
         result
       end
 
@@ -48,9 +44,9 @@ module Jkf
         sum = 0
         hands[color].each_value { |n| sum += n }
         if sum > 0
-          result += "P#{csa_color(color)}"
-          hands[color].to_a.reverse_each { |(k, v)| v.times { result += "00#{k}" } }
-          result += "\n"
+          result << "P#{csa_color(color)}"
+          hands[color].to_a.reverse_each { |(k, v)| v.times { result << "00#{k}" } }
+          result << "\n"
         end
         result
       end
@@ -60,14 +56,15 @@ module Jkf
         before_pos = nil
         moves.each do |move|
           next if move == {}
-          result += convert_move(move['move'], before_pos) if move['move']
-          result += convert_special(move['special'], move['color']) if move['special']
+
+          result << convert_move(move['move'], before_pos) if move['move']
+          result << convert_special(move['special'], move['color']) if move['special']
           if move['time']
-            result += ',' + convert_time(move['time'])
+            result << ',' + convert_time(move['time'])
           elsif move['move'] || move['special']
-            result += "\n"
+            result << "\n"
           end
-          result += convert_comments(move['comments']) if move['comments']
+          result << convert_comments(move['comments']) if move['comments']
           before_pos = move['move']['to'] if move['move'] && move['move']['to']
         end
         result
@@ -75,8 +72,8 @@ module Jkf
 
       def convert_move(move, before_pos)
         result = csa_color(move['color'])
-        result += move['from'] ? pos2str(move['from']) : '00'
-        result += if move['to']
+        result << (move['from'] ? pos2str(move['from']) : '00')
+        result << if move['to']
                     pos2str(move['to']) + move['piece']
                   else
                     pos2str(before_pos) + move['piece']
@@ -86,8 +83,8 @@ module Jkf
 
       def convert_special(special, color = nil)
         result = '%'
-        result += csa_color(color) if color
-        result + special
+        result << csa_color(color) if color
+        result << special
       end
 
       def convert_time(time)
@@ -102,22 +99,22 @@ module Jkf
       def convert_board(board)
         result = ''
         9.times do |y|
-          result += "P#{y + 1}"
+          result << "P#{y + 1}"
           9.times do |x|
             piece = board[8 - x][y]
-            result += if piece == {}
+            result << if piece == {}
                         ' * '
                       else
                         csa_color(piece['color']) + piece['kind']
                       end
           end
-          result += "\n"
+          result << "\n"
         end
         result
       end
 
       def convert_preset(preset)
-        'PI' + PRESET_NAME_TO_CSA_MAPPING[preset]
+        'PI' << PRESET_NAME_TO_CSA_MAPPING[preset]
       end
 
       PRESET_NAME_TO_CSA_MAPPING = {
@@ -144,7 +141,7 @@ module Jkf
       end
 
       def pos2str(pos)
-        '%d%d' % [pos['x'], pos['y']]
+        format('%d%d', pos['x'], pos['y'])
       end
 
       def version

data/lib/jkf/converter/ki2.rb

@@ -11,13 +11,13 @@ module Jkf
         setup_players!(jkf)
 
         result = ''
-        result += convert_header(jkf['header']) if jkf['header']
-        result += convert_initial(jkf['initial']) if jkf['initial']
-        result += @header2.join + "\n"
-        result += convert_moves(jkf['moves']) if jkf['moves']
+        result << convert_header(jkf['header']) if jkf['header']
+        result << convert_initial(jkf['initial']) if jkf['initial']
+        result << @header2.join + "\n"
+        result << convert_moves(jkf['moves']) if jkf['moves']
         unless @forks.empty?
-          result += "\n"
-          result += @forks.join("\n")
+          result << "\n"
+          result << @forks.join("\n")
         end
 
         result
@@ -53,22 +53,22 @@ module Jkf
         moves.each_with_index do |move, i|
           if move['special']
             # first_board+speical分を引く(-2)
-            result += convert_special_and_split(move, i + idx - 2)
+            result << convert_special_and_split(move, i + idx - 2)
           else
-            result += before_split
+            result << before_split
             if move['move']
               j += 1
               result_move, before_split = convert_move_and_split(move, j)
-              result += result_move
+              result << result_move
             end
 
             if move['comments']
               unless result.end_with?("\n") || result.empty?
-                result += "\n"
+                result << "\n"
                 before_split = ''
                 j = 0
               end
-              result += convert_comments(move['comments'])
+              result << convert_comments(move['comments'])
             end
 
             @forks.unshift convert_forks(move['forks'], i + idx) if move['forks']
@@ -93,8 +93,8 @@ module Jkf
 
       def convert_move(move)
         result = move['color'] == 0 ? '▲' : '△'
-        result += convert_piece_with_pos(move)
-        result += csa2relative(move['relative']) if move['relative']
+        result << convert_piece_with_pos(move)
+        result << csa2relative(move['relative']) if move['relative']
         result
       end
 

data/lib/jkf/converter/kif.rb

@@ -11,14 +11,14 @@ module Jkf
         setup_players!(jkf)
 
         result = ''
-        result += convert_header(jkf['header'], jkf) if jkf['header']
-        result += convert_initial(jkf['initial']) if jkf['initial']
-        result += @header2.join
-        result += "手数----指手---------消費時間--\n"
-        result += convert_moves(jkf['moves'])
+        result << convert_header(jkf['header'], jkf) if jkf['header']
+        result << convert_initial(jkf['initial']) if jkf['initial']
+        result << @header2.join
+        result << "手数----指手---------消費時間--\n"
+        result << convert_moves(jkf['moves'])
         unless @forks.empty?
-          result += "\n"
-          result += @forks.join("\n")
+          result << "\n"
+          result << @forks.join("\n")
         end
 
         result
@@ -46,10 +46,10 @@ module Jkf
         result = ''
         moves.each_with_index do |move, i|
           if move['special']
-            result += convert_special_line(move, i + idx)
+            result << convert_special_line(move, i + idx)
           else
-            result += convert_move_line(move, i + idx) if move['move']
-            result += convert_comments(move['comments']) if move['comments']
+            result << convert_move_line(move, i + idx) if move['move']
+            result << convert_comments(move['comments']) if move['comments']
             @forks.unshift convert_forks(move['forks'], i + idx) if move['forks']
           end
         end
@@ -57,26 +57,26 @@ module Jkf
       end
 
       def convert_move_line(move, index)
-        result = '%4d ' % [index]
-        result += convert_move(move['move'])
-        result += convert_time(move['time']) if move['time']
-        result += '+' if move['forks']
-        result + "\n"
+        result = format('%4d ', index)
+        result << convert_move(move['move'])
+        result << convert_time(move['time']) if move['time']
+        result << '+' if move['forks']
+        result << "\n"
       end
 
       def convert_special_line(move, index)
-        result = '%4d ' % [index]
-        result += ljust(special2kan(move['special']), 13)
-        result += convert_time(move['time']) if move['time']
-        result += '+' if move['forks']
-        result += "\n"
+        result = format('%4d ', index)
+        result << ljust(special2kan(move['special']), 13)
+        result << convert_time(move['time']) if move['time']
+        result << '+' if move['forks']
+        result << "\n"
         # first_board+speical分を引く(-2)
-        result + convert_special(move['special'], index - 2)
+        result << convert_special(move['special'], index - 2)
       end
 
       def convert_move(move)
         result = convert_piece_with_pos(move)
-        result += if move['from']
+        result << if move['from']
                     "(#{pos2str(move['from'])})"
                   else
                     '打'
@@ -85,13 +85,8 @@ module Jkf
       end
 
       def convert_time(time)
-        '(%2d:%02d/%02d:%02d:%02d)' % [
-          time['now']['m'],
-          time['now']['s'],
-          time['total']['h'],
-          time['total']['m'],
-          time['total']['s']
-        ]
+        format('(%2d:%02d/%02d:%02d:%02d)', time['now']['m'], time['now']['s'], time['total']['h'], time['total']['m'],
+               time['total']['s'])
       end
 
       def special2kan(special)
@@ -119,7 +114,7 @@ module Jkf
       end
 
       def pos2str(pos)
-        '%d%d' % [pos['x'], pos['y']]
+        format('%d%d', pos['x'], pos['y'])
       end
     end
   end

data/lib/jkf/converter/kifuable.rb

@@ -10,16 +10,16 @@ module Jkf
 
         data = initial['data']
         if data
-          result += convert_teban(data, 1)
+          result << convert_teban(data, 1)
           if (hands = data['hands'])
-            result += convert_hands(hands, 1) if hands[1]
-            footer += convert_hands(hands, 0) if hands[0]
+            result << convert_hands(hands, 1) if hands[1]
+            footer << convert_hands(hands, 0) if hands[0]
           end
-          footer += convert_teban(data, 0)
+          footer << convert_teban(data, 0)
 
-          result += convert_board(data['board']) if data['board']
+          result << convert_board(data['board']) if data['board']
         end
-        result + footer
+        result << footer
       end
 
       def convert_handicap(preset)
@@ -39,12 +39,12 @@ module Jkf
         9.times do |y|
           line = '|'
           9.times do |x|
-            line += convert_board_piece(board[8 - x][y])
+            line << convert_board_piece(board[8 - x][y])
           end
-          line += "|#{n2kan(y + 1)}\n"
-          result += line
+          line << "|#{n2kan(y + 1)}\n"
+          result << line
         end
-        result + "+---------------------------+\n"
+        result << "+---------------------------+\n"
       end
 
       def convert_comments(comments)
@@ -56,9 +56,9 @@ module Jkf
           if num > 0
             str = csa2kind(piece)
             if num > 1
-              str += n2kan(num / 10) if num / 10 > 0
+              str << n2kan(num / 10) if num / 10 > 0
               num %= 10
-              str += n2kan(num)
+              str << n2kan(num)
             end
             str
           end
@@ -71,8 +71,8 @@ module Jkf
         if piece == {}
           result = ' ・'
         else
-          result += piece['color'] == 0 ? ' ' : 'v'
-          result += csa2kind(piece['kind'])
+          result << (piece['color'] == 0 ? ' ' : 'v')
+          result << csa2kind(piece['kind'])
         end
 
         result
@@ -83,13 +83,13 @@ module Jkf
 
         if special == 'TORYO' || special.include?('ILLEGAL')
           turn = @players[index % 2]
-          result += "で#{turn}手の"
-          result += { 'TORYO' => '勝ち',
+          result << "で#{turn}手の"
+          result << { 'TORYO' => '勝ち',
                       'ILLEGAL_ACTION' => '反則勝ち',
                       'ILLEGAL_MOVE' => '反則負け' }[special]
         else
           turn = @players[(index + 1) % 2]
-          result += case special
+          result << case special
                     when 'TIME_UP' then "で時間切れにより#{turn}手の勝ち"
                     when 'CHUDAN' then 'で中断'
                     when 'JISHOGI' then 'で持将棋'
@@ -99,7 +99,7 @@ module Jkf
                     end
         end
 
-        result + "\n"
+        result << "\n"
       end
 
       def convert_piece_with_pos(move)
@@ -108,16 +108,16 @@ module Jkf
                  elsif move['same']
                    '同　'
                  end
-        result += csa2kind(move['piece'])
-        result += '成' if move['promote']
+        result << csa2kind(move['piece'])
+        result << '成' if move['promote']
         result
       end
 
       def convert_forks(forks, index)
         result = "\n"
-        result = "変化：%4d手\n" % [index] # ki2の場合\nなし
+        result = format("変化：%4d手\n", index) # ki2の場合\nなし
         forks.each do |moves|
-          result += convert_moves(moves, index)
+          result << convert_moves(moves, index)
         end
         result
       end
@@ -131,9 +131,9 @@ module Jkf
         players_flag = :sengo
         jkf['header']&.keys&.detect { |key| key =~ /[上下]手/ } && players_flag = :uwasimo
         @players = if players_flag == :uwasimo
-                     ['下', '上']
+                     %w[下 上]
                    else
-                     ['先', '後']
+                     %w[先 後]
                    end
       end
 

data/lib/jkf/parser/base.rb

@@ -30,7 +30,7 @@ module Jkf
         @result != :failed
       end
 
-      def failed?; !success?; end
+      def failed? = !success?
 
       def match_regexp(reg)
         matched = @scanner.scan(reg)