aromancer 0.0.7 → 0.0.9

data/lib/aromancer/routes.rb

@@ -46,24 +46,10 @@ module Aromancer
       ).first
     end
 
-    def self.arena_data
-      arena = Aromancer::Storage.get_arena
-      if arena.nil?
-        Aromancer::Api.load_arena
-        sleep(1)
-      end
-
-      if arena.nil?
-        Aromancer.print_last_error("routes.legend.arena_failed")
-        Aromancer::Prompt.p.ask(I18n.t("shared.key_press"))
-        Aromancer::Api.set_active_legend_id(nil)
-      else
-        arena
-      end
-    end
-
     def self.authentication
-      if Aromancer::Storage.get_player
+      unless Aromancer::Storage.get_player.nil? ||
+        Aromancer::Storage.get_player["api_key"].nil?
+
         Aromancer::Storage.set_signed_out_flag(false)
         return main_menu
       end
@@ -87,6 +73,9 @@ module Aromancer
         }},
         {value: :configure, proc: Proc.new{
           configure
+        }},
+        {value: :exit, proc: Proc.new{
+          exit
         }}
       ]
       Thread.main[:route] = __method__.to_sym
@@ -94,7 +83,7 @@ module Aromancer
 
     def self.configure
       cls
-
+      Aromancer.print_large_text(Thread.main[:route].to_s)
       Aromancer::Prompt.say(I18n.t("routes.configure.title", name: Aromancer.to_s.downcase))
       [
         Aromancer::Storage.get_server_url,
@@ -133,7 +122,7 @@ module Aromancer
             Aromancer::Storage.instance.set_key(storage_key, previous)
           end
 
-          Aromancer::Storage.instance.clear_cache!
+          Aromancer::Cli.instance.should_clear_cache = true
         end
         Aromancer::Prompt.say(I18n.t("shared.server_url", url: Aromancer::Storage.get_server_url))
       }
@@ -162,7 +151,7 @@ module Aromancer
           Aromancer::Prompt.say(
             I18n.t("routes.configure.force_ssl_toggle", value: Aromancer::Storage.get_preference(:force_ssl))
           )
-          sleep(2)
+          sleep(1)
           configure
         }},
         {value: :debug, proc: Proc.new{
@@ -171,7 +160,7 @@ module Aromancer
           Aromancer::Prompt.say(
             I18n.t("routes.configure.debug_toggle", value: Aromancer::Storage.get_preference(:debug))
           )
-          sleep(2)
+          sleep(1)
           configure
         }},
       ]
@@ -210,6 +199,7 @@ module Aromancer
 
       return authentication if player.nil?
 
+      Aromancer.print_large_text
       Thread.main[:menu_options][__method__.to_sym] ||= [
         {name: I18n.t("routes.main_menu.new_game"), value: :new},
         {name: I18n.t("routes.main_menu.load_game"), value: :load},
@@ -233,8 +223,8 @@ module Aromancer
           Thread.main[:route_params] = [params]
           new_game(params)
         }},
-        {value: :load, proc: Proc.new{ Aromancer::Routes::legends }},
-        {value: :find, proc: Proc.new{ Aromancer::Routes::find_game }},
+        {value: :load, proc: Proc.new{ Thread.main[:route] = :legends }},
+        {value: :find, proc: Proc.new{ Thread.main[:route] = :find_game }},
         {value: :configure, proc: Proc.new{
           configure
         }},
@@ -252,7 +242,7 @@ module Aromancer
         }},
         {value: :exit, proc: Proc.new{
           exit
-        }},
+        }}
       ]
       Thread.main[:route] = __method__.to_sym
     end
@@ -277,22 +267,12 @@ module Aromancer
       ]
       Thread.main[:menu_runners][__method__.to_sym] = [
         {value: :continue, proc: Proc.new{
-          Aromancer::Storage.instance.clear_cache!
           Aromancer::Api.create_legend(params)
-          legend_menu
-          # Aromancer::Api.get_legends
-
-          # unless active_legend.nil? || active_legend["id"] != Aromancer::Storage.get_player["active_legend_id"]
-          #   Aromancer.print_last_error
-          #   sleep(1)
-          #   main_menu
-          # else
-          #   legend_menu
-          # end
+          Thread.main[:route] = :legend_menu
         }},
         {value: :cancel, proc: Proc.new{
           Aromancer::Prompt.say(I18n.t("routes.new_game.cancelled"))
-          main_menu
+          Thread.main[:route] = :main_menu
         }}
       ]
       Thread.main[:route] = __method__.to_sym
@@ -306,13 +286,13 @@ module Aromancer
 
       # if legend_array.nil?, load player's legends
       if legend_array.nil?
-        Aromancer::Storage.instance.clear_cache!
         Aromancer::Api.get_legends
-        legend_array = Aromancer::Storage.get_legends
+        sleep(Aromancer::Cli::RENDER_DELAY)
+        legend_array = Aromancer::Storage.get_legends || []
         unless legend_array.any?
           Aromancer::Prompt.say(I18n.t("shared.empty"))
           sleep(1)
-          return main_menu
+          Thread.main[:route] = :main_menu
         end
       end
 
@@ -328,20 +308,19 @@ module Aromancer
       end
 
       Thread.main[:menu_runners][__method__.to_sym] = [
-        {value: :back, proc: Proc.new{ main_menu }},
+        {value: :back, proc: Proc.new{
+          Aromancer::Api.set_active_legend_id(nil)
+          Thread.main[:route] = :main_menu
+        }},
       ] + legend_array.map{|l|
         {
           value: l["id"],
           proc: Proc.new{
             Aromancer::Api.set_active_legend_id(l["id"])
+            sleep(Aromancer::Cli::RENDER_DELAY)
+            Aromancer::Api.get_legends
 
-            unless active_legend.nil? || active_legend["id"] != Aromancer::Storage.get_player["active_legend_id"]
-              Aromancer.print_last_error
-              sleep(1)
-              main_menu
-            else
-              legend_menu
-            end
+            Thread.main[:route] = :legend_menu
           }
         }
       }
@@ -352,9 +331,9 @@ module Aromancer
       return if Thread.main[:route] == __method__.to_sym
       Aromancer::Prompt.print_divider(I18n.t("routes.stream.title"))
       Aromancer::Api.load_stream(recent_count)
-      stream = Aromancer::Storage.get_stream
-      stream["stream"].last(
-        recent_count.nil? ? stream["stream"].count : recent_count
+      entries = Aromancer::Storage.get_stream
+      entries["stream"].last(
+        recent_count.nil? ? entries["stream"].count : recent_count
       ).each{|e|
         Aromancer::Prompt.say("[#{Aromancer.time_display(e["updated_at"])}]: #{e["description"]}", ljust: true)
       }
@@ -370,61 +349,82 @@ module Aromancer
 
     def self.legend_menu
       cls
-      legend
-
-      legend_array = Aromancer::Storage.get_legends
       al = active_legend
-      if !al.nil?
-        if al["status"] == "complete"
+      al_status = ((al || {})["status"] || "").to_sym
+      arena = Aromancer::Storage.get_arena
+      if !al_status.nil? &&
+        ![:started, :paused].include?(al_status) &&
+        !al.nil? &&
+        !arena.nil?
+
+        stream(display_only: true) # display entire stream
+        Aromancer::Prompt.print_divider(al["value_display"])
+        Aromancer::Prompt.say(arena["title"])
+        Aromancer::Prompt.say(arena["players"].map{|p| "#{p["alias"]}(#{p["status"]}): #{p["score"]}"}.join(" | "))
+        Thread.main[:route] = __method__.to_sym
+        case al_status
+        when :created
+          if al["player_count"] == 2
+            Thread.main[:menu_options][__method__.to_sym] = [
+              {name: I18n.t("shared.key_press"), value: :key_press}
+            ]
+            Thread.main[:menu_runners][__method__.to_sym] = [
+              {value: :key_press, proc: Proc.new{
+                Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_", route: :legends))
+                Aromancer::Api.set_active_legend_id(nil)
+                sleep(Aromancer::Cli::RENDER_DELAY)
+                Thread.main[:route] = :legends
+              }}
+            ]
+            Aromancer::Api.get_legends
+            Aromancer::Api.load_arena
+          end
+        when :complete
           Thread.main[:menu_options][__method__.to_sym] = [
             {name: I18n.t("shared.key_press"), value: :key_press}
           ]
           Thread.main[:menu_runners][__method__.to_sym] = [
             {value: :key_press, proc: Proc.new{
-              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_main"))
+              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_", route: :legends))
               Aromancer::Api.set_active_legend_id(nil)
-              legends
+              Thread.main[:route] = :legends
             }}
           ]
-          Thread.main[:route] = __method__.to_sym
-          return
-        elsif al["status"] == "created"
-          Thread.main[:menu_options][__method__.to_sym] = [
-            {name: :reload, value: :reload}, {name: I18n.t("shared.back"), value: :back}
-          ]
-          Thread.main[:menu_runners][__method__.to_sym] = [
-            {value: :reload, proc: Proc.new{ legend_menu }},
-            {value: :back, proc: Proc.new{
-              Aromancer::Api.set_active_legend_id(nil)
-              legends
-            }}
-          ]
-          Thread.main[:route] = __method__.to_sym
-          return
-        elsif active_legend["player"] && (active_legend["player"]["words"] || []).count == 0
-          Aromancer::Api.load_arena
-          return
         end
-      else
-        Thread.main[:menu_runners] = {}
-        Thread.main[:menu_options] = {}
-        Thread.main[:route] = :main_menu
+        return
+      end
+
+      arena = Aromancer::Storage.get_arena
+      if arena.nil? || arena["turn_player"].nil?
+        Aromancer::Prompt.say(I18n.t("shared.spelling"))
+        Thread.main[:menu_options][__method__.to_sym] = []
+        Thread.main[:menu_runners][__method__.to_sym] = []
+        sleep(Aromancer::Cli::RENDER_DELAY)
+        Aromancer::Api.get_legends
+        Aromancer::Api.load_arena
+        return
       end
 
+      legend
+
+      Thread.main[:route] = __method__.to_sym
+
       hide_sentences_pref = Aromancer::Storage.get_preference(:hide_sentences)
       hide_sentences_pref_value = "#{hide_sentences_pref ? "" : "hide_"}signed_sentences".to_sym
       hide_stream_pref = Aromancer::Storage.get_preference(:hide_stream)
       hide_stream_pref_value = "#{hide_stream_pref ? "" : "hide_"}title".to_sym
-
-      Thread.main[:route] = __method__.to_sym
       Thread.main[:menu_options][__method__.to_sym] = [
-        {name: I18n.t("routes.legend.unspoken_words"), value: :words},
-        {name: I18n.t("routes.legend.spoken_words"), value: :spoken_words},
-        {name: I18n.t("routes.legend.unsigned_sentences"), value: :unsigned_sentences},
         {name: I18n.t("routes.legend.#{hide_sentences_pref_value}"), value: hide_sentences_pref_value},
         {name: I18n.t("routes.stream.#{hide_stream_pref_value}"), value: hide_stream_pref_value},
         {name: I18n.t("routes.main_menu.title"), value: :main_menu}
       ]
+      if arena["turn_player"]["id"] == Aromancer::Storage.get_player["id"]
+        [
+          {name: I18n.t("routes.legend.unspoken_words"), value: :words},
+          {name: I18n.t("routes.legend.spoken_words"), value: :spoken_words},
+          {name: I18n.t("routes.legend.unsigned_sentences"), value: :unsigned_sentences}
+        ].reverse.each{|mo| Thread.main[:menu_options][__method__.to_sym].insert(0, mo)}
+      end
 
       Thread.main[:menu_runners][__method__.to_sym] = [
         {value: :words, proc: Proc.new{ words }},
@@ -447,48 +447,7 @@ module Aromancer
 
     def self.legend
       Aromancer::Prompt.say(I18n.t("shared.navigate", route: :legend)) if Aromancer::Storage.get_preference(:debug)
-      Aromancer::Api.load_arena
-      arena = arena_data
-      al = active_legend
-      al_status = ((al || {})["status"] || "").to_sym
-      if !al.nil? &&
-        [:created, :complete].include?(al_status)
-
-        stream(display_only: true) # display entire stream
-        Aromancer::Prompt.print_divider(al["value_display"])
-        Aromancer::Prompt.say(arena["title"])
-        Aromancer::Prompt.say(arena["players"].map{|p| "#{p["alias"]}(#{p["score"]})"}.join(" | "))
-
-        if al_status == :complete
-          Thread.main[:menu_options][:legend_menu] = [
-            {name: I18n.t("shared.key_press"), value: :key_press}
-          ]
-          Thread.main[:menu_runners][:legend_menu] = [
-            {value: :key_press, proc: Proc.new{
-              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_main"))
-              Aromancer::Api.set_active_legend_id(nil)
-              legends
-            }}
-          ]
-        else
-          Aromancer::Api.get_legends
-
-          Thread.main[:menu_options][:legend_menu] = [
-            {name: I18n.t("shared.back"), value: :back},
-            {name: I18n.t("shared.key_press"), value: :key_press}
-          ]
-          Thread.main[:menu_runners][:legend_menu] = [
-            {value: :back, proc: Proc.new{
-              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_main"))
-              Aromancer::Api.set_active_legend_id(nil)
-              legends
-            }},
-            {value: :key_press, proc: Proc.new{ legend_menu }}
-          ]
-        end
-        return
-      end
-
+      arena = Aromancer::Storage.get_arena
       return if arena.nil? || arena["turn_player"].nil?
 
       turn_player = arena["turn_player"]
@@ -578,7 +537,15 @@ module Aromancer
       cls
       legend
 
-      arena = arena_data
+      arena = Aromancer::Storage.get_arena
+      if arena.nil? ||
+        arena["player"].nil? ||
+        arena["player"]["words"].nil?
+        sleep(Aromancer::Cli::RENDER_DELAY)
+
+        Aromancer::Api.load_arena
+        return
+      end
       Thread.main[:menu_options][__method__.to_sym] = [
         {name: I18n.t("shared.back"), value: :back}
       ] + arena["player"]["words"].map{|w| {name: w["value_display"], value: w["id"]}}
@@ -597,7 +564,7 @@ module Aromancer
       cls
       legend
 
-      arena = arena_data
+      arena = Aromancer::Storage.get_arena
       Thread.main[:menu_options][__method__.to_sym] = [
         {name: I18n.t("shared.back"), value: :back}
       ] + arena["scroll_words"].map{|w| {name: w["value_display"], value: w["id"]}}
@@ -616,7 +583,7 @@ module Aromancer
       cls
       legend
 
-      arena = arena_data
+      arena = Aromancer::Storage.get_arena
       Thread.main[:menu_options][__method__.to_sym] = [
         {name: I18n.t("shared.back"), value: :back}
       ] + arena["sentences"].map{|s| {name: s["value_display"], value: s["id"]}}
@@ -646,11 +613,12 @@ module Aromancer
       selected_word = possibilities["word"]
       for_type = possibilities["for_type"].to_sym
 
-      arena = arena_data
+      arena = Aromancer::Storage.get_arena
       player_words = arena["player"]["words"]
 
       choices = [{name: I18n.t("shared.back"), value: :back}]
-      if for_type == :player_word
+      if for_type == :player_word &&
+        arena["turn_player"]["id"] == Aromancer::Storage.get_player["id"]
 
         # show place on scroll option if selected word is from player's words
         choices << {
@@ -659,8 +627,11 @@ module Aromancer
         }
       end
 
-      choices += options.map{|o| {name: "#{o["humanized_title"]} -> weight: #{o["total_weight"]}", value: o}}
+      unless arena["turn_player"]["id"] != Aromancer::Storage.get_player["id"]
+        choices += options.map{|o| {name: "#{o["humanized_title"]} -> weight: #{o["total_weight"]}", value: o}}
+      end
 
+      _muh_method = __method__.to_sym
       Thread.main[:menu_options][__method__.to_sym] = choices
       Thread.main[:menu_runners][__method__.to_sym] = [
         {value: :back, proc: Proc.new{
@@ -674,12 +645,24 @@ module Aromancer
           end
         }},
         {value: :player_word, proc: Proc.new{
+          Aromancer::Prompt.say(I18n.t("shared.spelling"))
+          Thread.main[:menu_options][_muh_method] = []
+          Thread.main[:menu_runners][_muh_method] = []
           Aromancer::Api.submit_turn(request_uuid)
-          legend_menu
+          # websockets will trigger this for other player after turn is submitted
+          Aromancer::Api.get_legends
+          Aromancer::Api.load_arena
+          sleep(Aromancer::Cli::RENDER_DELAY)
         }},
         {value: nil, proc: Proc.new{|o|
+          Aromancer::Prompt.say(I18n.t("shared.spelling"))
+          Thread.main[:menu_options][_muh_method] = []
+          Thread.main[:menu_runners][_muh_method] = []
           Aromancer::Api.submit_turn(request_uuid, {option_uuid: o[:uuid.to_s]})
-          legend_menu
+          # websockets will trigger this for other player after turn is submitted
+          Aromancer::Api.get_legends
+          Aromancer::Api.load_arena
+          sleep(Aromancer::Cli::RENDER_DELAY)
         }}
       ]
       Thread.main[:route_params] = [selected_word_id]

data/lib/aromancer/serve.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+=begin
+
+  serve.rb
+
+  aromancer serve functionality.
+
+  by i2097i
+
+=end
+
+module Aromancer
+  class Serve
+    SERVER_NAME = :"#{Aromancer.to_s.downcase}_serve".to_s
+
+    def self.run
+      unless Dir.exist?(serve_dir)
+        system(:"git clone git@github.com:arowmancy/#{SERVER_NAME}.git #{serve_dir}".to_s)
+      end
+      FileUtils.chdir serve_dir do
+        branch = "v#{Aromancer::VERSION}"
+        system(:"git checkout #{branch}".to_s)
+        system(:"git pull origin #{branch}".to_s)
+        system(:"bin/setup".to_s)
+      end
+    end
+
+    private
+
+    def self.serve_dir
+      File.join(Aromancer.home_directory, SERVER_NAME)
+    end
+  end
+end

data/lib/aromancer/server.rb

@@ -22,7 +22,6 @@ module Aromancer
       def initialize(status: -1, body: {})
         @status = status
         @body = body
-        Aromancer::Storage.instance.clear_cache!
       end
 
       def self.build(e)
@@ -129,7 +128,7 @@ module Aromancer
 
     def self.get_arena
       legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
-      return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
+      return InternalError.build(StandardError.new("#{__method__}: no active legend")) if legend_id.nil?
 
       begin
         Faraday.new(
@@ -143,13 +142,14 @@ module Aromancer
 
     def self.get_stream(count = nil)
       legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
-      return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
+      return InternalError.build(StandardError.new("#{__method__}: no active legend")) if legend_id.nil?
 
+      count_param = count.nil? || count.to_i <= 0 ? "" : "?last_count=#{count}"
       begin
         Faraday.new(
           url: Aromancer::Storage.get_server_url,
           headers: HEADERS.merge(auth_header),
-        ).get("/legends/#{legend_id}/stream?count=#{count || nil}")
+        ).get("/legends/#{legend_id}/stream#{count_param}")
       rescue StandardError => e
         InternalError.build(e)
       end
@@ -157,7 +157,7 @@ module Aromancer
 
     def self.get_word_possibilities(selected_word_id)
       legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
-      return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
+      return InternalError.build(StandardError.new("#{__method__}: no active legend")) if legend_id.nil?
 
       begin
         Faraday.new(
@@ -171,7 +171,7 @@ module Aromancer
 
     def self.submit_turn(request_uuid, params = {})
       legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
-      return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
+      return InternalError.build(StandardError.new("#{__method__}: no active legend")) if legend_id.nil?
 
       begin
         Faraday.new(