civility 1 → 2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df76ba40aea50dec8f246b036906e5f27dc002d
-  data.tar.gz: e4e16a66f545ae76eb60c719170730853392f213
+  metadata.gz: 9b0f74580880b0d37770465bf37e82dc32218f26
+  data.tar.gz: da8899ef0175eb9a1baf87abb25ac9478f95b4c7
 SHA512:
-  metadata.gz: eef89961b15e37fca9565cd636057f6012e2eb8132fea08d112ac2ffc235875212cbd06927042ab341e4cf4dcf2644d9f9a4f7df99de75d38a7e60e441d6ef76
-  data.tar.gz: f84cd67d695ec79d6ecf4adc4dae5a9658dce3b4e411b013e741ce9b8a97abd843d84f679f69d741f85825f3a9cdecd9f916736f31d60a5e02c66470a68a80f1
+  metadata.gz: e2ac60210ac526e0366b8065fb6dbdf903cabb490a52a7b8572e7f776147faf0aac6c29db0eaa04fc0f966ed6a19e5cf2244ddd0de768d0604dd77f7eca95844
+  data.tar.gz: ea43b7945ecbbdfe43b27f90bb5994a2d99af93709741dc63545bb3e96b4496f53d5e833551f30dd8edea083348f9d32e86955874f058f026214f03b6dbaf1c2

data/bin/civility

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require '/Users/abraham/dev/civility/lib/civility'
+require 'civility'
 
 Civility.start(ARGV)

data/lib/civility.rb

@@ -5,7 +5,7 @@ require 'yaml'
 require 'thor'
 
 class Civility < Thor
-  VERSION = '1'
+  VERSION = '2'
   SAVE_DIRECTORY = "/Documents/Aspyr/Sid\ Meier\'s\ Civilization\ 5/Saves/hotseat/"
   FILE_PREFIX = 'civility'
   FILE_EXT = 'Civ5Save'
@@ -35,27 +35,28 @@ class Civility < Thor
   desc "games", "List your current games"
   def games
     return missing_auth_error unless auth_key
-    response = get('GetGamesAndPlayers', {authKey: auth_key, playerIDText: user_id})
-    response = JSON.parse(response)
-    output_games(response['Games'])
-    self.config = @config.merge(games: response['Games'], updated_at: Time.now.to_i)
+    games = api_games
+    output_games(games)
   end
 
   desc 'play', 'Download a game to play'
-  def play(name)
+  def play(*name)
+    name = name.join(' ')
     return missing_auth_error unless auth_key
     game = game_by_name(name)
-    return missing_game_error unless game
+    return missing_game_error(name) unless game
     path = game_path(game)
     file('GetLatestSaveFileBytes', {authKey: auth_key, gameID: game['GameId']}, path)
     puts "Saved #{game['Name']} to #{path}"
+    api_games
   end
 
   desc 'complete', 'Upload a completed turn'
-  def complete(name)
+  def complete(*name)
+    name = name.join(' ')
     return missing_auth_error unless auth_key
     game = game_by_name(name)
-    return missing_game_error unless game
+    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)
@@ -75,6 +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']
+  end
+
   def game_path(game)
     "#{Dir.home}#{SAVE_DIRECTORY}#{FILE_PREFIX}-#{normalize(game['Name'])}-#{game['GameId']}.#{FILE_EXT}"
   end
@@ -171,8 +179,8 @@ class Civility < Thor
     "Unable to parse response\nCode: #{response.code}\nBody: #{response.body}"
   end
 
-  def missing_game_error
-    puts 'Unable to find that game'
+  def missing_game_error(name)
+    puts "Unable to find the game #{name}"
   end
 
   def missing_auth_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civility
 version: !ruby/object:Gem::Version
-  version: '1'
+  version: '2'
 platform: ruby
 authors:
 - Abraham Williams
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Civility is the easiest way to manage your Civ5 hotseat games hosted
   on Giant Multiplayer Robot
 email: abraham@abrah.am