cryptum 0.0.321 → 0.0.322

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618890a4abd0cf25d2ed57e8c159e24809f002d00bf1f80477ee527e9c10af80
-  data.tar.gz: f440a2343fc364c1889b0808101fbd86a6d543bd193ab226255c386740abea78
+  metadata.gz: 8ea4631099b7ad8ff94d00136248b662803cfba132ab021303bea8964f89dc78
+  data.tar.gz: efa2d3a350d174059f33ce86b6f3d04a6dce885b4c5b7649a185d2c13607c5a4
 SHA512:
-  metadata.gz: cc9cb05b462c3e2384249c6e6465793cbdfee40d0ac1d89fb86ece35e9e47e72294730b758f284fb88a6ae38cb22b17a672dbed94a4adc5322ba1996b796eb15
-  data.tar.gz: eeeee4adb494120eb55fe8301cdbbc00d1176e3a83494a0293d12cea3bbd2c4ba697ec7891bcd431275accc4074a72bd0198676e79ce9f8d6acaea65503db67e
+  metadata.gz: 0ed9f8234e09f5de2b916cd2769019427d2db893e3498e8e728b7e52b542d617f0766e2dce1d3ba73f7236330780bd306a403205918629beaf253feee0508366
+  data.tar.gz: 3c87ccb59b8f82a553d7cb37261490610f979200e858b1892b07c300bf1314d13aafdeace8382562a7f313acc43c8edb27b2c91c8c0d2c4b7feab247d8856d29

data/README.md

@@ -51,7 +51,7 @@ $ rvm use ruby-<VERSION>@cryptum
 $ cryptum --help
 $ cryptum --symbol btc-usd \
           --autotrade \
-          --repo-root ~/cryptum
+          --session-root ~/cryptum
 ```
 
 From an error monitoring perspective, they can be monitored via:

data/bin/cryptum-forecast

@@ -11,7 +11,7 @@ class Choice
                 :cycles_complete,
                 :driver_name,
                 :proxy,
-                :repo_root,
+                :session_root,
                 :sandbox,
                 :symbol,
                 :tpm,
@@ -60,9 +60,9 @@ begin
 
     options.on(
       '-rPATH',
-      '--repo-root=PATH',
+      '--session-root=PATH',
       '<Optional - Directory of Cloned Repo (Defaults to Dir.pwd)">'
-    ) { |r| option_choice.repo_root = r }
+    ) { |r| option_choice.session_root = r }
 
     options.on(
       '-tTPM',
@@ -83,16 +83,16 @@ begin
     reason = :symbol
   end
 
-  option_choice.repo_root = Dir.pwd if option_choice.repo_root.nil?
+  option_choice.session_root = Dir.pwd if option_choice.session_root.nil?
 
   if option_choice.autotrade_percent.to_f > 100
     usage = true
     reason = :autotrade_percent
   end
 
-  unless Dir.exist?(option_choice.repo_root)
+  unless Dir.exist?(option_choice.session_root)
     usage = true
-    reason = :repo_root
+    reason = :session_root
   end
 
   if usage
@@ -101,8 +101,8 @@ begin
       puts 'ERROR: --autotrade PERCENT value cannot exceed 100'
     when :symbol
       puts "ERROR: --symbol Flag is Required.\n\n"
-    when :repo_root
-      puts "ERROR: #{option_choice.repo_root} does not exist.\n\n"
+    when :session_root
+      puts "ERROR: #{option_choice.session_root} does not exist.\n\n"
     end
 
     puts `#{option_choice.driver_name} --help`
@@ -125,7 +125,7 @@ begin
 
   # crypto = products.last[:base_currency]
   fiat = products.last[:quote_currency]
-  fiat_portfolio_file = "#{option_choice.repo_root}/order_books/#{fiat}_PORTFOLIO.json"
+  fiat_portfolio_file = "#{option_choice.session_root}/order_books/#{fiat}_PORTFOLIO.json"
 
   # portfolio = Cryptum::API.get_portfolio(
   #   option_choice: option_choice,

data/lib/cryptum/bot_conf.rb

@@ -10,10 +10,12 @@ module Cryptum
       option_choice = opts[:option_choice]
       event_history = opts[:event_history]
 
-      bot_conf_file = "#{option_choice.repo_root}/etc/bot_confs/#{option_choice.symbol}_bot_conf.yaml"
+      session_root = option_choice.session_root
+      symbol = option_choice.symbol
+      bot_conf_file = "#{session_root}/etc/bot_confs/#{symbol}_bot_conf.yaml"
       unless File.exist?(bot_conf_file)
         FileUtils.cp(
-          "#{option_choice.repo_root}/etc/bot_confs/BOT_CONF.TEMPLATE",
+          "#{session_root}/etc/bot_confs/BOT_CONF.TEMPLATE",
           bot_conf_file
         )
       end
@@ -161,7 +163,9 @@ module Cryptum
       key = opts[:key].to_s.to_sym
       value = opts[:value]
 
-      bot_conf_file = "#{option_choice.repo_root}/etc/bot_confs/#{option_choice.symbol}_bot_conf.yaml"
+      session_root = option_choice.session_root
+      symbol = option_choice.symbol
+      bot_conf_file = "#{session_root}/etc/bot_confs/#{symbol}_bot_conf.yaml"
 
       bot_conf[key] = value
       File.write(bot_conf_file, bot_conf.to_yaml)

data/lib/cryptum/event.rb

@@ -35,7 +35,7 @@ module Cryptum
       # order_history = event_history.order_book[:order_history]
       this_product = event_history.order_book[:this_product]
       fiat = this_product[:quote_currency]
-      fiat_portfolio_file = "#{option_choice.repo_root}/order_books/#{fiat}_PORTFOLIO.json"
+      fiat_portfolio_file = "#{option_choice.session_root}/order_books/#{fiat}_PORTFOLIO.json"
 
       # Determine if Summary UI needs updated data
       event_history = Cryptum::Portfolio::Balance.refresh(

data/lib/cryptum/option/choice.rb

@@ -9,7 +9,7 @@ module Cryptum
                     :driver_name,
                     :list_products,
                     :proxy,
-                    :repo_root,
+                    :session_root,
                     :sandbox,
                     :symbol,
                     :market_trend_reset,

data/lib/cryptum/option.rb

@@ -43,9 +43,9 @@ module Cryptum
 
         options.on(
           '-rPATH',
-          '--repo-root=PATH',
-          '<Optional - Directory of Cloned Repo (Defaults to ~/cryptum)>'
-        ) { |r| option_choice.repo_root = r }
+          '--session-root=PATH',
+          '<Optional - Directory with etc && order_books (Defaults to ~/cryptum)>'
+        ) { |r| option_choice.session_root = r }
 
         options.on(
           '-S',
@@ -82,11 +82,11 @@ module Cryptum
         reason = :symbol
       end
 
-      option_choice.repo_root = "#{Dir.home}/cryptum" if option_choice.repo_root.nil?
+      option_choice.session_root = "#{Dir.home}/cryptum" if option_choice.session_root.nil?
 
-      unless Dir.exist?(option_choice.repo_root)
+      unless Dir.exist?(option_choice.session_root)
         usage = true
-        reason = :repo_root
+        reason = :session_root
       end
 
       option_choice.market_trend_reset = 86_400 if option_choice.market_trend_reset.to_i.zero?
@@ -130,8 +130,8 @@ module Cryptum
         case reason
         when :symbol
           puts "ERROR: --symbol Flag is Required.\n\n"
-        when :repo_root
-          puts "ERROR: #{option_choice.repo_root} does not exist.\n\n"
+        when :session_root
+          puts "ERROR: #{option_choice.session_root} does not exist.\n\n"
         when :market_trend_reset
           puts "ERROR: #{option_choice.market_trend_reset} - Possible values are: 604_800 || 86_400 || 14_400 || 10_800 || 7_200 || 3_600 || 2_700 || 1_800 || 900 || 300 || 180 || 60\n\n"
         end
@@ -168,7 +168,7 @@ module Cryptum
     public_class_method def self.get_env(opts = {})
       option_choice = opts[:option_choice]
 
-      yaml_conf_file = "#{option_choice.repo_root}/etc/coinbase_pro.yaml"
+      yaml_conf_file = "#{option_choice.session_root}/etc/coinbase_pro.yaml"
       yaml_conf = YAML.load_file(
         yaml_conf_file,
         symbolize_names: true

data/lib/cryptum/order_book/generate.rb

@@ -20,16 +20,9 @@ module Cryptum
         option_choice = opts[:option_choice]
         env = opts[:env]
 
-        order_book_file = "#{option_choice.repo_root}/order_books/#{option_choice.symbol}.ORDER_BOOK.json"
-
-        order_history_meta = []
-        if File.exist?(order_book_file)
-          last_order_book = Cryptum::OrderBook.analyze(
-            order_book_file: order_book_file,
-            option_choice: option_choice
-          )
-          order_history_meta = last_order_book[:order_history_meta] unless last_order_book[:order_history_meta].empty?
-        end
+        session_root = option_choice.session_root
+        symbol = option_choice.symbol
+        order_book_file = "#{session_root}/order_books/#{symbol}.ORDER_BOOK.json"
 
         # Only need to retrieve a product list once / session.
         products = Cryptum::API.get_products(
@@ -43,7 +36,7 @@ module Cryptum
 
         order_book = {
           path: order_book_file,
-          symbol: option_choice.symbol,
+          symbol: symbol,
           open_24h: 0.00,
           high_24h: 0.00,
           low_24h: 0.00,
@@ -51,8 +44,6 @@ module Cryptum
           ticker_price: 0.00,
           ticker_price_second_to_last: 0.00,
           ticker_price_third_to_last: 0.00,
-          highest_pie_in_sky_buy_percent: 0.00,
-          highest_pie_in_sky_sell_percent: 0.00,
           sequence: -1,
           this_product: this_product,
           portfolio: [],
@@ -70,7 +61,7 @@ module Cryptum
             sell_end: '--'
           },
           order_history: [],
-          order_history_meta: order_history_meta
+          order_history_meta: []
         }
 
         # Order History Retention ---------------------------------------#
@@ -83,6 +74,13 @@ module Cryptum
           order_book: order_book
         )
 
+        if File.exist?(order_book_file)
+          order_book = JSON.parse(
+            File.read(order_book_file),
+            symbolize_names: true
+          )
+        end
+
         event_history.order_book = order_book
 
         event_history

data/lib/cryptum/order_book.rb

@@ -112,42 +112,6 @@ module Cryptum
       raise e
     end
 
-    # Supported Method Parameters::
-    # Cryptum::OrderBook.analyze(
-    #   order_book_file: 'required - path to order book file'
-    # )
-    public_class_method def self.analyze(opts = {})
-      order_book_file = opts[:order_book_file]
-      option_choice = opts[:option_choice]
-      # TODO: Handle File that exists
-      # w/ Zero size...N number of
-      # attempts?  Timeout may be better.
-      order_book = JSON.parse(
-        File.read(order_book_file),
-        symbolize_names: true
-      )
-
-      order_book[:option_choice] = option_choice
-
-      bot_conf = Cryptum::BotConf.read(option_choice: option_choice)
-      order_book[:bot_conf] = bot_conf
-
-      env = Cryptum::Option.get_env(option_choice: option_choice)
-      order_book[:env] = env
-
-      order_book
-    rescue JSON::ParserError => e
-      File.open('/tmp/cryptum-errors.txt', 'a') do |f|
-        f.puts Time.now.strftime('%Y-%m-%d %H:%M:%S.%N %z')
-        f.puts "Module: #{self}"
-        f.puts "#{e}\n\n\n"
-      end
-
-      retry
-    rescue StandardError => e
-      raise e
-    end
-
     # Display Usage for this Module
     public_class_method def self.help
       constants.sort

data/lib/cryptum/version.rb

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

metadata

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