battle 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca74368fc020b4596625df1b3f649171458cfe86
-  data.tar.gz: 192c1857512a923e7ef56f9c03b0ccd9f17a50b2
+  metadata.gz: 20b63b218431b7d6012bcbd74d3918cc9e9feee2
+  data.tar.gz: ade55b6823ed8cd71a7bbc3f8ba27b3124305b33
 SHA512:
-  metadata.gz: 4486d64d0251772bfd01a6211095236f617c026500db8f372b0f8ae551ef8c46ed4eaf41c8a5532b4cffb9b4ecc6fde19d84b79a875984c2a52d59151834b73b
-  data.tar.gz: 475089aee99c2b9e6e6d74f0b042e1d564087eacc7700edf36f46fe5eb518e9fd8a8284e3f427986b87788e13ccf0a6f585cdb7f939dc56d4fdf162262c3ba29
+  metadata.gz: c137becb1b6c07f1cad79bd578cece549fe1eac89a3bb5adca2123f22f8210c166932fc07adc0d07444ec157bdcdc22e4f22ecd3d6efc4ae4203a015c7e39674
+  data.tar.gz: 54f60c22b88c6ee3ef9bb35804389af8430a73cfae374be8327111de20e416f70253052d25c13680aaae5566bb28b6fd86e9526c0e623f91c2f6e6576c3d11a5

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
 
 script:

data/lib/battle/game.rb

@@ -1,7 +1,7 @@
 module Battle
   class Game
     attr_reader :name, :email, :id, :coords, :status, :ships, :prize,
-      :response
+      :response, :nuke_status, :sunk
 
     STATUSES = %w[start victory defeat]
 
@@ -57,6 +57,8 @@ module Battle
     end
 
     def sink_ship(name)
+      @sunk = name
+      return if name.nil?
       ships.delete ships.find { |ship| ship.is? name }
     end
 
@@ -69,7 +71,8 @@ module Battle
     end
 
     def handle_nuke
-      sink_ship response['sunk'] unless response['sunk'].nil?
+      sink_ship response['sunk']
+      handle_nuke_status
       handle_defeat
       handle_victory
       assign_coordinates
@@ -82,6 +85,10 @@ module Battle
       end
     end
 
+    def handle_nuke_status
+      @nuke_status = response['status']
+    end
+
     def handle_defeat
       defeat if response["game_status"] == "lost"
     end

data/lib/battle/version.rb

@@ -1,3 +1,3 @@
 module Battle
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/battle/game_spec.rb

@@ -115,6 +115,11 @@ describe Battle::Game do
       it "don't change game status" do
         expect { game.nuke(5, 9) }.to_not change { game.status }
       end
+
+      it 'sets nuke_status to miss' do
+        game.nuke(5, 9)
+        expect(game.nuke_status).to eq 'miss'
+      end
     end
 
     context "when hit battleship" do
@@ -132,6 +137,16 @@ describe Battle::Game do
                                         "y" => 7 })
       end
 
+      it 'sets nuke_status to hit' do
+        game.nuke(5, 9)
+        expect(game.nuke_status).to eq 'hit'
+      end
+
+      it 'sets the sunk attribute to ship name' do
+        game.nuke(5, 9)
+        expect(game.sunk).to eq 'Battleship'
+      end
+
       it 'decrease ships count' do
         expect { game.nuke(5, 9) }.to change { game.ships.count }.by(-1)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: battle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vitaly Tatarintsev