jkf 0.5.2 → 0.5.3

data/lib/jkf/parser/ki2.rb

@@ -130,7 +130,7 @@ module Jkf
           s3 = parse_result
           s3 = nil if s3 == :failed
           @reported_pos = s0
-          s0 = -> (hd, tl, res) do
+          s0 = lambda do |hd, tl, res|
             tl.unshift(hd)
             tl << { 'special' => res } if res && !tl[tl.length - 1]['special']
             tl
@@ -177,7 +177,7 @@ module Jkf
             s5 = match_space if s5 == :failed
           end
           @reported_pos = s0
-          s0 = -> (line, c) do
+          s0 = lambda do |line, c|
             ret = { 'move' => line }
             ret['comments'] = c unless c.empty?
             ret
@@ -406,6 +406,7 @@ module Jkf
 
         str.gsub(/　$/, '').split('　').each do |kind|
           next if kind.empty?
+
           ret[kind2csa(kind[0])] = kind.length == 1 ? 1 : kan2n2(kind[1..-1])
         end
 

data/lib/jkf/parser/kif.rb

@@ -539,9 +539,7 @@ module Jkf
         end
         transform_root_header_data(ret) if ret['initial'] && ret['initial']['data']
         transform_root_forks(forks, moves)
-        if ret['initial'] && ret['initial']['data'] && ret['initial']['data']['color'] == 1
-          reverse_color(ret['moves'])
-        end
+        reverse_color(ret['moves']) if ret['initial'] && ret['initial']['data'] && ret['initial']['data']['color'] == 1
         ret
       end
 
@@ -600,6 +598,7 @@ module Jkf
 
         str.split(/[ 　]/).each do |kind|
           next if kind.empty?
+
           ret[kind2csa(kind[0])] = kind.length == 1 ? 1 : kan2n2(kind[1..-1])
         end
 
@@ -609,9 +608,7 @@ module Jkf
       # exchange sente gote
       def reverse_color(moves)
         moves.each do |move|
-          if move['move'] && move['move']['color']
-            move['move']['color'] = (move['move']['color'] + 1) % 2
-          end
+          move['move']['color'] = (move['move']['color'] + 1) % 2 if move['move'] && move['move']['color']
           move['forks']&.each { |fork| reverse_color(fork) }
         end
       end

data/lib/jkf/parser/kifuable.rb

@@ -479,7 +479,7 @@ module Jkf
         end
       end
 
-      # nonl : 
+      # nonl :
       def parse_nonl
         match_regexp(/[^\r\n]/)
       end
@@ -517,7 +517,7 @@ module Jkf
           make_hand(ret['header']['先手の持駒'] || ret['header']['下手の持駒']),
           make_hand(ret['header']['後手の持駒'] || ret['header']['上手の持駒'])
         ]
-        %w(先手の持駒 下手の持駒 後手の持駒 上手の持駒).each do |key|
+        %w[先手の持駒 下手の持駒 後手の持駒 上手の持駒].each do |key|
           ret['header'].delete(key)
         end
       end

data/lib/jkf/version.rb

@@ -1,3 +1,3 @@
 module Jkf
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/jkf.rb

@@ -49,6 +49,7 @@ module Jkf
         break
       end
       raise FileTypeError if result.nil?
+
       result
     end
   end

data/manifest.scm

@@ -1,115 +1,17 @@
 (use-modules ((guix licenses)
               #:prefix license:)
              (gnu packages ruby)
+             (gnu packages ruby-check)
+             (gnu packages ruby-xyz)
              (guix build-system ruby)
              (guix download)
-             (guix git)
              (guix packages)
-             (guix git-download))
-
-(define-public ruby-guard-rubocop
-  (package
-    (name "ruby-guard-rubocop")
-    (version "1.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "guard-rubocop" version))
-              (sha256
-               (base32
-                "0lb2fgfac97lvgwqvx2gbcimyvw2a0i76x6yabik3vmmvjbdfh9h"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:tests? #f)) ;TODO
-    (propagated-inputs (list ruby-guard ruby-rubocop))
-    (synopsis
-     "Automatically checks Ruby code style with RuboCop when files are
-modified")
-    (description
-     "@code{Guard::RuboCop} automatically checks Ruby code style with
-RuboCop when files are modified.")
-    (home-page "https://github.com/rubocop/guard-rubocop")
-    (license license:expat)))
-
-(define-public ruby-guard-compat
-  (package
-    (name "ruby-guard-compat")
-    (version "1.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "guard-compat" version))
-              (sha256
-               (base32
-                "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"))
-    (native-inputs (list ruby-rspec ruby-rubocop))
-    (synopsis "Helps creating valid Guard plugins and testing them")
-    (description "guard-compat helps creating valid Guard plugins and testing them.")
-    (home-page "https://github.com/guard/guard-compat")
-    (license license:expat)))
-
-(define-public ruby-gem-isolator
-  (package
-    (name "ruby-gem-isolator")
-    (version "0.2.3")
-    (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/e2/gem_isolator")
-                   (commit "1ec35362d946e682089a3983e7063593231d5188")))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32
-               "1kkg7y2lw2jpdcdw33f2pvz9q14rlnx29l3a2qcwc5smivd03kww"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"
-       #:tests? #f ;FIXME: uninitialized constant Pathname
-       ))
-    (native-inputs (list ruby-rspec ruby-nenv ruby-rubocop))
-    (propagated-inputs (list ruby-dep))
-    (synopsis
-     "Good for testing dependencies of a gem and/or different gem version
-combinations")
-    (description
-     "gem_isolator is good for testing dependencies of a gem and/or
-different gem version combinations.")
-    (home-page "https://github.com/e2/gem_isolator")
-    (license license:expat)))
-
-(define-public ruby-guard-rspec
-  (package
-    (name "ruby-guard-rspec")
-    (version "4.7.3")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "guard-rspec" version))
-              (sha256
-               (base32
-                "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"
-       #:tests? #f ;FIXME: uninitialized constant Bundler
-       ))
-    (native-inputs (list ruby-rubocop ruby-launchy ruby-gem-isolator bundler ruby))
-    (propagated-inputs (list ruby-guard ruby-guard-compat ruby-rspec))
-    (synopsis "Automatically run your specs (much like autotest)")
-    (description
-     "@code{Guard::RSpec} automatically run your specs (much like autotest).")
-    (home-page "https://github.com/guard/guard-rspec")
-    (license license:expat)))
+             (guix git-download)
+             (guix profiles))
 
 (packages->manifest (list ruby-rake
                           ruby-yard
-                          ruby-redcarpet
-                          ruby-rubocop
-                          ruby-guard-rubocop
-                          ruby-rubocop-rake
-                          ruby-rubocop-rspec
                           ruby-rspec
                           ruby-simplecov
                           ruby-benchmark-ips
-                          ruby-rubocop-performance
                           ruby))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jkf
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - iyuuya
@@ -9,10 +9,24 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-26 00:00:00.000000000 Z
-dependencies: []
+date: 2025-07-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
 description: The jkf gem provides parsers and converters (generaters) for several
-  shogi formats.
+  shogi formats, including json-kifu-format, KIF, KI2, and CSA.
 email:
 - i.yuuya@gmail.com
 - gemmaro.dev@gmail.com
@@ -21,23 +35,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".envrc"
-- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.en.md
 - README.md
 - Rakefile
 - bench.rb
-- bin/console
-- bin/setup
 - jkf.gemspec
 - lib/jkf.rb
 - lib/jkf/converter.rb
@@ -58,7 +65,7 @@ files:
 - po/en.po
 - po/en.rdoc.po
 - po4a.cfg
-homepage: https://github.com/iyuuya/jkf
+homepage: https://sourceforge.net/projects/ruby-jkf/
 licenses:
 - MIT
 metadata:
@@ -79,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Shogi formats parser and converter

data/.github/workflows/ci.yml

@@ -1,16 +0,0 @@
-name: CI
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['3.0', '3.1', '3.2']
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - run: bundle exec rake

data/.hound.yml

@@ -1,3 +0,0 @@
-ruby:
-  enabled: true
-  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,75 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-  NewCops: enable
-  DisabledByDefault: true
-
-require:
-  - rubocop-rake
-  - rubocop-rspec
-  - rubocop-performance
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: never
-
-Layout/HashAlignment:
-  Enabled: true
-  EnforcedHashRocketStyle: key # キーが全角文字の場合が多いため
-
-Lint/AssignmentInCondition:
-  Enabled: true
-
-Lint/DuplicateBranch:
-  Enabled: false # FIXME
-
-Lint/UnderscorePrefixedVariableName:
-  Enabled: true
-
-Naming/AccessorMethodName:
-  Enabled: true
-
-RSpec/DescribedClass:
-  Enabled: true
-
-Style/ClassAndModuleChildren:
-  Enabled: true
-
-Style/Encoding:
-  Enabled: true
-
-Style/ExpandPathArguments:
-  Enabled: true
-
-Style/HashLikeCase:
-  Enabled: true
-
-Style/NegatedIf:
-  Enabled: true
-
-Style/RedundantAssignment:
-  Enabled: true
-
-Style/RedundantReturn:
-  Enabled: true
-
-Style/RescueStandardError:
-  Enabled: true
-
-Style/SafeNavigation:
-  Enabled: true
-
-Style/StringLiterals:
-  Enabled: true
-
-Style/GuardClause:
-  Enabled: true
-
-Performance/StringInclude:
-  Enabled: true
-
-Performance/RegexpMatch:
-  Enabled: true
-
-Performance/MapCompact:
-  Enabled: true

data/.rubocop_todo.yml

@@ -1,7 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2023-06-18 08:39:04 UTC using RuboCop version 1.48.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.

data/Guardfile

@@ -1,27 +0,0 @@
-scope(groups: %w(specs))
-
-directories %w(spec lib)
-
-group :specs, halt_on_fail: true do
-  guard :rspec, cmd: 'bundle exec rspec', failed_mode: :keep do
-    require 'guard/rspec/dsl'
-    dsl = Guard::RSpec::Dsl.new(self)
-
-    # RSpec files
-    rspec = dsl.rspec
-    watch(rspec.spec_helper) { rspec.spec_dir }
-    watch(rspec.spec_support) { rspec.spec_dir }
-    watch(rspec.spec_files)
-
-    # Ruby files
-    ruby = dsl.ruby
-    dsl.watch_spec_files_for(ruby.lib_files)
-  end
-
-  guard :rubocop, all_on_start: false, cli: '--rails' do
-    watch(%r{.+\.rb$}) { |m| m[0] }
-    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-  end
-end
-
-# vim: ft=ruby

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'jkf'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-if require 'pry'
-  Pry.start
-else
-  require 'irb'
-  IRB.start
-end

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here