bitex_bot 0.1.4 → 0.1.5

data/bitex_bot.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "sqlite3"
   spec.add_dependency "bitstamp"
-  spec.add_dependency "bitex", "0.1.2"
+  spec.add_dependency "bitex", "0.1.3"
   spec.add_dependency "mail"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/bitex_bot/models/buy_closing_flow.rb

@@ -26,7 +26,7 @@ module BitexBot
 
     def get_next_price_and_quantity
       closes = close_positions
-      next_price = desired_price - ((closes.count * (closes.count * 2)) / 100.0)
+      next_price = desired_price - ((closes.count * (closes.count * 3)) / 100.0)
       next_quantity = quantity - closes.sum(:quantity)
       [next_price, next_quantity]
     end

data/lib/bitex_bot/models/closing_flow.rb

@@ -92,7 +92,7 @@ module BitexBot
     end
     
     def self.close_time_to_live
-      60
+      30
     end
   end
 end

data/lib/bitex_bot/models/sell_closing_flow.rb

@@ -27,7 +27,7 @@ module BitexBot
     def get_next_price_and_quantity
       closes = close_positions
       next_price = 
-        desired_price + ((closes.count * (closes.count * 2)) / 100.0)
+        desired_price + ((closes.count * (closes.count * 3)) / 100.0)
       next_quantity =
         ((quantity * desired_price) - closes.sum(:amount)) / next_price
       [next_price, next_quantity]

data/lib/bitex_bot/robot.rb

@@ -37,6 +37,8 @@ module BitexBot
         next if start_time < cooldown_until
         self.current_cooldowns = 0
         bot.trade!
+        # This global sleep is so that we don't stress bitex too much.
+        sleep 0.1 unless test_mode
         self.cooldown_until = start_time + current_cooldowns.seconds
       end
     end
@@ -75,7 +77,7 @@ module BitexBot
       start_opening_flows_if_needed
     rescue CannotCreateFlow => e
       self.notify("#{e.message}:\n\n#{e.backtrace.join("\n")}")
-      sleep 1500 unless self.class.test_mode
+      sleep (60 * 3) unless self.class.test_mode
     rescue StandardError => e
       self.notify("#{e.message}:\n\n#{e.backtrace.join("\n")}")
       sleep 60 unless self.class.test_mode
@@ -112,9 +114,20 @@ module BitexBot
     end
     
     def start_opening_flows_if_needed
-      return if store.reload.hold?
-      return if active_closing_flows?
-      return if self.class.graceful_shutdown
+      if store.reload.hold?
+        BitexBot::Robot.logger.debug("Not placing new orders because of hold")
+        return
+      end
+      
+      if active_closing_flows?
+        BitexBot::Robot.logger.debug("Not placing new orders, closing flows.")
+        return
+      end
+      
+      if self.class.graceful_shutdown
+        BitexBot::Robot.logger.debug("Not placing new orders, shutting down.")
+        return
+      end
       
       recent_buying, recent_selling =
         [BuyOpeningFlow, SellOpeningFlow].collect do |kind|
@@ -122,7 +135,10 @@ module BitexBot
           kind.active.where('created_at > ?', threshold).first
         end
 
-      return if recent_buying && recent_selling
+      if recent_buying && recent_selling
+        BitexBot::Robot.logger.debug("Not placing new orders, recent ones exist.")
+        return
+      end
       
       balances = with_cooldown{ Bitstamp.balance }
       profile = Bitex::Profile.get
@@ -147,8 +163,14 @@ module BitexBot
         end
       end
 
-      return if store.usd_stop && total_usd <= store.usd_stop
-      return if store.btc_stop && total_btc <= store.btc_stop
+      if store.usd_stop && total_usd <= store.usd_stop
+        BitexBot::Robot.logger.debug("Not placing new orders, USD target not met")
+        return
+      end
+      if store.btc_stop && total_btc <= store.btc_stop
+        BitexBot::Robot.logger.debug("Not placing new orders, BTC target not met")
+        return
+      end
 
       order_book = with_cooldown{ Bitstamp.order_book }
       transactions = with_cooldown{ Bitstamp.transactions }

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/models/buy_closing_flow_spec.rb

@@ -130,12 +130,12 @@ describe BitexBot::BuyClosingFlow do
       stub_bitstamp_orders_into_transactions
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       flow.close_positions.last.tap do |close|
-        close.amount.should == '312.0324'.to_d
+        close.amount.should == '312.02235'.to_d
         close.quantity.should == 1.005
       end
       flow.should be_done
       flow.btc_profit.should == 0
-      flow.usd_profit.should == '20.0849000000001'.to_d
+      flow.usd_profit.should == '20.07485'.to_d
     end
     
     it "does not retry for an amount less than minimum_for_closing" do
@@ -168,7 +168,7 @@ describe BitexBot::BuyClosingFlow do
 
       flow.reload.should be_done
       flow.btc_profit.should == 0
-      flow.usd_profit.should == '-16.075'.to_d
+      flow.usd_profit.should == '-34.165'.to_d
     end
   end
 end

data/spec/models/sell_closing_flow_spec.rb

@@ -132,12 +132,12 @@ describe BitexBot::SellClosingFlow do
       stub_bitstamp_orders_into_transactions
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       flow.close_positions.last.tap do |close|
-        close.amount.should == "291.943548".to_d
+        close.amount.should == "291.953597".to_d
         close.quantity.should == '1.0049'.to_d
       end
       flow.should be_done
       flow.btc_profit.should == '-0.0001'.to_d
-      flow.usd_profit.should == '20.1039519999999'.to_d
+      flow.usd_profit.should == '20.093903'.to_d
 
     end
     
@@ -157,8 +157,8 @@ describe BitexBot::SellClosingFlow do
       end.not_to change{ BitexBot::CloseSell.count }
 
       flow.should be_done
-      flow.btc_profit.should == '-0.0156963'.to_d
-      flow.usd_profit.should == '20.66616775'.to_d
+      flow.btc_profit.should == '-0.0224895'.to_d
+      flow.usd_profit.should == '20.66566825'.to_d
     end
     
     it "can lose BTC if price had to be raised dramatically" do
@@ -175,11 +175,11 @@ describe BitexBot::SellClosingFlow do
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
 
       flow.reload.should be_done
-      flow.btc_profit.should == "-0.1173".to_d
-      flow.usd_profit.should == "20.10205".to_d
+      flow.btc_profit.should == "-0.1709".to_d
+      flow.usd_profit.should == "20.08575".to_d
       close = flow.close_positions.last
       (close.amount / close.quantity)
-        .should == '308.5'.to_d
+        .should == '317.5'.to_d
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement