footty 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930601b32688da7494d8ee0ee4ad531075b728f1
-  data.tar.gz: a39c443fe682fb6a429633b783a0377ca98844bb
+  metadata.gz: a9e350f6c69753563babe7b6313e990333d20f8a
+  data.tar.gz: 9abbd3a090529c2d6dceb8f5cb4a30c09032885a
 SHA512:
-  metadata.gz: 9de355cd9ef713b79b2076e52778d38b59412a4a668bb7196d1eb6ff01ff729dcdf848a0fed00ea6cee0c003dd44a79492e349296f68892620154bf6062705d0
-  data.tar.gz: d75c615a075dda25f5bfde475d44b27b75e8402d48fc3481668ee9a466e95c7dbc73db0ede0804ff6db140f15c4ef757048b93f10548a3313c4d4210d3789b19
+  metadata.gz: 9fb986e01c99f9ce33b1ebb04e321af30c85570967c42a046029c3c70726a57e38a56a8f217792959cebe9d59313962407af8ca54a07c4a2af07f422812751ad
+  data.tar.gz: dae5fdad18c6f894f01e991d5bc0db5f9345fbde968edf3d42b4f3407c79a31e2678af30269d2b24d67b419e1d8f1602d6a856bad70828aa0c08b87f93d31979

data/Manifest.txt

@@ -1,10 +1,10 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-bin/footty
-lib/footty.rb
-lib/footty/client.rb
-lib/footty/version.rb
-test/helper.rb
-test/test_client.rb
+HISTORY.md
+Manifest.txt
+README.md
+Rakefile
+bin/footty
+lib/footty.rb
+lib/footty/client.rb
+lib/footty/version.rb
+test/helper.rb
+test/test_client.rb

data/README.md

@@ -19,20 +19,21 @@ for upcoming or past matches. For example:
 
 prints on Jun/14 2018:
 
-    #1 Thu Jun/14       Russia (RUS) vs Saudi Arabia (KSA) Group A  @ Luzhniki Stadium, Moscow
+    #1 Thu Jun/14       Russia (RUS)  5-0  Saudi Arabia (KSA) Group A  @ Luzhniki Stadium, Moscow
+                     [Gazinsky 12' Cheryshev 43' Dzyuba 71' Cheryshev 90+1' Golovin 90+4']
 
 prints on Jun/15 2018:
 
-     #2 Fri Jun/15        Egypt (EGY) vs      Uruguay (URU) Group A  @ Ekaterinburg Arena, Ekaterinburg
-     #3 Fri Jun/15     Portugal (POR) vs        Spain (ESP) Group B  @ Fisht Stadium, Sochi
-     #4 Fri Jun/15      Morocco (MAR) vs         Iran (IRN) Group B  @ Saint Petersburg Stadium, Saint Petersburg
+    #2 Fri Jun/15        Egypt (EGY) vs      Uruguay (URU) Group A  @ Ekaterinburg Arena, Ekaterinburg
+    #3 Fri Jun/15     Portugal (POR) vs        Spain (ESP) Group B  @ Fisht Stadium, Sochi
+    #4 Fri Jun/15      Morocco (MAR) vs         Iran (IRN) Group B  @ Saint Petersburg Stadium, Saint Petersburg
 
 prints on Jun/16:
 
-     #5 Sat Jun/16       France (FRA) vs    Australia (AUS) Group C  @ Kazan Arena, Kazan
-     #6 Sat Jun/16         Peru (PER) vs      Denmark (DEN) Group C  @ Mordovia Arena, Saransk
-     #7 Sat Jun/16    Argentina (ARG) vs      Iceland (ISL) Group D  @ Spartak Stadium, Moscow
-     #8 Sat Jun/16      Croatia (CRO) vs      Nigeria (NGA) Group D  @ Kaliningrad Stadium, Kaliningrad
+    #5 Sat Jun/16       France (FRA) vs    Australia (AUS) Group C  @ Kazan Arena, Kazan
+    #6 Sat Jun/16         Peru (PER) vs      Denmark (DEN) Group C  @ Mordovia Arena, Saransk
+    #7 Sat Jun/16    Argentina (ARG) vs      Iceland (ISL) Group D  @ Spartak Stadium, Moscow
+    #8 Sat Jun/16      Croatia (CRO) vs      Nigeria (NGA) Group D  @ Kaliningrad Stadium, Kaliningrad
 
 and so on.
 Use `tomorrow` or `t` or `+1` to print tomorrow's matches e.g.:

data/lib/footty.rb

@@ -39,27 +39,27 @@ module Footty
     today = Date.today
 
     if ['yesterday', 'y', '-1'].include? what
-      matches = client.get_todays_matches( date: today )
+      matches = client.get_yesterdays_matches
       if matches.empty?
          puts "** No matches played yesterday.\n"
       end
     elsif ['tomorrow', 't', '+1', '1'].include? what
-      matches = client.get_tomorrows_matches( date: today )
+      matches = client.get_tomorrows_matches
       if matches.empty?
          puts "** No matches scheduled tomorrow.\n"
       end
     elsif ['past', 'p', 'prev'].include? what
-      matches = client.get_past_matches( date: today )
+      matches = client.get_past_matches
       if matches.empty?
          puts "** No matches played yet.\n"
       end
     elsif ['upcoming', 'up', 'u', 'next', 'n'].include? what
-      matches = client.get_upcoming_matches( date: today )
+      matches = client.get_upcoming_matches
       if matches.empty?
          puts "** No more matches scheduled.\n"
       end
     else
-       matches = client.get_todays_matches( date: today )
+       matches = client.get_todays_matches
 
        ## no matches today
        if matches.empty?
@@ -67,10 +67,10 @@ module Footty
 
           if Date.today > Date.new( 2018, 7, 11 )   ## world cup is over, look back
             puts "Past matches:"
-            matches = client.get_past_matches( date: today )
+            matches = client.get_past_matches
           else  ## world cup is upcoming /in-progress,look forward
             puts "Upcoming matches:"
-            matches = client.get_upcoming_matches( date: today )
+            matches = client.get_upcoming_matches
           end
        end
     end
@@ -86,19 +86,24 @@ module Footty
     today = Date.today
 
     matches.each do |match|
-      print "   "
-      print "\##{match['num']} "
+      print "   %5s" % "\##{match['num']} "
 
       date = Date.parse( match['date'] )
       print "#{date.strftime('%a %b/%d')} "      ## e.g. Thu Jun/14
       if date > today
          diff = (date - today).to_i
-         print "(in #{diff}d) "
+         print "%10s" % "(in #{diff}d) "
       end
 
-      print "%18s" % "#{match['team1']['name']} (#{match['team1']['code']})"
-      print " vs "
-      print "%18s" % "#{match['team2']['name']} (#{match['team2']['code']})"
+      print "%20s" % "#{match['team1']['name']} (#{match['team1']['code']})"
+
+      if match['score1'] && match['score2']
+        print " #{match['score1']}-#{match['score2']} "
+      else
+        print " vs "
+      end
+
+      print "%20s" % "#{match['team2']['name']} (#{match['team2']['code']})"
 
       if match['group']
         print " #{match['group']} "    ## group phase/stage
@@ -108,6 +113,35 @@ module Footty
 
       print " @ #{match['stadium']['name']}, #{match['city']}"
       print "\n"
+
+      if match['goals1'] && match['goals2']
+        print "                     ["
+        match['goals1'].each_with_index do |goal,i|
+          print " "    if i > 0
+          print "#{goal['name']}"
+          print " #{goal['minute']}"
+          print "+#{goal['offset']}"   if goal['offset']
+          print "'"
+          print " (o.g.)"    if goal['owngoal']
+          print " (pen.)"    if goal['penalty']
+        end
+        match['goals2'].each_with_index do |goal,i|
+          if i == 0
+            print "; "
+          else
+           print " "
+          end
+          print "#{goal['name']}"
+          print " #{goal['minute']}"
+          print "+#{goal['offset']}"  if goal['offset']
+          print "'"
+          print " (o.g.)"  if goal['owngoal']
+          print " (pen.)"  if goal['penalty']
+        end
+        print "]\n"
+      end
+
+
     end
   end
 

data/lib/footty/version.rb

@@ -2,7 +2,7 @@
 
 
 module Footty
-   VERSION = '0.3.0'
+   VERSION = '0.4.0'
 
    def self.banner
      "footty/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-10 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils