football__data 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94036f5602a15ffb7b5ae10b32bc5f6b390add34
-  data.tar.gz: 8a51e8c4bb2e6d91437f4ab86bf2855adb641bad
+  metadata.gz: afcb1a285e5e1e201d1e4d35231b700f176819e4
+  data.tar.gz: 15f1ccf391b7f955e8c8da3045e050adbbd706c1
 SHA512:
-  metadata.gz: bcdc718f9dc805a70676b9d4a7dec903c7f970b92ae978462e3ef3717c69e2ff49cc2f426e3ee4b40f3f61b87510cf9a433829f18d141607892ff8fe784974b4
-  data.tar.gz: 08ded28d32bccfc8e6027e91dd17f015125dbde9965dfba16f12e14aa32775b81bf2c12585aab0b56d72c7dd0480f8e1e8735a0cdfbb585b0f0cf27164c10fbc
+  metadata.gz: 850f052d12717ea2f5026b1a64038ad785041fdf896b4ad416ba8c46e8910cb670538cf5e385fc9f24f51a37764f59b5ef3469d1894bf3136df3778c9c88436a
+  data.tar.gz: 65936faa07598ee49306dd23e8cb52e75461c85bdbd810d5afed44ad88c1a9b18a8dc567850b900269f3c19a1ac380686bfee4226f2c36fa8aba90fc15617e80

data/.gitignore

@@ -1,9 +1,9 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -1,4 +1,4 @@
-language: ruby
-rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6
+language: ruby
+rvm:
+  - 2.2.3
+before_install: gem install bundler -v 1.10.6

data/CODE_OF_CONDUCT.md

@@ -1,13 +1,13 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in football__data.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in football__data.gemspec
+gemspec

data/README.md

@@ -1,110 +1,110 @@
-# FootballData
-
-A ruby wrapper of [football-data.org](http://api.football-data.org/index),
-it also has an executable to get football info from terminal.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'football__data'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install football__data
-
-## Usage
-
-### Executable
-
-You can use `football` from the terminal to get some football info.
-
-```
-$ football help # get the help info
-
-# examples
-$ football config # config api key, fav team, fav league, etc
-$ football table --league=398
-Premier League 2015/16  matchday 15
----------------------------------------------------------------------------
-R    Team                          P    W    D    L    GF   GA   GD   Pts
----------------------------------------------------------------------------
-1    Leicester City FC             15   9    5    1    32   21   11   32
-2    Arsenal FC                    15   9    3    3    27   13   14   30
-3    Manchester City FC            15   9    2    4    30   16   14   29
-......
-
-# you could also add -i to interactive mode, you can see the league id there
-# such as:
-$ football fixture -i
-BL1            1. Bundesliga            394
-BL2            2. Bundesliga            395
-FL1            Ligue 1                  396
-......
-Enter the league id of the team: 394
-FCB            FC Bayern München             5
-HSV            Hamburger SV                  7
-......
-Enter the team id: 5
-2015-12-10 03:45        GNK Dinamo Zagreb    : FC Bayern München   (TBD)
-2015-12-12 22:30        FC Bayern München    : FC Ingolstadt 04    (TBD)
-
-# setting fav_league and fav_team would make it much simple
-# use football help SUBCOMMAND to see details
-```
-
-### API
-
-First you need to configure the api
-
-```ruby
-FootballData.configure do |config|
-    # get api key at 'http://api.football-data.org/register'
-    config.api_key = YOUR_API_KEY
-
-    # default api version is 'alpha' if not setted
-    config.api_version = 'alpha'
-
-    # the default control method is 'full' if not setted
-    # see request section on 'http://api.football-data.org/documentation'
-    config.response_control = 'minified'
-end
-```
-
-Use `FootballData.fetch(resource, subresource, params)` to fetch the data.
-It returns a json parsed object. Such as:
-
-```ruby
-# GET 'http://api.football-data.org/v1/soccerseasons'
-FootballData.fetch(:soccerseasons)
-
-# GET 'http://api.football-data.org/v1/soccerseasons/398/leagueTable'
-FootballData.fetch(:soccerseasons, :leagueTable, id: 398)
-
-# GET 'http://api.football-data.org/v1/soccerseasons/398/fixtures?matchday=8'
-FootballData.fetch(:soccerseasons, :fixtures, id: 398, matchday: 8)
-
-res = FootballData.fetch(:teams, :players, id: 57)
-pp res['players'].find{|player| player['name'] =~ /Mesut/i}
-# {"id"=>1967,
-# "name"=>"Mesut Özil",
-# "position"=>"Attacking Midfield",
-# "jerseyNumber"=>11,
-# "dateOfBirth"=>"1988-10-15",
-# "nationality"=>"Germany",
-# "contractUntil"=>"2018-06-30",
-# "marketValue"=>"40,000,000 €"}
-```
-
-See api structure on page 'http://api.football-data.org/documentation'
-
-
-## Contributing
-
-Feel free to file an issue of make a pr.
+# FootballData
+
+A ruby wrapper of [football-data.org](http://api.football-data.org/index),
+it also has an executable to get football info from terminal.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'football__data'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install football__data
+
+## Usage
+
+### Executable
+
+You can use `football` from the terminal to get some football info.
+
+```
+$ football help # get the help info
+
+# examples
+$ football config # config api key, fav team, fav league, etc
+$ football table --league=398
+Premier League 2015/16  matchday 15
+---------------------------------------------------------------------------
+R    Team                          P    W    D    L    GF   GA   GD   Pts
+---------------------------------------------------------------------------
+1    Leicester City FC             15   9    5    1    32   21   11   32
+2    Arsenal FC                    15   9    3    3    27   13   14   30
+3    Manchester City FC            15   9    2    4    30   16   14   29
+......
+
+# you could also add -i to interactive mode, you can see the league id there
+# such as:
+$ football fixture -i
+BL1            1. Bundesliga            394
+BL2            2. Bundesliga            395
+FL1            Ligue 1                  396
+......
+Enter the league id of the team: 394
+FCB            FC Bayern München             5
+HSV            Hamburger SV                  7
+......
+Enter the team id: 5
+2015-12-10 03:45        GNK Dinamo Zagreb    : FC Bayern München   (TBD)
+2015-12-12 22:30        FC Bayern München    : FC Ingolstadt 04    (TBD)
+
+# setting fav_league and fav_team would make it much simple
+# use football help SUBCOMMAND to see details
+```
+
+### API
+
+First you need to configure the api
+
+```ruby
+FootballData.configure do |config|
+    # get api key at 'http://api.football-data.org/register'
+    config.api_key = YOUR_API_KEY
+
+    # default api version is 'alpha' if not setted
+    config.api_version = 'alpha'
+
+    # the default control method is 'full' if not setted
+    # see request section on 'http://api.football-data.org/documentation'
+    config.response_control = 'minified'
+end
+```
+
+Use `FootballData.fetch(resource, subresource, params)` to fetch the data.
+It returns a json parsed object. Such as:
+
+```ruby
+# GET 'http://api.football-data.org/v1/soccerseasons'
+FootballData.fetch(:soccerseasons)
+
+# GET 'http://api.football-data.org/v1/soccerseasons/398/leagueTable'
+FootballData.fetch(:soccerseasons, :leagueTable, id: 398)
+
+# GET 'http://api.football-data.org/v1/soccerseasons/398/fixtures?matchday=8'
+FootballData.fetch(:soccerseasons, :fixtures, id: 398, matchday: 8)
+
+res = FootballData.fetch(:teams, :players, id: 57)
+pp res['players'].find{|player| player['name'] =~ /Mesut/i}
+# {"id"=>1967,
+# "name"=>"Mesut Özil",
+# "position"=>"Attacking Midfield",
+# "jerseyNumber"=>11,
+# "dateOfBirth"=>"1988-10-15",
+# "nationality"=>"Germany",
+# "contractUntil"=>"2018-06-30",
+# "marketValue"=>"40,000,000 €"}
+```
+
+See api structure on page 'http://api.football-data.org/documentation'
+
+
+## Contributing
+
+Feel free to file an issue of make a pr.

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/bin/football

@@ -1,174 +1,184 @@
-#!/usr/bin/env ruby
-
-require "thor"
-require "time"
-require "yaml"
-require "fileutils"
-
-require "football__data"
-
-
-# constants
-CLI                 = $PROGRAM_NAME
-HOME                = ENV["HOME"]
-EDITOR              = ENV["EDITOR"] || "vim"
-CONFIG_FILE         = "#{HOME}/.config/football-data/config.yml"
-CONFIG_FILE_EXAMPLE = "config/config.yml.example"
-
-
-# check config file
-unless File.exist? CONFIG_FILE
-    puts <<-END.gsub(/^\s*\|/, '')
-    |It seems you haven't configured it yet.
-    |#{CLI} will generate generate an example config file.
-    |Run `#{CLI} config` to config the file.
-    END
-
-    FileUtils.mkdir_p File.dirname(CONFIG_FILE)
-    FileUtils.cp CONFIG_FILE_EXAMPLE, CONFIG_FILE
-
-    exit
-end
-
-
-# get config info
-CONFIG = YAML.load_file CONFIG_FILE
-
-FootballData.configure do |config|
-    config.api_key          = CONFIG['api_key']
-    config.api_version      = CONFIG['api_version']
-end
-
-FAV_LEAGUE_ID = CONFIG['fav_league_id']
-FAV_TEAM_ID   = CONFIG['fav_team_id']
-
-
-# cli
-class Football < Thor
-    desc "config [EXAMPLE]", "Custom configuration file or edit it from an example"
-    option :example, :type => :boolean, :default => false
-    def config
-        if options[:example]
-            FileUtils.rm CONFIG_FILE
-            FileUtils.cp CONFIG_FILE_EXAMPLE, CONFIG_FILE
-        end
-        exec "#{EDITOR} #{CONFIG_FILE}"
-    end
-
-    desc "list TYPE", "List LEAGUE or TEAM id"
-    option :league, :type => :numeric
-    def list(type)
-        if type == "league"
-            __list_league
-        elsif type == "team"
-            if league_id = options[:league]
-                __list_team league_id
-            else
-                puts "can not get teams id without specifying the league id"
-            end
-        else
-            puts "type should be league or team"
-        end
-    end
-
-
-    desc "table [LEAGUE]", "Get LEAGUE table"
-    option :league, :type => :numeric
-    option :interactive, :type => :boolean, :default => false, :aliases => :i
-    def table
-        league_id = if options[:interactive]
-                        __list_league
-                        print "\nEnter league id: "
-                        STDIN.gets.to_i
-                    else
-                        options[:league_id] || FAV_LEAGUE_ID
-                    end
-        league_table = FootballData.fetch :soccerseasons, :leagueTable, :id => league_id
-        caption  = league_table['leagueCaption']
-        matchday = league_table['matchday']
-        standing = league_table['standing']
-        div_line = "-" * 75
-        w        = 5
-
-        puts "#{caption}\tmatchday #{matchday}"
-        puts div_line
-        puts "R".ljust(w) + "Team".ljust(30) + %w[P W D L GF GA GD Pts].map{|i|i.ljust(w)}.join
-        puts div_line
-        standing.each do |team|
-            row = team['position'].to_s.ljust(w)
-            row += team['teamName'].ljust(30)
-            row += team['playedGames'].to_s.ljust(w)
-            row += team['wins'].to_s.ljust(w)
-            row += team['draws'].to_s.ljust(w)
-            row += team['losses'].to_s.ljust(w)
-            row += team['goals'].to_s.ljust(w)
-            row += team['goalsAgainst'].to_s.ljust(w)
-            row += team['goalDifference'].to_s.ljust(w)
-            row += team['points'].to_s.ljust(w)
-            puts row
-        end
-    end
-
-    desc "fixture [TEAM]", "Get latest fixture of TEAM"
-    option :team, :type => :numeric
-    option :time, :type => :string
-    option :interactive, :type => :boolean, :default => false, :aliases => :i
-    def fixture
-        team_id = if options[:interactive]
-                      __list_league
-                      print "\nEnter the league id of the team: "
-                      league_id = STDIN.gets.to_i
-                      __list_team league_id
-                      print "\nEnter the team id: "
-                      STDIN.gets.to_i
-                  else
-                      options[:team] || FAV_TEAM_ID
-                  end
-        time = options[:time] || "n7"
-        info = FootballData.fetch :teams, :fixtures, :id => team_id, :timeFrame => time
-        fixtures = info['fixtures']
-        if fixtures.empty?
-            puts "There is no match coming >_<"
-        else
-            fixtures.each do |fixture|
-                date = Time.parse(fixture['date']).localtime
-                home = fixture['homeTeamName']
-                away = fixture['awayTeamName']
-                goal_home = fixture['result']['goalsHomeTeam']
-                goal_away = fixture['result']['goalsAwayTeam']
-                gh = goal_home == -1 ? '' : " #{goal_home}"
-                ga = goal_away == -1 ? '' : " #{goal_away}"
-                l = "#{home.ljust(20)}#{gh}"
-                r = "#{ga}#{away}"
-                match = "#{date.strftime("%Y-%m-%d %H:%M").ljust(20)}\t"
-                match += "#{l} : #{r.ljust(20)}"
-                match += "(TBD)" if gh.empty?
-                puts match
-            end
-        end
-    end
-
-    private
-
-    def __list_league
-        leagues = FootballData.fetch :soccerseasons
-        leagues.each do |league|
-            id       = league['_links']['self']['href'].split('/').last
-            *name, _ = league['caption'].split
-            code     = league['league']
-            puts "#{code.ljust(15)}#{name.join(' ').ljust(25)}#{id}"
-        end
-    end
-
-    def __list_team(league_id)
-        teams = FootballData.fetch(:soccerseasons, :teams, :id => league_id)['teams']
-        teams.each do |team|
-            id   = team['_links']['self']['href'].split('/').last
-            name = team['name']
-            code = team['code']
-            puts "#{code.ljust(15)}#{name.ljust(30)}#{id}"
-        end
-    end
-end
-
-Football.start
+#!/usr/bin/env ruby
+
+require "thor"
+require "time"
+require "yaml"
+
+require "football__data"
+
+
+# constants
+CLI                 = File.basename $PROGRAM_NAME
+HOME                = ENV["HOME"]
+EDITOR              = ENV["EDITOR"] || "vim"
+CONFIG_FILE         = "#{HOME}/.config/football-data/config.yml"
+
+CONFIG_FILE_EXAMPLE =<<-END.gsub(/^\s*\|/, '')
+    |# football__data config file example, yaml format
+
+    |# api info
+    |api_key: YOUR_API_KEY                        # must
+    |# api_version: alpha|v1                      # optional, default to alpha
+
+    |# favorite setting
+    |# run `football list league` to get league id
+    |# run `football list team --league=ID` to get team id in league ID
+    |
+    |# fav_league_id: YOUR_FAVORITE_LEAGUE_ID     # favorite league id
+    |# fav_team_id: YOUR_FAVORITE_TEAM_ID         # favorite team id
+END
+
+# check config file
+unless File.exist? CONFIG_FILE
+    puts <<-END.gsub(/^\s*\|/, '')
+    |It seems you haven't configured it yet.
+    |`#{CLI}` will generate generate an example config file.
+    |Run `#{CLI} config` to config the file.
+    END
+
+    File.open(CONFIG_FILE, "w") { |f| f.puts CONFIG_FILE_EXAMPLE }
+
+    exit
+end
+
+# get config info
+CONFIG = YAML.load_file CONFIG_FILE
+
+FootballData.configure do |config|
+    config.api_key          = CONFIG['api_key']
+    config.api_version      = CONFIG['api_version']
+end
+
+FAV_LEAGUE_ID = CONFIG['fav_league_id']
+FAV_TEAM_ID   = CONFIG['fav_team_id']
+
+
+# cli
+class Football < Thor
+    desc "config [EXAMPLE]", "Custom configuration file or edit it from an example"
+    option :example, :type => :boolean, :default => false
+    def config
+        if options[:example]
+            FileUtils.rm CONFIG_FILE
+            FileUtils.cp CONFIG_FILE_EXAMPLE, CONFIG_FILE
+        end
+        exec "#{EDITOR} #{CONFIG_FILE}"
+    end
+
+    desc "list TYPE", "List LEAGUE or TEAM id"
+    option :league, :type => :numeric
+    def list(type)
+        if type == "league"
+            __list_league
+        elsif type == "team"
+            if league_id = options[:league]
+                __list_team league_id
+            else
+                puts "can not get teams id without specifying the league id"
+            end
+        else
+            puts "type should be league or team"
+        end
+    end
+
+
+    desc "table [LEAGUE]", "Get LEAGUE table"
+    option :league, :type => :numeric
+    option :interactive, :type => :boolean, :default => false, :aliases => :i
+    def table
+        league_id = if options[:interactive]
+                        __list_league
+                        print "\nEnter league id: "
+                        STDIN.gets.to_i
+                    else
+                        options[:league_id] || FAV_LEAGUE_ID
+                    end
+        league_table = FootballData.fetch :soccerseasons, :leagueTable, :id => league_id
+        caption  = league_table['leagueCaption']
+        matchday = league_table['matchday']
+        standing = league_table['standing']
+        div_line = "-" * 75
+        w        = 5
+
+        puts "#{caption}\tmatchday #{matchday}"
+        puts div_line
+        puts "R".ljust(w) + "Team".ljust(30) + %w[P W D L GF GA GD Pts].map{|i|i.ljust(w)}.join
+        puts div_line
+        standing.each do |team|
+            row = team['position'].to_s.ljust(w)
+            row += team['teamName'].ljust(30)
+            row += team['playedGames'].to_s.ljust(w)
+            row += team['wins'].to_s.ljust(w)
+            row += team['draws'].to_s.ljust(w)
+            row += team['losses'].to_s.ljust(w)
+            row += team['goals'].to_s.ljust(w)
+            row += team['goalsAgainst'].to_s.ljust(w)
+            row += team['goalDifference'].to_s.ljust(w)
+            row += team['points'].to_s.ljust(w)
+            puts row
+        end
+    end
+
+    desc "fixture [TEAM]", "Get latest fixture of TEAM"
+    option :team, :type => :numeric
+    option :time, :type => :string
+    option :interactive, :type => :boolean, :default => false, :aliases => :i
+    def fixture
+        team_id = if options[:interactive]
+                      __list_league
+                      print "\nEnter the league id of the team: "
+                      league_id = STDIN.gets.to_i
+                      __list_team league_id
+                      print "\nEnter the team id: "
+                      STDIN.gets.to_i
+                  else
+                      options[:team] || FAV_TEAM_ID
+                  end
+        time = options[:time] || "n7"
+        info = FootballData.fetch :teams, :fixtures, :id => team_id, :timeFrame => time
+        fixtures = info['fixtures']
+        if fixtures.empty?
+            puts "There is no match coming >_<"
+        else
+            fixtures.each do |fixture|
+                date = Time.parse(fixture['date']).localtime
+                home = fixture['homeTeamName']
+                away = fixture['awayTeamName']
+                goal_home = fixture['result']['goalsHomeTeam']
+                goal_away = fixture['result']['goalsAwayTeam']
+                gh = goal_home == -1 ? '' : " #{goal_home}"
+                ga = goal_away == -1 ? '' : " #{goal_away}"
+                l = "#{home.ljust(20)}#{gh}"
+                r = "#{ga}#{away}"
+                match = "#{date.strftime("%Y-%m-%d %H:%M").ljust(20)}\t"
+                match += "#{l} : #{r.ljust(20)}"
+                match += "(TBD)" if gh.empty?
+                puts match
+            end
+        end
+    end
+
+    private
+
+    def __list_league
+        leagues = FootballData.fetch :soccerseasons
+        leagues.each do |league|
+            id       = league['_links']['self']['href'].split('/').last
+            *name, _ = league['caption'].split
+            code     = league['league']
+            puts "#{code.ljust(15)}#{name.join(' ').ljust(25)}#{id}"
+        end
+    end
+
+    def __list_team(league_id)
+        teams = FootballData.fetch(:soccerseasons, :teams, :id => league_id)['teams']
+        teams.each do |team|
+            id   = team['_links']['self']['href'].split('/').last
+            name = team['name']
+            code = team['code']
+            puts "#{code.ljust(15)}#{name.ljust(30)}#{id}"
+        end
+    end
+end
+
+Football.start

data/football__data.gemspec

@@ -1,26 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'football__data/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "football__data"
-  spec.version       = FootballData::VERSION
-  spec.authors       = ["delta"]
-  spec.email         = ["delta4d@gmail.com"]
-  spec.license       = 'MIT'
-
-  spec.summary       = %q{ruby api wrapper of football-data.org}
-  spec.description   = %q{ruby api wrapper of football-data.org}
-  spec.homepage      = "https://github.com/delta4d/football-data"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = ["football"]
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-
-  spec.add_dependency "faraday", "~> 0.9"
-  spec.add_dependency "thor", "~> 0.19"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'football__data/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "football__data"
+  spec.version       = FootballData::VERSION
+  spec.authors       = ["delta"]
+  spec.email         = ["delta4d@gmail.com"]
+  spec.license       = 'MIT'
+
+  spec.summary       = %q{api wrapper of football-data.org}
+  spec.description   = %q{ruby api wrapper of football-data.org and a executable}
+  spec.homepage      = "https://github.com/delta4d/football-data"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.executables   = ["football"]
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency "faraday", "~> 0.9"
+  spec.add_dependency "thor", "~> 0.19"
+end

data/lib/football__data.rb

@@ -1,48 +1,48 @@
-require "football__data/version"
-require "football__data/configuration"
-
-require "json"
-require "faraday"
-
-module FootballData
-    extend Configuration
-
-    class << self
-        # main method of FootballData, fetch info of football matches and players
-        # see 'http://api.football-data.org/documentation' for details
-        #
-        # @param resource [Symbol, String] one of :soccerseasons, :teams, :fixtures
-        # @param subresource [Symbol, String]
-        #   :soccerseasons => one of :fixtures, :teams, :leagueTable
-        #   :teams => one of :fixtures, :players
-        # @param params [Hash] the filter parameters, :id is also pass by params
-        def fetch(resource, subresource = nil, params = {})
-            id, filter = parse_params(params)
-            path = "/#{@api_version}/#{resource}"
-            path += "/#{id}/#{subresource}" if id
-            path += "?#{filter}" if filter
-            response = get(path)
-            JSON.parse(response.body)
-        end
-
-        private
-
-        def parse_params(params)
-            id = params[:id]
-            no_id_params = params.dup
-            no_id_params.delete(:id)
-            filter = no_id_params.map{ |key, val| "#{key}=#{val}" }.join("&")
-            [id, filter]
-        end
-
-        def connection
-            @connection ||= Faraday.new(url: API_ENDPOINT,
-                                        headers: {"X-Auth-Token" => @api_key,
-                                                  "X-Response-Control" => @response_control})
-        end
-
-        def get(path)
-            connection.get(path)
-        end
-    end
-end
+require "football__data/version"
+require "football__data/configuration"
+
+require "json"
+require "faraday"
+
+module FootballData
+    extend Configuration
+
+    class << self
+        # main method of FootballData, fetch info of football matches and players
+        # see 'http://api.football-data.org/documentation' for details
+        #
+        # @param resource [Symbol, String] one of :soccerseasons, :teams, :fixtures
+        # @param subresource [Symbol, String]
+        #   :soccerseasons => one of :fixtures, :teams, :leagueTable
+        #   :teams => one of :fixtures, :players
+        # @param params [Hash] the filter parameters, :id is also pass by params
+        def fetch(resource, subresource = nil, params = {})
+            id, filter = parse_params(params)
+            path = "/#{@api_version}/#{resource}"
+            path += "/#{id}/#{subresource}" if id
+            path += "?#{filter}" if filter
+            response = get(path)
+            JSON.parse(response.body)
+        end
+
+        private
+
+        def parse_params(params)
+            id = params[:id]
+            no_id_params = params.dup
+            no_id_params.delete(:id)
+            filter = no_id_params.map{ |key, val| "#{key}=#{val}" }.join("&")
+            [id, filter]
+        end
+
+        def connection
+            @connection ||= Faraday.new(url: API_ENDPOINT,
+                                        headers: {"X-Auth-Token" => @api_key,
+                                                  "X-Response-Control" => @response_control})
+        end
+
+        def get(path)
+            connection.get(path)
+        end
+    end
+end

data/lib/football__data/configuration.rb

@@ -1,24 +1,24 @@
-module FootballData
-    module Configuration
-        DEFAULT_API_KEY = nil
-        DEFAULT_API_VERSON   = "alpha"
-        DEFAULT_RESPONSE_CONTROL = "full"
-
-        API_ENDPOINT = "http://api.football-data.org"
-
-        attr_writer :api_version, :api_key, :response_control
-
-        def configure
-            raise "don't you wanna configure it?" unless block_given?
-            yield self
-            @api_version ||= DEFAULT_API_VERSON
-            @response_control ||= DEFAULT_RESPONSE_CONTROL
-        end
-
-        def reset!
-            @api_key = DEFAULT_API_KEY
-            @api_version = DEFAULT_API_VERSON
-            @response_control = DEFAULT_RESPONSE_CONTROL
-        end
-    end
-end
+module FootballData
+    module Configuration
+        DEFAULT_API_KEY = nil
+        DEFAULT_API_VERSON   = "alpha"
+        DEFAULT_RESPONSE_CONTROL = "full"
+
+        API_ENDPOINT = "http://api.football-data.org"
+
+        attr_writer :api_version, :api_key, :response_control
+
+        def configure
+            raise "don't you wanna configure it?" unless block_given?
+            yield self
+            @api_version ||= DEFAULT_API_VERSON
+            @response_control ||= DEFAULT_RESPONSE_CONTROL
+        end
+
+        def reset!
+            @api_key = DEFAULT_API_KEY
+            @api_version = DEFAULT_API_VERSON
+            @response_control = DEFAULT_RESPONSE_CONTROL
+        end
+    end
+end

data/lib/football__data/version.rb

@@ -1,3 +1,3 @@
-module FootballData
-  VERSION = "0.2.2"
-end
+module FootballData
+  VERSION = "0.2.3"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: football__data
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - delta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-description: ruby api wrapper of football-data.org
+description: ruby api wrapper of football-data.org and a executable
 email:
 - delta4d@gmail.com
 executables:
@@ -80,10 +80,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/console
 - bin/football
-- bin/setup
-- config/config.yml.example
 - football__data.gemspec
 - lib/football__data.rb
 - lib/football__data/configuration.rb
@@ -108,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: ruby api wrapper of football-data.org
+summary: api wrapper of football-data.org
 test_files: []
-has_rdoc: 

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "football__data"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/config/config.yml.example

@@ -1,11 +0,0 @@
-# football__data config file example, yaml format
-
-# api info
-api_key: YOUR_API_KEY                      # must
-api_version: alpha|v1                      # optional, default to alpha
-
-# favorite setting
-# run `football list league` to get league id
-# run `football list team --league=ID` to get team id in league ID
-fav_league_id: YOUR_FAVORITE_LEAGUE_ID     # favorite league id
-fav_team_id: YOUR_FAVORITE_TEAM_ID         # favorite team id