greed_game 0.0.2 → 0.0.3

data/lib/greed_game.rb

@@ -11,6 +11,7 @@ module GreedGame
   def initialize(*names)
     raise "It should be 2 or more players in the game" if names.size < 2
     @dices = 5
+    @max_score = 0
     @players = Array.new
     names.each do |name|
       @players << Player.new(name)
@@ -18,30 +19,38 @@ module GreedGame
   end
   
   def in_progress
-    max_score = 0
-    last_round = false
-    while  max_score < 3000 or not last_round
+    while  next_round?
+      calculate_max_score
       @players.each do |player|
         player.roll(@dices)
       end
-      player_whith_max_score = @players.max_by {|players| players.score_total }
-      last_round = true if max_score >= 3000
-      max_score = player_whith_max_score.score_total
     end
+    winner
+  end
+  
+  def finished
+    return "#{@winner[0].name} is winner" if @winner.count == 1
+    "Winner is absent"
+  end
+  
+  private
+  
+  def next_round?
+    @max_score < 3000 ? true : false
+  end
+  
+  def calculate_max_score
+    player_whith_max_score = @players.max_by {|players| players.score_total }
+    @max_score = player_whith_max_score.score_total
+  end
+  
+  def winner
+    calculate_max_score
     @winner = Array.new
     @players.each do |player|
-      @winner << player if player.score_total == max_score
+      @winner << player if player.score_total == @max_score
     end
     @winner
   end
   
-  def finished
-    if @winner.count == 1
-      text = "#{@winner[0].name} is winner"
-    else
-      text = "Winner is absent"
-    end
-    text
-  end
-
 end

data/lib/greed_game/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greed_game
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74810540 !ruby/object:Gem::Requirement
+  requirement: &82418820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74810540
+  version_requirements: *82418820
 description: Greed is a dice game played among 2 or more players, using 5 six-sided
   dice.
 email: