sokoban 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a921867ffc4091581ea2ba07a96d0fd98ede029
-  data.tar.gz: 7a66174afaff10b372deedbe8dc342348ee0bf57
+  metadata.gz: 4c1e7cc5fafc2a73545dcef03810153dd37bb504
+  data.tar.gz: 9c7eee8ba0b588cffb5073c87bb2507ee54209c6
 SHA512:
-  metadata.gz: 52e6766c2d227cc6aa5beb2afa5c83b22df5156af6413421b2c4bcc5edc3d1f2d8512965fb2f042328e738d085e4e47e3b222355a013b848ece8f5c287140a0d
-  data.tar.gz: c9aaea1824af81935a5dedd4d45855c0787c0d98e2355cd88340b3bed1c15cf6e2b31ace35c700b70449b0878c69472e208552327d1d113513024f00f4de8ef0
+  metadata.gz: 332e0899f91d305e5b7e493ee6125caacae0aa088265c6e02d5799b8911c833b8fecddf92abcec72818692c98a7bc8ce8d4e902112a71d5d244a8365b2d3b30a
+  data.tar.gz: 902fdc58e2e3e4526094872e310a612d3ac50f381b1a0bc98ae8ef9b9813db4286a2297609e46c7716ad3bbccc58ffe3ce329a21ff963ce3b2e9e6d0009d766a

data/lib/sokoban.rb

@@ -33,7 +33,9 @@ module Sokoban
     D: { x:  1, y:  0 }  # 4
   }
 
-  # Global-ish variables to ease testing
+  # Global variables to ease testing
+  # I still like to initialize them even though
+  # nil is the same as false in an if statement
   $batch, $hax = false, false
 
   # Game class separates logger and optparse from internal
@@ -161,16 +163,12 @@ module Sokoban
       initialize(lnum)
     end
 
-    def parse_move_string(string)
-      string.each_char {|c| parse_move(c) }
-    end
-
     def play
       while free_boxes > 0
         print self
         if $batch
           # Input a string terminated by newline
-          parse_move_string(gets.strip)
+          parse_move(gets.strip)
         else
           # Handle single key press
           parse_move(STDIN.getch)
@@ -216,6 +214,8 @@ module Sokoban
     end
 
     def parse_move(input)
+      # Handle multiple moves
+      input.each_char {|c| parse_move(c) } if input.size > 1
       case input.downcase
       when 'b'; $batch = ! $batch
       when 'w', 'k', '8'; move(:W) #UP)

data/lib/sokoban/version.rb

@@ -1,3 +1,3 @@
 module Sokoban
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/spec/lib/sokoban_spec.rb

@@ -37,20 +37,20 @@ describe Level do
 
   it "accepts valid moves" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     expect(level.moves).to eq(INPUT.size)
   end
 
   it "ignores invalid moves" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     level.parse_move("F") # shouldn"t increment moves
     expect(level.moves).to eq(INPUT.size)
   end
 
   it "restarts" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     expect(level.free_boxes).to eq(1)
     level.parse_move("R") # restart
     expect(level.free_boxes).to eq(6)
@@ -58,14 +58,14 @@ describe Level do
 
   it "plays level 1" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     level.parse_move("D") # right
     expect(level.free_boxes).to eq(0) # Victory!
   end
 
   it "increments pushes on box move" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     expect(level.pushes).to eq(96)
     level.parse_move("D") # right
     expect(level.pushes).to eq(97)
@@ -73,7 +73,7 @@ describe Level do
 
   it "decrements pushes on box move undo" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     level.parse_move("D") # right
     expect(level.pushes).to eq(97)
     level.parse_move("U") # undo
@@ -82,7 +82,7 @@ describe Level do
 
   it "ignores moves into walls" do
     level = Level.new
-    level.parse_move_string(INPUT)
+    level.parse_move(INPUT)
     level.parse_move("A") # left
     expect(level.moves).to eq(INPUT.size + 1)
     # Try to move into wall
@@ -92,8 +92,8 @@ describe Level do
 
   it "ignores moves into non-free boxes" do
     level = Level.new
-    level.parse_move_string(INPUT)
-    level.parse_move_string("SD")
+    level.parse_move(INPUT)
+    level.parse_move("SD")
     expect(level.moves).to eq(INPUT.size + 2)
     # Try to move into non-free box
     level.parse_move("D") # right
@@ -102,8 +102,8 @@ describe Level do
 
   it "ignores pushes into walls" do
     level = Level.new
-    level.parse_move_string(INPUT)
-    level.parse_move_string("SDW") # down, right, up
+    level.parse_move(INPUT)
+    level.parse_move("SDW") # down, right, up
     expect(level.pushes).to eq(97)
     # Try to push box into wall
     level.parse_move("W") # up
@@ -112,10 +112,10 @@ describe Level do
 
   it "ignores pushes into non-free boxes" do
     level = Level.new
-    level.parse_move_string(INPUT)
-    level.parse_move_string("WDS") # up, right, down
+    level.parse_move(INPUT)
+    level.parse_move("WDS") # up, right, down
     expect(level.pushes).to eq(97)
-    level.parse_move_string("AS") # left, down
+    level.parse_move("AS") # left, down
     # Try to push box into non-free box
     level.parse_move("D") # right
     expect(level.pushes).to eq(97)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sokoban
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Boohbah