99_game 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96962a69d0a4bfd4d474e5c6c3d2e1dffa71d07
-  data.tar.gz: 71398ed0684f61ecf2a11a0c8fb3981efe15bc43
+  metadata.gz: 79c3b36f954a1926f4e319e3584ce62d397af750
+  data.tar.gz: 23d12f11a841e502c980cb64750c66ab5790d439
 SHA512:
-  metadata.gz: fca2b490828686ae8384fb41906c2929a85365907fff34a1ae1afb07c8585c9b18bc6f55128d17cca3b239fd592efb5f0e29e9be29c8d793f35ee077a75b6e4c
-  data.tar.gz: 41aec9e1313c39ad65f643d89a0fd4cb271a0ecb41aff93605168406a178ecbea2d81fb03f748894989967498294aa0cf24cfd1b9723a25f818c919d106a0495
+  metadata.gz: d563dec8728ab21af85908c7cea2520375ce326b4b9c410d21133781f0d8552f9b4fedf40177c264994eea75603ef7d49b9c2727d8fabf87e0bb20652a7a0966
+  data.tar.gz: d381e887c98a7825e64526ae42578057ea55e06b3b7a5d08ca4854fb73f4c0c7c7cce93b1648f284547f1b1d3085cffb529aa599dfa8f0d6b6e1a1da72313ed4

data/.rspec

@@ -1,4 +1,4 @@
 --color
---warnings
---require spec_helper
+--require spec_helper.rb
 --format doc
+--warnings

data/README.md

@@ -1,11 +1,14 @@
+
+# 99_game
+
+To install: `gem install 99_game`
+
+For the rules and arguments: `99_game -h`
+
+## Badges
 [![Gem Version](https://badge.fury.io/rb/99_game.png)](http://badge.fury.io/rb/99_game)
 [![Coverage Status](https://img.shields.io/coveralls/Zrp200/99_game.svg)](https://coveralls.io/r/Zrp200/99_game)
 [![Code Climate](https://codeclimate.com/github/Zrp200/99_game.png)](https://codeclimate.com/github/Zrp200/99_game)
 [![Dependency Status](https://gemnasium.com/Zrp200/99_game.svg)](https://gemnasium.com/Zrp200/99_game)
 [![Inline docs](http://inch-ci.org/github/Zrp200/99_game.png?branch=master)](http://inch-ci.org/github/Zrp200/99_game)
-99_game
-=======
-
-To install: `gem install 99_game`
-
-For the rules and arguments: `gem '99_game'`
+[![Test Coverage](https://codeclimate.com/github/Zrp200/99_game/coverage.png)](https://codeclimate.com/github/Zrp200/99_game)

data/bin/99_game

@@ -1,22 +1,23 @@
 #!/usr/bin/env ruby
 require '99_game'
+deck = Deck.new
 BEGIN { # Looks at its arguements
 	ARGV[0] = "-h" if ARGV[0] == "--help"
 	ARGV[0] = "-v" if ARGV[0] == "--version"
-    case ARGV[0]
-    	when "-v"
-    		puts "1.3.0"
+	case ARGV[0]
+		when "-v"
+    		puts "2.0.0"
     		exit
-    	when "-h"
-    		puts "\u00B7 Commands"
-    		puts "\t\u00b7 -v/--version - display version
-    		puts "\t\u00B7 -h/--help - shows this message\n"
-    		puts "\u00B7 Abbrevations"
-    		puts "\t\u00B7 J -> Jack"
-    		puts "\t\u00b7 Q -> Queen"
-    		puts "\t\u00b7 K -> King"
-    		puts "\t\u00b7 A -> Ace"
-    		puts "\t\u00b7 $ -> Joker"
+		when "-h"
+			puts "\u00B7 Commands"
+			puts "\t\u00b7 -v/--version - display version"
+			puts "\t\u00B7 -h/--help - shows this message\n"
+			puts "\u00B7 Abbrevations"
+			puts "\t\u00B7 J -> Jack"
+			puts "\t\u00b7 Q -> Queen"
+			puts "\t\u00b7 K -> King"
+			puts "\t\u00b7 A -> Ace"
+			puts "\t\u00b7 $ -> Joker"
 			puts "\u00B7 Gameplay"
 			puts "\t\u00B7 Your goal is to get your opponent to bring the value over 99 by playing 1 of your 3 cards."
 			puts "\t\u00B7 A card will usually increase the value by itself, but there are a few exceptions:"
@@ -34,35 +35,27 @@ END { # Thanks for playing
     puts "\n\tThanks for playing 99!"
     sleep(3)
 }
-$value, value1, value2, value3, dealer, user = 0,0,0,0, Hand.new, Hand.new
+$value, value1, value2, value3, dealer, user = 0,0,0,0, Hand.new(deck), Hand.new(deck)
 loop do
-	$deck.shuffle!
     puts
     puts "\tIt is the dealer's turn!"
-    def test(card, value) # argument 'card' needs to be an instance of Card 
-        if card.num == "King"; value = 99
-        elsif card.num == "Joker"; value = -1
-        else; value = $value + card.value
-	    end
-	    value = -100 if value > 99
-    end
     i = 1
     for card in dealer.hand
         case i
-	        when 1 then test(card, value1)
-	        when 2 then test(card, value2)
-	        when 3 then test(card, value3)
+	        when 1 then test card, $value, value1
+	        when 2 then test card, $value, value2
+	        when 3 then test card, $value, value3
         end
         i += 1
     end
     if value1 >= value2 and value1 >= value3
-	    $card = dealer.hand[0].num
+	$card = dealer.hand[0].num
         dealer.play(dealer.hand[0])
     elsif value2 >= value3
-	    $card = dealer.hand[1].num
+    	$card = dealer.hand[1].num
         dealer.play(dealer.hand[1])
     else
-	    $card = dealer.hand[2].num
+   	$card = dealer.hand[2].num
         dealer.play(dealer.hand[2])
     end
     pause(2)

data/lib/99_game.rb

@@ -1,101 +1,136 @@
+# Used by the CPU to determine which card to play. Parameter card needs to be an instance of Card.
+	def test(card, actual_value, test_value)
+        	if card.num == "King"
+			test_value = 99
+        	elsif card.num == "Joker"
+        		test_value = 0
+        	else; test_value = actual_value + card.value
+	    	end
+	    	test_value = -100 if test_value > 99
+    	end
 # Tests if obj is not nil.
-def not_nil?(obj)
-	if obj.nil?
-		return false
-	else
-		return true
+	def not_nil?(obj)
+		if obj.nil?
+			return false
+		else
+			return true
+		end
 	end
-end
-# Converts _input_ to an integer if String#capitalize does something. If _input_ is an abbreviation, _input_ is converted to what it stands for. Otherwise, it simply returns a capitalized version of _input_. If _input_ is nil or an emtpy string, raises a CardError
-def converter(input)
-	abbrev = {"$".to_sym => "Joker", K: "King", J: "Jack", Q: "Queen", A: "Ace"}
-	if input == input.capitalize
-		return input.to_i
-	elsif not_nil? abbrev[input.capitalize.to_sym]
-		return abbrev[input.capitalize.to_sym]
-	elsif input.nil? || input == String.new
-		raise CardError, "Input not allowed"
-	else
-		return input.capitalize
+# Converts input to an integer if String#capitalize does something. If parameter input is an abbreviation, _input_ is converted to what it stands for. Otherwise, it simply returns a capitalized version of _input_. If _input_ is nil or an emtpy string, raises a CardError
+	def converter(input)
+		abbrev = {"$" => "Joker", "K" => "King", "J" => "Jack", "Q" => "Queen", "A" => "Ace"}
+		raise(CardError, "Input cannot be blank") if input == String.new
+		if input.to_i == 0
+			case input.capitalize
+				when "$" then "Joker"
+				when "K" then "King"
+				when "J" then "Jack"
+				when "Q" then "Queen"
+				when "A" then "Ace"
+			end
+		else
+			input.to_i
+		end
 	end
-end
-class CardError < Exception; end
+# Expected errors
+	class CardError < Exception; end
 class Card # Represents a card in the deck
-	attr_reader :num
-	@@value = {"Ace" => 1, 4 => 0, 9 => 0, "Jack" => 0, "Joker" => 0, "King" => 99, "Queen" => -10}
-# Gives the Card's value
-	def value
-		@@value.default = @num.to_i
-		return @@value[@num]
-	end
-# Backup method for Card#value
-	def _value
-		return case @num
-			when "Ace" then 1
-			when 2..3 then @num
-			when 4 then 0
-			when 5..8 then @num
-			when 9 then 0
-			when 10 then 10
-			when "Jack" then 0
-			when "Queen" then -10
-			when "King" then 99
-			when "Joker" then 0
+	# Gives the number on the card
+		attr_reader :num
+	# Gives the Card's value
+		attr_reader :value
+	# Backup method for Card#value
+		def _value
+			return case @num
+				when "Ace" then 1
+				when 2..3 then @num
+				when 4 then 0
+				when 5..8 then @num
+				when 9 then 0
+				when 10 then 10
+				when "Jack" then 0
+				when "Queen" then -10
+				when "King" then 99
+				when "Joker" then 0
+			end
+		end
+	# Creates a new card with num as the attribute :num
+		def initialize(num)
+			@num, @value = num, case num
+				when "Ace" then 1
+				when 4 then 0
+				when 9 then 0
+				when "Jack" then 0
+				when "Joker" then 0
+				when "King" then 99
+				when  "Queen" then -10
+			else
+				num.to_i
+			end
 		end
-	end
-# Creates a new card
-    def initialize(card); @num = card; end
 end
-class Hand # Creates an object that holds and can play cards
-    attr_reader :hand
-# Creates a new Hand
-    def initialize; @hand = [$deck.shift, $deck.shift, $deck.shift]; end
-# Gameplay method
-    def play(card)
-		if card.num == "King"; $value = 99
-		elsif card.num == "Joker"; $value = 0
-		else; $value += card.value
+class Hand # Creates an object that holds and can play cards. Interacts with Deck objects.
+	# The actual hand
+    	attr_reader :hand
+	# Creates a new Hand. The deck argument tells the object which deck to use in Hand#play
+    	def initialize(deck_in_use)
+			@hand, @deck = [deck_in_use.draw, deck_in_use.draw, deck_in_use.draw], deck_in_use
 		end
-		i, done = 0, false
-		for index in @hand
-			if index.num == card.num and not done
-				discard = @hand[i]
-				@hand.delete_at(i)
-				draw = $deck.shift
-				@hand.push(draw)
-				$deck.push(discard)
-				done = true
+	# Gameplay method. The parameter 'card' is the card being played.
+    	def play(card)
+			if card.num == "King"; $value = 99
+			elsif card.num == "Joker"; $value = 0
+			else; $value += card.value
+			end
+			i, done = 0, false
+			for index in @hand
+				if index.num == card.num and not done
+					discard = @hand[ i ]
+					@hand.delete_at i
+					@hand.push @deck.draw
+					@deck.discard discard
+					done = true
+				end
+				i += 1
 			end
-			i += 1
 		end
-	end
-# Allows you to see your cards.
-    def view
-	print "\tThese are your cards: "
-        @hand.each {|card| print "\t#{card.num}"}
-    end
+	# Allows you to see your cards.
+    	def view
+			print "\tThese are your cards: "
+        	@hand.each {|card| print "\t#{card.num}"}
+    	end
 end
-# Combines sleep and a newline.
-def pause(p)
-    sleep p
-    puts
-end
-$deck = Array.new
-4.times do # Add the cards to the deck
-	$deck.push Card.new("Ace")
-	$deck.push Card.new("King")
-	$deck.push Card.new("Queen")
-	$deck.push Card.new("Jack")
-	$deck.push Card.new(10)
-	$deck.push Card.new(9)
-	$deck.push Card.new(8)
-	$deck.push Card.new(7)
-	$deck.push Card.new(6)
-	$deck.push Card.new(5) 
-	$deck.push Card.new(4) 
-	$deck.push Card.new(3)
-	$deck.push Card.new(2)
+# Combines sleep and a newline. 'p' is the amount of time waited.
+	def pause(p)
+    	sleep p
+    	puts
+	end
+class Deck # Cards are stored in these objects
+	# The contents of the deck
+		attr_reader :cards
+	def initialize # Creates a new deck that can now be used for playing the game
+		@cards = Array.new
+		4.times do # Add the cards to the deck
+			@cards.push Card.new("Ace")
+			@cards.push Card.new("King")
+			@cards.push Card.new("Queen")
+			@cards.push Card.new("Jack")
+			@cards.push Card.new(10)
+			@cards.push Card.new(9)
+			@cards.push Card.new(8)
+			@cards.push Card.new(7)
+			@cards.push Card.new(6)
+			@cards.push Card.new(5) 
+			@cards.push Card.new(4) 
+			@cards.push Card.new(3)
+			@cards.push Card.new(2)
+		end
+		2.times {@cards.push Card.new("Joker")}
+		50.times {@cards.shuffle!}
+	end
+	# Draw from the deck
+		def draw; @cards.shift; end
+	# Adds 'card' to the deck. Used with Hand#play.
+		def discard(card); @cards.push card; end
 end
-2.times {$deck.push Card.new("Joker")}
-$deck.shuffle!
-__END__
+

data/spec/{99spec.rb → lib/99_game.rb}

@@ -1,11 +1,11 @@
-require_relative "spec_helper"
-require "99_game"
-describe "$deck" do
+deck = Deck.new
+describe Deck do
+	subject {Deck.new}
 	describe "#length" do
-		it "should == 54" do; expect($deck.length + 6).to eq 54; end
+		it "should == 54" do; expect(subject.cards.length).to eq 54; end
 	end
 end
-describe "Card" do
+describe Card do
 	cards = ["Ace", "King", "Queen", "Jack", "Joker"] + (2..10).to_a
 	describe "#value" do
 		for card in cards
@@ -20,29 +20,29 @@ end
 describe "converter" do
 	context "when a number" do
 		it "should return the input as a number" do
-			expect(converter("5")).to eq 1
+			expect(converter("5")).to eq 5
 		end
 	end
 	context "when an abbreveation" do
 		it "should expand it" do
-			expect(converter("k")).to eq "King"
+			expect(converter("K")).to eq "King"
 		end
 	end
 end
-describe "Hand" do
-	hand = Hand.new
+describe Hand do
+	hand = Hand.new Deck.new
 	describe "#hand" do
 		describe "#length" do
-			it "should == 3" do; expect(hand.hand.length).to eq 3; end
+			subject { hand.hand.length }
+			it "should == 3" do; expect( subject ).to eq 3; end
 		end
 	end
 	describe "#initialize" do
-		describe "$deck" do
+		describe "Deck#length" do
 			it "should have three less cards after initialization" do
-				deck1, hand, deck2 = $deck.length, Hand.new, $deck.length
-				expect(deck1).to > deck2
+				deck1, hand, deck2 = deck.cards.length, Hand.new( deck ), deck.cards.length
+				expect( deck1 ).to be > deck2
 			end
 		end
 	end
 end
-				

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require "99_game"
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this
@@ -14,7 +13,7 @@ CodeClimate::TestReporter.start
 #
 # The `.rspec` file also contains a few flags that are not defaults but that
 # users commonly want.
-
+require_relative "lib/99_game.rb"
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
 # The settings below are suggested to provide a good initial experience

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 99_game
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Zachary Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies: []
 description: |
   This is a text-based interpretation of the card game 99. Comes with the gem in the form of an executable. Make sure to read the rules in `99_game -h` before playing
@@ -25,7 +25,7 @@ files:
 - README.md
 - bin/99_game
 - lib/99_game.rb
-- spec/99spec.rb
+- spec/lib/99_game.rb
 - spec/spec_helper.rb
 homepage: https://rubygems.org/gems/99_game
 licenses:
@@ -40,7 +40,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -53,6 +53,7 @@ signing_key:
 specification_version: 4
 summary: The game of 99.
 test_files:
-- spec/99spec.rb
+- spec/lib/99_game.rb
 - ".rspec"
 - spec/spec_helper.rb
+has_rdoc: