cryptum 0.0.252 → 0.0.254

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c65d120a6680f9194a21ac9013e92e6f310dfd8303624fdd004222d5d5312e
-  data.tar.gz: 594138604571f74d30c2a7f7ec356200bc38e5a91b2ff02e6bf742b827168ded
+  metadata.gz: 189b9650a62af7d1ada241d68b1bb13bc6caade9fa90c99c853980cfa27eb7cf
+  data.tar.gz: ad999e6ae19c037efe09ae347fd9703c3a9486613d5aebe8834c0d5fbc339f93
 SHA512:
-  metadata.gz: 71afbb3e1abe24bc405df5b665140589a91e748dd834b7ba98632e16e5dbbfdf57220eb737ece3b0b60579e417a80d8ded685d27ca20e18cd32c2ec5a5ec776e
-  data.tar.gz: 204567aa5fed94200c212dc584708879b556c3c9d89208a21dead47d6dfef890629d6b3f4c8ab6fb03dcb2ffbe81f3292cc0aae0c997d216eb6194fee3aa2bdc
+  metadata.gz: ee711cb2ad49fee7f7a72ad77d15b5c8a194efb191b76c985a66f3ef37711c12abd8570446240eda6183c05c21a55ff6052867f98cd3c1ba974e8488fac5be94
+  data.tar.gz: 952c46940311f74205453d46cf39625070ee2403801b152b57ee8e98bba619e6a30d51c757820eae2e98c40cf64ae62d42b910499ee02774900eb18616535c07

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-07-06 00:27:10 UTC using RuboCop version 1.31.1.
+# on 2022-11-30 17:25:04 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,6 +103,11 @@ 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:
@@ -121,28 +126,28 @@ Lint/UselessAssignment:
     - 'lib/cryptum/ui/ticker.rb'
 
 # Offense count: 38
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 371
 
 # Offense count: 7
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 84
+  Max: 94
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 15
-# Configuration parameters: IgnoredMethods.
+# Offense count: 16
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 70
 
 # Offense count: 56
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 343
 
@@ -152,7 +157,7 @@ Metrics/ModuleLength:
   Max: 538
 
 # Offense count: 16
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 73
 
@@ -183,7 +188,7 @@ Style/Next:
 
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Strict, AllowedNumbers.
+# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
 Style/NumericLiterals:
   MinDigits: 7
 

data/Gemfile

@@ -30,7 +30,7 @@ gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.15.0'
 gem 'ruby-prof', '1.4.3'
 gem 'rvm', '1.11.3.9'
-gem 'sinatra', '3.0.3'
+gem 'sinatra', '3.0.4'
 gem 'thin', '1.8.1'
 gem 'tty-prompt', '0.23.1'
 gem 'tty-spinner', '0.9.3'

data/lib/cryptum/api.rb

@@ -438,7 +438,6 @@ module Cryptum
     public_class_method def self.cancel_all_open_orders(opts = {})
       env = opts[:env]
       option_choice = opts[:option_choice]
-      # order_type = opts[:order_type]
       event_notes = opts[:event_notes]
 
       product_id = option_choice.symbol.to_s.gsub('_', '-').upcase

data/lib/cryptum/event.rb

@@ -6,7 +6,7 @@ module Cryptum
   # This plugin is used to parse Coinbase Pro Web Socket Events in the HTTP Response
   module Event
     autoload :Buy, 'cryptum/event/buy'
-    autoload :Cancel, 'cryptum/event/cancel'
+    autoload :Buy, 'cryptum/event/cancel'
     autoload :History, 'cryptum/event/history'
     autoload :KeyPress, 'cryptum/event/key_press'
     autoload :Sell, 'cryptum/event/sell'

data/lib/cryptum/ui/command.rb

@@ -19,6 +19,14 @@ module Cryptum
           ui_win: command_win
         )
 
+        if key_press_event.key_c
+          key_c_color = :cyan
+          key_c_style = :reverse
+        else
+          key_c_color = :white
+          key_c_style = :bold
+        end
+
         if key_press_event.key_g
           key_g_color = :cyan
           key_g_style = :reverse
@@ -62,19 +70,23 @@ module Cryptum
         command_str_r2_arr = [
           "* v#{Cryptum::VERSION} >>> ",
           '[',
+          'C',
+          ']ancel Open Orders',
+          ' | ',
+          '[',
           'G',
           ']TFO',
           ' | ',
           '[',
           'r',
-          ']eload bot conf',
-          ' | ',
-          '[',
-          'u',
-          ']pdate summary'
+          ']eload bot conf'
         ]
 
         command_str_r3_arr = [
+          '[',
+          'u',
+          ']pdate summary',
+          ' | ',
           '[',
           'w',
           ']rite order book',
@@ -98,6 +110,7 @@ module Cryptum
         )
         command_win.clrtoeol
 
+        # * v#{Cryptum::VERSION} >>>
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :yellow,
@@ -105,24 +118,25 @@ module Cryptum
           string: command_str_r2_arr.first
         )
 
+        # [C]ancel Open Orders
         Cryptum::UI.colorize(
           ui_win: command_win,
-          color: key_g_color,
-          style: key_g_style,
+          color: key_c_color,
+          style: key_c_style,
           string: command_str_r2_arr[1]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :yellow,
-          style: key_g_style,
+          style: key_c_style,
           string: command_str_r2_arr[2]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
-          color: key_g_color,
-          style: key_g_style,
+          color: key_c_color,
+          style: key_c_style,
           string: command_str_r2_arr[3]
         )
 
@@ -133,24 +147,24 @@ module Cryptum
           string: command_str_r2_arr[4]
         )
 
+        # [G]TFO
         Cryptum::UI.colorize(
           ui_win: command_win,
-          color: key_r_color,
-          style: key_r_style,
+          color: key_g_color,
+          style: key_g_style,
           string: command_str_r2_arr[5]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :yellow,
-          style: key_r_style,
+          style: key_g_style,
           string: command_str_r2_arr[6]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
-          color: key_r_color,
-          style: key_r_style,
+          color: key_g_color,
           string: command_str_r2_arr[7]
         )
 
@@ -161,25 +175,26 @@ module Cryptum
           string: command_str_r2_arr[8]
         )
 
+        # [r]eload bot conf
         Cryptum::UI.colorize(
           ui_win: command_win,
-          color: key_u_color,
-          style: key_u_style,
+          color: key_r_color,
+          style: key_r_style,
           string: command_str_r2_arr[9]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :yellow,
-          style: key_u_style,
+          style: key_r_style,
           string: command_str_r2_arr[10]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
-          color: key_u_color,
-          style: key_u_style,
-          string: command_str_r2_arr[11]
+          color: key_r_color,
+          style: key_r_style,
+          string: command_str_r2_arr.last
         )
 
         # ROW 3
@@ -190,46 +205,76 @@ module Cryptum
         )
         command_win.clrtoeol
 
+        # [u]date summary
+        Cryptum::UI.colorize(
+          ui_win: command_win,
+          color: key_u_color,
+          string: command_str_r3_arr.first
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: command_win,
+          color: :yellow,
+          style: key_u_style,
+          string: command_str_r3_arr[1]
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: command_win,
+          color: key_u_color,
+          style: key_u_style,
+          string: command_str_r3_arr[2]
+        )
+
+        # |
+        Cryptum::UI.colorize(
+          ui_win: command_win,
+          color: :white,
+          string: command_str_r3_arr[3]
+        )
+
+        # [w]rite order book
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: key_w_color,
           style: key_w_style,
-          string: command_str_r3_arr.first
+          string: command_str_r3_arr[4]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :yellow,
           style: key_w_style,
-          string: command_str_r3_arr[1]
+          string: command_str_r3_arr[5]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: key_w_color,
           style: key_w_style,
-          string: command_str_r3_arr[2]
+          string: command_str_r3_arr[6]
         )
 
         # |
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :white,
-          string: command_str_r3_arr[3]
+          string: command_str_r3_arr[7]
         )
 
+        # e[x]it
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: key_x_color,
           style: key_x_style,
-          string: command_str_r3_arr[4]
+          string: command_str_r3_arr[8]
         )
 
         Cryptum::UI.colorize(
           ui_win: command_win,
           color: :yellow,
           style: key_x_style,
-          string: command_str_r3_arr[5]
+          string: command_str_r3_arr[9]
         )
 
         Cryptum::UI.colorize(

data/lib/cryptum/ui/key_press_event.rb

@@ -4,7 +4,8 @@ module Cryptum
   module UI
     # This Class is Used to Detect Key Press Events
     class KeyPressEvent
-      attr_accessor :key_g,
+      attr_accessor :key_c,
+                    :key_g,
                     :key_r,
                     :key_u,
                     :key_w,

data/lib/cryptum/ui/market_trend.rb

@@ -35,18 +35,15 @@ module Cryptum
         when :green
           order_trend_color = :green
           trend_arrow = Cryptum.up_arrow
-          trend = 'BULL'
         when :yellow
           order_trend_color = :yellow
           trend_arrow = Cryptum.flat_arrow
-          trend = 'FLATLINE'
         when :red
           order_trend_color = :red
           trend_arrow = Cryptum.down_arrow
-          trend = 'BEAR'
         end
 
-        market_trend_out = "Market Trend #{trend_arrow} | #{trend} | #{order_trend_out}"
+        market_trend_out = "Market Trend #{trend_arrow} | #{order_trend_out}"
 
         # UI
         # col_just1 = 12

data/lib/cryptum/ui/order_execution.rb

@@ -70,7 +70,7 @@ module Cryptum
           cast_margin_to_sec = margin_percent_open_24h * 0.1
 
           # Reset times to max or default depending on
-          # bullish or bearish trend
+          # BULL or BEAR market trend
           if cast_margin_to_sec.positive?
             event_history.bullish_trend = true
             event_history.time_between_orders = event_history.time_between_orders_max

data/lib/cryptum/ui/order_timer.rb

@@ -47,9 +47,19 @@ module Cryptum
         color = indicator_status.market_trend[:color] if indicator_status.market_trend
         case color
         when :green
-          intent = "- Wait for Open Sell Orders -"
+          # TODO: add condition to check if open sell orders exist.
+          # If so intent should be something like, "- SEE LIMIT SELL ORDERS -"
+          # Otherwise, intent should be something like, "- WAIT FOR MARKET TREND SHIFT -"
+          intent = "- SEE LIMIT SELL ORDERS -"
         else
-          intent = "Next BUY: #{order_countdown} of #{time_between_order_exec_out}"
+          trend = 'BEAR'
+          speed = 'FAST'
+          if event_history.bullish_trend
+            trend = 'BULL'
+            speed = 'SLOW'
+          end
+
+          intent = "#{trend} - #{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

@@ -209,7 +209,7 @@ module Cryptum
           ui_win: ticker_win,
           color: :white,
           style: :bold,
-          string: 'Highest | Lowest Sell Price:'
+          string: 'High | Low Limit Sell Prices:'
         )
 
         ticker_win.setpos(out_line_no, Cryptum::UI.col_third)

data/lib/cryptum/ui.rb

@@ -275,6 +275,8 @@ module Cryptum
       ui_win = opts[:ui_win]
 
       case ui_win.getch
+      when 'C'
+        key_press_event.key_c = true
       when 'G'
         key_press_event.key_g = true
       when 'r'

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -54,6 +54,7 @@ module Cryptum
 
             ws.on :message do |event|
               ai_enabled = bot_conf[:artifical_intelligence]
+
               event_history.event = JSON.parse(
                 event.data,
                 symbolize_names: true
@@ -77,6 +78,16 @@ module Cryptum
               # Detect Key Press Events
               Cryptum::Event::KeyPress.detect(terminal_win: terminal_win)
 
+              # Cancel ALL Open Orders when
+              # C is pressed
+              if terminal_win.key_press_event.key_c
+                Cryptum::API.cancel_all_open_orders(
+                  env: env,
+                  option_choice: option_choice
+                )
+                terminal_win.key_press_event.key_c = false
+              end
+
               # Get the F* Out (GTFO) when
               # G is pressed
               if terminal_win.key_press_event.key_g

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.252
+  version: 0.0.254
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-19 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement