cryptum 0.0.258 → 0.0.260

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 454825db36aecfdd354ab093bbc3f635fc48813e950bcc3a1b7792b8e1028646
-  data.tar.gz: 12d79a0af6469640bf933d3766a24c92d0986f2eebf352d9d8f87d48c6f833ef
+  metadata.gz: 4d516fc49952990a6873f6e2533dbc7853cc5a7b759bd36ecc9146635efd19e5
+  data.tar.gz: af1d4ff1fdefc57021edb8894a54c932d1e28618b7fd7001eea8b73ef22fd7ea
 SHA512:
-  metadata.gz: e08fb37dd973e62f0b068b66028a18c4cf1e9ecc8f212313fced489e685be3eb90fec26f5a29193686ff8c035fc870bfd1fecc7899c2f6be568407c0d68a5497
-  data.tar.gz: 3dd720c662229f86921f648e8adea5cf20ce10dfc2ce506413c6a1f26496133d333606a8cbc9364d868ad49d3f4d14a5a034bf6f63176b982779cfb763e89599
+  metadata.gz: 87b2644569e9931c657c9788fd4f8de94ad3ad4f79b0101db8c8a457fb243f3762db38cf5af780ad47e853c866bf675cef479569cc9782a0f9706bf1d73b7500
+  data.tar.gz: db4817a4d481ec036126f5e7d69f4bc5d186c0eb0d9def78e2a2addcf08e86ab2907b3199ffd945ee564ed6e9a47f098d5a6ada396cc4db69e5e4f1a2cfdd7f3

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-01 23:43:10 UTC using RuboCop version 1.39.0.
+# on 2022-12-02 18:49:14 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
@@ -35,12 +35,11 @@ Layout/EmptyLineAfterGuardClause:
     - 'lib/cryptum/order_book/market_trend.rb'
     - 'lib/cryptum/ui/order_execution.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLines:
   Exclude:
     - 'lib/cryptum/api.rb'
-    - 'lib/cryptum/ui/order_execution.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -91,7 +90,7 @@ Layout/SpaceAroundOperators:
   Exclude:
     - 'lib/cryptum/ui/order_plan.rb'
 
-# Offense count: 11
+# Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -103,7 +102,7 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 52
+# Offense count: 54
 Lint/UselessAssignment:
   Exclude:
     - 'bin/cryptum-forecast'
@@ -124,13 +123,13 @@ Lint/UselessAssignment:
 # Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 387
+  Max: 401
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 141
+  Max: 139
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
@@ -145,7 +144,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 56
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 362
+  Max: 391
 
 # Offense count: 15
 # Configuration parameters: CountComments, CountAsOne.
@@ -157,6 +156,14 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 75
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/cryptum/option.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
@@ -214,12 +221,13 @@ Style/StringChars:
   Exclude:
     - 'lib/cryptum.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
+    - 'lib/cryptum/ui/order_execution.rb'
     - 'lib/cryptum/ui/order_timer.rb'
     - 'lib/cryptum/ui/portfolio.rb'
 

data/lib/cryptum/event/history.rb

@@ -50,13 +50,14 @@ module Cryptum
         self.red_pill = false
         self.order_plan_win_active = true
         self.order_plan_index_offset = 0
-        self.order_plan_max_rows_to_display = 7
+        self.order_plan_max_rows_to_display = 6
         self.order_plan_row_to_select = 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 = order_execute_index_offset
 
+        # TODO: Implement market_trend_reset / 144
         # Default = 10 minutes
         self.time_between_orders = 600
         self.time_between_orders_reset = time_between_orders

data/lib/cryptum/option.rb

@@ -95,10 +95,16 @@ module Cryptum
         reason = :market_trend_reset
       end
 
-      option_choice.market_trend_reset_label = option_choice.market_trend_reset
-      option_choice.market_trend_reset_label = 'D' if option_choice.market_trend_reset == 84_600
-      option_choice.market_trend_reset_label = '1h' if option_choice.market_trend_reset == 3_600
-      option_choice.market_trend_reset_label = '1m' if option_choice.market_trend_reset == 60
+      case option_choice.market_trend_reset
+      when 86_400
+        option_choice.market_trend_reset_label = 'D'
+      when 3_600
+        option_choice.market_trend_reset_label = '1h'
+      when 60
+        option_choice.market_trend_reset_label = '1m'
+      else
+        option_choice.market_trend_reset_label = option_choice.market_trend_reset
+      end
 
       if usage
         case reason

data/lib/cryptum/order_book/market_trend.rb

@@ -33,12 +33,16 @@ module Cryptum
 
         # order_difference = 0
         if buy_total > sell_total
-          order_difference = buy_total - sell_total
+          order_difference = Cryptum.beautify_large_number(
+            value: buy_total - sell_total
+          ).to_i
           indicator_hash[:color] = :green
           indicator_hash[:ui] = "BUYS UP BY #{order_difference}"
           indicator_hash[:status] = "B#{Cryptum.up_arrow}"
         elsif buy_total < sell_total
-          order_difference = sell_total - buy_total
+          order_difference = Cryptum.beautify_large_number(
+            value: sell_total - buy_total
+          ).to_i
           indicator_hash[:color] = :red
           indicator_hash[:ui] = "SELLS UP BY #{order_difference}"
           indicator_hash[:status] = "S#{Cryptum.up_arrow}"

data/lib/cryptum/ui/order_execution.rb

@@ -367,6 +367,7 @@ module Cryptum
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
         col_just3 = (Curses.cols - Cryptum::UI.col_third) - 1
+        col_just4 = Curses.cols - Cryptum::UI.col_fourth
 
         Cryptum::UI.detect_key_press_in_ui(
           key_press_event: key_press_event,
@@ -376,8 +377,14 @@ module Cryptum
         # ROW 1
         out_line_no = 0
         line_color = :white
+        header_color = :white
+        header_style = :bold
         style = :bold
-        line_color = :red if event_history.order_execute_win_active
+        if event_history.order_execute_win_active
+          line_color = :blue
+          header_color = :yellow
+          header_style = :reverse
+        end
 
         Cryptum::UI.line(
           ui_win: order_execute_win,
@@ -391,32 +398,25 @@ module Cryptum
         order_execute_win.clrtoeol
         Cryptum::UI.colorize(
           ui_win: order_execute_win,
-          color: :white,
-          style: style,
-          string: 'Open Sell Orders | 24 Hr Stats:'
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just1, ' ')
         )
 
-        order_execute_win.setpos(out_line_no, Cryptum::UI.col_third)
-        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,
-            '.'
-          )
+        header_str = '- ORDER HISTORY -'
+        order_execute_win.setpos( 
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
         )
 
-        # ROW 3
-        out_line_no += 1
-        Cryptum::UI.line(
+        Cryptum::UI.colorize(
           ui_win: order_execute_win,
-          out_line_no: out_line_no,
-          color: line_color
+          color: header_color,
+          style: header_style,
+          string: header_str
         )
 
-
-        # ROWS 4-10
+        # ROWS 3-10
         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
@@ -427,7 +427,7 @@ module Cryptum
 
         order_history_meta.reverse[first_row..last_row].each do |meta|
           out_line_no += 1
-          current_line = out_line_no - 3
+          current_line = out_line_no - 2
 
           style = :normal
           style = :highlight if event_history.order_execute_row_to_select == current_line
@@ -481,6 +481,32 @@ module Cryptum
           )
         end
 
+        # ROW 10
+        out_line_no += 1
+        order_execute_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_execute_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_execute_win,
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just1, ' ')
+        )
+
+        header_str = "SUMMARY: #{total_to_sell} | #{order_hist_meta_expired} Expired | #{order_hist_meta_sold} Sold | $#{gains_24h_out} Gained"
+        order_execute_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: order_execute_win,
+          color: header_color,
+          style: header_style,
+          string: header_str
+        )
+
+        # ROW 11
+        out_line_no += 1
         Cryptum::UI.line(
           ui_win: order_execute_win,
           out_line_no: out_line_no,

data/lib/cryptum/ui/order_plan.rb

@@ -200,8 +200,14 @@ module Cryptum
         # ROW 1
         out_line_no = 0
         line_color = :white
+        header_color = :white
+        header_style = :bold
         style = :bold
-        line_color = :red if event_history.order_plan_win_active
+        if event_history.order_plan_win_active
+          line_color = :blue
+          header_color = :yellow
+          header_style = :reverse
+        end
 
         Cryptum::UI.line(
           ui_win: order_plan_win,
@@ -215,31 +221,25 @@ module Cryptum
         order_plan_win.clrtoeol
         Cryptum::UI.colorize(
           ui_win: order_plan_win,
-          color: :white,
-          style: style,
-          string: "Order Plan ##{order_plan_prefix} Summary:"
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just1, ' ')
+        ) 
+
+        header_str = "- ORDER PLAN: Cycle ##{order_plan_prefix} -"
+        order_plan_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
         )
 
-        order_plan_win.setpos(out_line_no, Cryptum::UI.col_third)
         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,
-            '.'
-          )
-        )
-
-        # ROW 3
-        out_line_no += 1
-        Cryptum::UI.line(
-          ui_win: order_plan_win,
-          out_line_no: out_line_no,
-          color: line_color
+          color: header_color,
+          style: header_style,
+          string: header_str
         )
 
-        # ROWS 4-10
+        # ROWS 3-10
         if event_history.red_pill
           out_line_no += 1
           order_plan_win.setpos(out_line_no, Cryptum::UI.col_first)
@@ -327,7 +327,7 @@ module Cryptum
 
           order_plan[first_row..last_row].each do |order|
             out_line_no += 1
-            current_line = out_line_no - 3
+            current_line = out_line_no - 2
 
             style = :normal
             style = :highlight if event_history.order_plan_row_to_select == current_line
@@ -378,6 +378,32 @@ module Cryptum
           end
         end
 
+        # ROW 10
+        out_line_no += 1
+        order_plan_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_plan_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_plan_win,
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just1, ' ')
+        )
+
+        header_str = "SUMMARY: $#{order_plan_volume_out} w #{max_order_plan_slices} Slices | $#{order_plan_profit_sum_out} 2 Gain | #{order_plan_exec_percent}% Done"
+        order_plan_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: order_plan_win,
+          color: header_color,
+          style: header_style,
+          string: header_str
+        )
+
+        # ROW 11
+        out_line_no += 1
         Cryptum::UI.line(
           ui_win: order_plan_win,
           out_line_no: out_line_no,

data/lib/cryptum/ui/order_timer.rb

@@ -51,9 +51,9 @@ module Cryptum
         case color
         when :green
           # TODO: add condition to check if open sell orders exist.
-          # If so intent should be something like, "- SEE LIMIT SELL ORDERS -"
+          # If so intent should be something like, "- SEE ORDER HISTORY -"
           # Otherwise, intent should be something like, "- WAIT FOR MARKET TREND SHIFT -"
-          intent = "- SEE LIMIT SELL ORDERS -"
+          intent = "- SEE ORDER HISTORY #{Cryptum.down_arrow} -"
         else
           speed = 'FAST'
           speed = 'SLOW' if event_history.bullish_trend
@@ -69,6 +69,7 @@ module Cryptum
         col_just4 = (Curses.cols - Cryptum::UI.col_fourth) - 1
 
         # ROW 1
+        # COLUMN 1
         out_line_no = 0
         order_timer_win.setpos(out_line_no, Cryptum::UI.col_first)
         order_timer_win.clrtoeol
@@ -79,6 +80,7 @@ module Cryptum
           string: "Market Trend Reset: #{trend_countdown}"
         )
 
+        # COLUMN 2
         order_timer_win.setpos(
           out_line_no,
           Cryptum::UI.col_center(str: intent)
@@ -90,6 +92,7 @@ module Cryptum
           string: intent
         )
 
+        # COLUMN 3
         order_timer_win.setpos(out_line_no, Cryptum::UI.col_fourth)
         Cryptum::UI.colorize(
           ui_win: order_timer_win,

data/lib/cryptum/ui/terminal_window.rb

@@ -42,7 +42,7 @@ module Cryptum
         )
 
         self.order_plan_section = Cryptum::UI.window(
-          height: 12,
+          height: 11,
           width: 0,
           top: 13,
           left: 0
@@ -79,7 +79,7 @@ module Cryptum
         self.command_section = Cryptum::UI.window(
           height: 3,
           width: 0,
-          top: 39,
+          top: 40,
           left: 0
         )
       end

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -134,18 +134,15 @@ module Cryptum
                 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
+                  event_history.order_plan_index_offset += 1 if event_history.order_plan_row_to_select > event_history.order_plan_max_rows_to_display
+                  event_history.order_plan_row_to_select = event_history.order_plan_max_rows_to_display if event_history.order_plan_row_to_select > event_history.order_plan_max_rows_to_display
                 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
-
+                  event_history.order_execute_index_offset += 1 if event_history.order_execute_row_to_select > event_history.order_execute_max_rows_to_display
+                  event_history.order_execute_row_to_select = event_history.order_execute_max_rows_to_display if event_history.order_execute_row_to_select > event_history.order_execute_max_rows_to_display
                 end
               end
 

metadata

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