civility 2 → 3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0f74580880b0d37770465bf37e82dc32218f26
-  data.tar.gz: da8899ef0175eb9a1baf87abb25ac9478f95b4c7
+  metadata.gz: 961441008c19039aec77918332dc3cf6d4b61311
+  data.tar.gz: 8521738ff666ecdd6056d813e629d48d9d0749c2
 SHA512:
-  metadata.gz: e2ac60210ac526e0366b8065fb6dbdf903cabb490a52a7b8572e7f776147faf0aac6c29db0eaa04fc0f966ed6a19e5cf2244ddd0de768d0604dd77f7eca95844
-  data.tar.gz: ea43b7945ecbbdfe43b27f90bb5994a2d99af93709741dc63545bb3e96b4496f53d5e833551f30dd8edea083348f9d32e86955874f058f026214f03b6dbaf1c2
+  metadata.gz: 49ed95a2664faa60d21a9752eb46d432600a0459bd3cb4a2c15fd2021cd088d208fe7ca2a8528e8423bf4882c86acdb76e94d6ece9fbeaf0050a095de0ddec99
+  data.tar.gz: 28fc93c4ff0b164980efe64ef44bf3d2f3cd940477619ef05582ddccf7bc1a7e00c4a7d7788432a59debb22927b896a37eba9df4aa4a6c6f7677bf43dc4a10d7

data/lib/civility.rb

@@ -5,38 +5,38 @@ require 'yaml'
 require 'thor'
 
 class Civility < Thor
-  VERSION = '2'
+  VERSION = '3'
   SAVE_DIRECTORY = "/Documents/Aspyr/Sid\ Meier\'s\ Civilization\ 5/Saves/hotseat/"
   FILE_PREFIX = 'civility'
   FILE_EXT = 'Civ5Save'
-  API = 'http://multiplayerrobot.com/api/Diplomacy/'
   CONFIG_FILE = '.civility.yml'
 
   def initialize(*args)
     @config = load_config
+    @gmr = Civility::GMR.new(auth_key, user_id) if auth_key
     super(*args)
   end
 
   desc 'auth', 'Save auth key'
-  def auth(key = nil)
-    if key.nil?
-      url = 'http://multiplayerrobot.com/download'
-      puts "Grab your Authentication Key from #{url}"
-      system('open', url)
+  def auth(auth_key = nil)
+    if auth_key.nil?
+      auth_url = Civility::GMR.auth_url
+      puts "Grab your Authentication Key from #{auth_url}"
+      system('open', auth_url)
     else
+      @gmr = Civility::GMR.new(auth_key)
       @config[:version] = VERSION
-      @config[:auth] = key
+      @config[:auth] = auth_key
       @config[:user] = user
       self.config = @config
       puts "Hello, #{user['PersonaName']}, your auth is all configured!"
     end
   end
 
-  desc "games", "List your current games"
+  desc 'games', 'List your current games'
   def games
     return missing_auth_error unless auth_key
-    games = api_games
-    output_games(games)
+    output_games sync_games
   end
 
   desc 'play', 'Download a game to play'
@@ -45,10 +45,11 @@ class Civility < Thor
     return missing_auth_error unless auth_key
     game = game_by_name(name)
     return missing_game_error(name) unless game
-    path = game_path(game)
-    file('GetLatestSaveFileBytes', {authKey: auth_key, gameID: game['GameId']}, path)
+    path = save_path(game)
+    data = @gmr.download(game['GameId'])
+    save_file(path, data)
     puts "Saved #{game['Name']} to #{path}"
-    api_games
+    sync_games
   end
 
   desc 'complete', 'Upload a completed turn'
@@ -57,9 +58,8 @@ class Civility < Thor
     return missing_auth_error unless auth_key
     game = game_by_name(name)
     return missing_game_error(name) unless game
-    path = game_path(game)
-    response = upload_file('SubmitTurn', {authKey: auth_key, turnId: game['CurrentTurn']['TurnId']}, path)
-    response = JSON.parse(response)
+    path = save_path(game)
+    response = @gmr.upload(game['CurrentTurn']['TurnId'], File.read(path))
     case response['ResultType']
     when 0
       puts "UnexpectedError: #{response}"
@@ -76,14 +76,13 @@ class Civility < Thor
 
   private
 
-  def api_games
-    response = get('GetGamesAndPlayers', {authKey: auth_key, playerIDText: user_id})
-    response = JSON.parse(response)
-    self.config = @config.merge(games: response['Games'], updated_at: Time.now.to_i)
-    response['Games']
+  def sync_games
+    games = @gmr.games
+    self.config = @config.merge(games: games, updated_at: Time.now.to_i)
+    games
   end
 
-  def game_path(game)
+  def save_path(game)
     "#{Dir.home}#{SAVE_DIRECTORY}#{FILE_PREFIX}-#{normalize(game['Name'])}-#{game['GameId']}.#{FILE_EXT}"
   end
 
@@ -100,73 +99,35 @@ class Civility < Thor
   end
 
   def output_games(games)
-    for game in games
+    games.each do |game|
       turn = (user_id == game['CurrentTurn']['UserId'] ? " and it's your turn" : '')
       puts "#{game['Name']} with #{game['Players'].size} other players#{turn}"
     end
-    puts "If your games are missing, try again" if games.size == 0
+    puts "\nIf your games are missing, try again"
   end
 
   def game_by_name(name)
     name = normalize(name)
-    games_list.find {|game| normalize(game['Name']) == name}
+    games_list.find { |game| normalize(game['Name']) == name }
   end
 
   def user
-    user_id = get('AuthenticateUser', {authKey: auth_key})
-    response = get('GetGamesAndPlayers', {authKey: auth_key, playerIDText: user_id})
-    players = JSON.parse(response)['Players']
-    user_from_players(user_id, players)
-  end
-
-  def user_from_players(user_id, players)
-    user_id = user_id.to_i
-    players.find {|player| player['SteamID'] == user_id }
+    @gmr.user
   end
 
   def normalize(name)
     name.downcase.strip.gsub(/[^\w]/, '')
   end
 
-  def get(method, params)
-    uri = URI.join(API, method)
-    uri.query = URI.encode_www_form(params)
-    response = Net::HTTP.get_response(uri)
-    fail error_message(response) unless response.code == '200'
-    response.body
-  end
-
-  def file(method, params, path)
-    uri = URI.parse("#{API}#{method}")
-    uri.query = URI.encode_www_form(params)
-    f = open(path, "wb")
-    Net::HTTP.start(uri.host) do |http|
-      http.request_get(uri.request_uri) do |response|
-        fail error_message(response) unless response.code == '200'
-        response.read_body do |segment|
-          f.write(segment)
-        end
-      end
-    end
-  ensure
-    f.close()
-  end
-
-  def upload_file(method, params, path)
-    uri = URI.parse("#{API}#{method}")
-    uri.query = URI.encode_www_form(params)
-    data = File.read(path)
-    http = Net::HTTP.new(uri.host)
-    request = Net::HTTP::Post.new(uri.request_uri)
-    request.body = data
-    response = http.request(request)
-    fail error_message(response) unless response.code == '200'
-    response.body
+  def save_file(path, data)
+    file = open(path, 'wb')
+    file.write(data)
+    file.close
   end
 
   def load_config
     if config_file?
-      @config = YAML::load_file config_path
+      @config = YAML.load_file config_path
     else
       self.config = {}
     end
@@ -201,3 +162,5 @@ class Civility < Thor
     File.exist?(config_path)
   end
 end
+
+require 'civility/gmr'

data/lib/civility/gmr.rb

@@ -0,0 +1,86 @@
+require 'net/http'
+require 'uri'
+require 'json'
+
+class Civility
+  class GMR
+    API_BASE = 'http://multiplayerrobot.com/api/Diplomacy'
+
+    def initialize(auth_key, user_id = nil)
+      @auth_key = auth_key
+      @user_id = user_id
+    end
+
+    def self.auth_url
+      'http://multiplayerrobot.com/download'
+    end
+
+    def user(user_id = nil)
+      user_id = current_user_id if user_id.nil?
+      code, response = get('GetGamesAndPlayers', playerIDText: user_id)
+      fail "Unable to get user #{response}" if code != 200
+      data = JSON.parse(response)
+      data['Players'].find { |player| player['SteamID'].to_i == user_id.to_i }
+    end
+
+    def games
+      code, response = get('GetGamesAndPlayers', playerIDText: current_user_id)
+      fail "Unable to get games #{response}" if code != 200
+      data = JSON.parse(response)
+      data['Games']
+    end
+
+    def download(game_id)
+      code, response = get('GetLatestSaveFileBytes', gameId: game_id)
+      fail "Unable to download file #{response}" if code != 200
+      response
+    end
+
+    def upload(turn_id, save_file)
+      code, response = post('SubmitTurn', save_file, turnId: turn_id)
+      fail "Unable to upload file #{response}" if code != 200
+      JSON.parse(response)
+    end
+
+    # TODO: Implement a method shortcut method to get a game turn_id
+    # def turn_id(game_id)
+    # end
+
+    private
+
+    attr_reader :auth_key
+
+    def api_url(path)
+      URI.parse([API_BASE, path].join('/'))
+    end
+
+    def current_user_id
+      return @user_id if @user_id
+
+      code, response = get('AuthenticateUser')
+      fail 'Unable to get current_user_id' if code != 200
+      @user_id = response.to_i
+    end
+
+    def get(path, params = {})
+      uri = api_url path
+      uri.query = encode_params_with_auth(params)
+      response = Net::HTTP.get_response(uri)
+      [response.code.to_i, response.body]
+    end
+
+    def post(path, body, params = {})
+      uri = api_url path
+      uri.query = encode_params_with_auth(params)
+      http = Net::HTTP.new(uri.host)
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request.body = body
+      response = http.request(request)
+      [response.code.to_i, response.body]
+    end
+
+    def encode_params_with_auth(params)
+      URI.encode_www_form(params.merge(authKey: auth_key))
+    end
+  end
+end

metadata

@@ -1,13 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: civility
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '3'
 platform: ruby
 authors:
 - Abraham Williams
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MRAwDgYDVQQDDAdhYnJh
+  aGFtMRUwEwYKCZImiZPyLGQBGRYFYWJyYWgxEjAQBgoJkiaJk/IsZAEZFgJhbTAe
+  Fw0xNjA0MDMwMDQ1NTJaFw0xNzA0MDMwMDQ1NTJaMD0xEDAOBgNVBAMMB2FicmFo
+  YW0xFTATBgoJkiaJk/IsZAEZFgVhYnJhaDESMBAGCgmSJomT8ixkARkWAmFtMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXVVnxC9MKHSypbIpX1dn9Vn
+  5XFdaj/2p54cmHkmjPj+Exqsmckev3jRkFGYERs9mO23wn1mzvaH9d9R/N+/fN7E
+  ewMRBJEnI2WjnpZuhaLRDqjxAeQuOH9FkA7gpRxs1/alTjHt7gYP/LGdY+jpYILA
+  PSu8ntrjXJPdRomDrRCwGM81X4nfo4ScU0kXb2grLnreLx/i9k5st6WW83TpQahy
+  7QqNUYNn26cnv4eHW5UiVI+m/Vyg/L6c3If7yh9baOIQaQ5VhweZg9l9O7D3IKNz
+  U/KSsRQnzrRWNeiNCEMB37JWezmBHk4CscRwu9rlKWDumPVBQijHekzJyO8BCwID
+  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUt5dCnQLt
+  AQ44CELhWtUmNkDUWiMwGwYDVR0RBBQwEoEQYWJyYWhhbUBhYnJhaC5hbTAbBgNV
+  HRIEFDASgRBhYnJhaGFtQGFicmFoLmFtMA0GCSqGSIb3DQEBBQUAA4IBAQB2wxY4
+  lZUPVgl6lTeaVDF0lWLUek0/rVKt7e/K39cvys3gmvA5sx1Z95fE4FxzOYtPWJDQ
+  pVBlhwFiYdqmn6aiG9d/qSB455JgcD8JNlEFSo++lEOubprh7/yO+r5fmAiilujm
+  tnMd3rBF4uYV9jRGGe3spVMji4wwJwlNcQ9uYIAT/ZmP0H9cBZCDtw/KrKBXEjvm
+  VENYG5VyzjxrDQqEc9Kzy8GCzcKBcwypgTX8+sYL+GKEUe3P1E8eKa83B7XWmMG7
+  EsiR9eCvovV79dCUTm5EBRWaqa7DIAXh+oEHOaAP2btcuDT/kJlg9/YG12YDdX82
+  U6jGnAwybOW/iArJ
+  -----END CERTIFICATE-----
 date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -38,6 +60,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Civility is the easiest way to manage your Civ5 hotseat games hosted
   on Giant Multiplayer Robot
 email: abraham@abrah.am
@@ -48,6 +98,7 @@ extra_rdoc_files: []
 files:
 - bin/civility
 - lib/civility.rb
+- lib/civility/gmr.rb
 homepage: https://github.com/abraham/civility
 licenses:
 - MIT

metadata.gz.sig

@@ -0,0 +1,2 @@
+��X�;�1�C���U���&S^������;f�.��Jҡ�5ˇt
+��mz<3�K���뙕����i��jmxAWD���L%��{ȇ^�c��I����]�����I�8иq<�$��P��� >�u�&�뮯Z�����i�F�3�͂�+�) �. �Ҙj~g�Y������gM�]��g3��g̎�5������P�	��5�7���;�v�)^�7�n%'�+�䵕ٲ�3�����	�igBV����8*0��E�