aromancer 0.0.7 → 0.0.9

data/lib/aromancer.rb

@@ -14,8 +14,7 @@ require_relative :reiquire.to_s
 Reiquire::aromancer
 
 module Aromancer
-  THROTTLE_MS = 0.1
-  ERROR_EXPIRATION = 7.77.to_f
+  ERROR_EXPIRATION = 11.11.to_f
   FONT = TTY::Font.new(:standard)
   DATE_FORMAT = "%A %d %b %Y %I:%M:%S %p"
   TIME_FORMAT = "%I:%M:%S %p"
@@ -25,136 +24,30 @@ module Aromancer
     check: "\u2713"
   }
 
-  class Serve
-    def self.run
-      unless Dir.exist?("#{Aromancer.to_s.downcase}_serve")
-        system("git clone git@github.com:arowmancy/aromancer_serve.git")
-      end
-      FileUtils.chdir :aromancer_serve.to_s do
-        system("bin/setup")
-      end
-    end
+  def self.print_large_text(text = Aromancer.to_s.downcase, letter_spacing = 1)
+    Aromancer::Prompt.say(Aromancer::FONT.write(text, letter_spacing: letter_spacing))
   end
 
-  # instance runs on main thread
-  class Cli
-    include Singleton
-
-    attr_accessor :ui_thread, :ws_thread, :busy, :ws_busy, :last_render, :error_timeout
-
-    # user entry point
-    def self.run
-      # ensure preferences exist
-      Aromancer::Storage.get_preference(:debug, default: false)
-      Aromancer::Storage.get_preference(:force_ssl, default: true)
-      Aromancer::Storage.get_preference(:hide_sentences, default: true)
-      Aromancer::Storage.get_preference(:hide_stream, default: true)
-
-      self.instance.last_render = 0
-      self.instance.error_timeout = Time.now.to_i
-
-      # load player on-start
-      Aromancer::Api.set_active_legend_id(nil) 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
-          self.instance.ui_thread.join
-        rescue NoMethodError => e
-          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)
-          end
-          self.instance.start_ui_thread
-          self.instance.start_ws_thread
-          sleep(1)
-        rescue Interrupt => e
-          Aromancer::Prompt.say("interrupt on main thread...exiting immediately.")
-          exit
-        end
-      end
-    end
-
-    def get_view(view_key)
-      Thread.main[:menu_options][view_key.to_sym]
-    end
-
-    def start_ui_thread(force = false)
-      return if (@busy || Time.now - @last_render < 2.0) && !force
-
-      @busy = true
-      self.ui_thread&.exit
-      self.ui_thread&.kill
-      Thread.main[:menu_runners] = {}
-      Thread.main[:menu_options] = {}
-      Aromancer::Prompt.instance.reload!
-      self.ui_thread = Thread.new do
-        loop do
-          menu_options = Thread.main[:menu_options][Thread.main[:route]]
-          menu_runners = Thread.main[:menu_runners][Thread.main[:route]]
-          unless menu_options.nil? || menu_runners.nil?
-            Aromancer::Routes.resume
-            Aromancer.print_hud
-            sleep(THROTTLE_MS)
-            v = Aromancer::Prompt.p.select("", menu_options, show_help: :always, cycle: true, per_page: 11)
-            runners = menu_runners.select{|r| r[:value] == v}
-            runners = menu_runners.select{|r| r[:value].nil?} if runners.empty?
-
-            if runners.any?
-              r = runners.first
-              r[:proc].call(v)
-            end
-
-          else
-            Aromancer::Routes.resume
-          end
-          Aromancer::Cli.instance.busy = false
-          Aromancer::Cli.instance.last_render = Time.now
-          sleep(THROTTLE_MS)
-        end
-      end
-    end
-
-    def start_ws_thread
-      return if @ws_busy
-      @ws_busy = true
-      self.ws_thread.kill unless self.ws_thread.nil?
-      self.ws_thread = Thread.new do
-        Aromancer::Websocket.instance.disconnect
-        loop do
-          player = Aromancer::Storage.get_player
-          if player.nil?
-            @ws_busy = true
-            Aromancer::Websocket.instance.disconnect
-          elsif !player["api_key"].nil?
-            # attempt websocket connection
-            @ws_busy = true
-            Aromancer::Websocket.instance.connect
-          end
-          @ws_busy = false
-          sleep(4)
-        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.get_font(text = :aromancer.to_s, letter_spacing = 1)
-    Aromancer::FONT.write(text, letter_spacing: letter_spacing).split("\n")
   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
@@ -165,15 +58,42 @@ module Aromancer
 
   def self.print_hud
     print_last_error
-    websocket_status = "#{Aromancer::Storage.instance.get_key(:websocket_scheme)}: #{Aromancer::Websocket.instance.socket.nil? ? UNICODE[:close] : UNICODE[:check] }"
+    ws_status_symbol = (
+      Aromancer::Websocket.instance.socket.nil? || Aromancer::Websocket.instance.socket.closed?
+    ) ? UNICODE[:close] : UNICODE[:check]
+    websocket_status = "#{Aromancer::Storage.instance.get_key(:websocket_scheme)}: #{ws_status_symbol}"
     player_status = if Aromancer::Storage.get_player.nil?
       I18n.t("routes.main_menu.not_signed_in")
     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
 
@@ -184,14 +104,15 @@ module Aromancer
       return
     end
 
-    last_error = Aromancer::Storage.get_last_error
-    return if last_error.nil?
+    last_error = Aromancer::Storage.get_last_error&.symbolize_keys
 
-    last_error = last_error.symbolize_keys
+    return if last_error.nil?
     message = last_error[:body]
     begin
       message = JSON.parse(message).symbolize_keys
       message = message[:error_message] if message.keys.include?(:error_message)
+    rescue TypeError => e
+      message = last_error[:body]
     rescue JSON::ParserError => e
       message = last_error[:body]
     end

data/lib/reiquire.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 =begin
 
   reiquire.rb

data/listen.rb

@@ -1,10 +1,6 @@
 require :listen.to_s
 
 listener = Listen.to(*[:lib.to_s, :bin.to_s, :spec.to_s, :locale.to_s], only: /[\.rb\.yml]/) {|modified, added, removed|
-  # puts modified
-  # puts added
-  # puts removed 
-  # system("exec rake make")
   system("exec rake install")
 }
 listener.start

data/locale/en.yml

@@ -6,13 +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}"
+    spelling: "spelling..."
     back: "back"
     exit: "exit"
   routes:
@@ -68,7 +69,7 @@ en:
       place_on_scroll: "place %{word} on the scroll."
       options_for_word: "available options for the %{word} word."
       last_error: "last error"
-      returning_to_main: "returning to main menu..."
+      returning_to_: "returning to %{route}..."
       your_alchemy: "alchemy"
     legends:
       help: ""

data/tasks/make.rake

@@ -1,4 +1,4 @@
-desc "bundle graph && rake install && rspec --backtrace"
+desc "rake install"
 task :make do
-  exec "bundle graph && rake install && rspec --backtrace"
+  exec "rake install"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aromancer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - i2097i
@@ -227,6 +227,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -235,7 +236,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - aromancer.gemspec
@@ -247,14 +247,18 @@ files:
 - checksums/aromancer-0.0.5.gem.sha512
 - checksums/aromancer-0.0.6.gem.sha512
 - checksums/aromancer-0.0.7.gem.sha512
-- gem_graph.png
+- 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
+- lib/aromancer/cli.rb
 - lib/aromancer/prompt.rb
 - lib/aromancer/routes.rb
+- 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

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2026 i2097i
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.