abot-info 0.2.4 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d58b0e5421210e4d455de713e558820168d1a1ad094e203bdf69fe3244a7dbe
-  data.tar.gz: 4a61b59b59a4ff4fbed7219c44b1063bcd14d7f46d4ea43cb930b3b4820d7313
+  metadata.gz: c356808904955eec165f429c9a0012bc095865983303853d48ff09239e988e19
+  data.tar.gz: 930de8a6a519242048f9e02603090cdd9560c8040866ec0d23f80b3affa2062e
 SHA512:
-  metadata.gz: 96859eb095d54fe84a84f506c8356a9f7bf44b0a0ee80dd3f9e54a947390c18e3d7ebf21f39ea24cee7f105d407fa3f2b8efac62534280bdd9023bd63ce79927
-  data.tar.gz: af692d94de52095dcaa092b7829e817d60bad1f65ef9826a1843a46d4ccde0415ef3213003e165b92afd64c8ff29e9dd33fede1a0f5e460485edcafacb50e886
+  metadata.gz: a5fbf25ee4fc34c87213f122de255590ae13e316741b0d049f6bde84dd3cacb52f10e8a002eafb6c4eb269b13f4396e8ea06d6d99acf6f2763d59f29dfbe448d
+  data.tar.gz: f833ee553da12be027dd6e72ebc2544527ec2e64e9080939b2bcbc15628675111e70c1caaf691cbfca2229540bb2778f64c0a0a7f46e3777ca129ebbe7ad35cb

data/Gemfile

@@ -5,3 +5,4 @@ gem 'paint', '~> 2.2.1'
 gem 'sqlite3', '~> 1.4.2'
 gem 'terminal-table', '~> 3.0.1'
 gem 'binance-ruby', '~> 1.3.1'
+gem 'telegram-bot-ruby', '~> 0.16.0'

data/abot-info.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3", '~> 1.4.2'
   spec.add_dependency "terminal-table", '~> 3.0.1'
   spec.add_dependency "binance-ruby", '~> 1.3.1'
+  spec.add_dependency 'telegram-bot-ruby', '~> 0.16.0'
 end

data/lib/abot/info/database_table.rb

@@ -14,6 +14,8 @@ module Abot
       API_KEY_TABLE = BASE_CONNECTION.execute('SELECT * FROM api_key').freeze
       API_KEY = API_KEY_TABLE.first['api'].freeze
       SECRET_KEY = API_KEY_TABLE.first['secret'].freeze
+      TG_TOKEN = API_KEY_TABLE.first['tg_token'].freeze
+      TG_NAME = API_KEY_TABLE.first['tg_name'].freeze
 
       class << self
         def data_coins

data/lib/abot/info/decorators/coin_decorator.rb

@@ -7,15 +7,7 @@ module Abot
         def decorated_sell_up
           return '-' if sell_up == Float::INFINITY
 
-          rounded_sell_up = sell_up.round(2)
-          case num_averaging
-          when 1, 2
-            rounded_sell_up > 2 ? Paint[rounded_sell_up, :red] : rounded_sell_up
-          when 3, 4, 5
-            rounded_sell_up > 2 ? rounded_sell_up : Paint[rounded_sell_up, :red]
-          else
-            rounded_sell_up
-          end
+          sell_up.round(2)
         end
 
         def decorated_current_profit
@@ -44,19 +36,15 @@ module Abot
         end
 
         def decorated_name
-          arrow = if account.symbol_info(symbol).try(:[], :lastPrice).to_f < account.symbol_info(symbol).try(:[], :askPrice).to_f
-                    Paint[' ↑', :green]
-                  elsif account.symbol_info(symbol).try(:[], :lastPrice).to_f > account.symbol_info(symbol).try(:[], :askPrice).to_f
-                    Paint[' ↓', :red]
-                  else
-                    ''
-                  end
-          "#{decorated_name_mobile} (#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{arrow}"
+          "#{name} (#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{pump}"
+        end
+
+        def pump
+          pump_detector == 'True' ? Paint[' (P)', :blue] : ''
         end
 
         def decorated_name_mobile
-          pump_det = pump_detector == 'True' ? '👁  ' : ''
-          "#{pump_det}#{name}"
+          "#{name} #{pump}"
         end
 
         def decorated_sell_price

data/lib/abot/info/helpers.rb

@@ -13,14 +13,17 @@ module Abot
       ].freeze
 
       def self.today_info_str
+        profit_array = DatabaseTable.data_daily_profit
+        return "Сегодня сделок не было \n" if profit_array.blank?
+
         profit = 'Профит сегодня:'
         transactions_count = 'Сделок '
-        DatabaseTable.data_daily_profit.each do |c|
+        profit_array.each do |c|
           tick_size = (c['quote'] == 'BTC' ? 7 : 2)
           profit += "#{Paint[" #{c['sum'].round(tick_size)} #{c['quote']}", :green]};"
           transactions_count += "#{c['quote']}: #{Paint[c['count'], :green]}; "
         end
-        "#{profit} #{transactions_count}"
+        "#{profit} #{transactions_count}\n"
       end
 
       def self.balance_str(account, current_coins, trade_params)
@@ -57,15 +60,54 @@ module Abot
         "#{symbol_name}: " + Paint["#{symbol[:askPrice].to_f} (#{symbol[:priceChangePercent]}%)", percent_color]
       end
 
-      def self.check_abot
-        Paint['WARNING: ПРОВЕРЬТЕ БОТА !!!', :black, :red] + "\n" if (Time.now - File.mtime(DatabaseTable::DB_PATH)) > 10
+      def self.check_abot(current_coins, telegram)
+        if (Time.now - File.mtime(DatabaseTable::DB_PATH)) > 40
+          if TelegramSender::SENDED_ERROR.blank?
+            TelegramSender::SENDED_ERROR[:warn_send] = true
+            telegram.send_message('WARNING: ПРОВЕРЬТЕ БОТА !!!') if telegram.present?
+          end
+          return Paint['WARNING: ПРОВЕРЬТЕ БОТА !!!', :black, :red] + "\n"
+        elsif TelegramSender::SENDED_ERROR
+          TelegramSender::SENDED_ERROR.clear
+        end
+
+        error_coins = current_coins.map { |c| c.current_price > c.sell_price ? c.name : nil }.compact
+        TelegramSender::SENDED_SELL_ERROR.delete_if { |key, _| !error_coins.include?(key) }
+
+        error_coins.each do |c|
+          if TelegramSender::SENDED_SELL_ERROR[c].to_i < 4
+            TelegramSender::SENDED_SELL_ERROR[c] = TelegramSender::SENDED_SELL_ERROR[c].to_i + 1
+          end
+        end
+
+        error_coins.select! { |s| TelegramSender::SENDED_SELL_ERROR[s].to_i > 2 }
+
+        return nil if error_coins.blank?
+
+        if telegram.present? &&
+           error_coins.find { |c| TelegramSender::SENDED_SELL_ERROR[c] == 3 }.present? &&
+           error_coins.find { |c| TelegramSender::SENDED_SELL_ERROR[c] == 4 }.blank?
+          telegram.send_message('WARNING: ПРОВЕРЬТЕ БОТА, ВОЗМОЖНО НУЖЕН РЕБУТ')
+        end
+        Paint['WARNING: ПРОВЕРЬТЕ БОТА, ВОЗМОЖНО НУЖЕН РЕБУТ', :black, :red] + "\n"\
       end
 
-      def self.check_coins(account, quote_assets)
+      def self.check_coins(account, quote_assets, telegram)
         coins_without_order = account.coins_without_order(quote_assets)
-        if coins_without_order.present?
-          Paint["Монеты без ордера: #{coins_without_order.join(', ')}", :black, :red] + "\n"
+        TelegramSender::SENDED_LOST_COINS.delete_if { |key, _| !coins_without_order.include?(key) }
+
+        coins_without_order.each do |c|
+          if TelegramSender::SENDED_LOST_COINS[c].to_i < 4
+            TelegramSender::SENDED_LOST_COINS[c] = TelegramSender::SENDED_LOST_COINS[c].to_i + 1
+          end
         end
+
+        coins_without_order.select! { |s| TelegramSender::SENDED_LOST_COINS[s].to_i > 2 }
+
+        return nil if coins_without_order.blank?
+
+        telegram.send_lost_coins(coins_without_order) if telegram.present?
+        Paint["Монеты без ордера: #{coins_without_order.join(', ')}", :black, :red] + "\n"\
       end
     end
   end

data/lib/abot/info/table.rb

@@ -6,7 +6,7 @@ module Abot
     class Table < Terminal::Table
       include Abot::Info::Helpers
 
-      attr_reader :current_coins, :account, :rate_coins, :columns, :trade_params
+      attr_reader :current_coins, :account, :rate_coins, :columns, :trade_params, :telegram
 
       ALL_HEADINGS = {
         name: 'Coin',
@@ -57,12 +57,13 @@ module Abot
         @rate_coins = options.fetch(:rate_coins, [])
         @trade_params ||= DatabaseTable.data_settings
         @current_coins = Coin.current_coins(account, trade_params)
-
+        @telegram = Info::TelegramSender.new if options[:telegram_enable] == 'true'
 
         options = {
           headings: columns.map { |h| { value: ALL_HEADINGS[h], alignment: :center } },
           style: { border_x: '=' }
         }
+
         super options
       end
 
@@ -97,9 +98,9 @@ module Abot
       end
 
       def info_str
-        "#{Helpers.check_coins(account, trade_params["quote_asset"].split(' '))}" \
-        "#{Helpers.check_abot}" \
-        "#{Helpers.today_info_str}\n" \
+        "#{Helpers.check_coins(account, trade_params["quote_asset"].split(' '), telegram)}" \
+        "#{Helpers.check_abot(current_coins, telegram)}" \
+        "#{Helpers.today_info_str}" \
         "#{Helpers.balance_str(account, current_coins, trade_params)}\n" \
         "#{Helpers.potential_balance_str(account, current_coins, trade_params)}\n" \
         "#{rate_coins_str}"

data/lib/abot/info/telegram_sender.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Abot
+  module Info
+    class TelegramSender
+      attr_reader :chat_id, :token
+      SENDED_LOST_COINS = {}
+      SENDED_ERROR = {}
+      SENDED_SELL_ERROR = {}
+
+      def initialize
+        @chat_id = DatabaseTable::TG_NAME
+        @token = DatabaseTable::TG_TOKEN
+      end
+
+      def send_message(text)
+        Telegram::Bot::Client.run(token) do |bot|
+          message = bot.api.send_message(chat_id: chat_id, text: text)
+          if message['ok'] == true
+            bot.api.pin_chat_message(chat_id: chat_id, message_id: message.dig('result', 'message_id'))
+          end
+        end
+      end
+
+      def send_lost_coins(coins_without_order)
+        coins_without_order.each do |coin|
+          send_message("WARNING обнаружена монета без ордера: #{coin}") if SENDED_LOST_COINS[coin].to_i == 3
+        end
+      end
+    end
+  end
+end

data/lib/abot/info/version.rb

@@ -2,6 +2,6 @@
 
 module Abot
   module Info
-    VERSION = '0.2.4'
+    VERSION = '0.2.8'
   end
 end

data/lib/abot/info.rb

@@ -5,12 +5,14 @@ require 'sqlite3'
 require 'terminal-table'
 require 'paint'
 require 'binance-ruby'
+require 'telegram/bot'
 
 require_relative 'info/option_parser'
 require_relative 'info/coin'
 require_relative 'info/binance_account'
 require_relative 'info/table'
 require_relative 'info/version'
+require_relative 'info/telegram_sender'
 
 module Abot
   module Info
@@ -74,11 +76,19 @@ module Abot
             :symbols, '--symbols=SYMBOL1,SYMBOL2,SYMBOL3',
             'Пары для отображения курсов',
           )
+          parser.add_option(
+            :telegram_enable, '--telegram_enable=true',
+            'Отправка в телеграм канал справочной информации',
+            )
+          parser.add_option(
+            :update_time, '--update_time=SECONDS',
+            'Период обновления информации, секунд, мин. 10',
+            )
         end.final!
 
         require_relative 'info/database_table'
 
-        start_stats({ rate_coins: rate_coins, columns: columns })
+        start_stats({ rate_coins: rate_coins, columns: columns, telegram_enable: telegram_enable, update_time: update_time })
       end
 
       def start_stats(opts)
@@ -92,7 +102,7 @@ module Abot
             puts "ERROR: #{e.message}"
           end
 
-          sleep 10
+          sleep update_time
         end
       end
 
@@ -106,6 +116,10 @@ module Abot
         @template ||= Info::OptionParser.instance.options[:template]
       end
 
+      def telegram_enable
+        @telegram_enable ||= Info::OptionParser.instance.options[:telegram_enable]
+      end
+
       def columns
         add = Info::OptionParser.instance.options[:add]&.split(',')&.map { |m| m.to_sym } || []
         del = Info::OptionParser.instance.options[:del]&.split(',')&.map { |m| m.to_sym } || []
@@ -125,6 +139,11 @@ module Abot
       def binance_account
         BinanceAccount.new(DatabaseTable::API_KEY, DatabaseTable::SECRET_KEY)
       end
+
+      def update_time
+        sec = Info::OptionParser.instance.options[:update_time].to_i
+        sec > 10 ? sec : 10
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abot-info
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.8
 platform: ruby
 authors:
 - w_dmitrii
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: telegram-bot-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 description:
 email:
 - wiz.work2021@gmail.com
@@ -146,6 +160,7 @@ files:
 - lib/abot/info/helpers.rb
 - lib/abot/info/option_parser.rb
 - lib/abot/info/table.rb
+- lib/abot/info/telegram_sender.rb
 - lib/abot/info/version.rb
 - spec/abot/statistics_spec.rb
 homepage: