remove sorbet, fix bug in e2e test

Author: Trevoke

Gemfile.lock

@@ -2,62 +2,60 @@ PATH
   remote: .
   specs:
     SgfParser (3.0.2)
-      sorbet-runtime
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    jaro_winkler (1.5.3)
-    json (2.3.1)
-    method_source (0.9.2)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    docile (1.3.5)
+    method_source (1.0.0)
+    parallel (1.20.1)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rdoc (6.1.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.6)
+    rdoc (6.3.3)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.72.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.12.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sorbet (0.5.6134)
-      sorbet-static (= 0.5.6134)
-    sorbet-runtime (0.4.4314)
-    sorbet-static (0.5.6134-universal-darwin-14)
-    unicode-display_width (1.6.0)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -70,7 +68,6 @@ DEPENDENCIES
   rspec
   rubocop
   simplecov
-  sorbet
 
 BUNDLED WITH
-   2.0.2
+   2.2.29

SgfParser.gemspec

@@ -24,6 +24,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sorbet'
-  s.add_runtime_dependency 'sorbet-runtime'
 end

lib/sgf.rb

@@ -1,17 +1,8 @@
-# typed: strict
 # frozen_string_literal: true
 
-require 'sorbet-runtime'
-
 module SGF
-  extend T::Sig
-
   class FileDoesNotExistError < StandardError; end
 
-  sig {
-    params(filename: String)
-      .returns(T.any(T.noreturn, SGF::Collection))
-  }
   def self.parse(filename)
     SGF::Parser.new.parse File.read(filename)
   rescue Errno::ENOENT
@@ -25,6 +16,10 @@ def self.parse(filename)
 require_relative 'sgf/variation'
 require_relative 'sgf/node'
 require_relative 'sgf/collection'
+require_relative 'sgf/collection_assembler'
+require_relative 'sgf/parsing_tokens'
+require_relative 'sgf/error_checkers'
+require_relative 'sgf/stream'
 require_relative 'sgf/parser'
 require_relative 'sgf/gametree'
 require_relative 'sgf/writer'

lib/sgf/collection.rb

@@ -1,16 +1,12 @@
-# typed: true
 # frozen_string_literal: true
 
 # Collection holds most of the logic, for now.
 # It has all the nodes, can iterate over them, and can even save to a file!
 module SGF
-  # mwa ha ha
   class Collection
     include Observable
     include Enumerable
 
-    extend ::T::Sig
-
     attr_accessor :current_node, :errors, :gametrees
     attr_reader :root
 
@@ -24,11 +20,6 @@ def initialize(root = SGF::Node.new)
       end
     end
 
-    sig {
-      params(
-        _block: T.proc.params(arg0: SGF::Node).void
-      ).returns(SGF::Collection)
-    }
     def each(&_block)
       gametrees.each do |game|
         game.each do |node|
@@ -38,41 +29,33 @@ def each(&_block)
       self
     end
 
-    sig {
-      params(gametree: Gametree).returns(Collection)
-    }
     def <<(gametree)
       @root.add_children gametree.root
       self
     end
 
     # Compares a tree to another tree, node by node.
     # Nodes must be the same (same properties, parents and children).
-    sig { params(other: Collection).returns(T::Boolean) }
     def ==(other)
       map { |node| node } == other.map { |node| node }
     end
 
-    sig { returns(String) }
     def inspect
       out = "#<SGF::Collection:#{object_id}, "
       out += "#{gametrees.count} Games, "
       out += "#{node_count} Nodes"
       out + '>'
     end
 
-    sig { returns(String) }
     def to_s
       SGF::Writer.new.stringify_tree_from @root
     end
 
     # Saves the Collection as an SGF file. Takes a filename as argument.
-    sig { params(filename: String).returns(T.nilable(IO)) }
     def save(filename)
       SGF::Writer.new.save(@root, filename)
     end
 
-    sig { params(message: Symbol, data: T::Array[Node]).returns(TrueClass)}
     def update(message, data)
       case message
       when :new_children
@@ -85,15 +68,10 @@ def update(message, data)
 
     private
 
-    sig { returns(Integer) }
     def node_count
       gametrees.inject(0) { |sum, game| sum + game.count }
     end
 
-    sig {
-      params(method_name: Symbol, args: T::Array)
-        .returns(T.any(T.noreturn, T::Array, String))
-    }
     def method_missing(method_name, *args)
       if @root.children.empty? || !@root.children[0].properties.key?(method_name)
         super
@@ -102,7 +80,6 @@ def method_missing(method_name, *args)
       end
     end
 
-    sig { params(name: Symbol, _include_private: T::Boolean).returns(T::Boolean) }
     def respond_to_missing?(name, _include_private = false)
       @root.children[0].properties.key?(name)
     end

lib/sgf/collection_assembler.rb

@@ -1,11 +1,9 @@
-# typed: true
 # frozen_string_literal: true
 
 require_relative 'node'
 require_relative 'collection'
 
 class SGF::CollectionAssembler
-  extend T::Sig
 
   attr_reader :collection
 
@@ -15,25 +13,21 @@ def initialize
     @branches = []
   end
 
-  sig { void }
   def open_branch
     @branches.unshift @current_node
   end
 
-  sig { void }
   def close_branch
     @current_node = @branches.shift
   end
 
-  sig { params(properties: Hash).void }
   def create_node_with_properties(properties)
     node = SGF::Node.new
     @current_node.add_children node
     @current_node = node
     @current_node.add_properties properties
   end
 
-  sig { params(message: String).void }
   def add_error(message)
     collection.errors << message
   end

lib/sgf/error.rb

@@ -1,4 +1,3 @@
-# typed: strong
 # frozen_string_literal: true
 
 module SGF

lib/sgf/error_checkers.rb

@@ -1,10 +1,6 @@
-# typed: strict
 # frozen_string_literal: true
 
 class SGF::StrictErrorChecker
-  extend T::Sig
-
-  sig { params(string: String).returns(T.any(T.noreturn, TrueClass))}
   def check_for_errors_before_parsing(string)
     if string[/\A\s*\(\s*;/]
       return true
@@ -17,9 +13,6 @@ def check_for_errors_before_parsing(string)
 end
 
 class SGF::LaxErrorChecker
-  extend T::Sig
-
-  sig { params(_string: String).returns(TrueClass)}
   def check_for_errors_before_parsing(_string)
     # just look the other way
     true

lib/sgf/gametree.rb

@@ -1,4 +1,3 @@
-# typed: false
 # frozen_string_literal: true
 
 require_relative 'writer'
@@ -7,48 +6,35 @@ module SGF
   class Gametree
     include Enumerable
 
-    extend T::Sig
-
     attr_reader :root
-
     attr_accessor :current_node
 
     # Takes a SGF::Node as an argument. It will be a problem if that node isn't
     # really the first node of of a game (ie: no FF property)
-    sig { params(node: SGF::Node).void }
     def initialize(node)
       @root = node
       @current_node = node
     end
 
     # A simple way to go to the next node in the same branch of the tree
-    sig { returns(Node) }
     def next_node
       @current_node = @current_node.children[0]
     end
 
     # Iterate through all the nodes in preorder fashion
-    sig {
-      params(
-        block: T.proc.params(arg0: SGF::Node).void
-      ).returns(SGF::Gametree)
-    }
     def each(&block)
       @root.each(&block)
       self
     end
 
-    sig { returns(String) }
     def inspect
       "<SGF::Gametree:#{object_id}>"
     end
 
-    sig { returns(String) }
     def to_s
       SGF::Writer.new.stringify_tree_from @root
     end
 
-    sig { params(range: T::Range[Integer]).returns(Gametree) }
     def slice(range)
       new_root = nil
       each do |node|

lib/sgf/gtp_writer.rb

@@ -1,10 +1,7 @@
-# typed: true
 # frozen_string_literal: true
 
 class SGF::GtpWriter < SGF::Writer
 
-  extend T::Sig
-
   attr_writer :upside_down
 
   def initialize
@@ -13,7 +10,6 @@ def initialize
 
   private
 
-  sig { params(node: SGF::Node).returns(String) }
   def gtp_move(node)
     pps = node.properties
     if pps['SZ']
@@ -33,7 +29,6 @@ def gtp_move(node)
     end
   end
 
-  sig { params(color: String, pos: String).returns(String) }
   def to_play(color, pos)
     if pos == ''
       gtp_pos = 'pass'
@@ -53,7 +48,6 @@ def to_play(color, pos)
     "play #{color} #{gtp_pos}"
   end
 
-  sig { params(node: T.any(SGF::Node, NilClass)).void }
   def write_tree_from(node)
     return unless node