bitex_bot 0.0.3 → 0.0.4

data/bin/bitex_bot

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'bitex_bot'
+require "bitex_bot/settings"
+BitexBot::Settings.load_default
 
+require 'bitex_bot'
 BitexBot::Robot.run!

data/bitex_bot.gemspec

@@ -26,8 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "sqlite3"
   spec.add_dependency "bitstamp"
-  spec.add_dependency "bitex"
-  spec.add_dependency "debugger"
+  spec.add_dependency "bitex", "0.0.8"
   spec.add_dependency "mail"
 
   spec.add_development_dependency "bundler", "~> 1.3"
@@ -37,5 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "timecop"
+  spec.add_development_dependency "debugger"
   spec.add_development_dependency "shoulda-matchers"
 end

data/lib/bitex_bot.rb

@@ -8,7 +8,6 @@ require "bitex"
 require "bitstamp"
 require "bitex_bot/settings"
 require "bitex_bot/database"
-require "debugger"
 require "bitex_bot/models/opening_flow.rb"
 require "bitex_bot/models/closing_flow.rb"
 Dir[File.dirname(__FILE__) + '/bitex_bot/models/*.rb'].each {|file| require file }

data/lib/bitex_bot/database.rb

@@ -1,3 +1,4 @@
+require 'debugger'
 module BitexBot
   module Database
     #ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'w'))

data/lib/bitex_bot/models/buy_opening_flow.rb

@@ -74,10 +74,6 @@ module BitexBot
     def self.get_remote_value_to_use(value_to_use_needed, safest_price)
       value_to_use_needed / safest_price
     end
-    
-    def self.order_is_executing?(order)
-      order.status != :executing && order.remaining_amount == order.amount
-    end
 
     def self.get_bitex_price(usd_to_spend, bitcoin_to_resell) 
      (usd_to_spend / bitcoin_to_resell) * (1 - Settings.buying.profit / 100.0)

data/lib/bitex_bot/models/opening_flow.rb

@@ -55,14 +55,21 @@ module BitexBot
 
       bitex_price = get_bitex_price(value_to_use, remote_value_to_use)      
 
-      order = order_class.create!(:btc, value_to_use, bitex_price, true)
-      if order_is_executing?(order)
+      begin 
+        order = order_class.create!(:btc, value_to_use, bitex_price, true)
+      rescue StandardError => e
+        raise CannotCreateFlow.new(e.message)
+      end
+
+      if order.reason == :not_enough_funds
         raise CannotCreateFlow.new(
           "You need to have #{value_to_use} on bitex to place this
           #{order_class.name}.")
       end
+
       Robot.logger.info("Opening: Placed #{order_class.name} ##{order.id} " \
         "#{value_to_use} @ $#{bitex_price} (#{remote_value_to_use})")
+
       begin 
         self.create!(price: bitex_price, value_to_use: value_to_use,
           suggested_closing_price: safest_price, status: 'executing', order_id: order.id)
@@ -94,7 +101,7 @@ module BitexBot
     
     def finalise!
       order = self.class.order_class.find(order_id)
-      if order.nil?
+      if order.status == :cancelled
         Robot.logger.info(
           "Opening: #{self.class.order_class.name} ##{order_id} was too old.")
         self.status = 'finalised'

data/lib/bitex_bot/models/sell_opening_flow.rb

@@ -71,10 +71,6 @@ module BitexBot
       value_to_use_needed * safest_price
     end
     
-    def self.order_is_executing?(order)
-      order.status != :executing && order.remaining_quantity == order.quantity
-    end
-      
     def self.get_bitex_price(btc_to_sell, usd_to_spend_re_buying) 
      (usd_to_spend_re_buying / btc_to_sell) * (1 + Settings.selling.profit / 100.0)
     end

data/lib/bitex_bot/settings.rb

@@ -1,13 +1,19 @@
 require 'settingslogic'
-require 'debugger'
+
 class BitexBot::Settings < Settingslogic
-  path = ARGV[0] || File.expand_path('bitex_bot_settings.yml', Dir.pwd)
-  unless FileTest.exists?(path)
-    sample_path = File.expand_path('../../../settings.yml.sample', __FILE__)
-    FileUtils.cp(sample_path, path)
-    puts "No settings found, I've created a new one with sample "\
-      "values at #{path}. Please go ahead and edit it before running this again."
-    exit 1
+  def self.load_default
+    path = ARGV[0] || File.expand_path('bitex_bot_settings.yml', Dir.pwd)
+    unless FileTest.exists?(path)
+      sample_path = File.expand_path('../../../settings.yml.sample', __FILE__)
+      FileUtils.cp(sample_path, path)
+      puts "No settings found, I've created a new one with sample "\
+        "values at #{path}. Please go ahead and edit it before running this again."
+      exit 1
+    end
+    source path
+  end
+  
+  def self.load_test
+    source File.expand_path('../../../settings.yml.sample', __FILE__)
   end
-  source path
 end

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/models/buy_closing_flow_spec.rb

@@ -61,11 +61,11 @@ describe BitexBot::BuyClosingFlow do
       stub_bitstamp_orders_into_transactions
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       close = flow.close_positions.last
-      close.amount.should == 624.1
+      close.amount.should == '624.1000000044'.to_d
       close.quantity.should == 2.01
       flow.should be_done
       flow.btc_profit.should == 0
-      flow.usd_profit.should == 20.1
+      flow.usd_profit.should == '20.1000000044'.to_d
     end
   
     it "retries closing at a lower price every minute" do
@@ -97,7 +97,7 @@ describe BitexBot::BuyClosingFlow do
         flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       end.to change{ BitexBot::CloseBuy.count }.by(1)
       flow.close_positions.first.tap do |close|
-        close.amount.should == 312.05
+        close.amount.should == '312.0500000022'.to_d
         close.quantity.should == 1.005
       end
 
@@ -106,12 +106,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.0299
+        close.amount.should == '312.0299000022'.to_d
         close.quantity.should == 1.005
       end
       flow.should be_done
       flow.btc_profit.should == 0
-      flow.usd_profit.should == 20.0799
+      flow.usd_profit.should == '20.0799000044001'.to_d
     end
     
     it "does not retry for an amount less than minimum_for_closing" do
@@ -126,7 +126,7 @@ describe BitexBot::BuyClosingFlow do
 
       flow.should be_done
       flow.btc_profit.should == 0.00201
-      flow.usd_profit.should == 19.4759
+      flow.usd_profit.should == '19.4759000043956'.to_d
     end
     
     it "can lose USD if price had to be dropped dramatically" do
@@ -144,7 +144,7 @@ describe BitexBot::BuyClosingFlow do
 
       flow.reload.should be_done
       flow.btc_profit.should == 0
-      flow.usd_profit.should == -16.08
+      flow.usd_profit.should == '-16.0799999956'.to_d
     end
   end
 end

data/spec/models/buy_opening_flow_spec.rb

@@ -14,7 +14,7 @@ describe BitexBot::BuyOpeningFlow do
 
   describe "when creating a buying flow" do
     it "spends 50 usd" do
-      stub_bitex_bid_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         buying: double(amount_to_spend_per_order: 50, profit: 0))
 
@@ -29,7 +29,7 @@ describe BitexBot::BuyOpeningFlow do
     end
 
     it "spends 100 usd" do
-      stub_bitex_bid_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         buying: double(amount_to_spend_per_order: 100, profit: 0))
 
@@ -43,7 +43,7 @@ describe BitexBot::BuyOpeningFlow do
     end
     
     it "lowers the price to pay on bitex to take a profit" do
-      stub_bitex_bid_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         buying: double(amount_to_spend_per_order: 100, profit: 50))
 
@@ -73,7 +73,7 @@ describe BitexBot::BuyOpeningFlow do
     end
     
     it "fails when there are not enough bitcoin to sell in the other exchange" do
-      stub_bitex_bid_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         buying: double(amount_to_spend_per_order: 100, profit: 0))
 
@@ -136,7 +136,7 @@ describe BitexBot::BuyOpeningFlow do
   end
   
   it 'cancels the associated bitex bid' do
-    stub_bitex_bid_create
+    stub_bitex_orders
     BitexBot::Settings.stub(time_to_live: 3,
       buying: double(amount_to_spend_per_order: 50, profit: 0))
 
@@ -146,9 +146,6 @@ describe BitexBot::BuyOpeningFlow do
     flow.finalise!
     flow.should be_settling
     flow.finalise!
-    flow.should be_settling
-    Bitex::Order.stub(active: [])
-    flow.finalise!
     flow.should be_finalised
   end
 end

data/spec/models/robot_spec.rb

@@ -19,8 +19,7 @@ describe BitexBot::Robot do
     )
     Bitex.api_key = "valid_key"
     Bitex::Profile.stub(get: {fee: 0.5})
-    stub_bitex_bid_create
-    stub_bitex_ask_create
+    stub_bitex_orders
     stub_bitstamp_sell
     stub_bitstamp_buy
     stub_bitstamp_balance
@@ -31,6 +30,7 @@ describe BitexBot::Robot do
   let(:bot){ BitexBot::Robot.new }
 
   it 'Starts out by creating opening flows that timeout' do
+    stub_bitex_orders
     bot.trade!
     stub_bitex_transactions
     buying = BitexBot::BuyOpeningFlow.last
@@ -42,7 +42,6 @@ describe BitexBot::Robot do
     buying.reload.should be_settling
     selling.reload.should be_settling
 
-    Bitex::Order.stub(active: [])
     bot.trade!
     buying.reload.should be_finalised
     selling.reload.should be_finalised
@@ -59,10 +58,15 @@ describe BitexBot::Robot do
     bot.trade!
     BitexBot::BuyOpeningFlow.active.count.should == 2
     
+    # When transactions appear, all opening flows
+    # should get old and die.
+    # We stub our finder to make it so all orders
+    # have been successfully cancelled.
     stub_bitex_transactions
-    Bitex::Order.stub(active: [])
+
     Timecop.travel 5.seconds.from_now
     bot.trade!
+    bot.trade!
     BitexBot::BuyOpeningFlow.active.count.should == 1
     Timecop.travel 5.seconds.from_now
     bot.trade!
@@ -72,13 +76,13 @@ describe BitexBot::Robot do
   it 'does not place new opening flows until all closing flows are done' do
     bot.trade!
     stub_bitex_transactions
-    Bitex::Order.stub(active: [])
     expect do
       bot.trade!
     end.to change{ BitexBot::BuyClosingFlow.count }.by(1)
 
     Timecop.travel 15.seconds.from_now
     bot.trade!
+    bot.trade!
     bot.should be_active_closing_flows
     bot.should_not be_active_opening_flows
 

data/spec/models/sell_closing_flow_spec.rb

@@ -63,11 +63,11 @@ describe BitexBot::SellClosingFlow do
       stub_bitstamp_orders_into_transactions
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       close = flow.close_positions.last
-      close.amount.should == 583.9
+      close.amount.should == "583.9000000044".to_d
       close.quantity.should == 2.01
       flow.should be_done
       flow.btc_profit.should == 0
-      flow.usd_profit.should == 20.1
+      flow.usd_profit.should == "20.0999999956".to_d
     end
   
     it "retries closing at a higher price every minute" do
@@ -99,7 +99,7 @@ describe BitexBot::SellClosingFlow do
         flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       end.to change{ BitexBot::CloseSell.count }.by(1)
       flow.close_positions.first.tap do |close|
-        close.amount.should == 291.95
+        close.amount.should == "291.9500000022".to_d
         close.quantity.should == 1.005
       end
 
@@ -108,12 +108,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.95
-        close.quantity.should == '1.004930813120933'.to_d
+        close.amount.should == "291.9499990955143".to_d
+        close.quantity.should == '1.00493081'.to_d
       end
       flow.should be_done
-      flow.btc_profit.should == '-0.000069186879067'.to_d
-      flow.usd_profit.should == 20.1
+      flow.btc_profit.should == '-0.00006919'.to_d
+      flow.usd_profit.should == '20.1000009022857'.to_d
     end
     
     it "does not retry for an amount less than minimum_for_closing" do
@@ -132,8 +132,8 @@ describe BitexBot::SellClosingFlow do
       end.not_to change{ BitexBot::CloseSell.count }
 
       flow.should be_done
-      flow.btc_profit.should == '-0.015739962920125'.to_d
-      flow.usd_profit.should == '20.6839'.to_d
+      flow.btc_profit.should == '-0.01573996629'.to_d
+      flow.usd_profit.should == '20.6839009813144'.to_d
     end
     
     it "can lose BTC if price had to be raised dramatically" do
@@ -150,11 +150,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.117278093149271".to_d
-      flow.usd_profit.should == "20.1".to_d
+      flow.btc_profit.should == "-0.11727809".to_d
+      flow.usd_profit.should == "20.0999990243145".to_d
       close = flow.close_positions.last
       (close.amount / close.quantity)
-        .should == '308.497512437810935201007569945345172662'.to_d
+        .should == '308.497512439999968088286144476448735145'.to_d
     end
   end
 end

data/spec/models/sell_opening_flow_spec.rb

@@ -14,7 +14,7 @@ describe BitexBot::SellOpeningFlow do
 
   describe "when creating a selling flow" do
     it "sells 2 bitcoin" do
-      stub_bitex_ask_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         selling: double(quantity_to_sell_per_order: 2, profit: 0))
 
@@ -29,7 +29,7 @@ describe BitexBot::SellOpeningFlow do
     end
 
     it "sells 4 bitcoin" do
-      stub_bitex_ask_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         selling: double(quantity_to_sell_per_order: 4, profit: 0))
 
@@ -44,7 +44,7 @@ describe BitexBot::SellOpeningFlow do
     end
     
     it "raises the price to charge on bitex to take a profit" do
-      stub_bitex_ask_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         selling: double(quantity_to_sell_per_order: 4, profit: 50))
 
@@ -75,7 +75,7 @@ describe BitexBot::SellOpeningFlow do
     end
     
     it "fails when there are not enough USD to re-buy in the other exchange" do
-      stub_bitex_bid_create
+      stub_bitex_orders
       BitexBot::Settings.stub(time_to_live: 3,
         selling: double(quantity_to_sell_per_order: 4, profit: 50))
 
@@ -138,7 +138,7 @@ describe BitexBot::SellOpeningFlow do
   end
   
   it 'cancels the associated bitex bid' do
-    stub_bitex_ask_create
+    stub_bitex_orders
     BitexBot::Settings.stub(time_to_live: 3,
       selling: double(quantity_to_sell_per_order: 4, profit: 50))
 
@@ -148,9 +148,6 @@ describe BitexBot::SellOpeningFlow do
     flow.finalise!
     flow.should be_settling
     flow.finalise!
-    flow.should be_settling
-    Bitex::Order.stub(active: [])
-    flow.finalise!
     flow.should be_finalised
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'bundler/setup'
 Bundler.setup
 
+require "bitex_bot/settings"
+BitexBot::Settings.load_test
 require 'bitex_bot'
 require 'factory_girl'
 require 'database_cleaner'

data/spec/support/bitex_stubs.rb

@@ -1,14 +1,22 @@
 module BitexStubs
-  def ensure_bitex_orders_stub
-    begin
-      Bitex::Order.active
-    rescue Exception => e
-      Bitex::Order.stub(active: [])
+  mattr_accessor(:bids){ {} }
+  mattr_accessor(:asks){ {} }
+  mattr_accessor(:active_bids){ {} }
+  mattr_accessor(:active_asks){ {} }
+
+  def stub_bitex_orders
+    Bitex::Order.stub(:all) do
+      BitexStubs.active_bids + BitexStubs.active_asks
+    end
+
+    Bitex::Bid.stub(:find) do |id|
+      BitexStubs.bids[id]
+    end
+
+    Bitex::Ask.stub(:find) do |id|
+      BitexStubs.asks[id]
     end
-  end
 
-  def stub_bitex_bid_create
-    ensure_bitex_orders_stub
     Bitex::Bid.stub(:create!) do |specie, to_spend, price|
       bid = Bitex::Bid.new
       bid.id = 12345
@@ -18,17 +26,16 @@ module BitexStubs
       bid.remaining_amount = to_spend
       bid.status = :executing 
       bid.specie = specie
-      bid.stub(cancel!: true) do
-        bid.status = :cancelling
+      bid.stub(:cancel!) do
+        bid.status = :cancelled
+        BitexStubs.active_bids.delete(bid.id)
         bid
       end
-      Bitex::Order.stub(active: Bitex::Order.active + [bid])
+      BitexStubs.bids[bid.id] = bid
+      BitexStubs.active_bids[bid.id] = bid
       bid
     end
-  end
 
-  def stub_bitex_ask_create
-    ensure_bitex_orders_stub
     Bitex::Ask.stub(:create!) do |specie, to_sell, price|
       ask = Bitex::Ask.new
       ask.id = 12345
@@ -38,16 +45,17 @@ module BitexStubs
       ask.remaining_quantity = to_sell
       ask.status = :executing 
       ask.specie = specie
-      ask.stub(cancel!: true) do
-        ask.status = :cancelling
+      ask.stub(:cancel!) do
+        ask.status = :cancelled
+        BitexStubs.active_asks.delete(ask.id)
         ask
       end
-      Bitex::Order.stub(active: Bitex::Order.active + [ask])
+      BitexStubs.asks[ask.id] = ask
+      BitexStubs.active_asks[ask.id] = ask
       ask
     end
   end
   
-  
   def stub_bitex_transactions(*extra_transactions)
     Bitex::Transaction.stub(all: extra_transactions + [
       build(:bitex_buy),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
@@ -97,33 +97,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +236,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement