cryptum 0.0.257 → 0.0.259

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700e1a1a2785e98e2ba35546de12c8920716951d891439f37ddb67d44d11ac45
-  data.tar.gz: e0ba8ec4ce2dea089fe9e58aafc93258d02593029875636e20c0edee0f7a068d
+  metadata.gz: ab14ca560e814d115f113801ad78732ba8d10acce087f6eaadc143233424ffa4
+  data.tar.gz: 47bc5482fba211e04bf7ef299fafd323cf5388908d5786779cda36885748d198
 SHA512:
-  metadata.gz: 81f138f0d93da609436879479b61fb59750b2b6c013a921df87de1bbb566bb86e0a38f37067ecc3e8d4409c43db3102596afe17910b3770dcadaad8d0c66c04c
-  data.tar.gz: a94ad89f104b2dab9d0cef42de733b0211271e9ef5bed7788949e203b3f44d85e859dd40c4598befb341bed192f336f8f50c4376f654f238ea9195545d3fcb45
+  metadata.gz: cb7dd04b5337366f545a283d6b1dc184c1680279aa88f2d423ad4544374f018c2ec5cef61a15f1770bb39f69d0092898d8af198329b80c6b005321ae3c249df0
+  data.tar.gz: 949378bda3b6959556f3f888795780e46fe5e1e857814254273f4658ad5a4b81a81c0b86aa55b8e325e026a5ed51e67082cdc5740d2df12e23c25afeb63d0ff6

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-01 19:02:17 UTC using RuboCop version 1.39.0.
+# on 2022-12-01 23:59:06 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,7 +103,7 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 51
+# Offense count: 52
 Lint/UselessAssignment:
   Exclude:
     - 'bin/cryptum-forecast'
@@ -113,6 +113,7 @@ Lint/UselessAssignment:
     - 'lib/cryptum/event/buy.rb'
     - 'lib/cryptum/event/cancel.rb'
     - 'lib/cryptum/order_book/generate.rb'
+    - 'lib/cryptum/order_book/market_trend.rb'
     - 'lib/cryptum/ui/market_trend.rb'
     - 'lib/cryptum/ui/order_execution.rb'
     - 'lib/cryptum/ui/order_plan.rb'
@@ -123,13 +124,13 @@ Lint/UselessAssignment:
 # Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 388
+  Max: 387
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 135
+  Max: 141
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
@@ -156,6 +157,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:
@@ -207,12 +216,6 @@ Style/RedundantReturn:
   Exclude:
     - 'lib/cryptum.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/cryptum/event/history.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/StringChars:
@@ -244,7 +247,7 @@ Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cryptum/matrix.rb'
 
-# Offense count: 16
+# Offense count: 14
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/lib/cryptum/event/history.rb

@@ -18,7 +18,6 @@ module Cryptum
                     :plan_no,
                     :reconnected,
                     :red_pill,
-                    :reset_market_trend,
                     :start_time,
                     :ticker_event,
                     :time_between_orders,
@@ -49,19 +48,19 @@ module Cryptum
         self.start_time = start_time
         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_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 = self.order_execute_index_offset
+        self.order_execute_row_to_select = order_execute_index_offset
 
-        # 10 minutes
+        # TODO: Implement market_trend_reset / 144
+        # Default = 10 minutes
         self.time_between_orders = 600
-        self.time_between_orders_reset = self.time_between_orders
+        self.time_between_orders_reset = time_between_orders
 
         # 1 hour
         self.time_between_orders_max = 3_600

data/lib/cryptum/option/choice.rb

@@ -12,7 +12,8 @@ module Cryptum
                     :repo_root,
                     :sandbox,
                     :symbol,
-                    :market_trend_reset
+                    :market_trend_reset,
+                    :market_trend_reset_label
 
     rescue Interrupt
       # Exit Gracefully if CTRL+C is Pressed During Session

data/lib/cryptum/option.rb

@@ -95,6 +95,17 @@ module Cryptum
         reason = :market_trend_reset
       end
 
+      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
         when :symbol

data/lib/cryptum/order_book/market_trend.rb

@@ -14,15 +14,6 @@ module Cryptum
         event = opts[:event]
         indicator_status = opts[:indicator_status]
 
-        # Decent for debugging.
-        # puts event.inspect
-
-        if event_history.reset_market_trend
-          event_history.order_book[:market_trend][:buy] = 0
-          event_history.order_book[:market_trend][:sell] = 0
-          event_history.reset_market_trend = false
-        end
-
         buy_or_sell = event[:changes].first[0].to_s.to_sym
         case buy_or_sell
         when :buy
@@ -134,17 +125,12 @@ module Cryptum
           )
         end
 
-        # Reload Bot Conf (i.e. Risk Allocation)
-        terminal_win.key_press_event.key_r = true
-
         # Reset Market Trend Counter
-        event_history.reset_market_trend = true
+        event_history.order_book[:market_trend][:buy] = 0
+        event_history.order_book[:market_trend][:sell] = 0
         event_history.order_book[:last_trend_reset] = Time.now.strftime(
           '%Y-%m-%d %H:%M:%S.%N%z'
         )
-
-        # Write Order Book to Disk
-        terminal_win.key_press_event.key_w = true
       rescue StandardError => e
         raise e
       end

data/lib/cryptum/ui/ticker.rb

@@ -18,7 +18,7 @@ module Cryptum
         quote_increment = this_product[:quote_increment]
         fiat_smallest_decimal = quote_increment.to_s.split('.')[-1].length
 
-        symbol_out = "#{this_product[:id]}.#{option_choice.market_trend_reset}s"
+        symbol_out = "#{this_product[:id]}.#{option_choice.market_trend_reset_label}"
         fiat = this_product[:quote_currency].to_sym
         fiat_symbol = '?'
         fiat_symbol = '$' if fiat == :USD

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -197,8 +197,18 @@ module Cryptum
                 key_press_event: terminal_win.key_press_event
               )
 
-              event_history.order_ready = true if order_countdown.zero? ||
-                                                  order_countdown.negative?
+              if order_countdown.zero? ||
+                 order_countdown.negative?
+
+                # Ready to Submit a BUY order
+                event_history.order_ready = true
+
+                # Reload Bot Conf (i.e. Risk Allocation)
+                terminal_win.key_press_event.key_r = true
+
+                # Write Order Book to Disk
+                terminal_win.key_press_event.key_w = true
+              end
             end
 
             EM.add_periodic_timer(option_choice.market_trend_reset) do
@@ -208,6 +218,11 @@ module Cryptum
                 event_history: event_history,
                 bot_conf: bot_conf
               )
+              # Reload Bot Conf (i.e. Risk Allocation)
+              terminal_win.key_press_event.key_r = true
+
+              # Write Order Book to Disk
+              terminal_win.key_press_event.key_w = true
             end
           end
         rescue Faye::WebSocket::API::ErrorEvent,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.257
+  version: 0.0.259
 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