99_game 2.0.3 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI0ZGE5NGE3ODcyMzkxYTRhNmNjNDAyNWM2MjhhNzExYTljNjdiYQ==
+    ODY3N2NlOTFlNjdhNTI4YThiMDFjOTNhNTg5NmZiYzcwY2VmNDVhZg==
   data.tar.gz: !binary |-
-    MzBlZmM2MzJkODQ0NmNiNjI5ZThiZTY2MjRlNzQ3ZjU2ZDEzZWM5ZQ==
+    MWQzN2Y0NTJkYjBiNzBiZWE4ZDA2MzQwYmZkNmFiOTE5MWFmOWM5NQ==
 SHA512:
   metadata.gz: !binary |-
-    YWExNmUzMzRhOTQzZWFiMjRlMGE5YjQwMjhhYzVjMGQzNWMzMDM2MGQwYzEx
-    YTA3OTM5YTg2NGJmNjJmZDUyYjZiNGE0OGQ5YmUwNDQ0NTg4ZjFlYTYzOThl
-    OTcxYjk2ZjM5OTE5NWI0ZTYxNWMyY2Y3NzdmMjFmMmM2NGNmZTg=
+    NjMzZWQ5NmRjMzVlOGQ3OTBhMDY0NWYxYjhjODc3Y2Q1MWQzYTUyZDgxODdh
+    MTllN2NiNWQxYWE2YTg3NDM2NzNmNjc3NmU5MDZmYjY1YzRmZWJmNTU0YzI1
+    ZDI0ZjFjODI1MDBiZDA2YjZmOWJjY2QwMTI3ZmM4YTlmZjgyMmE=
   data.tar.gz: !binary |-
-    NWZiZDA1NjdiYWM2YmNiMjk1NGIwYTdlZmY1ZDVjYjllY2M2NzZlZGRjZTQ1
-    ZTkxYTRiODQ2NDJmNWNiOTcwNGMwMjQ3ZmU2NTUzZWFjYjgwZDU2MTk2NDk3
-    ZDEyMDMwOGEzY2QxMGZmNzZjNjU5NDA0NjFlYzA5MTZhNTcyMjI=
+    MmZjOTQzZTcyNDA0ZTUyMGZmOTM1ODk2OTM0MDQ1OWM0ZWMwYTU5NmI4NmJl
+    YjAyODdjOWFhNjI3NDJiZmVhMmM2ZjhmMzkwMjRjNTc1MDExMzViM2Y2MDRh
+    YjdhNzU5NGRiNzU3NDgxMzMyYWU3OTBiNjc3YjM2ZjhjNTQ1MGM=

data/{LICENSE.txt → LICENSE.md}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) {{{2014}}} {{{Zachary Roth Perlmutter}}}
+Copyright (c) 2016  Zachary Roth Perlmutter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/99_game

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 require '99_game'
-deck = Deck.new
+include CardDeck
+deck = Deck.new jokers: true
 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 "2.0.1"
+    			puts "3.1.2"
     			exit
 		when "-h"
 			puts "\u00B7 Commands"
@@ -22,7 +23,7 @@ BEGIN { # Looks at its arguements
 			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:"
 			puts "\t\t\u00B7 Aces are worth 1"
-			puts "\t\t\u00B7 1 - 10 are worth themselves, with the exception of 4 and 9"
+			puts "\t\t\u00B7 2 - 10 are worth themselves, with the exception of 4 and 9"
 			puts "\t\t\u00B7 4, 9, and Jacks are worth 0"
 			puts "\t\t\u00B7 Queens decrease the value by 10"
 			puts "\t\t\u00B7 Kings set the value to 99"
@@ -31,15 +32,15 @@ BEGIN { # Looks at its arguements
   	end
 }
 END { # Thanks for playing
-    sleep(1.5)
+    sleep 1.5
     puts "\n\tThanks for playing 99!"
-    sleep(2.5)
+    sleep 2.5
 }
-$value, value1, value2, value3, dealer, user = 0,0,0,0, Hand.new(deck), Hand.new(deck)
+$value, value1, value2, value3, dealer, user = 0,0,0,0, Hand.new, Hand.new
 loop do
     puts "\n\tIt is the dealer's turn!"
     i = 1
-    for card in dealer.hand
+    for card in dealer.cards
         case i
 	        when 1 then test card, $value, value1
 	        when 2 then test card, $value, value2
@@ -48,20 +49,19 @@ loop do
         i += 1
     end
     if value1 >= value2 && value1 >= value3
-	$card = dealer.hand[0].num
-        dealer.play dealer.hand[0]
-    elsif value1 <= value2 && value2 >= value3
-    	$card = dealer.hand[1].num
-        dealer.play dealer.hand[1]
+	$card = dealer.cards[0].num
+        dealer.play dealer.cards[0]
+    elsif value2 >= value1 && value2 >= value3
+    	$card = dealer.cards[1].num
+        dealer.play dealer.cards[1]
     else
-   	$card = dealer.hand[2].num
-        dealer.play(dealer.hand[2])
+   	$card = dealer.cards[2].num
+        dealer.play dealer.cards[2]
     end
-    pause(1.5)
+    pause 1.5 
     puts "\tThe dealer played a(n) #{$card}"
     pause(0.5)
-    puts "\tThe value is now #{$value}"
-    puts
+    puts "\tThe value is now #{$value}\n"
     pause(1.5)
     if $value > 99 # Runs when you win and exits loop
 	    puts "\tYou win!"
@@ -73,9 +73,9 @@ loop do
     pause 0.5
     print "\tPick a card to play by typing in the name of the card => "
     input, turn = gets.chomp, true
-    for card in user.hand
+    for card in user.cards
     	if card.num == converter(input) && turn
-    		user.play(card) 
+    		user.play card
     		turn = false
     	end
     end	

data/lib/99_game.rb

@@ -1,10 +1,21 @@
-# Used by the CPU to determine which card to play. Parameter card needs to be an instance of Card.
+autoload :CardDeck, "card_deck"
+autoload :Card, "card"
+autoload :Hand, "hand"
+
+=begin
+@param card [CardDeck::Card]
+@param actual_value [Integer]
+@param test_value [Integer]
+@return [Integer]
+@note Used by the CPU to determine which card to play. Parameter card needs to be an instance of Card.
+=end
 	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
+        	else
+        		test_value = actual_value + card.value
 	    	end
 	    	test_value = -100 if test_value > 99
 		return test_value
@@ -12,126 +23,43 @@
 # Tests if obj is not nil.
 	def not_nil?(obj)
 		if obj.nil?
-			return false
+			false
 		else
-			return true
+			true
 		end
 	end
 # 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
 # Expected errors
-	class CardError < Exception; end
-class Card # Represents a card in the deck
-	# 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
-class Hand # Creates an object that holds and can play cards. Interacts with Deck objects.
-	# The actual hand
-    	attr_accessor :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
-	# 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
-		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. 'p' is the amount of time waited.
-	def pause(p)
+class CardError < Exception; end
+=begin
+Combines sleep and a newline
+@param p [Integer] amount of time to sleep
+@return [void]
+=end
+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
+=begin
+@param input [String]
+@return [String, Integer]
+If parameter input is an abbreviation, input is converted to what it stands for.
+Otherwise, it simply returns a capitalized version of input.
+@raise [CardError] if input is nil or an emtpy string
+=end
+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
-		2.times {@cards.push Card.new("Joker")}
-		50.times {@cards.shuffle!}
+	else
+		input.to_i
 	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
 

data/lib/card.rb

@@ -0,0 +1,18 @@
+require "card_deck"
+class CardDeck::Card # Represents a card in the deck
+	# Value of the card
+		def value
+			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
+end

data/lib/hand.rb

@@ -0,0 +1,44 @@
+require_relative "card.rb"
+class Hand # Creates an object that holds and can play cards. Interacts with Deck objects.
+	@@deck = Deck.new.cards.shuffle!
+    	attr_accessor :cards # @return [Array<CardDeck::Card>]
+    	def initialize
+		@cards = Array.new(3) {@@deck.shift}
+	end
+	
+=begin
+@param card [CardDeck::Card] the card played
+@return [void]
+@note Gameplay method
+=end
+	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 @cards
+			if index.num == card.num and not done
+				discard = @cards[i]
+				@cards.delete_at i
+				@cards.push @@deck.shift
+				@@deck.push discard
+				done = true
+			end
+			i += 1
+		end
+	end
+		
+=begin
+@return [void]
+Displays cards
+=end
+    	def view
+		print "\tThese are your cards: "
+        	@cards.each {|card| print "\t#{card.num}"}
+    	end
+    	alias inspect cards
+end

data/spec/codeclimate.rb

@@ -0,0 +1,2 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start

data/spec/lib/99_game_spec.rb

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

data/spec/lib/deck_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper.rb"
+require "99_game"
+create_deck = proc {Deck.new jokers: true}
+deck = create_deck.call
+describe Deck do
+ describe create_deck.call.cards.length do
+		it {is_expected.to eq 54}
+	end
+end

data/spec/lib/hand_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+require "hand"
+describe "CPU" do
+  s = Hand.new
+  s.cards = [Card.new("King", Card::Spades), Card.new("Joker"), Card.new(2, Card::Diamonds)]
+  describe "test" do
+    tests = proc {|index| test(s.cards[index], 50, nil)}
+    v1 = tests.call 0
+    v2 = tests.call 1
+    v3 = tests.call 2
+    describe v1 do
+      it {is_expected.to be > v2}
+      it {is_expected.to be > v3}
+    end
+  end
+end
+describe Hand do
+	describe "#new" do
+		describe "#cards" do
+			subject {Hand.new.cards}
+			describe "#length" do
+				subject {Hand.new.cards.length}
+				it {is_expected.to be 3}
+			end
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
+require_relative "codeclimate.rb"
 require "99_game"
+include CardDeck
 # 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

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: 99_game
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
-- Zachary Perlmutter
+- Zachary Roth Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
-dependencies: []
+date: 2016-03-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: card_deck
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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: ! '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.
@@ -20,15 +62,19 @@ executables:
 - 99_game
 extensions: []
 extra_rdoc_files:
+- LICENSE.md
 - README.md
-- LICENSE.txt
 files:
-- .rspec
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - bin/99_game
 - lib/99_game.rb
+- lib/card.rb
+- lib/hand.rb
+- spec/codeclimate.rb
 - spec/lib/99_game_spec.rb
+- spec/lib/deck_spec.rb
+- spec/lib/hand_spec.rb
 - spec/spec_helper.rb
 homepage: https://rubygems.org/gems/99_game
 licenses:
@@ -42,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
@@ -50,11 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The game of 99.
 test_files:
+- spec/codeclimate.rb
 - spec/lib/99_game_spec.rb
-- .rspec
+- spec/lib/deck_spec.rb
+- spec/lib/hand_spec.rb
 - spec/spec_helper.rb

data/.rspec

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