cryptum 0.0.254 → 0.0.256

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 189b9650a62af7d1ada241d68b1bb13bc6caade9fa90c99c853980cfa27eb7cf
-  data.tar.gz: ad999e6ae19c037efe09ae347fd9703c3a9486613d5aebe8834c0d5fbc339f93
+  metadata.gz: 2687c6be08b4b287a0f9ad8192708a0f862b526933614bcd440607fa667e6e06
+  data.tar.gz: 00c9a699c865e8f91cdecafcc896e19a1481100c01e492c3bf53e15a22df9ee2
 SHA512:
-  metadata.gz: ee711cb2ad49fee7f7a72ad77d15b5c8a194efb191b76c985a66f3ef37711c12abd8570446240eda6183c05c21a55ff6052867f98cd3c1ba974e8488fac5be94
-  data.tar.gz: 952c46940311f74205453d46cf39625070ee2403801b152b57ee8e98bba619e6a30d51c757820eae2e98c40cf64ae62d42b910499ee02774900eb18616535c07
+  metadata.gz: fd74b3c4bd968db4e24b1a3fae5802b86d356619909e0d32a45d9d246d38c81a1b91714b3691f3ff7a3d95e2d4fcd0b57bdb408bfb89030062e1c57379379b5c
+  data.tar.gz: c2ec14727da1cfccc54afacb7760feb0062d640da5d7cc7e24189dcbad5c03c0e9aeacc339a619e53a192e236f43d98ddee672abc26349a20a2a630a48ae4a4d

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-11-30 17:25:04 UTC using RuboCop version 1.39.0.
+# on 2022-12-01 19:02:17 UTC using RuboCop version 1.39.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -103,11 +103,6 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 1
-Lint/NonLocalExitFromIterator:
-  Exclude:
-    - 'lib/cryptum/web_sock/event_machine.rb'
-
 # Offense count: 51
 Lint/UselessAssignment:
   Exclude:
@@ -125,16 +120,16 @@ Lint/UselessAssignment:
     - 'lib/cryptum/ui/signal_engine.rb'
     - 'lib/cryptum/ui/ticker.rb'
 
-# Offense count: 38
+# Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 371
+  Max: 388
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 94
+  Max: 135
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
@@ -144,22 +139,22 @@ Metrics/BlockNesting:
 # Offense count: 16
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 70
+  Max: 72
 
 # Offense count: 56
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 343
+  Max: 362
 
 # Offense count: 15
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 538
 
-# Offense count: 16
+# Offense count: 17
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 73
+  Max: 75
 
 # Offense count: 1
 # Configuration parameters: AllowedConstants.
@@ -212,7 +207,7 @@ Style/RedundantReturn:
   Exclude:
     - 'lib/cryptum.rb'
 
-# Offense count: 2
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantSelf:
   Exclude:
@@ -249,7 +244,7 @@ Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cryptum/matrix.rb'
 
-# Offense count: 10
+# Offense count: 16
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/lib/cryptum/event/history.rb

@@ -24,7 +24,15 @@ module Cryptum
                     :time_between_orders,
                     :time_between_orders_max,
                     :time_between_orders_min,
-                    :time_between_orders_reset
+                    :time_between_orders_reset,
+                    :order_plan_win_active,
+                    :order_plan_index_offset,
+                    :order_plan_max_rows_to_display,
+                    :order_plan_row_to_select,
+                    :order_execute_win_active,
+                    :order_execute_index_offset,
+                    :order_execute_max_rows_to_display,
+                    :order_execute_row_to_select
 
       def initialize(opts = {})
         # option_choice = opts[:option_choice]
@@ -42,6 +50,14 @@ module Cryptum
         self.reconnected = false
         self.red_pill = false
         self.reset_market_trend = false
+        self.order_plan_win_active = true
+        self.order_plan_index_offset = 0
+        self.order_plan_max_rows_to_display = 7
+        self.order_plan_row_to_select = self.order_plan_index_offset
+        self.order_execute_win_active = false
+        self.order_execute_index_offset = 0
+        self.order_execute_max_rows_to_display = 6
+        self.order_execute_row_to_select = self.order_execute_index_offset
 
         # 10 minutes
         self.time_between_orders = 600

data/lib/cryptum/ui/command.rb

@@ -97,13 +97,6 @@ module Cryptum
         ]
         # ROW 1
         out_line_no = 0
-        Cryptum::UI.line(
-          ui_win: command_win,
-          out_line_no: out_line_no
-        )
-
-        # ROW 2
-        out_line_no += 1
         command_win.setpos(
           out_line_no,
           Cryptum::UI.col_center(str: command_str_r2_arr.join(''))

data/lib/cryptum/ui/key_press_event.rb

@@ -9,7 +9,12 @@ module Cryptum
                     :key_r,
                     :key_u,
                     :key_w,
-                    :key_x
+                    :key_x,
+                    :key_ansi,
+                    :key_down_arrow,
+                    :key_esc,
+                    :key_tab,
+                    :key_up_arrow
 
     rescue Interrupt
       # Exit Gracefully if CTRL+C is Pressed During Session

data/lib/cryptum/ui/order_execution.rb

@@ -375,9 +375,14 @@ module Cryptum
 
         # ROW 1
         out_line_no = 0
+        line_color = :white
+        style = :bold
+        line_color = :red if event_history.order_execute_win_active
+
         Cryptum::UI.line(
           ui_win: order_execute_win,
-          out_line_no: out_line_no
+          out_line_no: out_line_no,
+          color: line_color
         )
 
         # ROW 2
@@ -387,7 +392,7 @@ module Cryptum
         Cryptum::UI.colorize(
           ui_win: order_execute_win,
           color: :white,
-          style: :bold,
+          style: style,
           string: 'Open Sell Orders | 24 Hr Stats:'
         )
 
@@ -395,6 +400,7 @@ module Cryptum
         Cryptum::UI.colorize(
           ui_win: order_execute_win,
           color: :white,
+          style: style,
           string: "#{total_to_sell} | #{order_hist_meta_expired} Expired | #{order_hist_meta_sold} Sold | $#{gains_24h_out} Gained".rjust(
             col_just3,
             '.'
@@ -405,15 +411,26 @@ module Cryptum
         out_line_no += 1
         Cryptum::UI.line(
           ui_win: order_execute_win,
-          out_line_no: out_line_no
+          out_line_no: out_line_no,
+          color: line_color
         )
 
 
         # ROWS 4-10
-        order_history_meta.reverse[0..6].each do |meta|
+        first_row = event_history.order_execute_index_offset
+        last_row = first_row + event_history.order_execute_max_rows_to_display
+        if last_row >= order_history_meta.length
+          last_row = order_history_meta.length - 1
+          first_row = last_row - event_history.order_execute_max_rows_to_display
+          event_history.order_execute_index_offset = first_row
+        end
+
+        order_history_meta.reverse[first_row..last_row].each do |meta|
           out_line_no += 1
+          current_line = out_line_no - 3
+
           style = :normal
-          style = :highlight if out_line_no == 1
+          style = :highlight if event_history.order_execute_row_to_select == current_line
           risk_alloc_out = Cryptum.beautify_large_number(
             value: meta[:risk_alloc]
           )
@@ -464,6 +481,12 @@ module Cryptum
           )
         end
 
+        Cryptum::UI.line(
+          ui_win: order_execute_win,
+          out_line_no: out_line_no,
+          color: line_color
+        )
+
         order_execute_win.refresh
 
         # Reset Order Ready Boolean

data/lib/cryptum/ui/order_plan.rb

@@ -199,9 +199,14 @@ module Cryptum
 
         # ROW 1
         out_line_no = 0
+        line_color = :white
+        style = :bold
+        line_color = :red if event_history.order_plan_win_active
+
         Cryptum::UI.line(
           ui_win: order_plan_win,
-          out_line_no: out_line_no
+          out_line_no: out_line_no,
+          color: line_color
         )
 
         # ROW 2
@@ -211,7 +216,7 @@ module Cryptum
         Cryptum::UI.colorize(
           ui_win: order_plan_win,
           color: :white,
-          style: :bold,
+          style: style,
           string: "Order Plan ##{order_plan_prefix} Summary:"
         )
 
@@ -219,6 +224,7 @@ module Cryptum
         Cryptum::UI.colorize(
           ui_win: order_plan_win,
           color: :white,
+          style: style,
           string: "$#{order_plan_volume_out} w #{max_order_plan_slices} Slices | $#{order_plan_profit_sum_out} 2 Gain | #{order_plan_exec_percent}% Done".rjust(
             col_just3,
             '.'
@@ -229,7 +235,8 @@ module Cryptum
         out_line_no += 1
         Cryptum::UI.line(
           ui_win: order_plan_win,
-          out_line_no: out_line_no
+          out_line_no: out_line_no,
+          color: line_color
         )
 
         # ROWS 4-10
@@ -310,10 +317,20 @@ module Cryptum
           plan_color = :cyan if color == :red
           plan_color = :green if color == :green
 
-          order_plan[0..6].each do |order|
+          first_row = event_history.order_plan_index_offset
+          last_row = first_row + event_history.order_plan_max_rows_to_display
+          if last_row >= order_plan.length
+            last_row = order_plan.length - 1
+            first_row = last_row - event_history.order_plan_max_rows_to_display
+            event_history.order_plan_index_offset = first_row
+          end
+
+          order_plan[first_row..last_row].each do |order|
             out_line_no += 1
+            current_line = out_line_no - 3
+
             style = :normal
-            style = :highlight if out_line_no == 1
+            style = :highlight if event_history.order_plan_row_to_select == current_line
             fiat_avail_out = Cryptum.beautify_large_number(
               value: order[:fiat_available]
             )
@@ -361,6 +378,12 @@ module Cryptum
           end
         end
 
+        Cryptum::UI.line(
+          ui_win: order_plan_win,
+          out_line_no: out_line_no,
+          color: line_color
+        )
+
         order_plan_win.refresh
 
         # event_history

data/lib/cryptum/ui/order_timer.rb

@@ -30,18 +30,21 @@ module Cryptum
         trend_timer_begin = Time.parse(last_trend_reset_time)
         trend_timer_end = trend_timer_begin + time_between_trend_reset
         trend_time_remaining = trend_timer_end - Time.now
-        trend_countdown = format('%0.4f', trend_time_remaining)
+        trend_countdown = Cryptum.beautify_large_number(
+          value: format('%0.2f', trend_time_remaining)
+        )
 
         # Market Trend Reset Timer
         time_between_order_exec = event_history.time_between_orders
-        time_between_order_exec_out = format(
-          '%0.4f',
-          time_between_order_exec
+        time_between_order_exec_out = Cryptum.beautify_large_number(
+          value: format('%0.2f', time_between_order_exec)
         )
         order_begin_time = Time.parse(last_order_exec_time)
         order_end_time = order_begin_time + time_between_order_exec
         order_exec_time_remaining = order_end_time - Time.now
-        order_countdown = format('%0.4f', order_exec_time_remaining)
+        order_countdown = Cryptum.beautify_large_number(
+          value: format('%0.2f', order_exec_time_remaining)
+        )
 
         color = :white
         color = indicator_status.market_trend[:color] if indicator_status.market_trend
@@ -71,13 +74,6 @@ module Cryptum
 
         # ROW 1
         out_line_no = 0
-        Cryptum::UI.line(
-          ui_win: order_timer_win,
-          out_line_no: out_line_no
-        )
-
-        # ROW 2
-        out_line_no += 1
         order_timer_win.setpos(out_line_no, Cryptum::UI.col_first)
         order_timer_win.clrtoeol
         Cryptum::UI.colorize(

data/lib/cryptum/ui/terminal_window.rb

@@ -42,16 +42,16 @@ module Cryptum
         )
 
         self.order_plan_section = Cryptum::UI.window(
-          height: 10,
+          height: 12,
           width: 0,
           top: 13,
           left: 0
         )
 
         self.order_timer_section = Cryptum::UI.window(
-          height: 2,
+          height: 1,
           width: 0,
-          top: 23,
+          top: 24,
           left: 0
         )
 
@@ -70,14 +70,14 @@ module Cryptum
         )
 
         self.order_execute_section = Cryptum::UI.window(
-          height: 10,
+          height: 11,
           width: 0,
           top: 29,
           left: 0
         )
 
         self.command_section = Cryptum::UI.window(
-          height: 4,
+          height: 3,
           width: 0,
           top: 39,
           left: 0

data/lib/cryptum/ui/ticker.rb

@@ -161,21 +161,12 @@ module Cryptum
         out_line_no += 1
         ticker_win.setpos(out_line_no, Cryptum::UI.col_first)
         ticker_win.clrtoeol
-        if Curses.can_change_color?
-          Cryptum::UI.colorize(
-            ui_win: ticker_win,
-            color: :rainbow,
-            style: :bold,
-            string: symbol_out.ljust(col_just1)
-          )
-        else
-          Cryptum::UI.colorize(
-            ui_win: ticker_win,
-            color: :yellow,
-            style: :bold,
-            string: symbol_out.ljust(col_just1)
-          )
-        end
+        Cryptum::UI.colorize(
+          ui_win: ticker_win,
+          color: :yellow,
+          style: :bold,
+          string: symbol_out.ljust(col_just1)
+        )
 
         ticker_win.setpos(out_line_no, Cryptum::UI.col_second)
         Cryptum::UI.colorize(

data/lib/cryptum/ui.rb

@@ -87,24 +87,19 @@ module Cryptum
     public_class_method def self.line(opts = {})
       ui_win = opts[:ui_win]
       out_line_no = opts[:out_line_no].to_i
+      color = opts[:color]
+      color ||= :white
+
+      style = :normal
+      style = :bold unless color == :white
 
       ui_win.setpos(out_line_no, 0)
-      if Curses.can_change_color?
-        colorize(
-          ui_win: ui_win,
-          color: :custom,
-          red: 192,
-          green: 192,
-          blue: 192,
-          string: "\u2500" * Curses.cols
-        )
-      else
-        colorize(
-          ui_win: ui_win,
-          color: :white,
-          string: "\u2500" * Curses.cols
-        )
-      end
+      colorize(
+        ui_win: ui_win,
+        color: color,
+        style: style,
+        string: "\u2500" * Curses.cols
+      )
     rescue Interrupt
       # Exit Gracefully if CTRL+C is Pressed During Session
       Cryptum.exit_gracefully(which_self: self)
@@ -274,7 +269,18 @@ module Cryptum
       key_press_event = opts[:key_press_event]
       ui_win = opts[:ui_win]
 
-      case ui_win.getch
+      key_press = ui_win.get_char
+
+      # Useful for detecting and logging actual key presses to file
+      # unless key_press.nil?
+      #   File.open('/tmp/detect_key_press_in_ui-cryptum.txt', 'a') do |f|
+      #     f.puts key_press.class
+      #     f.print key_press.inspect
+      #     f.puts "\n\n\n"
+      #    end
+      # end
+
+      case key_press
       when 'C'
         key_press_event.key_c = true
       when 'G'
@@ -287,8 +293,17 @@ module Cryptum
         key_press_event.key_w = true
       when 'x'
         key_press_event.key_x = true
+      when "\t"
+        key_press_event.key_tab = true
+      when "\e"
+        key_press_event.key_esc = true
       end
 
+      # What a hack to detect up / down arrow key presses.
+      key_press_event.key_ansi = true if key_press_event.key_esc && key_press == '['
+      key_press_event.key_up_arrow = true if key_press_event.key_ansi && key_press == 'A'
+      key_press_event.key_down_arrow = true if key_press_event.key_ansi && key_press == 'B'
+
       key_press_event
     rescue Interrupt
       # Exit Gracefully if CTRL+C is Pressed During Session

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.254'
+  VERSION = '0.0.256'
 end

data/lib/cryptum/web_sock/event_machine.rb

@@ -127,6 +127,61 @@ module Cryptum
                   env: env
                 )
               end
+
+              # Scroll Down Order Plan / Order Execution Window Panes
+              if terminal_win.key_press_event.key_down_arrow
+                terminal_win.key_press_event.key_ansi = false
+                terminal_win.key_press_event.key_esc = false
+                terminal_win.key_press_event.key_down_arrow = false
+                if event_history.order_plan_win_active
+                  order_plan_max_row_index = event_history.order_plan_max_rows_to_display - 1
+                  event_history.order_plan_row_to_select += 1
+                  event_history.order_plan_index_offset += 1 if event_history.order_plan_row_to_select > order_plan_max_row_index
+                  event_history.order_plan_row_to_select = order_plan_max_row_index if event_history.order_plan_row_to_select > order_plan_max_row_index
+                end
+
+                if event_history.order_execute_win_active
+                  order_execute_max_row_index = event_history.order_execute_max_rows_to_display - 1
+                  event_history.order_execute_row_to_select += 1
+                  event_history.order_execute_index_offset += 1 if event_history.order_execute_row_to_select > order_execute_max_row_index
+                  event_history.order_execute_row_to_select = order_execute_max_row_index if event_history.order_execute_row_to_select > order_execute_max_row_index
+
+                end
+              end
+
+              # TAB through Order Plan / Order Execution Window Panes
+              if terminal_win.key_press_event.key_tab
+                terminal_win.key_press_event.key_tab = false
+
+                if event_history.order_plan_win_active
+                  event_history.order_plan_win_active = false
+                  event_history.order_execute_win_active = true
+                else
+                  event_history.order_plan_win_active = true
+                  event_history.order_execute_win_active = false
+                end
+              end
+
+              # Scroll Up Order Plan / Order Execution Window Panes
+              if terminal_win.key_press_event.key_up_arrow
+                terminal_win.key_press_event.key_ansi = false
+                terminal_win.key_press_event.key_esc = false
+                terminal_win.key_press_event.key_up_arrow = false
+
+                if event_history.order_plan_win_active
+                  event_history.order_plan_row_to_select -= 1
+                  event_history.order_plan_index_offset -= 1 if event_history.order_plan_row_to_select.negative?
+                  event_history.order_plan_index_offset = 0 if event_history.order_plan_index_offset.negative?
+                  event_history.order_plan_row_to_select = 0 if event_history.order_plan_row_to_select.negative?
+                end
+
+                if event_history.order_execute_win_active
+                  event_history.order_execute_row_to_select -= 1
+                  event_history.order_execute_index_offset -= 1 if event_history.order_execute_row_to_select.negative?
+                  event_history.order_execute_index_offset = 0 if event_history.order_execute_index_offset.negative?
+                  event_history.order_execute_row_to_select = 0 if event_history.order_execute_row_to_select.negative?
+                end
+              end
             end
 
             ws.on :close do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.254
+  version: 0.0.256
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable