bitex_bot 0.2.2 → 0.2.3

data/bitex_bot.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "sqlite3"
   spec.add_dependency "bitstamp"
-  spec.add_dependency "bitex", "0.1.8"
-  spec.add_dependency "itbit", "0.0.2"
+  spec.add_dependency "bitex", "0.1.9"
+  spec.add_dependency "itbit", "0.0.3"
   spec.add_dependency "mail"
   spec.add_dependency "hashie"
 

data/lib/bitex_bot/models/bitstamp_api_wrapper.rb

@@ -23,8 +23,18 @@ class BitstampApiWrapper
   #    'asks' =>
   #      [['10', '2'], ['15', '3'], ['20', '1.5'], ['25', '3'], ['30', '3']]
   #  }
-  def self.order_book
-    Bitstamp.order_book
+  def self.order_book(retries = 20)
+    begin
+      Bitstamp.order_book
+    rescue StandardError => e
+      if retries == 0
+        raise
+      else
+        Robot.logger.info("Bitstamp order_book failed, retrying #{retries} more times")
+        sleep 1
+        self.order_book(retries - 1)
+      end
+    end
   end
 
   # {"btc_balance"=> "10.0", "btc_reserved"=> "0", "btc_available"=> "10.0",

data/lib/bitex_bot/models/opening_flow.rb

@@ -83,9 +83,9 @@ module BitexBot
     def self.sync_open_positions
       threshold = open_position_class
         .order('created_at DESC').first.try(:created_at)
-      Bitex::Transaction.all.collect do |transaction|
+      Bitex::Trade.all.collect do |transaction|
         next unless transaction.is_a?(transaction_class)
-        next if threshold && transaction.created_at < (threshold - 15.minutes)
+        next if threshold && transaction.created_at < (threshold - 30.minutes)
         next if open_position_class.find_by_transaction_id(transaction.id)
         next if transaction.specie != :btc
         next unless flow = find_by_order_id(transaction_order_id(transaction))

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/models/buy_opening_flow_spec.rb

@@ -120,7 +120,7 @@ describe BitexBot::BuyOpeningFlow do
     
     it 'does not register litecoin buys' do
       flow.order_id.should == 12345
-      Bitex::Transaction.stub(all: [build(:bitex_buy, id: 23456, specie: :ltc)])
+      Bitex::Trade.stub(all: [build(:bitex_buy, id: 23456, specie: :ltc)])
       expect do
         BitexBot::BuyOpeningFlow.sync_open_positions.should be_empty
       end.not_to change{ BitexBot::OpenBuy.count }

data/spec/models/robot_spec.rb

@@ -59,7 +59,7 @@ describe BitexBot::Robot do
   end
   
   it 'creates alternating opening flows' do
-    Bitex::Transaction.stub(all: [])
+    Bitex::Trade.stub(all: [])
     bot.trade!
     BitexBot::BuyOpeningFlow.active.count.should == 1
     Timecop.travel 2.seconds.from_now
@@ -132,7 +132,7 @@ describe BitexBot::Robot do
   end
 
   it 'warns every 30 minutes when usd warn is reached' do
-    Bitex::Transaction.stub(all: [])
+    Bitex::Trade.stub(all: [])
     other_bot = BitexBot::Robot.new
     other_bot.store.usd_warning = 11000
     other_bot.store.save!
@@ -150,7 +150,7 @@ describe BitexBot::Robot do
   end
 
   it 'warns every 30 minutes when btc warn is reached' do
-    Bitex::Transaction.stub(all: [])
+    Bitex::Trade.stub(all: [])
     other_bot = BitexBot::Robot.new
     other_bot.store.btc_warning = 30
     other_bot.store.save!

data/spec/models/sell_opening_flow_spec.rb

@@ -122,7 +122,7 @@ describe BitexBot::SellOpeningFlow do
     
     it 'does not register litecoin buys' do
       flow.order_id.should == 12345
-      Bitex::Transaction.stub(all: [build(:bitex_sell, id: 23456, specie: :ltc)])
+      Bitex::Trade.stub(all: [build(:bitex_sell, id: 23456, specie: :ltc)])
       expect do
         BitexBot::SellOpeningFlow.sync_open_positions.should be_empty
       end.not_to change{ BitexBot::OpenSell.count }

data/spec/support/bitex_stubs.rb

@@ -57,17 +57,8 @@ module BitexStubs
   end
   
   def stub_bitex_transactions(*extra_transactions)
-    Bitex::Transaction.stub(all: extra_transactions + [
-      build(:bitex_buy),
-      build(:bitex_sell),
-      Bitex::SpecieWithdrawal
-        .from_json([6,Time.now.to_i,946685400,1,100.00000000,1,0]),
-      Bitex::UsdWithdrawal
-        .from_json([8,Time.now.to_i,946685400,100.00000000,1,0]),
-      Bitex::UsdDeposit
-        .from_json([7,Time.now.to_i,946685400,1000.00000000,1,1,0]),
-      Bitex::SpecieDeposit
-        .from_json([5,Time.now.to_i,946685400,1,100.00000000]),
+    Bitex::Trade.stub(all: extra_transactions + [
+      build(:bitex_buy), build(:bitex_sell)
     ])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-29 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.8
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: itbit
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement