football_cli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96b922552deebad259c1b6793fde2462d7cc3312
-  data.tar.gz: 2f96cb95a21c007c6a7543a0b8968a60ba016f43
+  metadata.gz: 1df441d44406edc4be111c1116102489aed819c1
+  data.tar.gz: de99649c3dcadb29610f06dd83db866fda0e56da
 SHA512:
-  metadata.gz: 5d008a3907dfeeeff4cc6d26577b7a4446b9163dc15bc1237fcd3f459051c3c94a6f7d56a0d15031c03f97367c65a219bb501416d01bf98be125c9e333fbe7eb
-  data.tar.gz: 09b2e569be8e5c2938ee794efe8cad5b67f1c942d878b1624c47ae371cb947371937b6a4a49802a6cabfa3a0942134600a0b4362eb73d618d3e47125f99ed19b
+  metadata.gz: 036089059d5fc065ad442940e669846fa9c7cadce35b88e396803a48ed490911bd2cae729445f3c4d98ae30fa962f47fe877ee7605a74ad333ba054668b2db43
+  data.tar.gz: 9fc52868aa7c04995e55b05015f60bbe7af84312f0ced1de427345d2fc3a31b571620210a9c3c1f82f88a7d302c9d1d1a2ecaa992c7930517a4383440882a4d2

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    football_cli (0.0.5)
+    football_cli (0.0.6)
       football_ruby
-      gli (= 2.16.0)
       rainbow
+      thor
 
 GEM
   remote: https://rubygems.org/
@@ -35,7 +35,6 @@ GEM
     ffi (1.9.18)
     football_ruby (0.1.2)
     gherkin (4.1.3)
-    gli (2.16.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
     rainbow (2.2.2)

data/bin/football_cli

@@ -1,63 +1,4 @@
 #!/usr/bin/env ruby
-require 'gli'
 require 'football_cli'
 
-include GLI::App
-
-program_desc 'Football scores for geeks.'
-
-version FootballCli::VERSION
-
-subcommand_option_handling :normal
-arguments :strict
-
-desc 'Show leagues, team players, fixtures and more'
-command :show do |c|
-  c.desc 'Specify league code'
-  c.flag [:l, :league]
-
-  c.desc 'Specify match day'
-  c.flag [:md, :match_day]
-
-  c.desc 'Specify team code'
-  c.flag [:t, :team]
-
-  c.desc 'Specify format'
-  c.flag [:ft, :format]
-
-  c.desc 'Specify file name to save output'
-  c.flag [:fl, :file]
-
-  c.switch [:p, :players]
-  c.switch [:fs, :fixtures]
-
-  c.action do |global_options, options, args|
-    @handler.run
-  end
-end
-
-desc 'Display live scores'
-command :live do |c|
-  c.action do |global_options,options,args|
-    @handler.run
-  end
-end
-
-pre do |global,command,options,args|
-  @handler = FootballCli::Handler.new(command.name, options)
-end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  puts "----- backtrace: #{exception.backtrace}"
-  true
-end
-
-exit run(ARGV)
+FootballCli::CLI.start( ARGV )

data/football_cli.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
   spec.executables << 'football_cli'
   spec.require_paths = ['lib']
 
-  spec.add_dependency('football_ruby')
-  spec.add_dependency('rainbow')
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('aruba')
-  spec.add_development_dependency('terminal-table')
-  spec.add_runtime_dependency('gli','2.16.0')
+  spec.add_dependency 'thor'
+  spec.add_dependency 'football_ruby'
+  spec.add_dependency 'rainbow'
+
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'terminal-table'
 end

data/lib/football_cli.rb

@@ -1,2 +1,2 @@
-require 'football_cli/handler'
 require 'football_cli/version'
+require 'football_cli/cli'

data/lib/football_cli/cli.rb

@@ -0,0 +1,32 @@
+require 'thor'
+require_relative 'handler'
+
+module FootballCli
+  class CLI < Thor
+    desc 'show', 'sample description'
+
+    option :league
+    option :match_day, type: :numeric
+    option :format
+    option :file
+
+    option :team
+    class_option :players, type: :boolean
+    class_option :fixtures, type: :boolean
+
+    def show
+      handler.run
+    end
+
+    desc 'live', 'display live scores'
+    def live
+      handler.live_scores
+    end
+
+    private
+
+    def handler
+      FootballCli::Handler.new(options)
+    end
+  end
+end

data/lib/football_cli/format/base.rb

@@ -1,7 +1,7 @@
 module FootballCli
   module Format
     class Base
-      attr_reader :title, :response, :columns, :rows, :file_name
+      attr_reader :title, :response, :columns, :rows
 
       def initialize(opts={})
         @response = opts[:response]
@@ -18,33 +18,17 @@ module FootballCli
       end
 
       def output
-        raise NotImplementedError, 'must implement output() method in subclass'
-      end
-
-      def write_to_file(output)
-        File.write(file_name, output) if file_name
+        if @file_name
+          File.write(@file_name, generate)
+        else
+          puts generate
+        end
       end
 
       def goal_columns
         %i(goalsHomeTeam goalsAwayTeam).freeze
       end
 
-      def pretty_table(data, column)
-        if qualification
-          color = case data[:position]
-                  when qualification[:cl] then :green
-                  when qualification[:el] then :yellow
-                  when qualification[:rl] then :red
-                  else
-                    :aqua
-                  end
-
-          data[column].to_s.color(color)
-        else
-          data[column]
-        end
-      end
-
       def qualification
         Hash[@qualification.collect {|k, v| [ k, v.each_cons(2).map {|from, to| from..to }.max ] }] if @qualification
       end

data/lib/football_cli/format/csv.rb

@@ -19,12 +19,6 @@ module FootballCli
           end
         end
       end
-
-      def output
-        puts generate
-
-        write_to_file(generate)
-      end
     end
   end
 end

data/lib/football_cli/format/json.rb

@@ -19,12 +19,6 @@ module FootballCli
 
         @generate ||= JSON.pretty_generate(rows)
       end
-
-      def output
-        puts generate
-
-        write_to_file(generate)
-      end
     end
   end
 end

data/lib/football_cli/format/table.rb

@@ -6,28 +6,34 @@ module FootballCli
     class Table < Base
       def generate
         response.each do |data|
-          rows.push(
-            columns.collect {|c|
-              if goal_columns.include?(c) && data[:result] # when requesting team's fixtures
-                data[:result][c]
-              else
-                pretty_table(data, c)
-              end
-            }
-          )
+          rows.push(columns.collect {|column| pretty_table(data, column) })
         end
 
-        Terminal::Table.new do |t|
+        @generate ||= Terminal::Table.new do |t|
           t.title = title
           t.headings = columns.map(&:capitalize)
           t.rows = rows
         end
       end
 
-      def output
-        puts generate
+      def pretty_table(data, column)
+        if qualification
+          data[column].to_s.color(get_color(data[:position]))
+        elsif goal_columns.include?(column) && data[:result]
+          data[:result][column]
+        else
+          data[column]
+        end
+      end
 
-        write_to_file(generate)
+      def get_color(data)
+        case data
+        when qualification[:cl] then :green
+        when qualification[:el] then :yellow
+        when qualification[:rl] then :red
+        else
+          :aqua
+        end
       end
     end
   end

data/lib/football_cli/handler.rb

@@ -9,43 +9,32 @@ module FootballCli
   class Handler
     include FootballCli::Mapper
 
-    def initialize(command, options={})
-      @command = command
+    def initialize(options={})
       @league = options[:league]
       @match_day = options[:match_day]
       @players = options[:players]
       @fixtures = options[:fixtures]
       @team = options[:team]
-      @format = options[:format] || 'table'
       @file = options[:file]
+      @format = options.fetch(:format, 'table')
     end
 
     def run
-      case command
-      when :live
-        live_scores
-      when :show
-        case
-        when league, match_day
-          league_table
-        when team && players, fixtures
-          if players
-            team_players
-          elsif fixtures
-            team_fixtures
-          end
-        else
-          raise 'Invalid option'
+      if league
+        league_table
+      elsif team
+        if players
+          team_players
+        elsif fixtures
+          team_fixtures
         end
-      else
-        raise 'Invalid command'
       end
     end
 
     def league_table
       response = client.league_table(league_id, match_day: match_day)
 
-      display(
+      output(
         title: response[:leagueCaption],
         response: response[:standing],
         columns: %i(position teamName playedGames goalDifference points),
@@ -57,7 +46,7 @@ module FootballCli
       response = client.team_players(team_id)
       team_response = client.team(team_id)
 
-      display(
+      output(
         title: "#{team_response[:name]} players. Total #{response[:count]}",
         response: response[:players],
         columns: %i(jerseyNumber name position nationality dateOfBirth)
@@ -68,7 +57,7 @@ module FootballCli
       response = client.team_fixtures(team_id)
       team_response = client.team(team_id)
 
-      display(
+      output(
         title: "#{team_response[:name]} players. Total #{response[:count]}",
         response: response[:fixtures],
         columns: %i(matchday homeTeamName goalsHomeTeam goalsAwayTeam awayTeamName status date)
@@ -78,7 +67,7 @@ module FootballCli
     def live_scores
       response = client.live_scores
 
-      display(
+      output(
         title: 'Live scores',
         response: response[:games],
         columns: %i(league homeTeamName goalsHomeTeam goalsAwayTeam awayTeamName time)
@@ -101,24 +90,17 @@ module FootballCli
       get_qualification(league)
     end
 
-    def display(opts = {})
-      response = opts[:response]
-      title = opts[:title]
-      columns = opts[:columns]
-      qualification = opts[:qualification]
-
-      factory = FootballCli::Format::FormatFactory.build(
+    def output(opts = {})
+      FootballCli::Format::FormatFactory.build(
         format,
         {
-          response: response,
-          title: title,
-          columns: columns,
-          file_name: file,
-          qualification: qualification
+          qualification: opts[:qualification],
+          response: opts[:response],
+          columns: opts[:columns],
+          title: opts[:title],
+          file_name: file
         }
-      )
-
-      factory.output
+      ).output
     end
 
     def client

data/lib/football_cli/version.rb

@@ -1,3 +1,3 @@
 module FootballCli
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: football_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Said Kaldybaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: football_ruby
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: football_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: '0'
 description: A command line interface for all the football data feeds in Ruby
 email:
 - said.kaldybaev@gmail.com
@@ -113,6 +113,7 @@ files:
 - config/teams.json
 - football_cli.gemspec
 - lib/football_cli.rb
+- lib/football_cli/cli.rb
 - lib/football_cli/format/base.rb
 - lib/football_cli/format/csv.rb
 - lib/football_cli/format/format_factory.rb