gamemaker 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9c799ef34e5fa6def38e0c9ca605422066beb7
-  data.tar.gz: 71dfb99cd0ae105da715e2a95c8dd504dafb2c5e
+  metadata.gz: 1045e4b4a921944124481400fa0d40da13c65770
+  data.tar.gz: 79a374f9a54f50c447764c98e016df80a188f045
 SHA512:
-  metadata.gz: d9fb7600fad795a54207bc0ee96af83123ea675c5fd69b366217e8d1ce3afe04d6f42c4372a581255315eb1879baa50974218ba01d7b0bb9c6489e1527b85d53
-  data.tar.gz: 604c9d9304ec761dc990a16693032bef46f60fd79554894b2cfdb3eeb0bb2bc26d04596ab2cba879ae48d451f3e0550c6cc19dd9a22778516af09acbb418db24
+  metadata.gz: 4d2b8672921d11aec36a9da94afe5331b74ef04ddb13b9edf9f9f0af6806ad10793a50421d534376a73d3bf316a69fbc616f3929e0829919f211eea724f76331
+  data.tar.gz: f564779841d15944ac84e3e29e9757e13631b72e5ba93709d350e892cf90f7c663902d104e0ac57f7349ba09d88e18361ba5f72102dbfd775c190a3bed5f7d7f

data/lib/gamemaker/card_game/deck.rb

@@ -28,7 +28,7 @@ module Gamemaker
         @cards.empty?
       end
 
-      def shuffle!
+      def shuffle
         @cards.shuffle!
         self
       end
@@ -41,9 +41,9 @@ module Gamemaker
 
       def draw!(n = nil)
         if n && n > @cards.length
-          raise IndexError, "Cannot draw #{n} cards from the deck: only #{@cards.length} cards left"
+          raise IndexError, "Tried to draw #{n} cards when there were only #{@cards.length} cards left"
         elsif !n && empty?
-          raise IndexError, "Cannot draw from the deck: no cards left"
+          raise IndexError, "Tried to draw a card when there were no cards left"
         else
           draw(n)
         end
@@ -74,7 +74,7 @@ module Gamemaker
 
       alias_method :untake, :undraw
 
-      def merge!(other)
+      def merge(other)
         self << other.draw(other.length)
       end
 

data/lib/gamemaker/card_game/hand.rb

@@ -15,6 +15,42 @@ module Gamemaker
       def initialize(cards = [])
         super(cards)
       end
+
+      def include?(*cards)
+        cards.flatten.all? { |card| @cards.include?(card) }
+      end
+
+      def draw_randomly(n = nil)
+        drawn = n ? @cards.sample(n) : @cards.sample
+        remove(*Array(drawn))
+        drawn
+      end
+
+      def draw_randomly!(n = nil)
+        if n && n > @cards.length
+          raise IndexError, "Tried to draw #{n} cards when there were only #{@cards.length} cards left"
+        elsif !n && empty?
+          raise IndexError, "Tried to draw a card when there were no cards left"
+        else
+          draw_randomly(n)
+        end
+      end
+
+      def remove(*cards)
+        cards = cards.flatten
+        @cards.delete_if { |card| cards.include?(card) }
+        self
+      end
+
+      def remove!(*cards)
+        cards.flatten.each do |card|
+          unless @cards.include?(card)
+            raise ArgumentError, "Cannot remove #{card} as it's not part of the hand"
+          end
+        end
+
+        remove(*cards)
+      end
     end
   end
 end

data/lib/gamemaker/version.rb

@@ -1,3 +1,3 @@
 module Gamemaker
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamemaker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Godfrey Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport