tennis 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b058e15112d8268ef3ae828804e72656cb26dff3
-  data.tar.gz: 10aabb8eaacd31a048224e0fac0066a24db2f690
+  metadata.gz: 5bd5759605bb85cc0627c04bcbcee66593b513a8
+  data.tar.gz: 0fa38355782c45b1fe77347a51da96657b0a2831
 SHA512:
-  metadata.gz: 422cbc0250672d9c11fd09dc75f0a54eef705b185b0a07c2e2c2331860002f438437f712cfbdcebc03e680425dddec5acfc2ef442953b9ee3e683a2d45b579fe
-  data.tar.gz: 81f5eb54ccb0eb62774fc9a513c749f98abe7735932e371ce7c8f234c030330aa37f688358d6b00b2b0c6879079e1bd7d1d1ba3706cb446b960bb571d9817ce8
+  metadata.gz: 10074593f568f7929736fa2258a01f91fbe8761f955abdf01696b4a6498c546749cb85c2dd7764552fb9029bab95a414bdeb9c2c468cf513ad672cb2849efe12
+  data.tar.gz: 152ca820399495c84fbc3dc12413e07d0004d8908f53c72334e371b3eecea6d06d7b83a5966fd3eeb04c77afbb98174973c1587c692bbab5741daecf06915828

data/.rbenv-version

@@ -0,0 +1 @@
+2.2.0

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.2.0

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tennis.gemspec
 gemspec
-
-gem 'rspec'

data/Rakefile

@@ -1,3 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+

data/lib/tennis/version.rb

@@ -1,3 +1,3 @@
-module Tennis
-  VERSION = "0.0.2"
+class Tennis
+	VERSION = "0.0.4"
 end

data/lib/tennis.rb

@@ -1,103 +1,101 @@
 require "tennis/version"
 
-module Tennis
-	class << self
-		def initialize(scores)
-			@scores = scores != 'default-1' && scores != 'default-2' ? scores.split(/[-,,]/).map(&:to_i) : scores
-			@result = (1 if scores == 'default-1') || (2 if scores == 'default-2') || :default
-			if @result == :default
-				# to check if score for only 1 set has been input
-				validation_1 = @scores.length == 2
-				# to check if any input > 7
-				validation_2 = @scores.any? { |score| score > 7 }
-				@result = :error if validation_1 || validation_2
-			end
+class Tennis
+	def initialize(scores)
+		@scores = scores != 'default-1' && scores != 'default-2' ? scores.split(/[-,,]/).map(&:to_i) : scores
+		@result = (1 if scores == 'default-1') || (2 if scores == 'default-2') || :default
+		if @result == :default
+			# to check if score for only 1 set has been input
+			validation_1 = @scores.length == 2
+			# to check if any input > 7
+			validation_2 = @scores.any? { |score| score > 7 }
+			@result = :error if validation_1 || validation_2
 		end
+	end
 
-		# returns who won the match
-		# :incomplete_match (bad input/incomplete match)
-		# :error (bad input for sure)
-		# 1 (player-1 won)
-		# 2 (player-2 won)
-		def result
-			return @result if @result != :default
-			return @result = (@scores.length == 4) ? two_sets : three_sets
-		end
+	# returns who won the match
+	# :incomplete_match (bad input/incomplete match)
+	# :error (bad input for sure)
+	# 1 (player-1 won)
+	# 2 (player-2 won)
+	def result
+		return @result if @result != :default
+		return @result = (@scores.length == 4) ? two_sets : three_sets
+	end
 
-		# returns an array of points
-		# returns (points_player_1 , points_player_2)
-		# returns (0,0) for bad input
-		def points
-			@result = self.result
-			(return [0, 0]) if @result == :error
-			return (complete_match_points if @result == 1 || @result == 2) || incomplete_match_points
-		end
+	# returns an array of points
+	# returns (points_player_1 , points_player_2)
+	# returns (0,0) for bad input
+	def points
+		@result = self.result
+		(return [0, 0]) if @result == :error
+		return (complete_match_points if @result == 1 || @result == 2) || incomplete_match_points
+	end
 
-		private
+	private
 
-		# helper method: called by RESULT method for valid matches with 2 sets
-		def two_sets
-			set_results = []
-			[0, 2].each do |i|
-				# tie breaker (assuming a 7 point tie breaker) or a 7-5 scores
-				if @scores[i] == 7 || @scores[i+1] == 7
-					set_results << (@scores[i] == 7 ? 1 : 2)
-					# regular set victory - 6 games with a margin of 2
-				else
-					return :incomplete_match if ( @scores[i] - @scores[i + 1] ).abs < 2
-					set_results << (@scores[i] == 6 ? 1 : 2)
-				end
+	# helper method: called by RESULT method for valid matches with 2 sets
+	def two_sets
+		set_results = []
+		[0, 2].each do |i|
+			# tie breaker (assuming a 7 point tie breaker) or a 7-5 scores
+			if @scores[i] == 7 || @scores[i+1] == 7
+				set_results << (@scores[i] == 7 ? 1 : 2)
+				# regular set victory - 6 games with a margin of 2
+			else
+				return :incomplete_match if ( @scores[i] - @scores[i + 1] ).abs < 2
+				set_results << (@scores[i] == 6 ? 1 : 2)
 			end
-			# incomplete match e.g: 6-4,5-3
-			return (set_results[0] if set_results[0] == set_results[1]) || :incomplete_match
 		end
+		# incomplete match e.g: 6-4,5-3
+		return (set_results[0] if set_results[0] == set_results[1]) || :incomplete_match
+	end
 
-		# helper method: called by RESULT method for valid matches with 3 sets
-		def three_sets
-			set_results = []
-			[0, 2, 4].each do |i|
-				# tie breaker (assuming a 7 point tie breaker) or a 7-5 score
-				if @scores[i] == 7 || @scores[i + 1] == 7
-					set_results << (@scores[i] == 7 ? 1 : 2)
-					# regular set victory - 6 games with a margin of 2
-				else
-					return :incomplete_match if (@scores[i] - @scores[i + 1]).abs < 2
-					set_results << (@scores[i] == 6 ? 1 : 2)
-				end
+	# helper method: called by RESULT method for valid matches with 3 sets
+	def three_sets
+		set_results = []
+		[0, 2, 4].each do |i|
+			# tie breaker (assuming a 7 point tie breaker) or a 7-5 score
+			if @scores[i] == 7 || @scores[i + 1] == 7
+				set_results << (@scores[i] == 7 ? 1 : 2)
+				# regular set victory - 6 games with a margin of 2
+			else
+				return :incomplete_match if (@scores[i] - @scores[i + 1]).abs < 2
+				set_results << (@scores[i] == 6 ? 1 : 2)
 			end
-			# checks if the result has been decided in the first 2 sets
-			# but the 3rd set is also present in the input
-			return :error if set_results[0] == set_results[1]
-			return  set_results.count(1) ? 1 : 2
 		end
+		# checks if the result has been decided in the first 2 sets
+		# but the 3rd set is also present in the input
+		return :error if set_results[0] == set_results[1]
+		return  set_results.count(1) ? 1 : 2
+	end
 
-		# helper method: called by POINTS for complete matches
-		def complete_match_points
-			points = [0, 0]
-			@result = self.result
-			points[@result - 1] = (@scores.length == 6) ? 12 : 14
-			runner_up = (@result == 1) ? 2 : 1
-			runner_up_points = player_points(runner_up)
-			points[runner_up - 1] = runner_up_points < 8 ? runner_up_points : 8
-			return points
-		end
+	# helper method: called by POINTS for complete matches
+	def complete_match_points
+		points = [0, 0]
+		@result = self.result
+		points[@result - 1] = (@scores.length == 6) ? 12 : 14
+		runner_up = (@result == 1) ? 2 : 1
+		runner_up_points = player_points(runner_up)
+		points[runner_up - 1] = runner_up_points < 8 ? runner_up_points : 8
+		return points
+	end
 
-		# helper method: called by POINTS for incomplete matches
-		def incomplete_match_points
-			points = [0, 0]
-			player_1_points = player_points(1)
-			player_2_points = player_points(2)
-			points[0] = player_1_points < 10 ? player_1_points : 10
-			points[1] = player_2_points < 10 ? player_2_points : 10
-			return points
-		end
+	# helper method: called by POINTS for incomplete matches
+	def incomplete_match_points
+		points = [0, 0]
+		player_1_points = player_points(1)
+		player_2_points = player_points(2)
+		points[0] = player_1_points < 10 ? player_1_points : 10
+		points[1] = player_2_points < 10 ? player_2_points : 10
+		return points
+	end
 
-		# helper method: returns the POINTS of a player given the player number
-		def player_points(player)
-			player_scores = []
-			@scores.each_with_index { |score, index| (player_scores << score; player +=2) if index == (player - 1) }
-			player_scores = player_scores.sort! { |x, y| y <=> x }
-			return player_scores[0] + player_scores[1]
-		end
+	# helper method: returns the POINTS of a player given the player number
+	def player_points(player)
+		player_scores = []
+		@scores.each_with_index { |score, index| (player_scores << score; player +=2) if index == (player - 1) }
+		player_scores = player_scores.sort! { |x, y| y <=> x }
+		return player_scores[0] + player_scores[1]
 	end
 end

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--diff unified
+--require spec/spec_helper
+--format documentation

data/spec/spec_helper.rb

@@ -16,6 +16,11 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'bundler/setup'
+Bundler.setup
+require 'tennis'
+
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest

data/spec/tennis_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Tennis, "#packge" do
+  it 'has a version number' do
+    expect(Tennis::VERSION).not_to be nil
+  end
+end
+
+describe Tennis, "#scores" do
+  it "finds the winner properly in two sets" do
+    score = Tennis.new("6-4, 6-4")
+    expect(score.result).to eq 1
+  end
+end
+
+describe Tennis, "#points" do
+end

data/tennis.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["cpg+git@amahi.org"]
   spec.summary       = %q{A gem to manage tennis scores.}
   spec.description   = %q{A gem to manage and validate tennis scores.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/racketlogger/tennis"
   spec.license       = "GPL"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tennis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Carlos Puchol
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A gem to manage and validate tennis scores.
 email:
 - cpg+git@amahi.org
@@ -46,16 +60,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rbenv-version"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/tennis.rb
 - lib/tennis/version.rb
+- spec/spec.opts
 - spec/spec_helper.rb
+- spec/tennis_spec.rb
 - tennis.gemspec
-homepage: ''
+homepage: https://github.com/racketlogger/tennis
 licenses:
 - GPL
 metadata: {}
@@ -80,4 +98,6 @@ signing_key:
 specification_version: 4
 summary: A gem to manage tennis scores.
 test_files:
+- spec/spec.opts
 - spec/spec_helper.rb
+- spec/tennis_spec.rb