ogs_katacheck 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efcf71b47a81e504adac1957eba94c7b6e51776a663c00b07816bfe69efa5178
-  data.tar.gz: 30c6b7ff2df94ee195cd534904b5e7da6dc288bd85aec03c1e48893daa233278
+  metadata.gz: 52dfee949c55757b97e32793622f7a39a049cf15d24fb1da89a56545fc8c2788
+  data.tar.gz: 9c1a44799c1b9a9cb6829c180668ad60686b7c35add2e4918e056767e5e866e0
 SHA512:
-  metadata.gz: 44f2a9169e1d1da2ab56582d97e616035f01120ba18d890b8b433c993071c38aa0a6e66971edea630e13fdf180fb52b5e3c627e6207163b3090ac8c768251c93
-  data.tar.gz: 63be13d07b2df822864fed5c500c9645895449d3dc0a641d1f67ea09a3e54b40a93ba65dc49ec1cabbcd29bb4fdeb1ac435bd47e8473291c6d9b59de1848d842
+  metadata.gz: 9431979c80fa6ef8b69a4eb547841dbc6e10cd51a8c5fbf0e658a15fba9417b95f224a2ba54e23318d23c6238771223ee2d7ec187710d55cc16ce031e961f8a4
+  data.tar.gz: 44aba207155eb0caf47348020f092b8850b1ec566131070e4d4907ecce9aacaafa7d82092fcbe5e401fd8e03f3b6e91c454a6f1c25ed649357212524b8657ba0

data/CHANGELOG.md

@@ -20,3 +20,7 @@
 
 ### 0.1.6
 - fixes bug in the way percentages are calculated
+
+### 0.2.0
+- new formatting for output table
+- fixes error introduced by new uuid attribute on reviews 

data/Gemfile

@@ -5,4 +5,10 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem 'faraday'
+gem 'colorize'
+gem "terminal-table"
 # gem 'pry'
+
+if RUBY_PLATFORM =~ /win32/
+  gem 'win32console'
+end

data/Gemfile.lock

@@ -1,26 +1,33 @@
 PATH
   remote: .
   specs:
-    ogs_katacheck (0.1.6)
+    ogs_katacheck (0.2.0)
       faraday
+      terminal-table
 
 GEM
   remote: https://rubygems.org/
   specs:
+    colorize (0.8.1)
     faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     multipart-post (2.1.1)
     rake (12.3.0)
     ruby2_keywords (0.0.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  colorize
   faraday
   ogs_katacheck!
   rake (~> 12.0)
+  terminal-table
 
 BUNDLED WITH
    2.1.4

data/lib/ogs_katacheck.rb

@@ -1,5 +1,8 @@
 require 'faraday'
 require 'json'
+require 'colorize'
+require 'win32console'
+require 'terminal-table'
 require_relative "./ogs_katacheck/version"
 require_relative "./ogs_katacheck/cli"
 require_relative "./ogs_katacheck/review"

data/lib/ogs_katacheck/cli.rb

@@ -37,7 +37,8 @@ class OGSKataCheck::CLI
     puts "The following reviews are available:"
 
     Review.all.each do |review|
-      puts "#{review.number}.  #{review.id} - #{review.engine} - #{review.type} - #{review.date}"
+      review.date = Time.new(review.date.slice(0,4), review.date.slice(5, 2), review.date.slice(8, 2), review.date.slice(11, 2), review.date.slice(14, 2), review.date.slice(17, 2), "+00:00")
+      puts "#{review.number}.  #{review.id} -- #{review.engine} -- #{review.type} -- #{review.date.localtime.strftime("%e %b %Y, %I:%M%p %Z")}"
     end
 
     puts ""

data/lib/ogs_katacheck/full_review.rb

@@ -1,5 +1,5 @@
 class FullReview
-  attr_accessor :win_rates, :scores, :id, :type, :game_id, :engine, :engine_version, :network, :network_size, :date, :strength, :win_rate, :moves,
+  attr_accessor :win_rates, :uuid, :scores, :id, :type, :game_id, :engine, :engine_version, :network, :network_size, :date, :strength, :win_rate, :moves,
     :total_moves, :black_tier_1, :black_tier_2, :black_tier_3, :black_tier_4, :white_tier_1, :white_tier_2, :white_tier_3, :white_tier_4, :black_total, :white_total
 
   @@all = []

data/lib/ogs_katacheck/review.rb

@@ -1,5 +1,5 @@
 class Review
-  attr_accessor :full_review, :number, :id, :type, :game_id, :engine, :engine_version, :network, :network_size, :date, :strength, :win_rate, :moves
+  attr_accessor :full_review, :number, :uuid, :id, :type, :game_id, :engine, :engine_version, :network, :network_size, :date, :strength, :win_rate, :moves
   @@all = []
 
   def initialize(attributes, number:)
@@ -25,21 +25,80 @@ class Review
     puts "Checking player submitted moves against #{@engine} #{@type} review ##{@id}..."
     review = load_review
     review.process
-    puts ""
-    puts "-----------------------------------------------------"
-    puts "Black Tier 1 Moves: #{review.black_tier_1[0]} --- #{review.black_tier_1[1].round(2)}%"
-    puts "Black Tier 2 Moves: #{review.black_tier_2[0]} --- #{review.black_tier_2[1].round(2)}%"
-    puts "Black Tier 3 Moves: #{review.black_tier_3[0]} --- #{review.black_tier_3[1].round(2)}%"
-    puts "Black Tier 4 Moves: #{review.black_tier_4[0]} --- #{review.black_tier_4[1].round(2)}%"
-    puts "-----------------------------------------------------"
-    puts "White Tier 1 Moves: #{review.white_tier_1[0]} --- #{review.white_tier_1[1].round(2)}%"
-    puts "White Tier 2 Moves: #{review.white_tier_2[0]} --- #{review.white_tier_2[1].round(2)}%"
-    puts "White Tier 3 Moves: #{review.white_tier_3[0]} --- #{review.white_tier_3[1].round(2)}%"
-    puts "White Tier 4 Moves: #{review.white_tier_4[0]} --- #{review.white_tier_4[1].round(2)}%"
-    puts "-----------------------------------------------------"
-    puts "Black Total Top Moves: #{review.black_total[0]} --- #{review.black_total[1].round(2)}%"
-    puts "White Total Top Moves: #{review.white_total[0]} --- #{review.white_total[1].round(2)}%"
-    puts "-----------------------------------------------------"
+
+    # table = Terminal::Table.new title: "Results".bold, headings: ['Color'.bold, 'Tier'.bold, "#".bold, "%".bold]
+    # x = 1
+    # while x < 4 do
+    #   table.add_row [x == 2 ? "Black".bold : nil, x, review.public_send("black_tier_#{x}")[0], review.public_send("black_tier_#{x}")[1].round(2)]
+    #   x += 1
+    # end
+    #
+    # table.add_separator
+    # table.add_row [{:value => 'Total'.bold, :colspan => 2, :alignment => :center}, review.black_total[0], "#{review.black_total[1].round(2)}%"]
+    # table.add_separator
+    # table.add_separator
+    #
+    # x = 1
+    # while x < 4 do
+    #   table.add_row [x == 2 ? "White".bold : nil, x, review.public_send("black_tier_#{x}")[0], review.public_send("black_tier_#{x}")[1].round(2)]
+    #   x += 1
+    # end
+    #
+    # table.add_separator
+    #
+    # table.add_row [{:value => 'Total'.bold, :colspan => 2, :alignment => :center}, review.white_total[0], "#{review.white_total[1].round(2)}%"]
+    #
+    # table.style = {:width => 80, :padding_left => 3, :border_x => "=", :border_i => "x"}
+    #
+    # puts table
+
+    table = Terminal::Table.new title: "Results".bold, headings: ['Tier'.bold, "#".bold, "%".bold]
+    x = 1
+    table.add_row [{value: "Black".bold.light_white.on_black, alignment: :center, colspan: 3}]
+    table.add_separator
+    while x < 4 do
+      table.add_row [x, {value: review.public_send("black_tier_#{x}")[0], alignment: :center}, {value: review.public_send("black_tier_#{x}")[1].round(2).to_s + " %", alignment: :center}]
+      x += 1
+    end
+
+    table.add_separator
+    table.add_row [{:value => 'Total'.bold, :alignment => :center}, review.black_total[0], "#{review.black_total[1].round(2)}%"]
+    table.add_separator
+
+    table.add_row [{value: "White".bold.black.on_light_white.blink, alignment: :center, colspan: 3}]
+    table.add_separator
+    x = 1
+    while x < 4 do
+      table.add_row [x, review.public_send("white_tier_#{x}")[0], review.public_send("white_tier_#{x}")[1].round(2).to_s + " %"]
+      x += 1
+    end
+
+    table.add_separator
+
+    table.add_row [{:value => 'Total'.bold, :alignment => :center}, review.white_total[0], "#{review.white_total[1].round(2)}%"]
+
+    table.style = {:width => 70, :padding_left => 2, :border_x => "=".blue, :border_i => "x".blue, :alignment => :center}
+
+    puts table
+
+    # puts ""
+    # puts "^^ new"
+    # puts "vv old"
+    # puts ""
+    # puts "-----------------------------------------------------"
+    # puts "Black Tier 1 Moves: #{review.black_tier_1[0]} --- #{review.black_tier_1[1].round(2)}%"
+    # puts "Black Tier 2 Moves: #{review.black_tier_2[0]} --- #{review.black_tier_2[1].round(2)}%"
+    # puts "Black Tier 3 Moves: #{review.black_tier_3[0]} --- #{review.black_tier_3[1].round(2)}%"
+    # puts "Black Tier 4 Moves: #{review.black_tier_4[0]} --- #{review.black_tier_4[1].round(2)}%"
+    # puts "-----------------------------------------------------"
+    # puts "White Tier 1 Moves: #{review.white_tier_1[0]} --- #{review.white_tier_1[1].round(2)}%"
+    # puts "White Tier 2 Moves: #{review.white_tier_2[0]} --- #{review.white_tier_2[1].round(2)}%"
+    # puts "White Tier 3 Moves: #{review.white_tier_3[0]} --- #{review.white_tier_3[1].round(2)}%"
+    # puts "White Tier 4 Moves: #{review.white_tier_4[0]} --- #{review.white_tier_4[1].round(2)}%"
+    # puts "-----------------------------------------------------"
+    # puts "Black Total Top Moves: #{review.black_total[0]} --- #{review.black_total[1].round(2)}%"
+    # puts "White Total Top Moves: #{review.white_total[0]} --- #{review.white_total[1].round(2)}%"
+    # puts "-----------------------------------------------------"
 
   end
 

data/lib/ogs_katacheck/version.rb

@@ -1,3 +1,3 @@
 module OGSKataCheck
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/ogs_katacheck.gemspec

@@ -23,9 +23,10 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.add_runtime_dependency "faraday"
+  spec.add_runtime_dependency "terminal-table"
   spec.bindir        = "bin"
   spec.executables   = ["ogs-katacheck", "katacheck"]
   spec.require_paths = ["lib"]
 end
 
-# to release, bump version and run `bundle exec rake release` 
+# to release, bump version and run `bundle exec rake release`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ogs_katacheck
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - RubyMineshaft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,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'
 description: This CLI gem is written for OGS team members in order to aid in investigating
   suspicions of botting.
 email: