football-manager 0.1.2 → 0.1.4

data/README.md

@@ -8,7 +8,7 @@ I am a tool to help you pick the fairest teams for your game
     
 ## HOW TO USE ME
 
-1) Create a file with all your available players, including their names and skill level
+1) Create a file with all your available players, including their names and skill level (1-5)
 
 e.g. players.txt
 
@@ -25,6 +25,15 @@ e.g. players.txt
     
 3) Two fair team should now be output
 
+    Team A has 3 player and 11 points
+    Alan
+    Steve T
+    Tom
+    Team B has 3 player and 11 points
+    Jeff
+    Paul
+    Steve B
+
 
 
 I will randomise the teams to the best of my algorithmic ability!

data/bin/football-manager

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'ruby-debug'
 require 'optparse'
 
 require File.dirname(__FILE__) + '/../lib/football-manager'

data/features/support/choose_teams_support.rb

@@ -6,6 +6,6 @@ def check_both_teams_are_equal(number_of_players, points)
 end
 
 def check_team_has_the_following(number_of_players, points)
-    pattern = "Team (A|B) has #{number_of_players} player[s]? and #{points} points"
-    assert_matching_output(pattern, all_output)
+  pattern = "Team (A|B) has #{number_of_players} player[s]? and #{points} points"
+  assert_matching_output(pattern, all_output)
 end

data/football-manager.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'football-manager'
-  s.version           = '0.1.2'
-  s.date              = '2012-03-13'
+  s.version           = '0.1.4'
+  s.date              = '2012-03-17'
   s.rubyforge_project = 'football-manager'
 
   ## Make sure your summary is short. The description may be as long

data/lib/football-manager.rb

@@ -1,5 +1,5 @@
 module FOOTBALLMANAGER
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end
 
 require 'ruby-debug'

data/lib/football-manager/game.rb

@@ -1,5 +1,5 @@
 module FootballManager
-  module Game
+  class Game
     def self.pick_teams(player_data_reference)
       player_data = FootballManager::IOHelper.fetch_player_data(player_data_reference)
       players = FootballManager::PlayersCreator.create_players(player_data)

data/lib/football-manager/i_o_helper.rb

@@ -1,5 +1,5 @@
 module FootballManager
-  module IOHelper
+  class IOHelper
     def self.fetch_player_data(player_data_reference)
       File.readlines(player_data_reference)
     end

data/lib/football-manager/players_creator.rb

@@ -7,22 +7,24 @@ module FootballManager
       def create_players(player_data)
         player_data.collect do |player|
           player =~ player_pattern
-          self.player_match = Regexp.last_match
-          FootballManager::Player.new(player_name, player_skill)
-        end
+          if self.player_match = Regexp.last_match
+            FootballManager::Player.new(name, skill)
+          end
+        end.compact
       end
 
-      def player_pattern
-        /^\s*([a-zA-Z0-9]+\s?[a-zA-Z0-9]+)\s*,\s*([1-5]{1})\s*$/
-      end
+      private
+        def player_pattern
+          /^\s*([a-zA-Z0-9]+\s?[a-zA-Z0-9]+)\s*,\s*([1-5]{1})\s*$/
+        end
 
-      def player_name
-        player_match.captures.first
-      end
+        def name
+          player_match.captures.first
+        end
 
-      def player_skill
-        player_match.captures.last
-      end
+        def skill
+          player_match.captures.last
+        end
     end
   end
 end

data/lib/football-manager/team_picker.rb

@@ -1,17 +1,9 @@
 module FootballManager
-  module TeamPicker
+  class TeamPicker
     def self.calculate_fair_teams(players)
-      # players_in_descending_order = players.sort { |a,b| b.skill <=> a.skill }
-      players_in_descending_order = []
-
-      5.downto(1) do |i|
-        players_in_descending_order <<
-          players.select { |player| player.skill == i }.sort_by {rand}
-      end
-
       team_a, team_b  = FootballManager::Team.new, FootballManager::Team.new
 
-      players_in_descending_order.flatten.partition do |player|
+      players_in_descending_order(players).each do |player|
         if team_a.empty? || team_a.points <= team_b.points
           team_a << player
         else
@@ -21,6 +13,13 @@ module FootballManager
 
       return [team_a, team_b]
     end
+
+    private
+      def self.players_in_descending_order(players)
+        5.downto(1).collect do |i|
+          players.select { |player| player.skill == i }.sort_by {rand}
+        end.flatten!
+      end
   end
 end
 

data/lib/football-manager/team_sheet_creator.rb

@@ -1,5 +1,5 @@
 module FootballManager
-  module TeamSheetCreator
+  class TeamSheetCreator
     def self.create_team_sheet(teams)
       teams.each do |team|
         puts "Team #{teams.first == team ? 'A' : 'B'} has #{team.size} player and #{team.points} points"

data/spec/football-manager/players_creator_spec.rb

@@ -10,7 +10,7 @@ describe FootballManager::PlayersCreator do
     let(:player_2_name) { 'player 2' }
     let(:player_1_skill) { '5' }
     let(:player_2_skill) { '5' }
-    let(:player_data) { [player_1, player_2] }
+    let(:player_data) { [player_1, player_2, ''] }
 
     it 'iterate through the player details, creating new players' do
       FootballManager::Player.should_receive(:new).once.with(player_1_name, player_1_skill)

data/spec/football-manager/team_sheet_creator_spec.rb

@@ -4,10 +4,16 @@ describe FootballManager::TeamSheetCreator do
   subject { FootballManager::TeamSheetCreator }
 
   describe 'create_team_sheet' do
-    let(:player_1) { double('player 1', :name => 'player 1', :skill => 1) }
-    let(:player_2) { double('player 2', :name => 'player 2', :skill => 1) }
-    let(:team_1) { double('team 1', :size => 1, :points => 5, :players => [player_1]) }
-    let(:team_2) { double('team 2', :size => 1, :points => 5, :players => [player_2]) }
+    let(:player_1)  { double('player 1', :name => 'player 1', :skill => 1) }
+    let(:player_2)  { double('player 2', :name => 'player 2', :skill => 1) }
+    let(:team_1)    { double( 'team 1',
+                              :size => 1,
+                              :points => 5,
+                              :players_ordered_by_name => [player_1]) }
+    let(:team_2)    { double( 'team 2',
+                              :size => 1,
+                              :points => 5,
+                              :players_ordered_by_name => [player_2]) }
 
 
     it 'asks each team for their size' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: football-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-03-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70137021946120 !ruby/object:Gem::Requirement
+  requirement: &70152889135460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70137021946120
+  version_requirements: *70152889135460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70137021945240 !ruby/object:Gem::Requirement
+  requirement: &70152889134900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70137021945240
+  version_requirements: *70152889134900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70137021940580 !ruby/object:Gem::Requirement
+  requirement: &70152889134380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137021940580
+  version_requirements: *70152889134380
 description: Picks two teams fair based on player skill
 email: ionysis@gmail.com
 executables:
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1980237793795828249
+      hash: 4271657946246885275
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: