rrschedule 0.1.2 → 0.1.3

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+*.gemspec

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rrschedule.rb

@@ -1,9 +1,7 @@
 # rrschedule (Round Robin Schedule generator)
 # Auhtor: François Lamontagne
 ############################################################################################################################
-require 'rubygems'
 require 'active_support'
-
 module RRSchedule
   class Schedule
     attr_accessor :playing_surfaces, :game_times, :cycles, :wdays, :start_date, :exclude_dates, :shuffle_initial_order
@@ -13,7 +11,7 @@ module RRSchedule
       self.teams = params[:teams] || [1,2,3,4,5]
       self.playing_surfaces = params[:playing_surfaces] || ["--"]
       self.cycles = params[:cycles] || 1
-      self.game_times = params[:game_times] || ["7:00 PM"]
+      self.game_times = params[:game_times] || ["Game time not specified"]
       self.shuffle_initial_order = params[:shuffle_initial_order] || true
       self.exclude_dates = params[:exclude_dates] || []
       self.start_date = params[:start_date] || Time.now.beginning_of_day
@@ -42,10 +40,16 @@ module RRSchedule
         #round completed
         current_round += 1
         @rounds ||= []
-        @rounds << Round.new(:round => current_round, :games => games.collect {|g| Game.new(:team_a => g[:team_a], :team_b => g[:team_b])})
+        @rounds << Round.new( 
+                    :round => current_round,
+                    :games => games.collect { |g| Game.new( 
+                                                    :team_a => g[:team_a],
+                                                    :team_b => g[:team_b])
+                                            })
         
-        games.reject! {|g| g[:team_a] == :dummy || g[:team_b] == :dummy}
-        all_games.reject! {|g| g[:team_a] == :dummy || g[:team_b] == :dummy}
+        reject_dummy = lambda {|g| g[:team_a] == :dummy || g[:team_b] == :dummy}
+        games.reject! {|g| reject_dummy.call(g)}
+        all_games.reject! {|g| reject_dummy.call(g)}
           
         @teams = @teams.insert(1,@teams.delete_at(@teams.size-1))
         
@@ -67,7 +71,7 @@ module RRSchedule
     def face_to_face(team_a,team_b)
       res=[]
       self.gamedays.each do |gd,games|
-        res << games.select{|g| (g.team_a == team_a && g.team_b == team_b) || (g.team_a == team_b && g.team_b == team_a)}
+        res << games.select {|g| (g.team_a == team_a && g.team_b == team_b) || (g.team_a == team_b && g.team_b == team_a)}
       end
       res.flatten
     end
@@ -76,11 +80,10 @@ module RRSchedule
       res = ""
       res << "#{@schedule.keys.size.to_s} gamedays\n"    
       @schedule.sort.each do |gd,games|
-        gd_proc = lambda {gd.strftime("%Y-%m-%d")}
-        res << gd_proc.call + "\n"
-        res << "=" * gd_proc.call.length + "\n"
+        res << gd.strftime("%Y-%m-%d") + "\n"
+        res << "==========\n"
         games.each do |g|
-          res << g.team_a.to_s + " VS " + g.team_b.to_s + " on playing surface #{g.playing_surface} at #{g.game_time}\n"
+          res << "#{g.team_a.to_s} VS #{g.team_b.to_s} on playing surface #{g.playing_surface} at #{g.game_time}\n"
         end
         res << "\n"
       end
@@ -94,7 +97,6 @@ module RRSchedule
     def by_team(team)
       gms=[]
       self.gamedays.each do |gd,games|
-        #games = games.each {|g| g.game_date = gd}
         gms << games.select{|g| g.team_a == team || g.team_b == team}
       end
       gms.flatten
@@ -126,7 +128,12 @@ module RRSchedule
         res[cur_date] = []
         slice.each_with_index do |g,game_index|          
           cur_ps = ps_stack.shift
-          res[cur_date] << Game.new(:team_a => g[:team_a], :team_b => g[:team_b], :playing_surface => cur_ps, :game_time => cur_gt, :game_date => cur_date)
+          res[cur_date] << Game.new(
+                            :team_a => g[:team_a], 
+                            :team_b => g[:team_b], 
+                            :playing_surface => cur_ps, 
+                            :game_time => cur_gt, 
+                            :game_date => cur_date)
           cur_gt = gt_stack.shift if ps_stack.empty?            
           gt_stack = self.game_times.clone if gt_stack.empty?          
           ps_stack = self.playing_surfaces.clone if ps_stack.empty?                              

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rrschedule
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - flamontagne
@@ -48,9 +48,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/example.rb
 - lib/rrschedule.rb
-- rrschedule.gemspec
 - test/helper.rb
 - test/test_rrschedule.rb
 has_rdoc: true
@@ -88,5 +86,5 @@ signing_key:
 specification_version: 3
 summary: Round-Robin schedule generator
 test_files: 
-- test/helper.rb
 - test/test_rrschedule.rb
+- test/helper.rb

data/lib/example.rb

@@ -1,56 +0,0 @@
-require 'rrschedule.rb'
-Time.zone = "America/New_York"
-
-teams = ["Rockets","Jetpacks","Snakes","Cobras","Wolves","Huskies","Tigers","Lions","Moose","Sprinklers","Pacers","Cyclops","Munchkins","Magicians","French Fries"]
-schedule=RRSchedule::Schedule.new(
-                                :teams => teams,  #array of teams that will compete against each other in the season (can be any kind of object)
-                                :playing_surfaces => ["A","B","C","D"], #list of available playing surfaces (volleyball fields, curling sheets, tennis courts, etc)
-                                :wdays => [3], #day(s) of the week where games are played
-                                :start_date => Time.zone.parse("2010/10/13"), #Season will start on...                
-                                :exclude_dates => [ #array of dates WITHOUT games
-                                                    Time.zone.parse("2010/11/24"),
-                                                    Time.zone.parse("2010/12/15"),
-                                                    Time.zone.parse("2010/12/22"),
-                                                    Time.zone.parse("2010/12/29")
-                                                  ],
-                                :cycles => 1, #1 for Round Robin, 2 for Double Round Robin and so on
-                                :shuffle_initial_order => true, #Shuffle team order before each cycle
-                                :game_times => ["10:00 AM", "1:00 PM"] #Times of the day where the games are played
-                              )
-res=schedule.generate
-
-#human readable schedule
-puts schedule.to_s
-
-schedule.rounds.each do |round|
-  puts "Round ##{round.round}"
-  round.games.each do |g|
-    puts g.team_a.to_s + " Vs " + g.team_b.to_s
-  end
-  puts "\n"
-end
-
-#display a team schedule
-#test_team = "Sprinklers"
-#games=schedule.by_team(test_team)
-#puts "Schedule for team ##{test_team.to_s}"
-#games.each do |g|
-#  puts "#{g.game_date.strftime("%Y-%m-%d")}: against #{g.team_a == test_team ? g.team_b.to_s : g.team_a.to_s} on playing surface ##{g.playing_surface} at #{g.game_time}"     
-#end
-
-#face_to_face
-#games=schedule.face_to_face("Lions","Moose")
-#puts "FACE TO FACE: Lions Vs Moose"
-#games.each do |g|
-#  puts g.game_date.to_s + " on playing surface " + g.playing_surface.to_s + " at " + g.game_time.to_s
-#end
-
-#How to iterate the schedule
-#schedule.gamedays.each do |gd,games|
-#  puts gd
-#  puts "===================="
-#  games.each do |g|
-#    puts g.team_a.to_s + " Vs " + g.team_b.to_s + " on playing surface ##{g.playing_surface} at #{g.game_time}"     
-#  end
-#  puts "\n"
-#end

data/rrschedule.gemspec

@@ -1,55 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rrschedule}
-  s.version = "0.1.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["flamontagne"]
-  s.date = %q{2010-11-08}
-  s.description = %q{This gem automate the process of creating a round-robin sport schedule.}
-  s.email = %q{flamontagne@azanka.ca}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/example.rb",
-     "lib/rrschedule.rb",
-     "rrschedule.gemspec",
-     "test/helper.rb",
-     "test/test_rrschedule.rb"
-  ]
-  s.homepage = %q{http://github.com/flamontagne/rrschedule}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Round-Robin schedule generator}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_rrschedule.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-  end
-end
-