sokoban 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc20a6c91e17b03742439b6efd20795ce307551
-  data.tar.gz: f1e3f9517ca58f4434cb0c76cdc139beec833440
+  metadata.gz: 0a921867ffc4091581ea2ba07a96d0fd98ede029
+  data.tar.gz: 7a66174afaff10b372deedbe8dc342348ee0bf57
 SHA512:
-  metadata.gz: 3168eeffb1063706c72efc042b6f3d4a2164011cd24cda0eda8cc63c80dce2bf9b79252054da31888312ea2a7645f5c0c9335e599b7690eb0c3d83eaeb691a55
-  data.tar.gz: 8412f24863ac3923a1b1f8df2645632ecc5e782827fc958197550aee1647c7a6daff07b7f497001810e2dd2249ab24264ddea5d4709302273f1c0d922c7229fa
+  metadata.gz: 52e6766c2d227cc6aa5beb2afa5c83b22df5156af6413421b2c4bcc5edc3d1f2d8512965fb2f042328e738d085e4e47e3b222355a013b848ece8f5c287140a0d
+  data.tar.gz: c9aaea1824af81935a5dedd4d45855c0787c0d98e2355cd88340b3bed1c15cf6e2b31ace35c700b70449b0878c69472e208552327d1d113513024f00f4de8ef0

data/lib/sokoban.rb

@@ -7,7 +7,7 @@
 # Copyright 2004 Dennis Ranke <dennis.ranke at epost.de>
 # Copyright 2013 Boohbah <boohbah at gmail.com>
 
-require File.expand_path("../../lib/sokoban/version.rb", __FILE__)
+require File.expand_path('../../lib/sokoban/version.rb', __FILE__)
 require 'io/console'
 require 'optparse'
 require 'logger'
@@ -18,7 +18,7 @@ module Sokoban
   BASENAME = File.basename($0, '.rb')
   SAV_FILE = "#{HOME}/sokoban.save.gz"
   LOG_FILE = "#{HOME}/sokoban-#{Time.now.to_i}.log"
-  LVL_FILE = File.expand_path("../../sokoban_levels.txt", __FILE__)
+  LVL_FILE = File.expand_path('../../sokoban_levels.txt', __FILE__)
 
   LEVELS = File.open(LVL_FILE).readlines.map do |l|
     l.chomp.ljust(19)
@@ -33,11 +33,16 @@ module Sokoban
     D: { x:  1, y:  0 }  # 4
   }
 
+  # Global-ish variables to ease testing
+  $batch, $hax = false, false
+
+  # Game class separates logger and optparse from internal
+  # Level logic and handles level changes and win condition
   class Game
     def initialize
       @level = Level.new
       parse_opts
-      # -l and -r opts may change lnum
+      # --level and --resume may change lnum
       # set @lnum after parse_opts
       @lnum = @level.lnum
       play
@@ -151,16 +156,21 @@ module Sokoban
       @moves.size
     end
 
+    # The public interface to initialize()
     def restart(lnum)
       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
-          gets.strip.each_char {|c| parse_move(c.downcase) }
+          parse_move_string(gets.strip)
         else
           # Handle single key press
           parse_move(STDIN.getch)
@@ -174,7 +184,7 @@ module Sokoban
       unless @lnum == 50
         print "Congratulations, on to level #{@lnum + 1}. "
       end
-      STDIN.getch unless $batch
+      STDIN.getch
     end
 
     def free_boxes
@@ -195,12 +205,10 @@ module Sokoban
 
     def load_saved_game
       file = Zlib::GzipReader.open(SAV_FILE) {|f| f.read }
-      # Gzip becomes space-efficient when @moves is ~100 or more
       file = file.unpack('C' * file.size)
-      # Initialize @level @state @lnum from file
-      @lnum = file.shift # @lnum is the first byte
-      @level = LEVELS[@lnum - 1].ljust(19 * 16)
-      @state = [@level.dup]
+      # Initialize Level with @lnum from file
+      @lnum = file.shift
+      initialize(@lnum)
       # Rebuild @moves
       moves = []
       file.map {|c| moves << unpack_nibs(c) }
@@ -208,13 +216,13 @@ module Sokoban
     end
 
     def parse_move(input)
-      case input
+      case input.downcase
       when 'b'; $batch = ! $batch
       when 'w', 'k', '8'; move(:W) #UP)
       when 'a', 'h', '4'; move(:A) #LEFT)
       when 's', 'j', '2'; move(:S) #DOWN)
       when 'd', 'l', '6'; move(:D) #RIGHT) 
-      when 'r'; restart(@lnum)
+      when 'r'; initialize(@lnum)
       when 'u'; undo
       when 'q'; quit
       when "\u0003"; puts; exit # ^C - Quit without save 
@@ -223,28 +231,29 @@ module Sokoban
 
   private
 
-    # @lnum is one byte and each move is 4 bits
-    def unpack_nibs(c)
-      a, b = ("%2X" % c).split(//).map(&:to_i)
-      b.zero? ? a : [a, b]
+    def clear_screen
+      30.times { puts }
     end
 
     def pack_nibs(a, b)
       b.nil? ? (a << 4) | 0 : (a << 4) | b
     end
 
+    def unpack_nibs(c)
+      a, b = ("%2X" % c).split(//).map(&:to_i)
+      b.zero? ? a : [a, b]
+    end
+
     def save_game
       file = [@lnum]
+      # @moves are 1, 2, 3, or 4 to enable easy bit packing
       @moves.each_slice(2) {|s| file << pack_nibs(s[0], s[1]) }
       file = file.pack('C' * file.size)
+      # Gzip becomes space-efficient when @moves is ~99
       Zlib::GzipWriter.open(SAV_FILE) {|f| f.write(file) }
       # $ zcat sokoban.save.gz | hexdump
     end
 
-    def clear_screen
-      30.times { puts }
-    end
-
     def undo
       if @moves.size > 0
         @moves.pop
@@ -255,9 +264,9 @@ module Sokoban
     end
 
     def box_moved?
-      0.upto(@level.size - 1) do |i|
-        if @level[i].match(/o|\*/)
-          return true if @state.last[i] != @level[i]
+      @level.split(//).each_with_index do |char, i|
+        if char =~ /o|\*/
+          return true if @state.last[i] != char
         end
       end
       return false

data/lib/sokoban/version.rb

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

data/spec/lib/sokoban_spec.rb

@@ -35,99 +35,89 @@ describe Level do
     expect { Level.new(54) }.to raise_error(RangeError)
   end
 
-  def input_moves(level)
-    INPUT.each_char {|c| level.parse_move(c.downcase) }
-  end
-
   it "accepts valid moves" do
     level = Level.new
-    input_moves(level)
+    level.parse_move_string(INPUT)
     expect(level.moves).to eq(INPUT.size)
   end
 
   it "ignores invalid moves" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('f') # shouldn't increment moves
+    level.parse_move_string(INPUT)
+    level.parse_move("F") # shouldn"t increment moves
     expect(level.moves).to eq(INPUT.size)
   end
 
   it "restarts" do
     level = Level.new
-    input_moves(level)
+    level.parse_move_string(INPUT)
     expect(level.free_boxes).to eq(1)
-    level.parse_move('r') # restart
+    level.parse_move("R") # restart
     expect(level.free_boxes).to eq(6)
   end
 
   it "plays level 1" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('d') # right
+    level.parse_move_string(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
-    input_moves(level)
+    level.parse_move_string(INPUT)
     expect(level.pushes).to eq(96)
-    level.parse_move('d') # right
+    level.parse_move("D") # right
     expect(level.pushes).to eq(97)
   end
 
   it "decrements pushes on box move undo" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('d') # right
+    level.parse_move_string(INPUT)
+    level.parse_move("D") # right
     expect(level.pushes).to eq(97)
-    level.parse_move('u') # undo
+    level.parse_move("U") # undo
     expect(level.pushes).to eq(96)
   end
 
   it "ignores moves into walls" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('a') # left
+    level.parse_move_string(INPUT)
+    level.parse_move("A") # left
     expect(level.moves).to eq(INPUT.size + 1)
     # Try to move into wall
-    level.parse_move('w') # up
+    level.parse_move("W") # up
     expect(level.moves).to eq(INPUT.size + 1)
   end
 
   it "ignores moves into non-free boxes" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('s') # down
-    level.parse_move('d') # right
+    level.parse_move_string(INPUT)
+    level.parse_move_string("SD")
     expect(level.moves).to eq(INPUT.size + 2)
     # Try to move into non-free box
-    level.parse_move('d') # right
+    level.parse_move("D") # right
     expect(level.moves).to eq(INPUT.size + 2)
   end
 
   it "ignores pushes into walls" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('s') # down
-    level.parse_move('d') # right
-    level.parse_move('w') # up
+    level.parse_move_string(INPUT)
+    level.parse_move_string("SDW") # down, right, up
     expect(level.pushes).to eq(97)
     # Try to push box into wall
-    level.parse_move('w') # up
+    level.parse_move("W") # up
     expect(level.pushes).to eq(97)
   end
 
   it "ignores pushes into non-free boxes" do
     level = Level.new
-    input_moves(level)
-    level.parse_move('w') # up 
-    level.parse_move('d') # right
-    level.parse_move('s') # down
+    level.parse_move_string(INPUT)
+    level.parse_move_string("WDS") # up, right, down
     expect(level.pushes).to eq(97)
-    level.parse_move('a') # left
-    level.parse_move('s') # down
+    level.parse_move_string("AS") # left, down
     # Try to push box into non-free box
-    level.parse_move('d') # right
+    level.parse_move("D") # right
     expect(level.pushes).to eq(97)
   end
 end

metadata

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