bitex_bot 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0341a8eb9da405634fc53dd2165a30c31f46674d
-  data.tar.gz: 6a468573664f6efc3a00e7811b31ce658e9dc11c
+  metadata.gz: 042de027f9e4945015bb3dadb4eb0791ae088d1c
+  data.tar.gz: 5ac5f3a68839f43827023b79c979204856946838
 SHA512:
-  metadata.gz: 4529d05e2353bcbf5a91d7ad05bfa261a83cb97bcf4df9d36d235508d31b64cf5ffa66953984095ba72a206c183dd6bec25955f9a648190535f6c967a4d4255f
-  data.tar.gz: 280af9b62f157ffaa0932b8781fcfcb06bfdb8dd322b41e5a6014f362ef37d991b0a1e2358ad8b51163090c3db287b9aeacfc2da1cba8cc31d495f3731d6dca7
+  metadata.gz: d0f9192ae1bc2469b425a71b0f497cde7500fd980e6ff1744932921bec1c40094bfaea1e6a0d5f371439f9a95bab4082877b79b234c3da5ae7c42dec8bd4f9b3
+  data.tar.gz: f8904fb9df76e8eed734a11423afc1c15bc509bf2e49abe0230b2d6b9de325c037e334d1704fc3e97ce8bc7d6226cb974df55558eeec9425a9739b72d8fe8898

data/lib/bitex_bot/database.rb

@@ -92,18 +92,16 @@ module BitexBot
       unless ActiveRecord::Base.connection.table_exists?('stores')
         create_table   :stores, force: true do |t|
           t.decimal    :maker_crypto,                       precision: 20,   scale: 8
-          t.decimal    :maker_crypto_stop,                  precision: 20,   scale: 8
-          t.decimal    :maker_crypto_warning,               precision: 20,   scale: 8
           t.decimal    :maker_fiat,                         precision: 20,   scale: 8
-          t.decimal    :maker_fiat_stop,                    precision: 20,   scale: 8
-          t.decimal    :maker_fiat_warning,                 precision: 20,   scale: 8
 
           t.decimal    :taker_crypto,                       precision: 20,   scale: 8
-          t.decimal    :taker_crypto_stop,                  precision: 20,   scale: 8
-          t.decimal    :taker_crypto_warning,               precision: 20,   scale: 8
           t.decimal    :taker_fiat,                         precision: 20,   scale: 8
-          t.decimal    :taker_fiat_stop,                    precision: 20,   scale: 8
-          t.decimal    :taker_fiat_warning,                 precision: 20,   scale: 8
+
+          t.decimal    :crypto_stop,                  precision: 20,   scale: 8
+          t.decimal    :crypto_warning,               precision: 20,   scale: 8
+
+          t.decimal    :fiat_stop,                    precision: 20,   scale: 8
+          t.decimal    :fiat_warning,                 precision: 20,   scale: 8
 
           t.decimal    :buying_amount_to_spend_per_order,   precision: 20,   scale: 8
           t.decimal    :buying_fx_rate,                     precision: 20,   scale: 8

data/lib/bitex_bot/models/api_wrappers/bitstamp/bitstamp_api_wrapper.rb

@@ -72,8 +72,6 @@ class BitstampApiWrapper < ApiWrapper
     raise ApiWrapperError, "Bitstamp user_transactions failed: #{e.message}"
   end
 
-  private_class_method
-
   # {
   #   btc_reserved: '0', btc_available: '0', btc_balance: '0',
   #   usd_reserved: '1.02, usd_available: '6952.05', usd_balance: '6953.07',

data/lib/bitex_bot/models/api_wrappers/itbit/itbit_api_wrapper.rb

@@ -58,8 +58,6 @@ class ItbitApiWrapper < ApiWrapper
     []
   end
 
-  private_class_method
-
   # [
   #   { total_balance: 0.2e2, currency: :usd, available_balance: 0.1e2 },
   #   { total_balance: 0.0, currency: :xbt, available_balance: 0.0 },

data/lib/bitex_bot/models/api_wrappers/kraken/kraken_api_wrapper.rb

@@ -55,8 +55,6 @@ class KrakenApiWrapper < ApiWrapper
     []
   end
 
-  private_class_method
-
   # { ZEUR: '1433.0939', XXBT: '0.0000000000', 'XETH': '99.7497224800' }
   def self.balance_summary_parser(balances)
     open_orders = KrakenOrder.open

data/lib/bitex_bot/robot.rb

@@ -69,8 +69,6 @@ module BitexBot
       end
     end
 
-    private_class_method
-
     def self.start_robot
       setup
       log(:info, 'Loading trading robot, ctrl+c *once* to exit gracefully.')
@@ -183,10 +181,8 @@ module BitexBot
 
       check_balance_warning if expired_last_warning?
 
-      return log(:debug, "Not placing new orders, #{Settings.quote} target not met") if alert?(:maker, :fiat, :stop)
-      return log(:debug, "Not placing new orders, #{Settings.base} target not met") if alert?(:maker, :crypto, :stop)
-      return log(:debug, 'Not placing new orders, USD target not met') if alert?(:taker, :fiat, :stop)
-      return log(:debug, "Not placing new orders, #{Settings.quote} target not met") if alert?(:taker, :crypto, :stop)
+      return log(:debug, "Not placing new orders, #{Settings.quote} target not met") if alert?(:fiat, :stop)
+      return log(:debug, "Not placing new orders, #{Settings.base} target not met") if alert?(:crypto, :stop)
 
       order_book = with_cooldown { Robot.taker.order_book }
       transactions = with_cooldown { Robot.taker.transactions }
@@ -218,18 +214,19 @@ module BitexBot
       store.last_warning.nil? || store.last_warning < 30.minutes.ago
     end
 
-    # rubocop:disable Metrics/AbcSize
     def check_balance_warning
-      notify_balance_warning(Settings.base, store.maker_crypto, store.maker_crypto_warning) if alert?(:maker, :crypto, :warning)
-      notify_balance_warning(Settings.quote, store.maker_fiat, store.maker_fiat_warning) if alert?(:maker, :fiat, :warning)
-      notify_balance_warning(Settings.base, store.taker_crypto, store.taker_crypto_warning) if alert?(:taker, :crypto, :warning)
-      notify_balance_warning(:usd, store.taker_fiat, store.taker_fiat_warning) if alert?(:taker, :fiat, :warning)
+      notify_balance_warning(Settings.base, balance(:crypto), store.crypto_warning) if alert?(:crypto, :warning)
+      notify_balance_warning(Settings.quote, balance(:fiat), store.fiat_warning) if alert?(:fiat, :warning)
+    end
+
+    def alert?(currency, flag)
+      return unless store.send("#{currency}_#{flag}").present?
+      balance(currency) <= store.send("#{currency}_#{flag}")
     end
-    # rubocop:enable Metrics/AbcSize
 
-    def alert?(market, currency, flag)
-      return unless store.send("#{market}_#{currency}_#{flag}").present?
-      store.send("#{market}_#{currency}") <= store.send("#{market}_#{currency}_#{flag}")
+    def balance(currency)
+      fx_rate = currency == :fiat ? Settings.buying_fx_rate : 1
+      store.send("maker_#{currency}") / fx_rate + store.send("taker_#{currency}")
     end
 
     def notify_balance_warning(currency, amount, warning_amount)

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/spec/models/robot_spec.rb

@@ -132,24 +132,12 @@ describe BitexBot::Robot do
       other_bot.store.update(hold: true)
     end
 
-    context 'maker' do
-      it 'crypto stop is reached' do
-        other_bot.store.update(maker_crypto_stop: 30)
-      end
-
-      it 'fiat stop is reached' do
-        other_bot.store.update(maker_fiat_stop: 30)
-      end
+    it 'crypto stop is reached' do
+      other_bot.store.update(crypto_stop: 30)
     end
 
-    context 'taker' do
-      it 'crypto stop is reached' do
-        other_bot.store.update(taker_crypto_stop: 30)
-      end
-
-      it 'fiat stop is reached' do
-        other_bot.store.update(taker_fiat_stop: 30)
-      end
+    it 'fiat stop is reached' do
+      other_bot.store.update(fiat_stop: 30)
     end
   end
 
@@ -166,7 +154,7 @@ describe BitexBot::Robot do
       })
       Bitex::Trade.stub(all: [])
       stub_bitstamp_api_wrapper_balance(100, 100)
-      other_bot.store.update(maker_crypto_warning: 0, taker_crypto_warning: 0, maker_fiat_warning: 0, taker_fiat_warning: 0)
+      other_bot.store.update(crypto_warning: 0, fiat_warning: 0)
     end
 
     after(:each) do
@@ -181,26 +169,14 @@ describe BitexBot::Robot do
       expect { bot.trade! }.to change { Mail::TestMailer.deliveries.count }.by(1)
     end
 
-    let(:other_bot) { described_class.new  }
-
-    context 'maker' do
-      it 'crypto warning is reached' do
-        other_bot.store.update(maker_crypto_warning: 100)
-      end
+    let(:other_bot) { described_class.new }
 
-      it 'fiat warning is reached' do
-        other_bot.store.update(maker_fiat_warning: 100)
-      end
+    it 'crypto warning is reached' do
+      other_bot.store.update(crypto_warning: 1_000)
     end
 
-    context 'taker' do
-      it 'crypto warning is reached' do
-        other_bot.store.update(taker_crypto_warning: 100)
-      end
-
-      it 'fiat warning is reached' do
-        other_bot.store.update(taker_fiat_warning: 100)
-      end
+    it 'fiat warning is reached' do
+      other_bot.store.update(fiat_warning: 1_000)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Nubis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord