rubywarrior 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+0.1.3 (April 28, 2012)
+
+* Making specs pass with latest RSpec.
+
+* Lowering ace score for Beginner Level 6.
+
+* Store relative tower paths in Profile so files can be moved.
+
+* Other minor bug fixes (see commit history for details)
+
+
 0.1.2 (September 23, 2010)
 
 * Adding intermediate level 9 with distance_of ability

data/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+group :test do
+  gem 'rake'
+  gem 'rspec', '~> 2.8.0'
+  gem 'cucumber'
+  gem 'mocha'
+end

data/Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (1.1.9)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.9.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.9.3)
+      json (>= 1.4.6)
+    json (1.7.0)
+    metaclass (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    term-ansicolor (1.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  mocha
+  rake
+  rspec (~> 2.8.0)

data/Rakefile

@@ -1,17 +1,12 @@
 require 'rake'
-require 'spec'
+require 'rspec'
+require 'rspec/core/rake_task'
 require 'cucumber'
-
 require 'cucumber/rake/task'
-require 'spec/rake/spectask'
-
-
-spec_files = Rake::FileList["spec/**/*_spec.rb"]
 
 desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = spec_files
-  t.spec_opts = ["-c"]
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
 end
 
 Cucumber::Rake::Task.new(:features) do |t|

data/features/step_definitions/interaction_steps.rb

@@ -1,9 +1,9 @@
 Given /^a profile named "([^\"]*)" on "([^\"]*)"$/ do |name, tower|
-  When 'I run rubywarrior'
-  And 'I answer "y" to "create one?"'
-  And 'I choose "' + tower + '" for "tower"'
-  And 'I answer "' + name + '" to "name"'
-  Then 'I should see "generated"'
+  step 'I run rubywarrior'
+  step 'I answer "y" to "create one?"'
+  step 'I choose "' + tower + '" for "tower"'
+  step 'I answer "' + name + '" to "name"'
+  step 'I should see "generated"'
 end
 
 Given /^no profile at "([^\"]*)"$/ do |path|

data/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'cucumber'
-require 'spec'
+require 'rspec'
 
 require File.dirname(__FILE__) + '/../../lib/ruby_warrior'
 

data/lib/ruby_warrior/game.rb

@@ -156,7 +156,7 @@ module RubyWarrior
     end
     
     def tower_paths
-      Dir[File.expand_path(File.dirname(__FILE__) + '/../../towers/*')]
+      Dir[File.expand_path('../../../towers/*', __FILE__)]
     end
     
     

data/lib/ruby_warrior/level.rb

@@ -24,7 +24,11 @@ module RubyWarrior
     end
     
     def load_path
-      @profile.tower_path + "/level_" + @number.to_s.rjust(3, '0') + ".rb"
+      File.join(
+        File.expand_path('../../../towers/', __FILE__),
+        File.basename(@profile.tower_path) + "/level_" +
+          @number.to_s.rjust(3, '0') + ".rb"
+      )
     end
     
     def load_level

data/lib/ruby_warrior/player_generator.rb

@@ -19,7 +19,7 @@ module RubyWarrior
     # TODO refactor and test this method
     def generate
       if level.number == 1
-        FileUtils.mkdir_p(level.player_path)
+        FileUtils.mkdir_p(level.player_path) unless File.exists? level.player_path
         FileUtils.cp(templates_path + '/player.rb', level.player_path)
       end
       
@@ -29,7 +29,7 @@ module RubyWarrior
     end
     
     def templates_path
-      File.expand_path(File.dirname(__FILE__) + "/../../templates")
+      File.expand_path("../../../templates", __FILE__)
     end
     
     private

data/lib/ruby_warrior/profile.rb

@@ -62,7 +62,7 @@ module RubyWarrior
     end
     
     def tower
-      Tower.new(@tower_path)
+      Tower.new(File.basename @tower_path)
     end
     
     def current_level

data/lib/ruby_warrior/tower.rb

@@ -3,7 +3,7 @@ module RubyWarrior
     attr_reader :path
     
     def initialize(path)
-      @path = path
+      @path = File.join(File.expand_path('../../../towers/', __FILE__), path)
     end
     
     def name

data/spec/ruby_warrior/abilities/attack_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Attack do
   before(:each) do

data/spec/ruby_warrior/abilities/base_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Base do
   before(:each) do

data/spec/ruby_warrior/abilities/bind_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Bind do
   before(:each) do

data/spec/ruby_warrior/abilities/direction_of_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::DirectionOf do
   before(:each) do

data/spec/ruby_warrior/abilities/direction_of_stairs_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::DirectionOfStairs do
   before(:each) do

data/spec/ruby_warrior/abilities/distance_of_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::DistanceOf do
   before(:each) do

data/spec/ruby_warrior/abilities/explode_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Explode do
   before(:each) do

data/spec/ruby_warrior/abilities/feel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Feel do
   before(:each) do

data/spec/ruby_warrior/abilities/form_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Form do
   before(:each) do

data/spec/ruby_warrior/abilities/health_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Health do
   before(:each) do

data/spec/ruby_warrior/abilities/listen_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Listen do
   before(:each) do

data/spec/ruby_warrior/abilities/look_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Look do
   before(:each) do

data/spec/ruby_warrior/abilities/pivot_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Pivot do
   before(:each) do

data/spec/ruby_warrior/abilities/rescue_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Rescue do
   before(:each) do

data/spec/ruby_warrior/abilities/rest_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Rest do
   before(:each) do

data/spec/ruby_warrior/abilities/shoot_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Shoot do
   before(:each) do

data/spec/ruby_warrior/abilities/throw_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Detonate do
   before(:each) do

data/spec/ruby_warrior/abilities/walk_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Abilities::Walk do
   before(:each) do

data/spec/ruby_warrior/core_additions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe String do
   it "should wrap text at white space when over a specific character length" do

data/spec/ruby_warrior/floor_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Floor do
   describe "2x3" do

data/spec/ruby_warrior/game_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Game do
   before(:each) do
@@ -74,7 +74,7 @@ describe RubyWarrior::Game do
   end
   
   it "should find tower paths using Dir[] search" do
-    Dir.expects(:[]).with(File.expand_path(File.dirname(__FILE__) + '/../../towers/*'))
+    Dir.expects(:[]).with(File.expand_path('../../../towers/*', __FILE__))
     @game.tower_paths
   end
   

data/spec/ruby_warrior/level_loader_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::LevelLoader do
   describe "with profile" do

data/spec/ruby_warrior/level_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'set'
 
 describe RubyWarrior::Level do
@@ -51,7 +51,7 @@ describe RubyWarrior::Level do
   
   it "should have a load path from profile tower with level number in it" do
     @profile.stubs(:tower_path).returns('path/to/tower')
-    @level.load_path.should == 'path/to/tower/level_001.rb'
+    @level.load_path.should == File.expand_path('towers/tower/level_001.rb')
   end
   
   it "should exist if file exists" do

data/spec/ruby_warrior/player_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::PlayerGenerator do
   before(:each) do
@@ -7,6 +7,6 @@ describe RubyWarrior::PlayerGenerator do
   end
   
   it "should know templates path" do
-    @generator.templates_path.should == File.expand_path(File.dirname(__FILE__) + "/../../templates")
+    @generator.templates_path.should == File.expand_path("../../../templates", __FILE__)
   end
 end

data/spec/ruby_warrior/position_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Position do
   before(:each) do

data/spec/ruby_warrior/profile_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Profile do
   before(:each) do
@@ -164,7 +164,7 @@ describe RubyWarrior::Profile do
     end
   
     it "should load tower from path" do
-      RubyWarrior::Tower.expects(:new).with('path/to/tower').returns('tower')
+      RubyWarrior::Tower.expects(:new).with('tower').returns('tower')
       @profile.tower.should == 'tower'
     end
   end

data/spec/ruby_warrior/space_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Space do
   before(:each) do

data/spec/ruby_warrior/tower_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Tower do
   before(:each) do

data/spec/ruby_warrior/turn_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Turn do
   describe "with actions" do

data/spec/ruby_warrior/ui_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::UI do
   before(:each) do

data/spec/ruby_warrior/units/archer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::Archer do
   before(:each) do

data/spec/ruby_warrior/units/base_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::Base do
   before(:each) do

data/spec/ruby_warrior/units/captive_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::Captive do
   before(:each) do

data/spec/ruby_warrior/units/golem_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::Golem do
   before(:each) do

data/spec/ruby_warrior/units/sludge_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::Sludge do
   before(:each) do

data/spec/ruby_warrior/units/thick_sludge_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::ThickSludge do
   before(:each) do

data/spec/ruby_warrior/units/warrior_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 class Player
   def turn(warrior)

data/spec/ruby_warrior/units/wizard_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RubyWarrior::Units::Wizard do
   before(:each) do

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require File.dirname(__FILE__) + '/../lib/ruby_warrior'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
   config.before(:each) do
     RubyWarrior::Config.reset

data/towers/beginner/level_002.rb

@@ -3,7 +3,7 @@
 #  --------
 
 description "It is too dark to see anything, but you smell sludge nearby."
-tip "Use warrior.feel.empty? to see if there's anything in front of you, and warrior.attack! to fight it. Remember, you can only do one action (ending in !) per turn."
+tip "Use warrior.feel.empty? to see if there is anything in front of you, and warrior.attack! to fight it. Remember, you can only do one action (ending in !) per turn."
 clue "Add an if/else condition using warrior.feel.empty? to decide whether to warrior.attack! or warrior.walk!."
 
 time_bonus 20

data/towers/beginner/level_003.rb

@@ -4,7 +4,7 @@
 
 description "The air feels thicker than before. There must be a horde of sludge."
 tip "Be careful not to die! Use warrior.health to keep an eye on your health, and warrior.rest! to earn 10% of max health back."
-clue "When there's no enemy ahead of you, call warrior.rest! until health is full before walking forward."
+clue "When there is no enemy ahead of you call warrior.rest! until health is full before walking forward."
 
 time_bonus 35
 ace_score 71

data/towers/beginner/level_005.rb

@@ -3,8 +3,8 @@
 #  -------
 
 description "You hear cries for help. Captives must need rescuing."
-tip "Use warrior.feel.captive? to see if there's a captive, and warrior.rescue! to rescue him. Don't attack captives."
-clue "Don't forget to constantly check if you're taking damage and rest until your health is full if you aren't taking damage."
+tip "Use warrior.feel.captive? to see if there is a captive and warrior.rescue! to rescue him. Don't attack captives."
+clue "Don't forget to constantly check if you're taking damage. Rest until your health is full if you aren't taking damage."
 
 time_bonus 45
 ace_score 123

data/towers/beginner/level_006.rb

@@ -3,11 +3,11 @@
 #  --------
 
 description "The wall behind you feels a bit further away in this room. And you hear more cries for help."
-tip "You can walk backward by passing ':backward' as an argument to walk!. Same goes for feel, rescue! and attack!."
+tip "You can walk backward by passing ':backward' as an argument to walk!. Same goes for feel, rescue! and attack!. Archers have a limited attack distance."
 clue "Walk backward if you are taking damage from afar and do not have enough health to attack. You may also want to consider walking backward until warrior.feel(:backward).wall?."
 
 time_bonus 55
-ace_score 110
+ace_score 105
 size 8, 1
 stairs 7, 0
 

data/towers/intermediate/level_002.rb

@@ -5,7 +5,7 @@
 
 description "Another large room, but with several enemies blocking your way to the stairs."
 tip "Just like walking, you can attack! and feel in multiple directions (:forward, :left, :right, :backward)."
-clue "Call warrior.feel(direction).enemy? in each direction to make sure there isn't an enemy beside you (attack if there is). Call warrior.rest! if you're low and health when there's no enemies around."
+clue "Call warrior.feel(direction).enemy? in each direction to make sure there isn't an enemy beside you (attack if there is). Call warrior.rest! if you're low and health when there are no enemies around."
 
 time_bonus 40
 ace_score 84

data/towers/intermediate/level_003.rb

@@ -5,8 +5,8 @@
 #  ---
 
 description "You feel slime on all sides, you're surrounded!"
-tip "Call warrior.bind!(direction) to bind an enemy to keep him from attacking. Bound enemies look like capitves."
-clue "Count the number of enemies around you, if there's two or more, bind one."
+tip "Call warrior.bind!(direction) to bind an enemy to keep him from attacking. Bound enemies look like captives."
+clue "Count the number of enemies around you. Bind an enemy if there are two or more."
 
 time_bonus 50
 ace_score 101

metadata

@@ -1,33 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubywarrior
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ryan Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-23 00:00:00 -07:00
-default_executable: 
+date: 2012-04-28 00:00:00.000000000Z
 dependencies: []
-
-description: You play as a warrior climbing a tall tower. On each floor you need to write a Ruby script to instruct the warrior to battle enemies, rescue captives, and reach the stairs.
+description: You play as a warrior climbing a tall tower. On each floor you need to
+  write a Ruby script to instruct the warrior to battle enemies, rescue captives,
+  and reach the stairs.
 email: ryan@railscasts.com
-executables: 
+executables:
 - rubywarrior
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ruby_warrior/abilities/attack.rb
 - lib/ruby_warrior/abilities/base.rb
 - lib/ruby_warrior/abilities/bind.rb
@@ -141,44 +133,33 @@ files:
 - templates/README.erb
 - bin/rubywarrior
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
-homepage: http://github.com/ryanb/ruby-warrior
+homepage: https://github.com/ryanb/ruby-warrior
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: rubywarrior
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Game written in Ruby for learning Ruby and artificial intelligence.
 test_files: []
-