cryptum 0.0.255 → 0.0.257

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 821d3666c9176e49b63ba26c032d24a901e1c5eab538726d8b675860156190fd
-  data.tar.gz: 7a58108f07d42aefce9112c6349e76c802590ed9e21b829f3d96ae22700483de
+  metadata.gz: 700e1a1a2785e98e2ba35546de12c8920716951d891439f37ddb67d44d11ac45
+  data.tar.gz: e0ba8ec4ce2dea089fe9e58aafc93258d02593029875636e20c0edee0f7a068d
 SHA512:
-  metadata.gz: 97c6fc6168fd04c6f4c6d55994ab27908977c4c7969aff195a60fb01f3e7a43f510056a16ff49f3e08e5d1f0f701f7f0633e85eda55ee4f4333ddcdbea169996
-  data.tar.gz: 98a384029779c042d4059ed5194ffd65ba9179bfe7e1cc8a1746efc30cc53ee06be84bce7190adb4a893dca6114e4a950b739217b6906b41035d563b64672862
+  metadata.gz: 81f138f0d93da609436879479b61fb59750b2b6c013a921df87de1bbb566bb86e0a38f37067ecc3e8d4409c43db3102596afe17910b3770dcadaad8d0c66c04c
+  data.tar.gz: a94ad89f104b2dab9d0cef42de733b0211271e9ef5bed7788949e203b3f44d85e859dd40c4598befb341bed192f336f8f50c4376f654f238ea9195545d3fcb45

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-01 03:19:16 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
@@ -123,13 +123,13 @@ Lint/UselessAssignment:
 # Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 384
+  Max: 388
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 117
+  Max: 135
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
@@ -144,7 +144,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 56
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 361
+  Max: 362
 
 # Offense count: 15
 # Configuration parameters: CountComments, CountAsOne.
@@ -207,7 +207,7 @@ Style/RedundantReturn:
   Exclude:
     - 'lib/cryptum.rb'
 
-# Offense count: 2
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantSelf:
   Exclude:
@@ -244,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

@@ -25,10 +25,14 @@ module Cryptum
                     :time_between_orders_max,
                     :time_between_orders_min,
                     :time_between_orders_reset,
-                    :order_plan_win_highlighted,
-                    :order_plan_line,
-                    :order_execute_win_highlighted,
-                    :order_execute_line
+                    :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]
@@ -46,17 +50,21 @@ module Cryptum
         self.reconnected = false
         self.red_pill = false
         self.reset_market_trend = false
-        self.order_plan_win_highlighted = true
-        self.order_plan_line = 0
-        self.order_execute_win_highlighted = false
-        self.order_execute_line = 0
+        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
         self.time_between_orders_reset = self.time_between_orders
 
-        # 24 hours
-        self.time_between_orders_max = self.time_between_orders_reset * 144
+        # 1 hour
+        self.time_between_orders_max = 3_600
 
         # 5 seconds
         self.time_between_orders_min = 5

data/lib/cryptum/ui/key_press_event.rb

@@ -11,10 +11,10 @@ module Cryptum
                     :key_w,
                     :key_x,
                     :key_ansi,
-                    :key_down,
+                    :key_down_arrow,
                     :key_esc,
                     :key_tab,
-                    :key_up
+                    :key_up_arrow
 
     rescue Interrupt
       # Exit Gracefully if CTRL+C is Pressed During Session

data/lib/cryptum/ui/order_execution.rb

@@ -377,7 +377,7 @@ module Cryptum
         out_line_no = 0
         line_color = :white
         style = :bold
-        line_color = :red if event_history.order_execute_win_highlighted
+        line_color = :red if event_history.order_execute_win_active
 
         Cryptum::UI.line(
           ui_win: order_execute_win,
@@ -417,18 +417,20 @@ module Cryptum
 
 
         # ROWS 4-10
-        first_row = event_history.order_execute_line
-        last_row = first_row + 6
+        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 - 6
-          event_history.order_execute_line = first_row
+          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 event_history.order_execute_win_highlighted
+          style = :highlight if event_history.order_execute_row_to_select == current_line
           risk_alloc_out = Cryptum.beautify_large_number(
             value: meta[:risk_alloc]
           )

data/lib/cryptum/ui/order_plan.rb

@@ -201,7 +201,7 @@ module Cryptum
         out_line_no = 0
         line_color = :white
         style = :bold
-        line_color = :red if event_history.order_plan_win_highlighted
+        line_color = :red if event_history.order_plan_win_active
 
         Cryptum::UI.line(
           ui_win: order_plan_win,
@@ -317,18 +317,20 @@ module Cryptum
           plan_color = :cyan if color == :red
           plan_color = :green if color == :green
 
-          first_row = event_history.order_plan_line
-          last_row = first_row + 7
+          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 - 7
-            event_history.order_plan_line = first_row
+            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 event_history.order_plan_win_highlighted
+            style = :highlight if event_history.order_plan_row_to_select == current_line
             fiat_avail_out = Cryptum.beautify_large_number(
               value: order[:fiat_available]
             )

data/lib/cryptum/ui/order_timer.rb

@@ -55,14 +55,10 @@ module Cryptum
           # Otherwise, intent should be something like, "- WAIT FOR MARKET TREND SHIFT -"
           intent = "- SEE LIMIT SELL ORDERS -"
         else
-          trend = 'BEAR'
           speed = 'FAST'
-          if event_history.bullish_trend
-            trend = 'BULL'
-            speed = 'SLOW'
-          end
+          speed = 'SLOW' if event_history.bullish_trend
 
-          intent = "#{trend} - #{speed} BUY: #{order_countdown} of #{time_between_order_exec_out}"
+          intent = "- #{speed} BUY: #{order_countdown} of #{time_between_order_exec_out} -"
           intent = '- BUYING PAUSED -' if event_history.red_pill
         end
         

data/lib/cryptum/ui/ticker.rb

@@ -98,14 +98,17 @@ module Cryptum
         )
         if margin_percent_open_24h.positive?
           margin_percent_open_24h_color = :green
-          margin_percent_open_24h_out = "#{Cryptum.up_arrow} #{beautify_margin_percent_open_24h}%"
+          trend = 'BULL'
+          margin_percent_open_24h_out = "#{Cryptum.up_arrow} #{beautify_margin_percent_open_24h}% (#{trend})"
         elsif margin_percent_open_24h.negative?
           # Space removed to account for negative number.
           margin_percent_open_24h_color = :red
-          margin_percent_open_24h_out = "#{Cryptum.down_arrow}#{beautify_margin_percent_open_24h}%"
+          trend = 'BEAR'
+          margin_percent_open_24h_out = "#{Cryptum.down_arrow}#{beautify_margin_percent_open_24h}% (#{trend})"
         else
+          trend = 'FLAT'
           margin_percent_open_24h_color = :yellow
-          margin_percent_open_24h_out = "#{Cryptum.flat_arrow} #{beautify_margin_percent_open_24h}%"
+          margin_percent_open_24h_out = "#{Cryptum.flat_arrow} #{beautify_margin_percent_open_24h}% (#{trend})"
         end
 
         current_time_out = Time.now.strftime('%Y-%m-%d %H:%M:%S%z')

data/lib/cryptum/ui.rb

@@ -301,8 +301,8 @@ module Cryptum
 
       # 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 = true if key_press_event.key_ansi && key_press == 'A'
-      key_press_event.key_down = true if key_press_event.key_ansi && key_press == 'B'
+      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

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -129,40 +129,58 @@ module Cryptum
               end
 
               # Scroll Down Order Plan / Order Execution Window Panes
-              if terminal_win.key_press_event.key_down
+              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 = 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
 
-                event_history.order_plan_line += 1 if event_history.order_plan_win_highlighted
+                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
 
-                event_history.order_execute_line += 1 if event_history.order_execute_win_highlighted
+                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_highlighted
-                  event_history.order_plan_win_highlighted = false
-                  event_history.order_execute_win_highlighted = true
+                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_highlighted = true
-                  event_history.order_execute_win_highlighted = false
+                  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
+              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 = false
+                terminal_win.key_press_event.key_up_arrow = false
 
-                event_history.order_plan_line -= 1 if event_history.order_plan_win_highlighted &&
-                                                      event_history.order_plan_line.positive?
+                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
 
-                event_history.order_execute_line -= 1 if event_history.order_execute_win_highlighted &&
-                                                         event_history.order_execute_line.positive?
+                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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.255
+  version: 0.0.257
 platform: ruby
 authors:
 - 0day Inc.