maze-server 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a4f6508bbce0941c7b7e9691204c26b11b8222
-  data.tar.gz: 9f5efe9f83720ee843d03de3a2bb5193e97ceb13
+  metadata.gz: 37e53347bcf52bf94d22d9cead52640ddaaf0a26
+  data.tar.gz: a81750259cea435728de7006e9296f087bc9b933
 SHA512:
-  metadata.gz: c7c8f6bf2790132931cb20b7dc7367fad78c620d9afb0bfbfb9e96a500e9b567382bac69b7b67c8ce03665662c62ddf928de872364a42102bf5dc8c9a1d40e87
-  data.tar.gz: caa375e28751a599d1debaa0149c3e30db50d02a8dce3662c8538c3dd6dc19677013d91e7bd73180020eba59eb3efd39417eeecf844b9caf9a24229766087464
+  metadata.gz: 6cea12fb5d013e2eeac9ea49c7ef91e1f53f6ad296352248b971c900c9192b412721be7ac8ed2f116c2f6e5f0526953445387d9f83286cd33813b5955fa04381
+  data.tar.gz: 6226a861f016fd42e4cff19b4d81863b71c2e5bc2afac6e63d986b5bcf78849750c7ec7ed69d5a089bf9d50a6f942582de4e3c87c005b56113bda3f149340d21

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+script: bundle exec rspec spec

data/README.rdoc

@@ -1,9 +1,9 @@
 = \Maze Server
 {<img src="https://badge.fury.io/rb/maze-server.png" alt="Gem Version" />}[http://badge.fury.io/rb/maze-server]
-{<img src="https://drone.io/github.com/FuriKuri/maze-server/status.png"/>}[https://drone.io/github.com/FuriKuri/maze-server/latest]
+{<img src="https://travis-ci.org/FuriKuri/maze-server.png?branch=master" alt="Build Status" />}[https://travis-ci.org/FuriKuri/maze-server]
 {<img src="https://gemnasium.com/FuriKuri/maze-server.png"/>}[https://gemnasium.com/FuriKuri/maze-server]
 {<img src="https://codeclimate.com/github/FuriKuri/maze-server.png" />}[https://codeclimate.com/github/FuriKuri/maze-server]
-
+{<img src="https://coveralls.io/repos/FuriKuri/maze-server/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/FuriKuri/maze-server]
 == Installation
 
 Add this line to your application's Gemfile:

data/lib/maze/game/maze_game.rb

@@ -21,6 +21,14 @@ class MazeGame
     @players[client].move(orientation)
   end
 
+  def moves
+    player_moves = {}
+    @players.each do |client, player|
+      player_moves[client.name] = player.moves
+    end
+    player_moves
+  end
+
   def maze(client)
     @maze.to_s_for_player(client.number, @players[client].current_position)
   end
@@ -30,6 +38,14 @@ class MazeGame
     puts @maze.to_s
   end
 
+  def player_reached_exit?(client)
+    @maze.exit?(@players[client].current_position)
+  end
+
+  def all_players_reached_exit?
+    @players.reject{|client, _| player_reached_exit? client }.empty?
+  end
+
   def reached_player_exit?
     !winning_players.empty?
   end

data/lib/maze/game/maze_player.rb

@@ -1,9 +1,10 @@
 class MazePlayer
-  attr_reader :current_position, :name
+  attr_reader :current_position, :name, :moves
 
   def initialize(current_position, name)
     @current_position = current_position
     @name = name
+    @moves = 0
   end
 
   def move(orientation)
@@ -39,5 +40,6 @@ class MazePlayer
   def do_move(diff)
     @current_position = [@current_position[0] + diff[0],
                          @current_position[1] + diff[1]]
+    @moves += 1
   end
 end

data/lib/maze/server/maze_server.rb

@@ -37,28 +37,30 @@ class MazeServer
   end
 
   def start_game
-    until @maze_game.reached_player_exit?
+    until @maze_game.all_players_reached_exit?
       do_moves
     end
-    puts @maze_game.winning_players
+    puts @maze_game.moves
     confirm_clients
   end
 
   private
   def do_moves
     @players.each do |player_number, client|
-      puts "Print maze for player #{client.name}"
-      puts @maze_game.maze(client)
-      next_moves = @maze_game.show_next_moves(client).map { |move| move.to_s }
-      client.socket.puts('{"operation" : "NEXT_MOVE", "messageId" : 2, "type": "REQUEST", "data" : ' + next_moves.to_s + '}')
-      move = JSON.parse(client.socket.gets.chop)['move'].to_sym
-      @maze_game.move(client, move)
+      unless @maze_game.player_reached_exit?(client)
+        puts "Print maze for player #{client.name}"
+        puts @maze_game.maze(client)
+        next_moves = @maze_game.show_next_moves(client).map { |move| move.to_s }
+        client.socket.puts('{"operation" : "NEXT_MOVE", "messageId" : 2, "type": "REQUEST", "data" : ' + next_moves.to_s + '}')
+        move = JSON.parse(client.socket.gets.chop)['move'].to_sym
+        @maze_game.move(client, move)
+      end
     end
   end
 
   def confirm_clients
     @players.each do |player_number, client|
-      client.socket.puts('{"operation" : "WINNING_PLAYERS", "messageId" : 3, "type": "NOTIFICATION", "data" : ' + @maze_game.winning_players.to_s + '}')
+      client.socket.puts('{"operation" : "WINNING_PLAYERS", "messageId" : 3, "type": "NOTIFICATION", "data" : ' + @maze_game.moves.to_s + '}')
       client_msg = client.socket.gets.chop
       puts "#{client.name} send message #{client_msg}"
     end

data/lib/maze/server/version.rb

@@ -1,3 +1,3 @@
 module Server
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/maze-server.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coveralls'
+
 end

data/spec/maze/game/generator/maze_generator_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../../../../lib/maze/game/generator/maze_generator'
 require_relative '../../../../lib/maze/game/generator/maze_walker'
+require_relative '../../../../spec/spec_helper'
 
 describe MazeGenerator do
   it 'creates a empty maze' do

data/spec/maze/game/generator/maze_walker_spec.rb

@@ -1,4 +1,5 @@
 require_relative '../../../../lib/maze/game/generator/maze_walker'
+require_relative '../../../../spec/spec_helper'
 
 describe MazeWalker do
   it 'creates a way in a maze' do

data/spec/maze/game/maze_game_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../../../lib/maze/game/maze_game'
 require_relative '../../../lib/maze/server/maze_server'
+require_relative '../../../spec/spec_helper'
 
 describe MazeGame do
   before do
@@ -46,4 +47,29 @@ describe MazeGame do
     Maze.any_instance.stub(:to_s_for_player).and_return('maze')
     @maze_game.maze(@client).should == 'maze'
   end
+
+  it 'returns the moves for each player' do
+    MazePlayer.any_instance.stub(:moves).and_return(3)
+    @maze_game.moves.should include('Player' => 3)
+  end
+
+  it 'can say if player reached exit' do
+    MazePlayer.any_instance.stub(:current_position).and_return([1, 1])
+    @maze_game.reached_player_exit?.should be_true
+  end
+
+  it 'can say if player is still in maze' do
+    MazePlayer.any_instance.stub(:current_position).and_return([1, 2])
+    @maze_game.reached_player_exit?.should be_false
+  end
+
+  it 'can say if all players reached exit' do
+    MazePlayer.any_instance.stub(:current_position).and_return([1, 1])
+    @maze_game.all_players_reached_exit?.should be_true
+  end
+
+  it 'can say if not all players reached exit' do
+    MazePlayer.any_instance.stub(:current_position).and_return([1, 2])
+    @maze_game.all_players_reached_exit?.should be_false
+  end
 end

data/spec/maze/game/maze_player_spec.rb

@@ -1,4 +1,5 @@
 require_relative '../../../lib/maze/game/maze_player'
+require_relative '../../../spec/spec_helper'
 
 describe MazePlayer do
   before do
@@ -52,4 +53,11 @@ describe MazePlayer do
     @player.move(:right)
     @player.current_position.should == [6, 5]
   end
+
+  it 'count the moves' do
+    @player.move(:right)
+    @player.move(:right)
+    @player.move(:right)
+    @player.moves.should == 3
+  end
 end

data/spec/maze/game/maze_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../../../lib/maze/game/maze'
 require_relative '../../../lib/maze/game/generator/maze_generator'
+require_relative '../../../spec/spec_helper'
 
 describe Maze do
   before do

data/spec/maze/server/maze_server_spec.rb

@@ -2,6 +2,7 @@ require_relative '../../../lib/maze/server/maze_server'
 require_relative '../../../lib/maze/server/version'
 require_relative '../../../lib/maze/game/maze_game'
 require 'socket'
+require_relative '../../../spec/spec_helper'
 
 describe MazeServer do
 
@@ -30,7 +31,7 @@ describe MazeServer do
     end
 
     it 'handle a game' do
-      MazeGame.any_instance.stub(:reached_player_exit?).and_return(false, true)
+      MazeGame.any_instance.stub(:all_players_reached_exit?).and_return(false, true)
       response = double('response', :chop => '{"move" : "left"}')
       socket = double('socket', :gets => response, :puts => nil)
       Client.any_instance.stub(:socket).and_return(socket)

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maze-server
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Theo Pack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Maze server
 email:
 - tf.pack@googlemail.com
@@ -75,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -94,6 +109,7 @@ files:
 - spec/maze/game/maze_player_spec.rb
 - spec/maze/game/maze_spec.rb
 - spec/maze/server/maze_server_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/FuriKuri/maze-server
 licenses:
 - MIT
@@ -125,3 +141,4 @@ test_files:
 - spec/maze/game/maze_player_spec.rb
 - spec/maze/game/maze_spec.rb
 - spec/maze/server/maze_server_spec.rb
+- spec/spec_helper.rb