aromancer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da80d9c4f943470ac226c37651e21eaa5ee12128beb9c00264b43ace9845c61c
-  data.tar.gz: c55101847c0d3e6c14d7c821dc9fdf31d4e114d614d97957b7162ab995d5a02e
+  metadata.gz: 635ad1d6e0100e8311e7d9a2ed2d810e939684c02dc3572fbb6150cda376a90a
+  data.tar.gz: f3c3c71736c9c1ea4bf339ad6b3b804b302526f8b063de19d64138cdfa539792
 SHA512:
-  metadata.gz: 706112cc7fbf39edadef53eb6ac54a73c4e43d17f0f3b288cb9c795ba937bc38ec8427bb74ddcfbd8c84411483c520a8d9ac9b576f4371c1f0c656c2e36adb69
-  data.tar.gz: 91aa390ba4cf322eef5e616053cce00ebaba35ef0b9d13e051f2ba71a08bdf7c7ba5a9669d0279f88e7a67ed619a2cddba2b36f5eddc52854f691f2b74458fbc
+  metadata.gz: 1284816493145370d4f997a9e5e0ffd74791faa5c7ddd8ca9d131ed0e1ebd7189026d238cc7f3999714cf2235f198be2a1c64e9f2aae9f812a9463ff1672cb7e
+  data.tar.gz: 19d0046c8683d31847cd51b59b0228eff1cca91a15eb4af6160cbc526294c032ed3fcc21ad8c60d7de9154137af35260106b9c83a6e1af6f7adf0b254d89e1d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aromancer (0.0.5)
+    aromancer (0.0.9)
       activesupport (~> 8.1.4)
       faraday (~> 2.14.4)
       fileutils (~> 1.8.0)
@@ -171,7 +171,7 @@ DEPENDENCIES
 
 CHECKSUMS
   activesupport (8.1.4) sha256=891dd3fe43c4fc8391934b237b1189bb1f661c932a84a840043db9d46a4e80df
-  aromancer (0.0.5)
+  aromancer (0.0.9)
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.3) sha256=61ebe1e5e559bdc3cc6f2c0ee7f427321fc838f59611c294356eb04d6e21cf66
   bundler (4.0.22) sha256=d8d5ec84c8555e0af71db63ed7aee4d1a8fb839ec46d84212d61979242a5d75a

data/checksums/aromancer-0.0.9.gem.sha512

@@ -0,0 +1 @@
+c113cc095e8e8621b438078a7708295b681cbe4887e0c2fa537c90c777c8f1bf548becf77efb1ae3ec0abfacc1c9fa43ff730ed82ffb4acd0dc62377ad9925cc

data/lib/aromancer/api.rb

@@ -28,8 +28,10 @@ module Aromancer
       if response.status == 401
         Aromancer::Storage.set_signed_out_flag(true)
         player = Aromancer::Storage.get_player
-        player["api_key"] = nil
-        Aromancer::Storage.set_player(player)
+        unless player.nil?
+          player["api_key"] = nil
+          Aromancer::Storage.set_player(player)
+        end
       end
     end
 
@@ -130,7 +132,7 @@ module Aromancer
         player["active_legend_id"] = active_legend_id
         Aromancer::Storage.set_player(player)
       end
-      Aromancer::Storage.instance.clear_cache!
+      Aromancer::Cli.instance.should_clear_cache = true
       result = Aromancer::Server.update_player({player: {
         active_legend_id: active_legend_id,
         status: active_legend_id.nil? ? :lobby : :playing

data/lib/aromancer/cli.rb

@@ -15,38 +15,57 @@ module Aromancer
   class Cli
     include Singleton
 
-    attr_accessor :ui_thread, :ws_thread, :ui_busy, :ws_busy, :last_render, :error_timeout
+    attr_accessor :error_timeout, :last_render, :should_clear_cache, :storage_mutex, :ui_busy, :ui_thread, :ws_busy, :ws_thread
 
-    THROTTLE_MS = 0.1
+    RENDER_DELAY = 0.1
+
+    def initialize
+      self.storage_mutex = Mutex.new
+      self.should_clear_cache = false
+      self.last_render = 0
+      self.error_timeout = Time.now.to_i
+
+      Thread.main[:route] = :authentication
+      Thread.main[:menu_runners] = {}
+      Thread.main[:menu_options] = {}
+    end
 
     # user entry point
     def self.run
       Aromancer::Websocket.instance
-      Aromancer::Storage.instance
-
-      self.instance.last_render = 0
-      self.instance.error_timeout = Time.now.to_i
+      Aromancer::Storage.instance.ensure_default_preferences_exist
 
       # load player on-start
-      Aromancer::Api.set_active_legend_id(nil) unless Aromancer::Storage.get_player.nil?
+      Aromancer::Api.set_active_legend_id(
+        ({} || Aromancer::Storage.get_player)[:active_legend_id.to_s]
+      ) unless Aromancer::Storage.get_player.nil?
 
-      Thread.main[:route] = :authentication
-      Thread.main[:menu_runners] = {}
-      Thread.main[:menu_options] = {}
       Aromancer::Prompt.say(I18n.t("shared.welcome", version: Aromancer::VERSION))
-      Aromancer::Prompt.say(I18n.t("shared.server_url", url: Aromancer::Storage::get_server_url))
+
       self.instance.start_ui_thread
       self.instance.start_ws_thread
       loop do
         begin
+
+          if self.instance.should_clear_cache
+            Aromancer::Storage.instance.clear_cache!
+            self.instance.should_clear_cache = false
+          end
+
           self.instance.ui_thread.join
+
         rescue NoMethodError => e
+          Aromancer::Storage.set_last_error({
+            status: -1,
+            headers: e.to_s,
+            body: e.inspect.to_s
+          })
           if Aromancer::Storage.get_preference(:debug)
             Aromancer::Prompt.say(I18n.t("shared.last_error"))
-            Aromancer::Prompt.say(JSON.pretty_generate(e[:body.to_s]))
-            Aromancer::Prompt.say("sleeping 5 on main thread...")
-            sleep(5)
+            Aromancer::Prompt.say("sleeping 1 on main thread...")
+            sleep(1)
           end
+          Aromancer::Storage.instance.clear_cache!
           self.instance.start_ui_thread
           self.instance.start_ws_thread
           sleep(1)
@@ -76,11 +95,10 @@ module Aromancer
             menu_runners.empty?
 
             Aromancer::Routes.resume
-            sleep(THROTTLE_MS)
+            sleep(Aromancer::Cli::RENDER_DELAY)
             Aromancer.print_hud
 
             v = Aromancer::Prompt.p.select("", menu_options, show_help: :always, cycle: true, per_page: 11)
-            Aromancer.print_hud
             runners = menu_runners.select{|r| r[:value] == v}
             runners = menu_runners.select{|r| r[:value].nil?} if runners.empty?
 
@@ -90,12 +108,13 @@ module Aromancer
             end
 
           else
-            sleep(THROTTLE_MS)
+            sleep(Aromancer::Cli::RENDER_DELAY)
             Aromancer::Routes.resume
+            Aromancer.print_hud
           end
           Aromancer::Cli.instance.ui_busy = false
           Aromancer::Cli.instance.last_render = Time.now
-          sleep(THROTTLE_MS)
+          sleep(Aromancer::Cli::RENDER_DELAY)
         end
       end
     end
@@ -121,12 +140,12 @@ module Aromancer
             Aromancer::Websocket.instance.connect
             if Aromancer::Storage.get_arena.nil?
               Aromancer::Api.load_arena
-              sleep(1)
+              sleep(Aromancer::Cli::RENDER_DELAY)
               Aromancer::Cli.instance.start_ui_thread(true)
             end
           end
           @ws_busy = false
-          sleep(1)
+          sleep(Aromancer::Cli::RENDER_DELAY)
         end
       end
     end

data/lib/aromancer/routes.rb

@@ -122,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))
       }
@@ -151,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{
@@ -160,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
         }},
       ]
@@ -223,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
         }},
@@ -268,11 +268,11 @@ module Aromancer
       Thread.main[:menu_runners][__method__.to_sym] = [
         {value: :continue, proc: Proc.new{
           Aromancer::Api.create_legend(params)
-          legend_menu
+          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
@@ -287,11 +287,12 @@ module Aromancer
       # if legend_array.nil?, load player's legends
       if legend_array.nil?
         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
 
@@ -309,17 +310,17 @@ module Aromancer
       Thread.main[:menu_runners][__method__.to_sym] = [
         {value: :back, proc: Proc.new{
           Aromancer::Api.set_active_legend_id(nil)
-          main_menu
+          Thread.main[:route] = :main_menu
         }},
       ] + legend_array.map{|l|
         {
           value: l["id"],
           proc: Proc.new{
             Aromancer::Api.set_active_legend_id(l["id"])
-            sleep(1)
+            sleep(Aromancer::Cli::RENDER_DELAY)
             Aromancer::Api.get_legends
 
-            legend_menu
+            Thread.main[:route] = :legend_menu
           }
         }
       }
@@ -330,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)
       }
@@ -363,19 +364,21 @@ module Aromancer
         Thread.main[:route] = __method__.to_sym
         case al_status
         when :created
-          Aromancer::Api.get_legends
-
-          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(1)
-              legends
-            }}
-          ]
+          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}
@@ -384,7 +387,7 @@ module Aromancer
             {value: :key_press, proc: Proc.new{
               Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_", route: :legends))
               Aromancer::Api.set_active_legend_id(nil)
-              legends
+              Thread.main[:route] = :legends
             }}
           ]
         end
@@ -393,10 +396,10 @@ module Aromancer
 
       arena = Aromancer::Storage.get_arena
       if arena.nil? || arena["turn_player"].nil?
-        Aromancer::Prompt.say(I18n.t("shared.waiting"))
+        Aromancer::Prompt.say(I18n.t("shared.spelling"))
         Thread.main[:menu_options][__method__.to_sym] = []
         Thread.main[:menu_runners][__method__.to_sym] = []
-        sleep(1)
+        sleep(Aromancer::Cli::RENDER_DELAY)
         Aromancer::Api.get_legends
         Aromancer::Api.load_arena
         return
@@ -535,10 +538,13 @@ module Aromancer
       legend
 
       arena = Aromancer::Storage.get_arena
-      if arena["player"].nil? || arena["player"]["words"].nil?
+      if arena.nil? ||
+        arena["player"].nil? ||
+        arena["player"]["words"].nil?
+        sleep(Aromancer::Cli::RENDER_DELAY)
+
         Aromancer::Api.load_arena
-        sleep(1)
-        main_menu
+        return
       end
       Thread.main[:menu_options][__method__.to_sym] = [
         {name: I18n.t("shared.back"), value: :back}
@@ -639,24 +645,24 @@ module Aromancer
           end
         }},
         {value: :player_word, proc: Proc.new{
-          Aromancer::Prompt.say(I18n.t("shared.waiting"))
+          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)
           # websockets will trigger this for other player after turn is submitted
           Aromancer::Api.get_legends
           Aromancer::Api.load_arena
-          sleep(1)
+          sleep(Aromancer::Cli::RENDER_DELAY)
         }},
         {value: nil, proc: Proc.new{|o|
-          Aromancer::Prompt.say(I18n.t("shared.waiting"))
+          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]})
           # websockets will trigger this for other player after turn is submitted
           Aromancer::Api.get_legends
           Aromancer::Api.load_arena
-          sleep(1)
+          sleep(Aromancer::Cli::RENDER_DELAY)
         }}
       ]
       Thread.main[:route_params] = [selected_word_id]

data/lib/aromancer/server.rb

@@ -128,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(
@@ -142,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
@@ -156,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(
@@ -170,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(

data/lib/aromancer/storage.rb

@@ -52,8 +52,6 @@ module Aromancer
       :port
     ]
 
-    DEFAULT_SERVER = "http://127.0.0.1"
-
     DEFAULT_PREFERENCES = {
       preference_debug: false,
       preference_force_ssl: false,
@@ -61,18 +59,19 @@ module Aromancer
       preference_hide_stream: true,
     }
 
+    DEFAULT_SERVER_URL = :"http://127.0.0.1:3000".to_s
+
     attr_accessor :storage_open, :cache, :clear_flag, :parser_error
 
     def initialize
       reload!
-      ensure_default_preferences_exist
     end
 
     def ensure_default_preferences_exist
-      DEFAULT_PREFERENCES.keys.each{|d_key|
+      DEFAULT_PREFERENCES.each{|d_key, d_value|
         current_value = get_key(d_key)
         if current_value.nil? || ![TrueClass, FalseClass].include?(current_value.class)
-          set_key(d_key.to_s, DEFAULT_PREFERENCES[d_key])
+          set_key(d_key.to_s, d_value)
         end
       }
     end
@@ -82,7 +81,7 @@ module Aromancer
       @clear_flag = false
       @parser_error = nil
       clear_cache!
-      FileUtils.mkdir_p(Aromancer.home_directory)
+      Aromancer.configure_home
     end
 
     def clear_cache!
@@ -127,13 +126,15 @@ module Aromancer
     end
 
     def self.storage_filepath
-      filepath = File.join(Aromancer.home_directory, "storage.json")
+      filepath = File.join(Aromancer.home_directory, "v#{Aromancer::VERSION}.json")
 
       # create storage file if not present
       unless File.exist?(filepath)
         File.open(filepath, "w+") do |f|
-          f.write({version: Aromancer::VERSION, created: Time.now}.to_json)
+          f.write({created_at: Time.now}.to_json)
         end
+      else
+
       end
 
       filepath
@@ -201,6 +202,7 @@ module Aromancer
 
     def self.set_arena(arena_hash)
       instance.set_key(:arena, arena_hash)
+      Aromancer::UnixDom.render_arena
     end
 
     def self.get_arena
@@ -230,12 +232,12 @@ module Aromancer
           instance.set_key("server_url_#{k}", uri.select(k).first)
         }
       elsif get_server_url.nil?
-        set_server_url(DEFAULT_SERVER)
+        set_server_url(DEFAULT_SERVER_URL)
       end
     end
 
     def self.get_server_url
-      set_server_url(DEFAULT_SERVER) if URI_KEYS.all?{|k| Aromancer::Storage.instance.get_key("server_url_#{k}").nil?}
+      set_server_url(DEFAULT_SERVER_URL) if URI_KEYS.all?{|k| Aromancer::Storage.instance.get_key("server_url_#{k}").nil?}
       URI.parse(URI_KEYS.map{|k|
         c = Aromancer::Storage.instance.get_key("server_url_#{k}")
         case k
@@ -269,101 +271,104 @@ module Aromancer
     end
 
     def get_key(key)
-      key = key.to_s
+      Aromancer::Cli.instance.storage_mutex.synchronize do
+        key = key.to_s
 
-      # ensure default for key exists
-      @cache[key] = {value: nil, persisted: false} unless @cache.keys.include?(key)
-      if false && (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
-        Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
-      end
-      # return cache value if storage open or the cache value is persisted
-      return @cache[key][:value] if @storage_open || @cache[key][:persisted]
-
-      # open storage
-      @storage_open = true
-      storage_contents = {}
-      begin
-        @parser_error = nil
-        # read storage
-        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath, encoding: "UTF-8"))
-      rescue StandardError => e
-        @storage_open = false
-        if @parser_error.nil?
-          @parser_error = e
-          return get_key(key)
+        # ensure default for key exists
+        @cache[key] = {value: nil, persisted: false} unless @cache.keys.include?(key)
+        if false && (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
+          Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
+        end
+        # return cache value if storage open or the cache value is persisted
+        return @cache[key][:value] if @storage_open || @cache[key][:persisted]
+
+        # open storage
+        @storage_open = true
+        storage_contents = {}
+        begin
+          @parser_error = nil
+          # read storage
+          storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath, encoding: "UTF-8"))
+        rescue StandardError => e
+          @storage_open = false
+          if @parser_error.nil?
+            @parser_error = e
+            return get_key(key)
+          else
+            raise @parser_error
+          end
+        end
+
+        # only update the cache value if present in storage
+        if storage_contents.keys.include?(key)
+          @cache[key] = {value: storage_contents[key], persisted: true}
         else
-          raise @parser_error
+          @cache[key][:persisted] = false
         end
-      end
 
-      # only update the cache value if present in storage
-      if storage_contents.keys.include?(key)
-        @cache[key] = {value: storage_contents[key], persisted: true}
-      else
-        @cache[key][:persisted] = false
+        value = @cache[key][:value]
+        @storage_open = false
+        clear_cache! if @clear_flag
+        return value
       end
-
-      value = @cache[key][:value]
-      @storage_open = false
-      clear_cache! if @clear_flag
-      return value
     end
 
     def set_key(key, value)
-      key = key.to_s
+      Aromancer::Cli.instance.storage_mutex.synchronize do
+        key = key.to_s
 
-      # ensure default for key exists
-      @cache[key] = {value: value, persisted: false} unless @cache.keys.include?(key)
+        # ensure default for key exists
+        @cache[key] = {value: value, persisted: false} unless @cache.keys.include?(key)
 
-      # assign new cache value and set persisted to false
-      @cache[key][:value] = value
-      @cache[key][:persisted] = false
+        # assign new cache value and set persisted to false
+        @cache[key][:value] = value
+        @cache[key][:persisted] = false
 
-      if @storage_open && (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
-        puts Thread.current.backtrace
-        Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
-      end
-      # return if storage open
-      # non-persisted cache values update next cycle
-      return if @storage_open
-
-      # open storage
-      @storage_open = true
-      storage_contents = {}
-      begin
-        @parser_error = nil
-        # read storage
-        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath, encoding: "UTF-8"))
-      rescue StandardError => e
-        @storage_open = false
-        if @parser_error.nil?
-          @parser_error = e
-          return get_key(key)
-        else
-          raise @parser_error
+        if @storage_open && (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
+          Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
+        end
+        # return if storage open
+        # non-persisted cache values update next cycle
+        return if @storage_open
+
+        # open storage
+        @storage_open = true
+        storage_contents = {}
+        begin
+          @parser_error = nil
+          # read storage
+          storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath, encoding: "UTF-8"))
+        rescue StandardError => e
+          @storage_open = false
+          if @parser_error.nil?
+            @parser_error = e
+            return get_key(key)
+          else
+            raise @parser_error
+          end
         end
-      end
 
-      # update storage and cache
-      ([key] + @cache.keys.select{|k|
-        !@cache[k][:persisted]
-      }).each{|k|
-        storage_contents[k] = @cache[k][:value]
-        @cache[k][:persisted] = true
-      }
+        # update storage and cache
+        ([key] + @cache.keys.select{|k|
+          !@cache[k][:persisted]
+        }).each{|k|
+          storage_contents[k] = @cache[k][:value]
+          @cache[k][:persisted] = true
+        }
 
-      # write storage
-      File.open(Aromancer::Storage.storage_filepath, "w+") do |f|
-        f.write(storage_contents.to_json)
-      end
+        # write storage
+        File.open(Aromancer::Storage.storage_filepath, "w+") do |f|
+          f.write(storage_contents.to_json)
+        end
 
-      if (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
-        Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
-      end
+        if (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
+          Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
+        end
 
-      # close storage
-      @storage_open = false
-      clear_cache! if @clear_flag
+        # close storage
+        @storage_open = false
+        clear_cache! if @clear_flag
+      end
     end
   end
 end

data/lib/aromancer/unix_dom.rb

@@ -0,0 +1,13 @@
+module Aromancer
+  class UnixDom
+
+    def self.render_arena
+      arena = Aromancer::Storage.get_arena
+      return unless arena.present?
+
+      # Aromancer.arena_directory
+      # todo:
+    end
+
+  end
+end

data/lib/aromancer/version.rb

@@ -11,5 +11,5 @@
 =end
 
 module Aromancer
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/aromancer/websocket.rb

@@ -54,7 +54,7 @@ module Aromancer
             legend_id = payload["message"]["id"]
             lid = Aromancer::Storage.get_player&.symbolize_keys[:active_legend_id]
             if !lid.nil? && lid == legend_id.to_i
-              Aromancer::Storage.instance.clear_cache!
+              Aromancer::Cli.instance.should_clear_cache = true
               Aromancer::Api.get_legends
               Aromancer::Api.load_arena
               sleep(1)

data/lib/aromancer.rb

@@ -28,10 +28,26 @@ module Aromancer
     Aromancer::Prompt.say(Aromancer::FONT.write(text, letter_spacing: letter_spacing))
   end
 
+  def self.configure_home
+    FileUtils.mkdir_p(Aromancer.home_directory) unless Dir.exist? Aromancer.home_directory
+    FileUtils.mkdir_p(Aromancer.arena_directory) unless Dir.exist? Aromancer.arena_directory
+    unless Dir.exist? File.join(Aromancer.home_directory, :".git".to_s)
+      FileUtils.chdir Aromancer.home_directory do
+        system(:"git init".to_s)
+        system(:"git add .".to_s)
+        system(:"git commit -m \"#{self.name} initial commit\"".to_s)
+      end
+    end
+  end
+
   def self.home_directory
     "#{`echo $HOME`.strip}/.aromancer"
   end
 
+  def self.arena_directory
+    File.join(home_directory, :arena.to_s)
+  end
+
   def self.date_display(raw)
     DateTime.parse(raw)&.strftime(Aromancer::DATE_FORMAT).downcase.gsub(" ", "_")
   end
@@ -51,9 +67,33 @@ module Aromancer
     else
       I18n.t("shared.signed_in_as", as: Aromancer::Storage.get_player["alias"])
     end
+    server_status = I18n.t("shared.server_url", url: Aromancer::Storage::get_server_url)
+    force_ssl_value = Aromancer::Storage.get_preference(:force_ssl)
+    force_ssl_status_symbol = (
+      force_ssl_value
+    ) ? UNICODE[:check] : UNICODE[:close]
+    force_ssl_status = "ssl: #{force_ssl_status_symbol}"
+
+    debug_value = Aromancer::Storage.get_preference(:debug)
+    hud = [
+      nil,
+      player_status,
+      server_status,
+      force_ssl_status,
+      websocket_status,
+      :v.to_s + Aromancer::VERSION,
+      nil
+    ]
+
+    if debug_value
+      debug_status_symbol = (
+        debug_value
+      ) ? UNICODE[:check] : UNICODE[:close]
+      hud.insert(1, "d: #{debug_status_symbol}")
+    end
 
     Aromancer::Prompt.say(
-      [nil, :v.to_s + Aromancer::VERSION, player_status, websocket_status, nil,].join(" | ")
+      hud.join(" | ")
     )
   end
 

data/locale/en.yml

@@ -6,14 +6,14 @@ en:
     key_press: "press enter to continue: "
     inturrupt: "exiting due to user inturrupt..."
     reader_initialized: "input reader initialized."
-    welcome: "welcome to aromancer. loading v%{version}..."
+    welcome: "welcome aromancer. loading v%{version}..."
     server_url: "current server: %{url}"
     navigate: "navigate to %{route}."
     update_cancel: "update cancelled."
     update_confirm: "confirm update [%{new_value}] (enter y): "
     signed_in_as: "authenticated as %{as}"
     last_error: "error (%{status}). %{error}"
-    waiting: "waiting..."
+    spelling: "spelling..."
     back: "back"
     exit: "exit"
   routes:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aromancer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - i2097i
@@ -248,6 +248,7 @@ files:
 - checksums/aromancer-0.0.6.gem.sha512
 - checksums/aromancer-0.0.7.gem.sha512
 - checksums/aromancer-0.0.8.gem.sha512
+- checksums/aromancer-0.0.9.gem.sha512
 - lib/aromancer.rb
 - lib/aromancer/.DS_Store
 - lib/aromancer/api.rb
@@ -257,12 +258,12 @@ files:
 - lib/aromancer/serve.rb
 - lib/aromancer/server.rb
 - lib/aromancer/storage.rb
+- lib/aromancer/unix_dom.rb
 - lib/aromancer/version.rb
 - lib/aromancer/websocket.rb
 - lib/reiquire.rb
 - listen.rb
 - locale/en.yml
-- pre-commit.git.template
 - sig/aromancer.rbs
 - tasks/console.rake
 - tasks/make.rake

data/pre-commit.git.template

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo "pre-commit hook"
-echo "rake build:checksum && git add checksums/"
-rake build:checksum && git add checksums/