war_simulator 0.0.2 → 0.1.0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 1.8.7
+
+branches:
+  only: master

data/Gemfile

@@ -1,3 +1,4 @@
+#ruby=1.9.3
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in war.gemspec

data/README.md

@@ -1,4 +1,8 @@
 # War simulator
+[![Build Status](https://secure.travis-ci.org/philbott/war_simulator.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/philbott/war_simulator.png?travis)][gemnasium]
+
+[travis]: http://travis-ci.org/philbott/war_simulator
+[gemnasium]: https://gemnasium.com/philbott/war_simulator
 
 Simulator for the War card game. Gives a summary of the game
 including the number of rounds that are needed before a player
@@ -10,17 +14,23 @@ For more info and how to play see: http://en.wikipedia.org/wiki/War_(card_game).
 
 Install it:
 
-    $ gem install war_simulator
+```bash
+$ gem install war_simulator
+```
 
 ## Usage
 
 To run a new simulaton:
 
-    WarSimulator.run
+```ruby
+WarSimulator.run
+```
 
 Then the number of rounds will be outputted:
 
-    => 234
+```irb
+=> 234
+```
 
 ## Todo
 

data/lib/war_simulator/game.rb

@@ -1,16 +1,22 @@
 module WarSimulator
   class Game
 
-    attr_accessor :p1_hand, :p2_hand, :deck
+    WAR_CARDS = 3
+
+    attr_accessor :p1_hand, :p2_hand, :deck, :war_hold
 
     def initialize
       @deck = Deck.new
       @p1_hand = Player.new.hand
       @p2_hand = Player.new.hand
+      @war_hold = []
+      @p1_war_cards = []
+      @p2_war_cards = []
       deal
     end
 
     def deal
+      raise 'Cards already delt' if @deck.cards.nil?
       cut = @deck.cards.each_slice(@deck.cards.count / 2).to_a
       @deck.cards = nil
 
@@ -20,40 +26,78 @@ module WarSimulator
 
     def simulate
       battles = 0
-      war_pile = []
 
       until player_has_no_cards?
         battles += 1
 
         if @p1_hand.first.number == @p2_hand.first.number
-          war_pile << @p1_hand.shift
-          war_pile << @p2_hand.shift
+          @war_hold << @p1_hand.shift
+          @war_hold << @p2_hand.shift
+          setup_war
 
         elsif @p1_hand.first.number > @p2_hand.first.number
           @p1_hand << @p2_hand.shift
           @p1_hand << @p1_hand.shift
-          @p1_hand << war_pile
-          war_pile = []
 
         else
           @p2_hand << @p1_hand.shift
           @p2_hand << @p2_hand.shift
-          @p2_hand << war_pile
-          war_pile = []
 
         end
 
-        @p1_hand.flatten!
-        @p2_hand.flatten!
-        war_pile.flatten!
+        flatten_hands
       end
 
       battles
     end
 
+    def setup_war
+      WAR_CARDS.times do
+        @p1_war_cards << @p1_hand.shift unless @p1_hand.empty? and return
+        @p2_war_cards << @p2_hand.shift unless @p2_hand.empty? and return
+      end
+
+      @p1_war_cards.flatten!
+      @p2_war_cards.flatten!
+
+      pick_and_compare
+    end
+
+    def pick_and_compare
+      p1_pick = @p1_war_cards.shuffle.first
+      p2_pick = @p2_war_cards.shuffle.first
+
+      @war_hold << @p1_war_cards
+      @war_hold << @p2_war_cards
+
+      @p1_war_cards = []
+      @p2_war_cards = []
+
+      flatten_hands
+
+      if p1_pick.number == p2_pick.number
+        setup_war
+
+      elsif p1_pick.number > p2_pick.number
+        @p1_hand << @war_hold
+        @war_hold = []
+
+      else
+        @p2_hand << @war_hold
+        @war_hold = []
+      end
+
+    end
+
     def player_has_no_cards?
       @p1_hand.count == 0 || @p2_hand.count == 0
     end
 
+    def flatten_hands
+      @p1_hand.flatten!
+      @p2_hand.flatten!
+      @war_hold.flatten!
+    end
+
   end
 end

data/lib/war_simulator/player.rb

@@ -3,9 +3,5 @@ module WarSimulator
 
     attr_accessor :hand
 
-    def intialize
-      @hand = []
-    end
-
   end
 end

data/lib/war_simulator/version.rb

@@ -1,3 +1,3 @@
 module WarSimulator
-  VERSION = "0.0.2"
+  VERSION = '0.1.0'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rspec'
 require 'war_simulator'
 

data/spec/war_simulator_spec.rb

@@ -6,4 +6,12 @@ describe WarSimulator do
     subject.should respond_to :run
   end
 
+  it 'should return integer' do
+    subject.run.should be_an Integer
+  end
+
+  it 'should be positive' do
+    subject.run.should > 0
+  end
+
 end

data/war_simulator.gemspec

@@ -15,5 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = WarSimulator::VERSION
 
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.11'
+  gem.add_development_dependency 'simplecov', '~> 0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: war_simulator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 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
@@ -27,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Simulator for the War card game.
 email:
 - philbottomley1@gmail.com
@@ -35,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -64,12 +97,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -701390445
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -701390445
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -84,4 +123,3 @@ test_files:
 - spec/war_simulator/game_spec.rb
 - spec/war_simulator/player_spec.rb
 - spec/war_simulator_spec.rb
-has_rdoc: