sokoban 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 589a162f779a7a0c824b766c4238d681b9895b6f
+  data.tar.gz: f391280ce7a29fc65dfc013c9105328e007835ee
+SHA512:
+  metadata.gz: 760e2cc272f589f563ba266415fda7093fc23c19f8332209b5ec0086058bd1432b5ba42f396a919389189b2a74bd46a08d490c5e1a2dada21fd56df8fff844fe
+  data.tar.gz: 700b9c9f2cfaee7d3a1e48ca5f4aaa5029b62052820f0608129f53749a6b287b2dc2d1170a7309a166ef153336e0e0e72c7b3258d22881de7101c158882636f0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sokoban (0.0.11)
+    sokoban (0.0.14)
 
 GEM
   remote: https://rubygems.org/

data/lib/sokoban.rb

@@ -37,8 +37,15 @@ module Sokoban
     def initialize
       @level = Level.new
       parse_opts
-      # -l and -r opts may change lnum; set @lnum after parse_opts
+      # -l and -r opts may change lnum
+      # set @lnum after parse_opts
       @lnum = @level.lnum
+      play
+    end
+
+  private
+
+    def play
       loop do
         begin
           @lnum += 1 if @level.play
@@ -48,8 +55,11 @@ module Sokoban
           exit
         end
         log_moves
+        break if @lnum > 50
         @level.restart(@lnum)
       end
+      puts "You won Sokoban!"
+      puts "やったね！"
     end
 
     def log_moves
@@ -87,6 +97,7 @@ module Sokoban
           @logger = Logger.new LOG_FILE
           @logger.level = Logger::DEBUG
           @logger.debug "Created logger"
+          @logger.debug "#{BASENAME} #{VERSION}"
           @logger.debug "#{$0} --debug #{ARGV.join(" ")}"
           @options[:debug] = true
         end
@@ -123,7 +134,7 @@ module Sokoban
   end
 
   class Level
-    attr_reader :lnum
+    attr_reader :lnum, :pushes
 
     def initialize(lnum = 1)
       unless lnum.between?(1, 50)
@@ -136,16 +147,20 @@ module Sokoban
       @pushes = 0
     end
 
+    def moves
+      @moves.size
+    end
+
     def restart(lnum)
       initialize(lnum)
     end
 
     def play
-      while count_free_boxes > 0
+      while free_boxes > 0
         print self
         if $batch
           # Input a string terminated by newline
-          gets.strip.each_char{|c| parse_move(c.downcase)}
+          gets.strip.each_char {|c| parse_move(c.downcase) }
         else
           # Handle single key press
           parse_move(STDIN.getch)
@@ -156,23 +171,25 @@ module Sokoban
       end
       print self
       print "Level #{@lnum} complete! "
-      print "Congratulations, on to level #{@lnum + 1}. "
-      STDIN.getch
+      unless @lnum == 50
+        print "Congratulations, on to level #{@lnum + 1}. "
+      end
+      STDIN.getch unless $batch
     end
 
-    def count_free_boxes
+    def free_boxes
       @level.scan(/o/).size
     end
 
     def inspect
       s = "Level: #{@lnum} Moves: #{@moves.size} Pushes: #{@pushes} "
-      s << @moves.map{|m| DIRECTIONS.keys[m - 1].to_s}.join
+      s << @moves.map {|m| DIRECTIONS.keys[m - 1].to_s }.join
     end
 
     def to_s
       clear_screen
       s = "Level: #{@lnum}\n\n"
-      s << (0...16).map{|i| @level[i * 19, 19]}.join("\n")
+      s << (0...16).map {|i| @level[i * 19, 19] }.join("\n")
       s << "\nMoves: #{@moves.size} Pushes: #{@pushes}\n> "
     end
 

data/lib/sokoban/version.rb

@@ -1,3 +1,3 @@
 module Sokoban
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/lib/sokoban_spec.rb

@@ -1,31 +1,85 @@
 require File.expand_path('../../spec_helper.rb', __FILE__)
 include Sokoban
 
+# Test input: One move away from level 1 completion
+# Strip out whitespace due to multiline heredoc - ugly & effective
+INPUT = <<-eos.gsub(/\s+/, "")
+  WAAAWWWAWAASSWAASSSDDDDDDDDDDDDDSDWAAAAAAAAAWWWAWAASSSWWAASSSDDD
+  DDDDDDDDDWDSASDWAAAAAAAAWWWAAWASSSWWAASSSDDDDDDDDDDDDSDWAAAAAAAA
+  WWWAWAWWDSSWWAASSSSSWWAASSSDDDDDDDDDDDWDSASDWAAAAAAAWWWAAWASSSWW
+  AASSSDDDDDDDDDDDDDAAAAAAAAAAAAAWAASDDDDDDDDDDDDD
+eos
+
 describe Level do
-  it "should default to level 1" do
-    Level.new.lnum.should == 1
+  it "defaults to level 1" do
+    expect(Level.new.lnum).to eq(1)
+  end
+
+  it "sets lnum to the given level" do
+    expect(Level.new(42).lnum).to eq(42)
+  end
+
+  it "initializes moves to 0" do
+    expect(Level.new.moves).to eq(0)
+  end
+
+  it "initializes pushes to 0" do
+    expect(Level.new.pushes).to eq(0)
   end
 
-  it "should set @lnum to the given level" do
-    Level.new(42).lnum.should == 42
+  it "starts level 1 with 6 free boxes" do
+    expect(Level.new.free_boxes).to eq(6)
   end
 
-  it "should raise RangeError when level is out of range" do
+  it "raises RangeError when level is out of range" do
     expect { Level.new(54) }.to raise_error(RangeError)
   end
 
-  it "should play level 1" do
+  def input_moves(level)
+    INPUT.each_char {|c| level.parse_move(c.downcase) }
+  end
+
+  it "accepts valid moves" do
     level = Level.new
-    level.count_free_boxes.should == 6
-    s =  "WAAAWWWAWAASSWAASSSDDDDDDDDDDDDDSDWAAAAAAAAAWWWAWAASSSWWAASSSDDDD"
-    s << "DDDDDDDDWDSASDWAAAAAAAAWWWAAWASSSWWAASSSDDDDDDDDDDDDSDWAAAAAAAAWW"
-    s << "WAWAWWDSSWWAASSSSSWWAASSSDDDDDDDDDDDWDSASDWAAAAAAAWWWAAWASSSWWAAS"
-    s << "SSDDDDDDDDDDDDDAAAAAAAAAAAAAWAASDDDDDDDDDDDDD\n"
-    s.each_char {|c| level.parse_move(c.downcase) }
-    level.parse_move('d') #if rand(0..1).zero? # hehehe
-    level.count_free_boxes.should == 0
+    input_moves(level)
+    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
+    expect(level.moves).to eq(INPUT.size)
+  end
+
+  it "restarts" do
+    level = Level.new
+    input_moves(level)
+    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') # east
+    expect(level.free_boxes).to eq(0) # Victory!
+  end
+
+  it "increments pushes on box move" do
+    level = Level.new
+    input_moves(level)
+    expect(level.pushes).to eq(96)
+    level.parse_move('d') # east
+    expect(level.pushes).to eq(97)
   end
-end
 
-describe Game do
+  it "decrements pushes on box move undo" do
+    level = Level.new
+    input_moves(level)
+    level.parse_move('d') # east
+    expect(level.pushes).to eq(97)
+    level.parse_move('u') # undo
+    expect(level.pushes).to eq(96)
+  end
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: sokoban
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Boohbah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,29 +76,29 @@ files:
 homepage: http://rubygems.org/gems/sokoban
 licenses:
 - GPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - bin
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A classic warehouse puzzle game
 test_files:
 - spec/lib/sokoban_spec.rb
 - spec/spec_helper.rb
+has_rdoc: