football_cli 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df441d44406edc4be111c1116102489aed819c1
-  data.tar.gz: de99649c3dcadb29610f06dd83db866fda0e56da
+  metadata.gz: 60746f91d740220139bb1a16b12689bb35f00ed9
+  data.tar.gz: 983ccaa2ff3c5cd5b831e47d79d13082ac4f85b3
 SHA512:
-  metadata.gz: 036089059d5fc065ad442940e669846fa9c7cadce35b88e396803a48ed490911bd2cae729445f3c4d98ae30fa962f47fe877ee7605a74ad333ba054668b2db43
-  data.tar.gz: 9fc52868aa7c04995e55b05015f60bbe7af84312f0ced1de427345d2fc3a31b571620210a9c3c1f82f88a7d302c9d1d1a2ecaa992c7930517a4383440882a4d2
+  metadata.gz: a71c97c95680115d4f951a482aeca9085ed03b6f8a449cb499f2e94501945d8eb5cda26060476da8b2aa6d59a075242e7641112aabd422695febec6650c7e5cd
+  data.tar.gz: ddd3331f6cef62daa3e1835dc1df1f8f8ffc9cc9a594d6d60ff91c6d87d3ab0bc303ce5c6de8318108c6f771638e55ce3e166c9fa186d2f4c8e019830ff971a3

data/.gitignore

@@ -1 +1 @@
-   tmp
+tmp

data/.ruby-version

@@ -1 +1 @@
-2.3.0@football_cli
+2.3.0@football_cli

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
-gemspec
+
+gemspec

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    football_cli (0.0.6)
+    football_cli (1.0.0)
       football_ruby
       rainbow
+      terminal-table
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
@@ -20,6 +23,8 @@ GEM
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     contracts (0.16.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -35,8 +40,10 @@ GEM
     ffi (1.9.18)
     football_ruby (0.1.2)
     gherkin (4.1.3)
+    hashdiff (0.3.4)
     multi_json (1.12.1)
     multi_test (0.1.2)
+    public_suffix (2.0.5)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
@@ -44,10 +51,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    safe_yaml (1.0.4)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     unicode-display_width (1.2.1)
+    webmock (3.0.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -56,7 +68,7 @@ DEPENDENCIES
   aruba
   football_cli!
   rake
-  terminal-table
+  webmock
 
 BUNDLED WITH
    1.14.6

data/README.md

@@ -2,7 +2,7 @@
   <img src="http://i.imgur.com/FLITgqs.jpg">
 </p>
 
-# Fottball CLI
+# Football CLI
 
 A command line interface for all the football data feeds in Ruby
 

data/bin/football_cli

@@ -1,4 +1,10 @@
-#!/usr/bin/env ruby
-require 'football_cli'
+#!/usr/bin/env ruby -U
+
+Signal.trap('INT') { abort }
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'football_cli/runner'
+FootballCli::Runner.new(ARGV.dup).execute!
 
-FootballCli::CLI.start( ARGV )

data/football_cli.gemspec

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

data/lib/football_cli/cli.rb

@@ -1,24 +1,22 @@
-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
+    desc 'config SUBCOMMAND ...ARGS', 'Write options in the configuration file'
+    subcommand 'config', Config
 
-    option :team
-    class_option :players, type: :boolean
-    class_option :fixtures, type: :boolean
+    desc 'show', 'Display all the football data feeds'
+    option :league, aliases: '-l', banner: 'PD', desc: 'Current standing of league'
+    option :match_day, type: :numeric, aliases: '-d', banner: 5, desc: 'Current standing of league for a given day'
+    option :format, aliases: '-t', banner: 'json', desc: 'Output format type, default: table'
+    option :file, aliases: '-f', banner: 'players.json', desc: 'File name to save the output'
+    option :team, aliases: '-t', banner: 'FCB', desc: 'Team details, players or fixtures'
+    class_option :players, type: :boolean, aliases: '-p'
+    class_option :fixtures, type: :boolean, aliases: '-f'
 
     def show
       handler.run
     end
 
-    desc 'live', 'display live scores'
+    desc 'live', 'Display live scores'
     def live
       handler.live_scores
     end

data/lib/football_cli/config.rb

@@ -0,0 +1,9 @@
+module FootballCli
+  class Config < Thor
+    desc 'api_token KEY', 'Set the global configuration for api_token'
+    method_options update: :boolean
+    def api_token(api_token)
+      Configuration.write(api_token, :api_token, options)
+    end
+  end
+end

data/lib/football_cli/configuration.rb

@@ -0,0 +1,47 @@
+require 'yaml'
+
+module FootballCli
+  module Configuration
+    CONFIG_FILE = '.football_cli.yml'
+    CONFIG_CONTENTS = {
+      api_token: '',
+    }
+
+    def self.write(value, key, options)
+      create_config_file unless File.exist? config_file
+      update_value(value, key) && return if options['update'] && !send(key).empty?
+
+      if send(key).empty?
+        puts "Updating config file with #{key}: #{value}"
+        update_value(value, key)
+      else
+        puts "Do you want to overwrite #{key} provide --update option"
+      end
+    end
+
+    def self.update_value(value, key)
+      content = config_data
+      content.send(:[]=, key, value)
+
+      File.open(config_file, 'w') do |f|
+        f.write(content.to_yaml)
+      end
+    end
+
+    def self.create_config_file
+      File.open(config_file, 'w+') { |f| f.write(CONFIG_CONTENTS.to_yaml) }
+    end
+
+    def self.api_token
+      config_data[:api_token] if config_data
+    end
+
+    def self.config_file
+      File.join(ENV['HOME'], CONFIG_FILE)
+    end
+
+    def self.config_data
+      YAML::load_file(config_file) if File.exist? config_file
+    end
+  end
+end

data/lib/football_cli/handler.rb

@@ -20,6 +20,8 @@ module FootballCli
     end
 
     def run
+      check_for_api_token
+
       if league
         league_table
       elsif team
@@ -58,7 +60,7 @@ module FootballCli
       team_response = client.team(team_id)
 
       output(
-        title: "#{team_response[:name]} players. Total #{response[:count]}",
+        title: "#{team_response[:name]} fixtures. Total #{response[:count]}",
         response: response[:fixtures],
         columns: %i(matchday homeTeamName goalsHomeTeam goalsAwayTeam awayTeamName status date)
       )
@@ -104,7 +106,13 @@ module FootballCli
     end
 
     def client
+      FootballRuby.api_token = Configuration.api_token
+
       @client ||= FootballRuby::Client.new
     end
+
+    def check_for_api_token
+      raise Thor::Error ,"ERROR: You must config the api_token\nSOLUTION: Set up with `config api_token TOKEN`" if Configuration.api_token.to_s.empty?
+    end
   end
 end

data/lib/football_cli/runner.rb

@@ -0,0 +1,47 @@
+require 'football_cli'
+
+# to use Webmock we need the Runner class
+# https://github.com/cucumber/aruba#testing-ruby-cli-programs-without-spawning-a-new-ruby-process
+module FootballCli
+  class Runner
+    def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
+      @argv = argv
+      @stdin = stdin
+      @stdout = stdout
+      @stderr = stderr
+      @kernel = kernel
+    end
+
+    def execute!
+      exit_code = run_cli
+      @kernel.exit(exit_code)
+    end
+
+    private
+
+    def run_cli
+      exit_code = begin
+        $stderr = @stderr
+        $stdin = @stdin
+        $stdout = @stdout
+
+        FootballCli::CLI.start(@argv)
+
+        0
+      rescue StandardError => e
+        b = e.backtrace
+        @stderr.puts("#{b.shift}: #{e.message} (#{e.class})")
+        @stderr.puts(b.map { |s| "\tfrom #{s}" }.join("\n"))
+        1
+      rescue SystemExit => e
+        e.status
+      ensure
+        $stderr = STDERR
+        $stdin = STDIN
+        $stdout = STDOUT
+      end
+
+      @kernel.exit(exit_code)
+    end
+  end
+end

data/lib/football_cli/version.rb

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

data/lib/football_cli.rb

@@ -1,2 +1,6 @@
-require 'football_cli/version'
+require 'thor'
+require 'football_cli/configuration'
+require 'football_cli/config'
 require 'football_cli/cli'
+require 'football_cli/handler'
+require 'football_cli/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: football_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Said Kaldybaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,6 +128,8 @@ files:
 - football_cli.gemspec
 - lib/football_cli.rb
 - lib/football_cli/cli.rb
+- lib/football_cli/config.rb
+- lib/football_cli/configuration.rb
 - lib/football_cli/format/base.rb
 - lib/football_cli/format/csv.rb
 - lib/football_cli/format/format_factory.rb
@@ -121,6 +137,7 @@ files:
 - lib/football_cli/format/table.rb
 - lib/football_cli/handler.rb
 - lib/football_cli/mapper.rb
+- lib/football_cli/runner.rb
 - lib/football_cli/version.rb
 homepage: https://github.com/Saidbek/football_cli
 licenses: