ruby-blackjack 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe3747adde761eea4f77c2afa6855c569c4288a
-  data.tar.gz: 819656988aba32192bdecda5ec00ac03e63a7631
+  metadata.gz: cdea56b85c116fc3a4b57dbdf766f305f3af2832
+  data.tar.gz: 67b6addb052e8378a377a17771e631173546816f
 SHA512:
-  metadata.gz: 55a3e2a588222eb38d1219e65770bc947d14d162c4da6c76528c753caa9cc21a1bebd11c8a1586721ce1595c2a478c198354dde1aa666070e87f6e0d72267304
-  data.tar.gz: 320f47ecda727b8264749a8b846db8a9fa0a381d5a071c6d71941c90b33c48c62ced35c6ed24ec1a6a52eeb18e4656399fee8d9036caeef548d1b2e1ad3987fa
+  metadata.gz: 244b423811bd6719f546ea89970502ee1161af9637f6c5d837b02f76d2955e114635e4c2307b8cb2cf114a9e8a6a282e5b80c9835300aff34e51644b46569242
+  data.tar.gz: 790a84700c025bd9da3a817f46212189fd9f476da9912c5774328a266b1adcc7e818c48902d9ed007043a3aa32ac03cd5a0161e8b4dab7cfaa9f9c5b470239ba

data/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/lib/blackjack/blackjack_cli.rb

@@ -61,7 +61,7 @@ class BlackjackCli
         elsif result[2] == 'loss'
             puts ' You lost :( '.set_attributes([RED_BG, BLACK_FG])
         elsif result[2] == 'draw'
-            puts " It's a draw ".set_attributes([[YELLOW_BG, BLACK_FG]])
+            puts " It's a draw ".set_attributes([YELLOW_BG, BLACK_FG])
         end
 
         if result[2] != 'undecided'

data/lib/blackjack/game.rb

@@ -100,10 +100,15 @@ class Game
     # @return [Card Array, Card Array, string] the result of the drawing. Refer to evaluate() for details
     def stand
         @dealer_cards[1].flip_over
-        while @dealer_score < 17
-            hit(true)
+        result = [@player_cards.clone, @dealer_cards.clone, 'undecided']
+        while @dealer_score < 17 and result[2] == 'undecided'
+            result = hit(true)
+        end
+        if result[2] == 'undecided'
+            evaluate(true)
+        else
+            result
         end
-        evaluate(true)
     end
 
 
@@ -143,11 +148,12 @@ class Game
     # Resets the game to enable starting a new game.
     # @return [Card Array, Card Array] the user's cards and the dealer's cards
     def cleanup
+        if @dealer_cards[1].is_flipped
+            @dealer_cards[1].flip_over
+        end
         @used_cards += @player_cards + @dealer_cards
         @player_score = 0
         @dealer_score = 0
-        @player_ace_count = 0
-        @dealer_ace_count = 0
         old_player_cards = @player_cards.clone
         old_dealer_cards = @dealer_cards.clone
         @player_cards = []

data/test/controllers/home_controller_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class HomeControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-blackjack
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Hermann Krumrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies: []
 description: A Blackjack CLI game
 email: hermann@krumreyh.com
@@ -21,11 +21,17 @@ files:
 - README.md
 - Rakefile
 - bin/blackjack
+- bin/bundle
+- bin/rails
+- bin/rake
+- bin/setup
 - lib/blackjack/blackjack_cli.rb
 - lib/blackjack/game.rb
 - lib/blackjack/objects/card.rb
 - lib/blackjack/strings/string.rb
 - lib/ruby-blackjack.rb
+- test/controllers/home_controller_test.rb
+- test/test_helper.rb
 homepage: http://gitlab.namibsun.net/namboy94/ruby-blackjack
 licenses:
 - GPL-3.0