cards_lib 0.2.4 → 0.2.5

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 rvm:
-- 2.2.5
-- 2.3.2
-script: bundle exec rake test
+- 2.2.6
+- 2.3.3
 env:
   global:
     secure: kAw1KW3iTB3rqMur/U1RM7C/MTWJx17T6Xyc+NEcrvE0PtYuIAOfZ/Qn262PWEE34OHCdmkhfHbBY1ZbzwaVDg+5LTlnwikLREMYH5ddf+yLE39lZkoALQDQeNwXNdJG/s/tS2I7c+/+vE8Xk5fZJZmNxiZIFPuFseZUvruO8HnvRpLKdlb7HLJAXq1ITRBWYbCe2jkFhgYEQCBqs3gwIPeAoxXAOn3ILUJ3xDxC/G/eSU+GbLTraJIyrhJApsUw4xSWr+fFumYFRK/PnJlcx4FR64D49B2mEdRSmHvZcBPo0KUWwr+1CVhkPtsTgnO8OJsFkq6FYH1aTmP/5W46wnOe8rPHd1GsY6pgXYTiMisTXk5gLUmcdSWriqbIdeTaBdNDKYzejwRwitR9iPSb1iQXjoCRRvcS1G6dHVjrZq9SSkScpSqJAXvAgr2DeCCY9PejaXdVtyTyOvZYH2ql440+DoEkb4nK9mkhy93CmzoIHNFKWYqNKPCTpK2O7YdL9+wPFc8Kmaobu6Iht9hA0uShLooiF0SnnU0twcEWbVepU9tx5pI65DT46M3PGfLO0KQtXUZscytkstdXmwyWwzFPUMW2EXFeXVW3f9o77z5npe/5b6nBeHIrHTNOdw57fMPzKjmsv0v6EbeVL9xajdHkbJ9G9zOSJd0b+PIPfJc=
+addons:
+  code_climate:
+    repo_token: ecf8c246bcc2fdad42590f78c7b214bc19abf212eee0979427477e9c6a510320
+script: bundle exec rake test
+after_success:
+  - bundle exec codeclimate-test-reporter

data/Gemfile

@@ -6,7 +6,11 @@ gem "codeclimate-test-reporter", group: :test, require: nil
 group :development do
   gem "guard"
   gem "guard-minitest"
+  gem "guard-rubocop"
 end
-if Gem::Dependency.new('', ">= 2.4.0").match?('', RUBY_VERSION)
+
+if Gem::Dependency.new('', "~> 2.4.0").match?('', RUBY_VERSION)
   gem "json", git: 'https://github.com/flori/json', branch: 'v1.8'
+else
+  gem "json"
 end

data/Guardfile

@@ -15,33 +15,37 @@
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 
-guard :minitest do
-  # with Minitest::Unit
-  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
-  watch(%r{^lib/cards_lib/([^/]+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
-  watch(%r{^lib/cards_lib/standard/([^/]+)\.rb$})     { |m| "test/standard/#{m[1]}_test.rb" }
-  watch(%r{^lib/cards_lib/standard/evaluators/([^/]+)\.rb$})     { |m| "test/standard/evaluators/#{m[1]}_test.rb" }
-  watch(%r{^lib/cards_lib/standard/rules/([^/]+)\.rb$})     { |m| "test/standard/rules/#{m[1]}_test.rb" }
-  watch(%r{^lib/cards_lib/standard/rankers/([^/]+)\.rb$})     { |m| "test/standard/rankers/#{m[1]}_test.rb" }
-  watch(%r{^test/minitest_helper\.rb$})      { 'test' }
-  watch(%r{^lib/cards_lib/card.rb$})         { 'test' }
+group :red_green_refactor, halt_on_fail: true do
+  guard :minitest do
+    # with Minitest::Unit
+    watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+    watch(%r{^lib/cards_lib/([^/]+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
+    watch(%r{^lib/cards_lib/standard/([^/]+)\.rb$}) { |m| "test/standard/#{m[1]}_test.rb" }
+    watch(%r{^lib/cards_lib/standard/evaluators/([^/]+)\.rb$}) { |m| "test/standard/evaluators/#{m[1]}_test.rb" }
+    watch(%r{^lib/cards_lib/standard/rules/([^/]+)\.rb$}) { |m| "test/standard/rules/#{m[1]}_test.rb" }
+    watch(%r{^lib/cards_lib/standard/rankers/([^/]+)\.rb$})     { |m| "test/standard/rankers/#{m[1]}_test.rb" }
+    watch(%r{^test/minitest_helper\.rb$})      { 'test' }
+    watch(%r{^lib/cards_lib/card.rb$})         { 'test' }
 
-  # with Minitest::Spec
-  # watch(%r{^spec/(.*)_spec\.rb$})
-  # watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
-  # watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
+    # with Minitest::Spec
+    # watch(%r{^spec/(.*)_spec\.rb$})
+    # watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
+    # watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
 
-  # Rails 4
-  # watch(%r{^app/(.+)\.rb$})                               { |m| "test/#{m[1]}_test.rb" }
-  # watch(%r{^app/controllers/application_controller\.rb$}) { 'test/controllers' }
-  # watch(%r{^app/controllers/(.+)_controller\.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
-  # watch(%r{^app/views/(.+)_mailer/.+})                   { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
-  # watch(%r{^lib/(.+)\.rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
-  # watch(%r{^test/.+_test\.rb$})
-  # watch(%r{^test/test_helper\.rb$}) { 'test' }
+    # Rails 4
+    # watch(%r{^app/(.+)\.rb$})                               { |m| "test/#{m[1]}_test.rb" }
+    # watch(%r{^app/controllers/application_controller\.rb$}) { 'test/controllers' }
+    # watch(%r{^app/controllers/(.+)_controller\.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
+    # watch(%r{^app/views/(.+)_mailer/.+})                   { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
+    # watch(%r{^lib/(.+)\.rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
+    # watch(%r{^test/.+_test\.rb$})
+    # watch(%r{^test/test_helper\.rb$}) { 'test' }
 
-  # Rails < 4
-  # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" }
-  # watch(%r{^app/helpers/(.*)\.rb$})     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r{^app/models/(.*)\.rb$})      { |m| "test/unit/#{m[1]}_test.rb" }
+    # Rails < 4
+    # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" }
+    # watch(%r{^app/helpers/(.*)\.rb$})     { |m| "test/helpers/#{m[1]}_test.rb" }
+    # watch(%r{^app/models/(.*)\.rb$})      { |m| "test/unit/#{m[1]}_test.rb" }
+  end
+
+  guard :rubocop, all_on_start: true
 end

data/README.md

@@ -15,7 +15,7 @@ I'm willing to bet you that there is no other Ruby card game library
 out there as easy to use, as well thought out, and as simple to
 understand as mine. Come on, I dare you to use it and review it! ;-)
 
-##Scope
+## Scope
 
 The scope of this project aims to be a game agnostic card management
 and evaluation system.  Game logic itself will not be provided with
@@ -25,14 +25,14 @@ cards is the sole purpose of this gem.
 Feel free to contribute or raise suggestions via the issue tracker.
 I welcome participation of all kinds! :-)
 
-##Install
+## Install
 
 ```
 gem install 'cards_lib'
 ```
 Requires Ruby 2 or greater.
 
-##Usage
+## Usage
 
 Create a Card with Card.new(face)
 
@@ -64,7 +64,7 @@ CardsLib::IsSet.verify(
 )
 ```
 
-##Goodies
+## Goodies
 
 * **lib/cards_lib/is_set.rb** is a golden tool in card hand verification.
 
@@ -74,7 +74,7 @@ CardsLib::IsSet.verify(
 
 * In **lib/cards_lib/standard/evaluators/blackjack_evaluator.rb** there is a Blackjack hand worth evaluation tool.  See the **test/standard/evaluators/blackjack_evaluator_test.rb** for examples.
 
-##Definitions
+## Definitions
 
 The main difference between **Rules** and **Evaluators** is Rules are purposed
 for exact precedence and exact given matches (eg: two_pair only accepts
@@ -101,9 +101,9 @@ entire hand evaluation where-as Rules are specific scenarios.
 the Cards are first initialized.  Each Card holds its own Ranker
 object.
 
-#Example Usage
+# Example Usage
 
-###High Card
+### High Card
 
 ```ruby
 include CardsLib
@@ -144,11 +144,11 @@ as a simple list from least to greatest value.  If you want to use a Hash (in ca
 of different ranks may be the same value) you may, but you must then also define a Proc for
 lookup.  See [lib/cards_lib/standard/rankers/blackjack_ranker.rb](https://github.com/danielpclark/CardsLib/blob/master/lib/cards_lib/standard/rankers/blackjack_ranker.rb) for an example of how to implement that.
 
-##License
+## License
 
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 by Daniel P. Clark
+Copyright (c) 2015-2017 by Daniel P. Clark
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/cards_lib.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Daniel P. Clark"]
   spec.email         = ["6ftdan@gmail.com"]
 
-  spec.summary       = %q{OO Card Game Library}
-  spec.description   = %q{Card Game Library.  Testable and Object Oriented.}
+  spec.summary       = 'OO Card Game Library'
+  spec.description   = 'Card Game Library.  Testable and Object Oriented.'
   spec.homepage      = "http://github.com/danielpclark/CardsLib"
   spec.license       = "MIT"
 

data/lib/cards_lib.rb

@@ -8,7 +8,7 @@ require "cards_lib/is_set"
 
 module CardsLib
 
-  # Macro 
+  # Macro
   # Cards[]
   #  generate Card instances from string
   #  representations of their faces

data/lib/cards_lib/card.rb

@@ -6,9 +6,9 @@ module CardsLib
       @suit = if_hash_then_fetch(face, :suit)
       @rank = if_hash_then_fetch(face, :rank)
       @face = face_from_rank_and_suit(@rank, @suit) if face.is_a? Hash
-      
+
       @face ||= face
-      @ranker = ranker.new(self.rank)
+      @ranker = ranker.new(rank)
     end
 
     def inspect
@@ -16,7 +16,7 @@ module CardsLib
     end
 
     def face
-      @face   
+      @face
     end
 
     def suit
@@ -32,12 +32,12 @@ module CardsLib
     end
 
     def pair?(other)
-      self.rank == other.rank
+      rank == other.rank
     end
 
     # equal by both rank and suit
     def ==(other)
-      pair?(other) && self.suit == other.suit
+      pair?(other) && suit == other.suit
     end
 
     # equal by value
@@ -52,20 +52,20 @@ module CardsLib
     def sequential?(other)
       @ranker.sequential?(other)
     end
-    
+
     # return other if true
     def paired?(other)
-      (self.rank == other.rank) ? other : nil
+      (rank == other.rank) ? other : nil
     end
 
     # return other if true
     def suited?(other)
-      (self.suit == other.suit) ? other : nil
+      (suit == other.suit) ? other : nil
     end
 
     # returns other if true
     def ordered?(other)
-      self.sequential?(other) ? other : nil
+      sequential?(other) ? other : nil
     end
 
     private

data/lib/cards_lib/deck.rb

@@ -3,9 +3,13 @@ module CardsLib
     def initialize(options = {})
       cards = options.fetch(:cards) { Standard::PLAYING_CARDS }
       ranker = options.fetch(:ranker){ Ranker }
-      @seed = options.fetch(:seed)  { Random.new.seed         }
+      @seed = options.fetch(:seed) { Random.new.seed }
       @top = 0
-      @cards = cards.map {|c| Card.new(c, ranker) }.shuffle(random: Random.new(@seed)).to_enum
+      @cards = if cards.all? {|c| c.is_a? Card }
+                 cards
+               else
+                 cards.map {|c| Card.new(c, ranker) }
+               end.shuffle(random: Random.new(@seed)).to_enum
     end
 
     def inspect

data/lib/cards_lib/is_set.rb

@@ -7,9 +7,9 @@ module CardsLib
         rules.all? {|r| send(r, cards) } && (min..max).include?(cards.count)
       end
 
-      private 
+      private
       def unique(cards)
-        cards.combination(2).all? {|a,b| a != b }
+        cards.combination(2).all? {|a, b| a != b }
       end
 
       using Refinements::InjectWhile
@@ -17,7 +17,7 @@ module CardsLib
       def paired(cards)
         cards.inject_while?(:paired?)
       end
-      
+
       def suited(cards)
         cards.inject_while?(:suited?)
       end

data/lib/cards_lib/ranker.rb

@@ -1,13 +1,15 @@
 module CardsLib
   class Ranker
     include Comparable
-    attr :rank, :rank_lookup
+    attr_reader :rank, :rank_lookup
     # Initialize's arguments:
     # rank        - is whatever part of the object, or the object itself you choose to use.
     # ranks       - is a simple hash to lookup a cards value with the keys matching the rank object.
     # rank_lookup - is an optional Proc to redefine how you will lookup a cards value.
     def initialize(rank = nil, ranks = nil, rank_lookup = nil)
-      @rank, @ranks, @rank_lookup = rank, ranks, rank_lookup
+      @rank = rank
+      @ranks = ranks
+      @rank_lookup = rank_lookup
     end
 
     def ranks
@@ -15,16 +17,19 @@ module CardsLib
     end
 
     def ranker(rank_face = @rank)
-      @rank_lookup ? @rank_lookup.(rank_face) :
-      ranks.index(rank_face).to_i + 1
+      if @rank_lookup
+        @rank_lookup.(rank_face)
+      else
+        ranks.index(rank_face).to_i + 1
+      end
     end
 
-    def <=>(item)
-      ranker(self.rank) <=> ranker(item.rank)
+    def <=>(other)
+      ranker(rank) <=> ranker(other.rank)
     end
 
-    def sequential?(item)
-      (ranker(self.rank) - ranker(item.rank)).abs == 1
+    def sequential?(other)
+      (ranker(rank) - ranker(other.rank)).abs == 1
     end
   end
 end

data/lib/cards_lib/refinements.rb

@@ -2,7 +2,7 @@ module CardsLib::Refinements
   module InjectWhile
     refine Array do
       def inject_while?(m)
-        result, *array = self.dup
+        result, *array = dup
         loop do
           break if array.empty?
           other = array.shift

data/lib/cards_lib/standard/evaluators/blackjack_evaluator.rb

@@ -6,15 +6,13 @@ module CardsLib
           @cards = cards
           @reduced_ace_count = 0
         end
-        
+
         def worth
           @worth ||= @cards.map(&:value).inject(:+)
           if @worth > 21
             attempt = reduce_by_ace
-            until @worth < 22 || !attempt
-              attempt = reduce_by_ace
-            end
-          end 
+            attempt = reduce_by_ace until @worth < 22 || !attempt
+          end
           @worth
         end
 

data/lib/cards_lib/standard/rankers/blackjack_ranker.rb

@@ -27,4 +27,3 @@ module CardsLib
     end
   end
 end
-

data/lib/cards_lib/standard/rules/poker_rule.rb

@@ -10,7 +10,7 @@ module CardsLib
             :high_card
           ]
         end
-        
+
         def self.royal_flush(cards)
           cards if IsSet.verify(cards, [:suited]) && straight_to_ace(cards)
         end
@@ -18,16 +18,16 @@ module CardsLib
         def self.straight_flush(cards)
           cards if IsSet.verify(cards, [:unique, :ordered, :suited], {min: 5, max: 5})
         end
-        
+
         def self.four_of_a_kind(cards)
           cards if IsSet.verify(cards, [:unique, :paired], {min: 4, max: 4})
         end
-        
+
         def self.full_house(cards)
           pair, set = cards.group_by(&:rank).values.sort
-          cards if pair.inject(:pair?) && IsSet.verify(set, [:unique, :paired], {min:3, max: 3})
+          cards if pair.inject(:pair?) && IsSet.verify(set, [:unique, :paired], {min: 3, max: 3})
         end
-        
+
         def self.flush(cards)
           cards if IsSet.verify(cards, [:unique, :suited], {min: 5, max: 5})
         end
@@ -38,7 +38,7 @@ module CardsLib
         end
 
         def self.three_of_a_kind(cards)
-          cards if IsSet.verify(cards, [:unique, :paired], {min:3, max: 3})
+          cards if IsSet.verify(cards, [:unique, :paired], {min: 3, max: 3})
         end
 
         def self.two_pair(cards)
@@ -47,16 +47,16 @@ module CardsLib
         end
 
         def self.one_pair(cards)
-          cards if IsSet.verify(cards, [:unique, :paired], {min:2, max: 2})
+          cards if IsSet.verify(cards, [:unique, :paired], {min: 2, max: 2})
         end
 
         def self.high_card(cards)
           cards.detect {|c| c.rank[/\AA/]} || cards.sort.pop
         end
 
-        class << self 
+        class << self
           def straight_to_ace(cards)
-            cards.sort.map(&:rank) == Cards[*%w[As Ks Qs Js Ts]].sort.map(&:rank)
+            cards.sort.map(&:rank) == Cards[*%w(As Ks Qs Js Ts)].sort.map(&:rank)
           end
           private :straight_to_ace
         end

data/lib/cards_lib/version.rb

@@ -1,3 +1,3 @@
 module CardsLib
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cards_lib
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: OO Card Game Library