firstrow 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ4YzkzNjk3ZGU1YjE1OWQ3YjlhNTQwNzU5MzVmMjVjMGMxMGI2OQ==
+    YTYzMzBkMWQ4MWFiNTdjYjgyNjA2ZWJkYmQ3OTgzYTVjYTNjNmJiMw==
   data.tar.gz: !binary |-
-    Zjc3NjhiNmQ0OTBjNDVjYzllOGFhNDc0NDU4ZjMwODQzYTU2N2ZkMQ==
+    YjU0ZTZiNjc4NzU0ZGI4NGVjZWU4NTFhNGFjNDUwM2VlMzU4NWNjZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmVmM2U5ZmM3ZGI4MmU1ZGIwYzcwYmE2Zjk1NTc0YTM0MzI0YzFlMGViZTBh
-    NmE2MDIyMGRhMzA5NmZhMTliN2RhZDBlZDFmNDg5MWE3NmJhYmVmNzYwYThl
-    OTM4M2VlNTEzNWE4NWI2OTY1NmMwNDU1N2NjYWE1ZjA3MmI0ZmY=
+    ZTk3ZTk3NzBlYzkwYjJhNTBlMGU2MzFkZThlOWE2NjBmMDgyZDE2ZGYxZDFh
+    NTRhZDkwMmEyMjVhODJjYjExZTE1YTJmZWUxMzVkZTk1ZWUyNjliMzhjNTc5
+    NGE0ZTkwZTdiYTIxMjg1YmNkOTJjNzc1Mzc5MzVkNTc0Mjk4ZDE=
   data.tar.gz: !binary |-
-    YWEyMWZkNDU4Yjc3ZDgyZjAyZjhkYzMwMTkyMGI3NzM2ZTZlOTE3NDQ2M2Fm
-    OWNlMjhmYWY3YmU2YjYwYzI2NDQ3NGE4NmNjY2I1MjgyMTNlYTI4NGFmMTNm
-    OTI2ZGNjYmQwMjA1OWUzYTQ3NTAxYTJjNjk0YjE0MmVmMDYyNGM=
+    NTU2OTgxM2ZlZWRjN2RlNGY0YzFlMmJiZDYxNzUwYmU1ZjNmYmY0Yjk5N2Nk
+    Mzg4ODMxZDZlODIyNDE3MjcxZTk3MmU4YWFhYjk5YjQwNGY4MDZmZWUzZWJh
+    ODY4Mzk4MzVlNjhhN2Y4MGM4Y2MwNjM0ZjVmOWM5MjhhYmQ1ZDU=

data/bin/firstrow

@@ -14,7 +14,7 @@ $object = [nil]
 def get(i); return false if $object[i].nil?;	$object[i]; end
 def set(object); $object.push(object); $object.length - 1; end
 
-def launch_match(id)
+def launch_match(id, shown = 0)
 	match = get(id)
 
 	if match[:links].length == 0
@@ -25,133 +25,212 @@ def launch_match(id)
 	else
 		match_input = ""
 		while match_input == ""
-			print Paint["Enter stream number to watch (Enter between stream 1-#{match[:links].length}): ", "EDD9AA"]
+			
+			if shown == 0
+				print Paint["Enter stream to watch (Enter between stream 1-#{match[:links].length}): ", match[:color]]
+			else
+				print Paint["Enter another stream to watch (#{shown+1}-#{match[:links].length} or 'exit'): ", match[:color]]
+			end
+
+
 			match_input = $stdin.gets.chomp
-			match_input = "" if match_input.to_i.abs == 0 or match[:links][match_input.to_i.abs - 1].nil?
+			
+			return false if match_input.to_i.abs == 0 or match[:links][match_input.to_i.abs - 1].nil?
 		end
 
 		link = match[:links][match_input.to_i.abs - 1]
 	end
 
-	print Paint["Opening stream in browser... ", "FFFFFF"]
+	print Paint["Opening in Google Chrome... ", "FFFFFF"]
+
 	page_content = open(link)
 	page_iframe = Nokogiri::HTML(page_content).css('iframe').first.attr('src')
 	
 	if not page_iframe.nil?
-		`chrome '#{page_iframe}'`
+		`/usr/bin/open -a "/Applications/Google Chrome.app" '#{page_iframe}'`
 	else
-		`chrome '#{link}'`
+		`/usr/bin/open -a "/Applications/Google Chrome.app" '#{link}'`
 	end
 
 	print Paint["Done. ", "FFFFFF"]
 	puts
+
+	launch_match(id, shown + 1)
 end
 
 # Default arguments
 show_all = false
 
+# Match type
+match_type = nil
+
 # Check arguments
 ARGV.each do |argument|
+	match_type = argument if ['football', 'soccer', 'amfootball', 'rugby', 'basketball', 'hockey', 'volleyball', 'boxing', 'wrestling', 'fighting', 'tennis', 'motosport', 'baseball', 'handball'].include?(argument)
 	show_all = true if argument == "--all"
 end
 
-puts Paint["Getting all matches from First Row Sports..", "EDD9AA"]
+list = {
+	"football" => "Soccer football",
+	"amfootball" => "American football",
+	"rugby" => "Rugby",
+	"basketball" => "Basketball",
+	"hockey" => "Ice Hockey",
+	"volleyball" => "Volleyball",
+	"boxing" => "Boxing matches",
+	"wrestling" => "Wrestling (including WWE/UFC)",
+	"tennis" => "Tennis",
+	"motosport" => "Motosport racing",
+	"baseball" => "Baseball",
+	"handball" => "Handball"
+}
+
+if match_type.nil?
+	puts Paint["Sports available via Firstrow Sports:", "FFFFFF"]
+
+	list.each do |command, description|
+		command += " " * (22 - command.length) if command.length < 22
+		puts Paint["firstrow #{command}", "FF3366"] + Paint[" => #{description}", "FFFFFF"]
+	end
 
-page_content = open('http://www.firstrow.org/')
-page_parsed = Nokogiri::HTML(page_content)
+else
 
-page_parsed.css('td.accordion.greybg').each do |match|
-	raw_html = match.to_s
-	
-	# What time does the match start?
-	start_time = Time.at(match.css('span.dt').first.attr("class").gsub('dt', '').strip.to_i + 60**2)
-	start_hour = start_time.strftime("%H").to_i # Hour number. Example: 14
-	start_time = start_time.strftime("%H:%M %Z") # Parse into readable time.
-
-	# Don't show all.
-	if (show_all == false and start_hour > Time.now.hour + 1) or (start_hour <= Time.now.hour - 2)
-		next
+	case match_type
+	when 'football', 'soccer'
+		url = 'http://www.firstrow.org/soccer'
+	when 'amfootball'
+		url = 'http://www.firstrow.org/amfootball'
+	when 'rugby'
+		url = 'http://www.firstrow.org/rugby'
+	when 'basketball'
+		url = 'http://www.firstrow.org/basketball'
+	when 'hockey'
+		url = 'http://www.firstrow.org/hockey'
+	when 'volleyball'
+		url = 'http://www.firstrow.org/volleyball'
+	when 'boxing', 'wrestling', 'fighting'
+		url = 'http://www.firstrow.org/boxing'
+	when 'tennis'
+		url = 'http://www.firstrow.org/tennis'
+	when 'motosport'
+		url = 'http://www.firstrow.org/moto_gp'
+	when 'baseball'
+		url = 'http://www.firstrow.org/baseball'
+	when 'handball'
+		url = 'http://www.firstrow.org/handball'
+	else
+		url = 'http://www.firstrow.org/soccer'
 	end
 
-	# Match name. Example: Real Madrid v Barcelona
-	match_name = match.css('h4 a').first.content.gsub(' - ', ' v ').strip
-
-	# Cool stuff. Replace famous teams with their national colours.
-	colors = {
-		"Arsenal" => "ec2832",
-		"Everton FC" => "10459a"
-	}
-	color_set = false
-	colors.each do |name, color|
-		if match_name.include?(name)
-			color_set = true
-			first_team, second_team = match_name.split(' v ')
-			if first_team == name
-				match_name = Paint[name.strip, color] + Paint[" v " + second_team.strip, "FFFFFF"]
-			else
-				match_name = Paint[first_team.strip + " v ", "FFFFFF"] + Paint[name.strip, color]
+	puts Paint["#{list[match_type]}: Getting all matches from Firstrow..", "FAAB6A"]
+
+	page_content = open(url)
+	page_parsed = Nokogiri::HTML(page_content)
+
+	page_parsed.css('td.accordion.greybg').each do |match|
+		raw_html = match.to_s
+		
+		# What time does the match start?
+		start_time = Time.at(match.css('span.dt').first.attr("class").gsub('dt', '').strip.to_i + 60**2)
+		start_hour = start_time.strftime("%H").to_i # Hour number. Example: 14
+		start_time = start_time.strftime("%H:%M %Z") # Parse into readable time.
+
+		# Don't show all.
+		if (show_all == false and start_hour > Time.now.hour + 1) or (start_hour <= Time.now.hour - 2)
+			next
+		end
+
+		# Match name. Example: Real Madrid v Barcelona
+		match_name = match.css('h4 a').first.content.gsub(' - ', ' v ').strip
+
+		# Cool stuff. Replace famous teams with their national colours.
+		colors = {
+			"Arsenal" => "ec2832",
+			"Everton FC" => "10459a"
+		}
+
+		color_set = false
+		colors.each do |name, color|
+			if match_name.include?(name)
+				color_set = true
+				first_team, second_team = match_name.split(' v ')
+				if first_team == name
+					match_name = Paint[name.strip, color] + Paint[" v " + second_team.strip, "FFFFFF"]
+				else
+					match_name = Paint[first_team.strip + " v ", "FFFFFF"] + Paint[name.strip, color]
+				end
 			end
 		end
-	end
 
-	if color_set == false
-		match_name = Paint[match_name, "FFFFFF"]
-	end
+		if color_set == false
+			match_name = Paint[match_name, "FFFFFF"]
+		end
 
-	# Links to the matches
-	links = []
-	match.css('.module-desc a').each do |link|
-		# Include match links
-		links.push(link.attr("href")) if link.attr("href").include?("firstrow")
-	end
+		# Links to the matches
+		links = []
+		match.css('.module-desc a').each do |link|
+			# Include match links
+			links.push(link.attr("href")) if link.attr("href").include?("firstrow")
+		end
 
-	# Set colour.
-	match_color = (start_hour >= 12) ? "6CB809" : "167FC9"
-
-	# Insert into temporary database.
-	match_id = set({
-		:name => match_name,
-		:time => start_time,
-		:linkcount => links.length,
-		:links => links
-	})
-
-	match_text = "(Match #{match_id})   "
-	match_text += " " if match_id < 10
-	start_text = "#{start_time}   "
-
-	str_count = (match_text + start_text).length
-	str_spaces = ""
-	if str_count < 18
-		(0..18-str_count).each { |space| str_spaces += " " }
+		# Set colour.
+		match_color = (start_hour >= 12) ? "6CB809" : "167FC9"
+
+		# Insert into temporary database.
+		match_id = set({
+			:name => match_name,
+			:time => start_time,
+			:color => match_color,
+			:linkcount => links.length,
+			:links => links
+		})
+
+		match_text = "(Match #{match_id})   "
+		match_text += " " if match_id < 10
+		start_text = "#{start_time}   "
+
+		str_count = (match_text + start_text).length
+		str_spaces = ""
+		if str_count < 18
+			(0..18-str_count).each { |space| str_spaces += " " }
+		end
+
+		puts Paint[match_text, "FAAB6A"] + Paint[start_text, :bold, match_color] + str_spaces + match_name
 	end
 
-	puts Paint[match_text, "EDD9AA"] + Paint[start_text, :bold, match_color] + str_spaces + match_name
-end
+	if $object.length <= 1
+		puts Paint["No matches currently available.", :red]
+		abort
 
-# Get input
-puts ""
-print Paint["Enter match number to watch: #", "EDD9AA"]
-match_input = $stdin.gets.chomp
+	else
 
-# No input.
-if match_input == ""
-	puts Paint["No match found with that number.", :red]
-	abort
-end
+		# Get input
+		puts ""
+		print Paint["Enter match number to watch: #", "FAAB6A"]
+		match_input = $stdin.gets.chomp
 
-# Avoid String-Integer issues.
-begin
-	match_input = match_input.to_i.abs
-rescue TypeError
-	puts Paint["Invalid match number.", :red]
-	abort
-end
+		# No input.
+		if match_input == ""
+			puts Paint["No match found with that number.", :red]
+			abort
+		end
+
+		# Avoid String-Integer issues.
+		begin
+			match_input = match_input.to_i.abs
+		rescue TypeError
+			puts Paint["Invalid match number.", :red]
+			abort
+		end
+
+		# Right let's sort this.
+		if get(match_input)
+			launch_match(match_input)
+		else
+			puts Paint["No match found.", :red]
+			abort
+		end
+
+	end
 
-# Right let's sort this.
-if get(match_input)
-	launch_match(match_input)
-else
-	puts Paint["No match found.", :red]
-	abort
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firstrow
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bilawal Hameed
@@ -39,7 +39,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple command-line gem provides a simple UI for watching football
-  matches via FirstRowSports.
+  (and other sports such as american football, baseball, handball, rugby, wrestling,
+  etc) matches via FirstRowSports.
 email: me@bilaw.al
 executables:
 - firstrow
@@ -51,8 +52,8 @@ homepage: http://rubygems.org/gems/firstrow
 licenses:
 - MIT
 metadata: {}
-post_install_message: Boom. You're all setup with FirstRow. To get started - simply
-  call the `firstrow` command on Terminal :)
+post_install_message: You're using our newest awesome-ist version. Type in the 'firstrow'
+  command and select which sport you want to watch. Have fun! -B
 rdoc_options: []
 require_paths:
 - lib
@@ -71,5 +72,5 @@ rubyforge_project:
 rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
-summary: Beautiful command line access to live football matches.
+summary: Beautiful command line access to live football (and sports) matches.
 test_files: []