leonardo-bridge 0.4.3 → 0.6.5

data/spec/hand_spec.rb

@@ -7,7 +7,7 @@ describe Hand do
     hand
   }
   
-  it { subject.size.should eq(12) }
+  it { expect(subject.size).to eq(12) }
   
   describe '#sort!' do
     before { 
@@ -15,7 +15,7 @@ describe Hand do
       subject.sort! unless subject.cards.map {|c| c.suit}.uniq.size == 4
     }
     
-    it { subject.cards.first.suit.should eq('C') }
-    it { subject.cards.last.suit.should eq('S') }
+    it { expect(subject.cards.first.suit).to eq('C') }
+    it { expect(subject.cards.last.suit).to eq('S') }
   end
 end

data/spec/player_spec.rb

@@ -14,9 +14,9 @@ describe Player do
       expect { subject.start_next_game }.to raise_error(GameError, 'Not ready to start game')
     end
   
-    it "should be able to start a game if available" do
-      subject.send(:game).stub(:next_game_ready?) { true }
-      subject.start_next_game.should eq(true)
+    it ").to be able to start a game if available" do
+      allow(subject.send(:game)).to receive(:next_game_ready?).and_return(true)
+      expect(subject.start_next_game).to eq(true)
     end
   end
 end

data/spec/result_spec.rb

@@ -32,16 +32,16 @@ describe Result do
     end
     
     while not game.play.complete?
-      game.state.should eq(:playing)
+      expect(game.state).to eq(:playing)
       turn = game.get_turn
       
       # Find a valid card.
       board.deal[turn].each do |card|
         if game.play.valid_play?(card, turn, board.deal[turn])
           if turn == game.play.dummy
-            players[game.play.declarer].play_card(card).should eq(true)
+            expect(players[game.play.declarer].play_card(card)).to eq(true)
           else
-            players[turn].play_card(card).should eq(true)
+            expect(players[turn].play_card(card)).to eq(true)
           end
           break
         end
@@ -51,14 +51,14 @@ describe Result do
     game
   }
   subject { game.results.first }
-  xit { subject.is_major.should eq(true) }
+  xit { expect(subject.is_major).to eq(true) }
   
   describe 'score tests' do
     let(:calls) {[Bid.new(Level.one, Strain.no_trump), Pass.new, Pass.new, Pass.new]}
     
     it 'should score a 1NT+3 game correctly' do
       r = DuplicateResult.new(game.board, game.contract, 10)
-      r.score.should eq(180)
+      expect(r.score).to eq(180)
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,15 +7,8 @@ root = File.dirname(__FILE__)
 Dir[File.join(root,'support', '**','*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
-  config.color_enabled = true
   config.mock_with :rspec
   config.order = "random"
-  
-  # set up test redis db
-  config.before(:suite) { $redis = Bridge::DB.new(:db => 15) }
-    
-  # flush test redis db
-  config.after(:each) { $redis.flushdb }
 end
 
 include Bridge

data/spec/support/auction_helper.rb

@@ -2,8 +2,8 @@ module AuctionHelper
   # expects an array of calls
   def assert_current_calls(calls)
     calls.map { |c| subject.make_call(c) unless c.nil? }
-    subject.current_bid.should eq(calls[0])
-    subject.current_double.should eq(calls[1])
-    subject.current_redouble.should eq(calls[2])
+    expect(subject.current_bid).to eq(calls[0])
+    expect(subject.current_double).to eq(calls[1])
+    expect(subject.current_redouble).to eq(calls[2])
   end
 end

data/spec/trick_play_spec.rb

@@ -12,16 +12,16 @@ describe TrickPlay do
   }
   
   
-  it { subject.declarer.should eq(Direction.east) }
-  it { subject.lho.should eq(Direction.south) }
-  it { subject.rho.should eq(Direction.north) }
-  it { subject.dummy.should eq(Direction.west) }
-  it { subject.trumps.should eq(Suit.club) }
-  it { subject.played.size.should eq(4) }
-  it { subject.winners.size.should eq(0) }
-  it { subject.complete?.should eq(false) }
-  it { subject.whose_turn.should eq(Direction.south) }
-  it { subject.get_current_trick.cards.size.should eq(0) }
+  it { expect(subject.declarer).to eq(Direction.east) }
+  it { expect(subject.lho).to eq(Direction.south) }
+  it { expect(subject.rho).to eq(Direction.north) }
+  it { expect(subject.dummy).to eq(Direction.west) }
+  it { expect(subject.trumps).to eq(Suit.club) }
+  it { expect(subject.played.size).to eq(4) }
+  it { expect(subject.winners.size).to eq(0) }
+  it { expect(subject.complete?).to eq(false) }
+  it { expect(subject.whose_turn).to eq(Direction.south) }
+  it { expect(subject.get_current_trick.cards.size).to eq(0) }
   
   describe '#play_card' do
     let(:card1) { Card.from_string('JC') }
@@ -32,56 +32,55 @@ describe TrickPlay do
     
     before { subject.play_card(card1,nil) }
     
-    it { subject.get_trick_count.should eq([0,0]) }
-    it { subject.get_current_trick.cards.compact.size.should eq(1) }
-    xit { subject.get_current_trick.cards.size.should eq(3) }
-    it { subject.winning_card(subject.get_current_trick).should eq(false) }
-    it { subject.whose_turn.should eq(Direction.west) }
-    it { subject.played[Direction.south].size.should eq(1) }
-    it { subject.history.size.should eq(1) }
-    it { subject.who_played?(card1).should eq(Direction.south) }
+    it { expect(subject.get_trick_count).to eq([0,0]) }
+    it { expect(subject.get_current_trick.cards.compact.size).to eq(1) }
+    it { expect(subject.winning_card(subject.get_current_trick)).to eq(false) }
+    it { expect(subject.whose_turn).to eq(Direction.west) }
+    it { expect(subject.played[Direction.south].size).to eq(1) }
+    it { expect(subject.history.size).to eq(1) }
+    it { expect(subject.who_played?(card1)).to eq(Direction.south) }
     
     describe '2 times' do
       before { subject.play_card(card2,nil) }
       
-      it { subject.get_trick_count.should eq([0,0]) }
-      it { subject.get_current_trick.cards.compact.size.should eq(2) }
-      it { subject.get_current_trick.cards.size.should eq(4) }
-      it { subject.winning_card(subject.get_current_trick).should eq(false) }
-      it { subject.whose_turn.should eq(Direction.north) }
-      it { subject.played[Direction.west].size.should eq(1) }
-      it { subject.who_played?(card2).should eq(Direction.west) }
+      it { expect(subject.get_trick_count).to eq([0,0]) }
+      it { expect(subject.get_current_trick.cards.compact.size).to eq(2) }
+      it { expect(subject.get_current_trick.cards.size).to eq(4) }
+      it { expect(subject.winning_card(subject.get_current_trick)).to eq(false) }
+      it { expect(subject.whose_turn).to eq(Direction.north) }
+      it { expect(subject.played[Direction.west].size).to eq(1) }
+      it { expect(subject.who_played?(card2)).to eq(Direction.west) }
       
       describe '3 times' do
         before { subject.play_card(card3,nil) }
         
-        it { subject.get_trick_count.should eq([0,0]) }
-        it { subject.get_current_trick.cards.compact.size.should eq(3) }
-        it { subject.get_current_trick.cards.size.should eq(4) }
-        it { subject.winning_card(subject.get_current_trick).should eq(false) }
-        it { subject.whose_turn.should eq(Direction.east) }
-        it { subject.played[Direction.north].size.should eq(1) }
-        it { subject.who_played?(card3).should eq(Direction.north) }
+        it { expect(subject.get_trick_count).to eq([0,0]) }
+        it { expect(subject.get_current_trick.cards.compact.size).to eq(3) }
+        it { expect(subject.get_current_trick.cards.size).to eq(4) }
+        it { expect(subject.winning_card(subject.get_current_trick)).to eq(false) }
+        it { expect(subject.whose_turn).to eq(Direction.east) }
+        it { expect(subject.played[Direction.north].size).to eq(1) }
+        it { expect(subject.who_played?(card3)).to eq(Direction.north) }
       
         describe '4 times' do
           before { subject.play_card(card4,nil) }
           
-          it { subject.get_trick_count.should eq([0,1]) } # south won
-          it { subject.get_current_trick.cards.compact.size.should eq(4) }
-          it { subject.get_current_trick.cards.size.should eq(4) }
-          it { subject.winning_card(subject.get_current_trick).should eq(card1) }
-          it { subject.whose_turn.should eq(Direction.south) }
-          it { subject.played[Direction.east].size.should eq(1) }
-          it { subject.who_played?(card4).should eq(Direction.east) }
+          it { expect(subject.get_trick_count).to eq([0,1]) } # south won
+          it { expect(subject.get_current_trick.cards.compact.size).to eq(4) }
+          it { expect(subject.get_current_trick.cards.size).to eq(4) }
+          it { expect(subject.winning_card(subject.get_current_trick)).to eq(card1) }
+          it { expect(subject.whose_turn).to eq(Direction.south) }
+          it { expect(subject.played[Direction.east].size).to eq(1) }
+          it { expect(subject.who_played?(card4)).to eq(Direction.east) }
           
           describe '5 times' do
             before { subject.play_card(card5,nil) }
-            it { subject.get_trick_count.should eq([0,1]) } # south won
-            it { subject.get_current_trick.cards.compact.size.should eq(1) }
-            it { subject.winning_card(subject.get_current_trick).should eq(false) }
-            it { subject.whose_turn.should eq(Direction.west) }
-            it { subject.played[Direction.south].size.should eq(2) }
-            it { subject.who_played?(card5).should eq(Direction.south) }
+            it { expect(subject.get_trick_count).to eq([0,1]) } # south won
+            it { expect(subject.get_current_trick.cards.compact.size).to eq(1) }
+            it { expect(subject.winning_card(subject.get_current_trick)).to eq(false) }
+            it { expect(subject.whose_turn).to eq(Direction.west) }
+            it { expect(subject.played[Direction.south].size).to eq(2) }
+            it { expect(subject.who_played?(card5)).to eq(Direction.south) }
           end
         end
       end

data/spec/trick_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Trick do
   subject { Trick.new }
   
-  it { subject.done?.should eq(false) }
-  it { subject.leader.should eq(nil) }
-  it { subject.cards.should eq([]) }
+  it { expect(subject.done?).to eq(false) }
+  it { expect(subject.leader).to eq(nil) }
+  it { expect(subject.cards).to eq([]) }
   
   describe 'with 4 cards' do
     before { Deck.new.first(4).each { |c| subject << c } }
     
-    it { subject.done?.should eq(true) }
+    it { expect(subject.done?).to eq(true) }
   end
 end

metadata

@@ -1,151 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: leonardo-bridge
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Achilles Charmpilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nutrun-string
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  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'
-- !ruby/object:Gem::Dependency
-  name: geminabox
-  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'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: A lean mean bridge playing machine
 email:
-- ac@humbuckercode.co.uk
+- achilles@clickitmedia.eu
 executables:
 - leo-console
 - leo-play
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -160,7 +104,6 @@ files:
 - lib/bridge/call.rb
 - lib/bridge/card.rb
 - lib/bridge/contract.rb
-- lib/bridge/db.rb
 - lib/bridge/deal.rb
 - lib/bridge/deck.rb
 - lib/bridge/game.rb
@@ -172,28 +115,23 @@ files:
 - lib/bridge/trick_play.rb
 - lib/bridge/version.rb
 - lib/enum.rb
-- lib/redis_model.rb
-- lib/uuid.rb
 - spec/auction_spec.rb
 - spec/board_spec.rb
 - spec/bridge_spec.rb
 - spec/call_spec.rb
 - spec/card_spec.rb
-- spec/db_spec.rb
 - spec/deck_spec.rb
 - spec/enum_spec.rb
 - spec/game_spec.rb
 - spec/hand_spec.rb
 - spec/player_spec.rb
-- spec/redis_model_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
 - spec/support/auction_helper.rb
 - spec/support/test_enum.rb
-- spec/support/test_model.rb
 - spec/trick_play_spec.rb
 - spec/trick_spec.rb
-homepage: http://bridge.leonardogames.net/
+homepage: https://leobridge.net
 licenses:
 - MIT
 metadata: {}
@@ -203,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Encapsulates all the necessary logic that allows 4 players to play a bridge
@@ -224,17 +162,14 @@ test_files:
 - spec/bridge_spec.rb
 - spec/call_spec.rb
 - spec/card_spec.rb
-- spec/db_spec.rb
 - spec/deck_spec.rb
 - spec/enum_spec.rb
 - spec/game_spec.rb
 - spec/hand_spec.rb
 - spec/player_spec.rb
-- spec/redis_model_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
 - spec/support/auction_helper.rb
 - spec/support/test_enum.rb
-- spec/support/test_model.rb
 - spec/trick_play_spec.rb
 - spec/trick_spec.rb