bchess 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00fd66fa6baaf3b55a29625cd3df6edfecad327ba01cb5c226aaf4b68745ca4a
-  data.tar.gz: 640fb109178dd4e040593010ca26a04b5fa4528246822196f8f49ae277bfe36e
+  metadata.gz: 6ee977b4ad266d30e964e008cce9ac2004295ffe1af8dea97d8f8c2b9810219f
+  data.tar.gz: 61ba542136ff29506701d5e1dc4b2048d5b7648192235c5cd6374260ae08839d
 SHA512:
-  metadata.gz: f7b808150824a292823ac9736dfdb8d5cfc6efbb7d73008ae630d4c8ff72ccade6514a6b34af9e5d23da8a4452ff04eecf6a94c023f67a8bf43aaba62c351f7b
-  data.tar.gz: 9042118b10556c81dbdb19076e0d46cd2a78930f5d4b21eb381e7e6f7a1292996189d51f3532c75ad8c0dcba9da87caded1eb843b9805cba76bcb538aedcc182
+  metadata.gz: 5542959193b43cdd80623440f293082c42fe0a1434ad74db240c1c371fdf10cf9b2338a508ebb1e560d0cef4d22994ef1bc7b0ff0a03d7274e861ccd2280c529
+  data.tar.gz: ac2616bae4d854b15c003f4938d7a48c66caf4a7c63a37fcad76bf1c52e4bc36ca9c024fb5c7b84b7d0647feb8a717ea26dcf3439c83bac103c0c64dd0099a83

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake spec

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+JetBrains iDeA config files
+/.idea/

data/Gemfile.lock

@@ -1,33 +1,34 @@
 PATH
   remote: .
   specs:
-    bchess (0.1.2)
+    bchess (0.1.4)
+      treetop (~> 1.6, >= 1.6.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    method_source (0.9.0)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    method_source (1.0.0)
     polyglot (0.3.5)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (13.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    treetop (1.6.10)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    treetop (1.6.11)
       polyglot (~> 0.3)
 
 PLATFORMS
@@ -42,4 +43,4 @@ DEPENDENCIES
   treetop (~> 1.6)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/bchess.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'treetop', '~> 1.6', '>= 1.6.11'
+
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/bchess/helpers/board_helpers.rb

@@ -1,9 +1,5 @@
 module Bchess
   module BoardHelpers
-    def field(column, row)
-      (column + 97).chr + (row + 1).to_s
-    end
-
     def invalid_data?(piece, column, row)
       piece.nil? || !(0..7).cover?(column) || !(0..7).cover?(row)
     end

data/lib/bchess/version.rb

@@ -1,3 +1,3 @@
 module Bchess
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/lib/bchess.rb

@@ -1,28 +1,28 @@
-require 'bchess/helpers/board_helpers'
-require 'bchess/helpers/fen_helpers'
-require 'bchess/helpers/board_helpers'
-require 'bchess/helpers/castle_helpers'
-require 'bchess/helpers/validations'
-require 'bchess/helpers/en_passant_helpers'
-require 'bchess/helpers/field_between_helpers'
+require_relative 'bchess/helpers/board_helpers'
+require_relative 'bchess/helpers/fen_helpers'
+require_relative 'bchess/helpers/board_helpers'
+require_relative 'bchess/helpers/castle_helpers'
+require_relative 'bchess/helpers/validations'
+require_relative 'bchess/helpers/en_passant_helpers'
+require_relative 'bchess/helpers/field_between_helpers'
 
-require 'bchess/version'
-require 'bchess/piece'
-require 'bchess/king'
-require 'bchess/rook'
-require 'bchess/bishop'
-require 'bchess/queen'
-require 'bchess/knight'
-require 'bchess/pawn'
-require 'bchess/board'
+require_relative 'bchess/version'
+require_relative 'bchess/piece'
+require_relative 'bchess/king'
+require_relative 'bchess/rook'
+require_relative 'bchess/bishop'
+require_relative 'bchess/queen'
+require_relative 'bchess/knight'
+require_relative 'bchess/pawn'
+require_relative 'bchess/board'
 
-require 'pgn/parser'
-require 'pgn/pgn_file'
-require 'pgn/pgn_nodes'
-require 'pgn/game'
-require 'pgn/game_header'
-require 'pgn/game_body'
-require 'pgn/move_info_parser'
+require_relative 'pgn/parser'
+require_relative 'pgn/pgn_file'
+require_relative 'pgn/pgn_nodes'
+require_relative 'pgn/game'
+require_relative 'pgn/game_header'
+require_relative 'pgn/game_body'
+require_relative 'pgn/move_info_parser'
 
 module Bchess
   class InvalidMoveException < StandardError; end

data/lib/pgn/game_body.rb

@@ -29,8 +29,10 @@ module Bchess
             next
           end
 
+          piece = move_info.fetch(:piece)
+          column, row = piece.column, piece.row
           board.move(*move_info.values)
-          @moves << move_info
+          @moves << move_info.merge( { piece: piece.class.new(piece.color, column, row) })
         end
       end
 

data/lib/pgn/game_header.rb

@@ -1,7 +1,7 @@
 module Bchess
   module PGN
     class GameHeader
-      attr_reader :header, :player_white, :player_black
+      attr_reader :header
 
       def initialize(header)
         @header = header
@@ -40,13 +40,25 @@ module Bchess
       end
 
       def eco
-        @eco ||= values['Eco']
+        @eco ||= values['ECO']
       end
 
       def result
         @result ||= values['Result']
       end
 
+      def opening
+        @opening ||= values['Opening']
+      end
+
+      def variation
+        @variation ||= values['Variation']
+      end
+
+      def plycount
+        @plycount ||= values['PlyCount']
+      end
+
       def values
         @values ||= header.create_value_hash
       end

data/lib/pgn/parser.rb

@@ -7,22 +7,22 @@ module Bchess
     class Parser
       attr_reader :input, :output, :error, :tree
 
-      Treetop.load('./lib/pgn/pgn_rules.treetop')
-      @@parser = SexpParser.new
+      Treetop.load(File.expand_path('pgn_rules.treetop', __dir__))
 
       def initialize(input)
+        @parser = SexpParser.new
         @input = input
       end
 
       def parse
         if input.is_a?(String)
-          @tree = @@parser.parse(input)
+          @tree = @parser.parse(input)
         elsif input.is_a?(Bchess::PGN::PGNFile)
-          @tree = @@parser.parse(input.load_games)
+          @tree = @parser.parse(input.load_games)
         end
 
         unless tree
-          raise PGN::ParserException, "Parse error at offset: #{@@parser.index}"
+          raise PGN::ParserException, "Parse error: #{@parser.failure_reason}"
         end
 
         sanitize_tree(tree)

data/lib/pgn/pgn_nodes.rb

@@ -1,3 +1,5 @@
+require 'treetop'
+
 module Sexp
   class PAllGames < Treetop::Runtime::SyntaxNode
   end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bchess
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Staszek Zawadzki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +107,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -145,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Parsing chess PGN games.