bitex_bot 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d52a8ce88ec8cfa25ad7781d8c989ac3311fd2
-  data.tar.gz: 3c15cc5fcb36a12a78585aa61e2ba2c86e73134d
+  metadata.gz: efc6ef530a550fa1e3c3f2a52f414b1027b4eba6
+  data.tar.gz: 82201c561520e8adbaf98472fd5a1ebb749f6157
 SHA512:
-  metadata.gz: 59c028daeb22fae99f9c2a87bf473a78d5cacf09ba1b3c3d3973560ac6cc4bc08c533ad00dfbb1ae3eb182a1798605a1a799258e57fa9dccaa602ec82174145b
-  data.tar.gz: 37138d26080cd50d03700733002c9318be47a8c433cdc71e42d7c9c0a4adca0fab55d4e1a5d3b96a01d287f198a99872b7902c7daa63b892dd23455a3da006fa
+  metadata.gz: d5086a469c090655a423994b5e915777090b94a99f3687bdeb48ee1df5c44c57dd0a5817f0de2a449b69ed92de518d3a95cb1e539ad0488f3f2745c1be978b75
+  data.tar.gz: 1f497ce86c62a994969c9718f7f5239e943457349b961cf2a41599c698ae989b00e521f43df05f5974849e27efeeaa445160dd29f876c2235ddcfc7a1aa991df

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bitex_bot.gemspec
 gemspec
-gem 'bitstamp', git: 'https://github.com/nubis/bitstamp.git'
+gem 'bitstamp', git: 'https://github.com/bitex-la/bitstamp.git'

data/bitex_bot.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_dependency "settingslogic"
-  spec.add_dependency "activerecord"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activerecord", "4.2"
   spec.add_dependency "sqlite3"
   spec.add_dependency "bitstamp"
   spec.add_dependency "bitex", "0.3"
@@ -32,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mail"
   spec.add_dependency "hashie"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
@@ -41,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "shoulda-matchers"
+  spec.add_development_dependency "webmock"
 end

data/lib/bitex_bot/models/bitfinex_api_wrapper.rb

@@ -1,6 +1,20 @@
 require "bigdecimal"
 require "bigdecimal/util"
 
+module Bitfinex
+  module WithUserAgent
+    def new_rest_connection
+      super.tap do |conn|
+        conn.headers['User-Agent'] = BitexBot.user_agent
+      end
+    end
+  end
+
+  class Client
+    prepend WithUserAgent
+  end
+end
+
 class BitfinexApiWrapper
   def self.setup(settings)
     Bitfinex::Client.configure do |conf|
@@ -13,6 +27,7 @@ class BitfinexApiWrapper
     begin
       block.call
     rescue StandardError, Bitfinex::ClientError => e
+      raise e if BitexBot::Robot.test_mode
       BitexBot::Robot.logger.info("Bitfinex #{action} failed. Retrying in 5 seconds.")
       sleep 5
       retry

data/lib/bitex_bot/models/bitstamp_api_wrapper.rb

@@ -1,7 +1,7 @@
 class BitstampApiWrapper
   def self.setup(settings)
     Bitstamp.setup do |config|
-      config.key = settings.bitstamp.key
+      config.key = settings.bitstamp.api_key
       config.secret = settings.bitstamp.secret
       config.client_id = settings.bitstamp.client_id.to_s
     end

data/lib/bitex_bot/robot.rb

@@ -225,8 +225,8 @@ module BitexBot
           subject 'Notice from your robot trader'
           body message
         end
-        mail.delivery_method(Settings.mailer.method.to_sym,
-          Settings.mailer.options.symbolize_keys)
+        mail.delivery_method(Settings.mailer.delivery_method.to_sym,
+          Settings.mailer.options.to_hash)
         mail.deliver!
       end
     end

data/lib/bitex_bot/settings.rb

@@ -1,21 +1,38 @@
-require 'settingslogic'
+require 'hashie'
 
 module BitexBot
-  class Settings < Settingslogic
-    def self.load_default
-      path = ARGV[0] || File.expand_path('bitex_bot_settings.yml', Dir.pwd)
+  class FileSettings < ::Hashie::Clash
+    def method_missing(name, *args)
+      return super unless args.size == 1 && args.none?
+      self[name] = args.first
+    end
+  end
+
+  class SettingsClass < ::Hashie::Mash
+    include ::Hashie::Extensions::Mash::SymbolizeKeys
+
+    def load_default
+      path = ARGV[0] || 'bitex_bot_settings.rb'
       unless FileTest.exists?(path)
-        sample_path = File.expand_path('../../../settings.yml.sample', __FILE__)
+        sample_path = File.expand_path('../../../settings.rb.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
+      load_settings(path)
     end
     
-    def self.load_test
-      source File.expand_path('../../../settings.yml.sample', __FILE__)
+    def load_test
+      load_settings File.expand_path('../../../settings.rb.sample', __FILE__)
+    end
+
+    def load_settings(path)
+      file_settings = FileSettings.new
+      file_settings.instance_eval(File.read(path), path, 1)
+      merge!(file_settings)
     end
   end
+
+  Settings = SettingsClass.new
 end

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/bitex_bot.rb

@@ -1,8 +1,6 @@
 require "bitex_bot/version"
 require 'hashie'
-require "active_support"
 require "active_record"
-require "active_model"
 require "mail"
 require "logger"
 require "bitex"
@@ -17,4 +15,36 @@ Dir[File.dirname(__FILE__) + '/bitex_bot/models/*.rb'].each {|file| require file
 require "bitex_bot/robot"
 
 module BitexBot
+  def self.user_agent
+    "Bitexbot/#{VERSION} (https://github.com/bitex-la/bitex-bot)"
+  end
+end
+
+module Bitex
+  module WithUserAgent
+    def grab_curl
+      super.tap do |curl|
+        curl.headers['User-Agent'] = BitexBot.user_agent
+      end
+    end
+  end
+
+  class Api
+    class << self
+      prepend WithUserAgent
+    end
+  end
+end
+
+# Itbit and Bitstamp
+module RestClient
+  module WithUserAgent
+    def default_headers
+      super.merge(:user_agent => BitexBot.user_agent)
+    end
+  end
+
+  class Request
+    prepend WithUserAgent
+  end
 end

data/settings.rb.sample

@@ -0,0 +1,97 @@
+# File to write log to. The log is rotated every 10240000 bytes, 10 oldest
+# logs are kept around.
+# If you want to log to stdout you can set 'file' to nil or remove the key.
+# How much information to show in the log, valid values are debug, info, error
+log file: 'bitex_bot.log', level: :info
+
+# Seconds to keep an order alive before recalculating the price and replacing it.
+# Given the way in which the robot tries to find the safest price to place an
+# order, if the time to live is too long the price is not going to be
+# competitive. About 20 seconds is a good number here.
+time_to_live 20
+
+# Use sandbox environments instead of live environments
+# only available for bitex and itbit
+sandbox false
+
+# Which market to use for taking (we're always makers on bitex)
+# 'itbit', 'bitstamp' or 'bitfinex'
+taker 'bitstamp'
+
+# Settings for buying on bitex and selling on bitstamp.
+# amount_to_spend_per_order:
+#   Dollars to spend on each initial bitex bid.
+#   Should at least be 10.0 which is the current minimum order size on Bitex.
+#   if it's too large you're taking a higher risk if whatever happens and you
+#   cannot re sell it afterwards. Also, higher amounts result in your bitex
+#   bid price not being competitive.
+#   A number between 10.0 and 1000.0 is reccommended.
+# profit:
+#   Your profit when buying on bitex, 0.5 means 0.5%.
+#   After calculating the price at which bitcoins can be sold on bitstamp, the
+#   robot deduces your profit from that price, and places a bid on bitex paying
+#   a lower price.
+buying amount_to_spend_per_order: 10.0, profit: 0.5
+
+# Settings for selling on bitex and buying on bitstamp.
+# quantity_to_sell_per_order:
+#   Quantity to sell on each initial bitex Ask.
+#   It should be at least 10 USD worth of BTC at current market prices, a bit
+#   more just to be safe. Otherwise Bitex will reject your orders for being too
+#   small.
+#   If it's too large then you're taking a risk if whatever happens and you 
+#   If it's too small then the robot is pointless, and if it's too large you're
+#   taking a higher risk if whatever happens ad you cannot re buy afterwards.
+#   Also, higher amounts result in your bitex bid price not being competitive.
+#   A number between 0.05 and 2.0 is recommended.
+# profit:
+#   Your profit when selling on bitex, 0.5 means 0.5%.
+#   After calculating the price at which bitcoins can be bought on bitstamp,
+#   the robot deduces your profit from that price and places an ask on bitex
+#   charging a higher price.
+selling quantity_to_sell_per_order: 0.1, profit: 0.5
+
+# This is your bitex api key, it's passed in to the
+# bitex gem: https://github.com/bitex-la/bitex-ruby
+bitex 'your_bitex_api_key_which_should_be_kept_safe'
+
+# These are passed in to the bitstamp gem:
+# see https://github.com/kojnapp/bitstamp for more info.
+bitstamp api_key: 'YOUR_API_KEY',
+  secret: 'YOUR_API_SECRET',
+  client_id: 'YOUR_BITSTAMP_USERNAME'
+
+# These are passed in to the itbit gem:
+# see https://github.com/bitex-la/itbit for more info.
+itbit client_key: 'the-client-key',
+  secret: 'the-secret',
+  user_id: 'the-user-id',
+  default_wallet_id: 'wallet-000'
+
+# These are passed in to the bitfinex gem:
+# see https://github.com/bitfinexcom/bitfinex-api-rb for more info.
+bitfinex api_key: 'your_api_key',
+  api_secret: 'your_api_secret'
+
+# Settings for the ActiveRecord Database to use.
+# sqlite is just fine. Check this link for more options:
+# http://apidock.com/rails/ActiveRecord/Base/establish_connection/class
+database adapter: :sqlite3, database: 'bitex_bot.db'
+
+# The robot sends you emails whenever a problem occurs.
+# If you do not want to receive emails just remove this 'mailer'
+# key and everything under it.
+# It uses https://github.com/mikel/mail under the hood, so method
+# is any valid delivery_method for teh mail gem.
+# Options is the options hash passed in to delivery_method.
+mailer from: 'robot@example.com',
+  to: 'you@example.com',
+  delivery_method: :smtp,
+  options: {
+    address: "your_smtp_server_address.com",
+    port: 587,
+    authentication: "plain",
+    enable_starttls_auto: true,
+    user_name: 'your_user_name',
+    password: 'your_smtp_password'
+  }

data/spec/models/bitex_api_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'BitexApi' do
+  before(:each) do
+    BitexBot::Robot.setup
+  end
+
+  it 'Sends User-Agent header' do
+    stub_request(:get, "https://bitex.la/api-v1/rest/private/profile?api_key=your_bitex_api_key_which_should_be_kept_safe")
+      .with(headers: { 'User-Agent': BitexBot.user_agent })
+    Bitex::Profile.get rescue nil # we don't care about the response
+  end
+end

data/spec/models/bitfinex_api_wrapper_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe BitfinexApiWrapper do
+  before(:each) do
+    BitexBot::Robot.stub(taker: 'bitfinex')
+    BitexBot::Robot.stub(taker: BitfinexApiWrapper)
+    BitexBot::Robot.setup
+  end
+
+  it 'Sends User-Agent header' do
+    stub_request(:post, "https://api.bitfinex.com/v1/balances")
+      .with(headers: { 'User-Agent': BitexBot.user_agent })
+    stub_request(:post, "https://api.bitfinex.com/v1/account_infos")
+      .with(headers: { 'User-Agent': BitexBot.user_agent })
+    BitfinexApiWrapper.balance rescue nil # we don't care about the response
+  end
+end

data/spec/models/bitstamp_api_wrapper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe BitstampApiWrapper do
+  before(:each) do
+    BitexBot::Robot.stub(taker: 'bitstamp')
+    BitexBot::Robot.stub(taker: BitstampApiWrapper)
+    BitexBot::Robot.setup
+  end
+
+  it 'Sends User-Agent header' do
+    stub_request(:post, "https://www.bitstamp.net/api/balance/")
+      .with(headers: { 'User-Agent': BitexBot.user_agent })
+    BitstampApiWrapper.balance rescue nil # we don't care about the response
+  end
+end

data/spec/models/itbit_api_wrapper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe ItbitApiWrapper do
+  before(:each) do
+    BitexBot::Robot.stub(taker: 'itbit')
+    BitexBot::Robot.stub(taker: ItbitApiWrapper)
+    BitexBot::Robot.setup
+  end
+
+  it 'Sends User-Agent header' do
+    stub_request(:get, "https://api.itbit.com/v1/wallets?userId=the-user-id")
+      .with(headers: { 'User-Agent': BitexBot.user_agent })
+    ItbitApiWrapper.balance rescue nil # we don't care about the response
+  end
+end

data/spec/models/robot_spec.rb

@@ -13,7 +13,7 @@ describe BitexBot::Robot do
       mailer: double(
         from: 'test@test.com',
         to: 'test@test.com',
-        method: :test,
+        delivery_method: :test,
         options: {}
       )
     )

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'factory_girl'
 require 'database_cleaner'
 require 'shoulda/matchers'
 require 'timecop'
+require 'webmock/rspec'
 FactoryGirl.find_definitions
 
 Dir[File.dirname(__FILE__) + '/support/*.rb'].each {|file| require file }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Nubis
@@ -9,50 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: settingslogic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -155,16 +127,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +249,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Both a trading robot and a library to build trading
                           robots. The bitex-bot lets you buy cheap on bitex and
@@ -317,15 +303,19 @@ files:
 - lib/bitex_bot/robot.rb
 - lib/bitex_bot/settings.rb
 - lib/bitex_bot/version.rb
-- settings.yml.sample
+- settings.rb.sample
 - spec/factories/bitex_buy.rb
 - spec/factories/bitex_sell.rb
 - spec/factories/buy_opening_flow.rb
 - spec/factories/open_buy.rb
 - spec/factories/open_sell.rb
 - spec/factories/sell_opening_flow.rb
+- spec/models/bitex_api_spec.rb
+- spec/models/bitfinex_api_wrapper_spec.rb
+- spec/models/bitstamp_api_wrapper_spec.rb
 - spec/models/buy_closing_flow_spec.rb
 - spec/models/buy_opening_flow_spec.rb
+- spec/models/itbit_api_wrapper_spec.rb
 - spec/models/order_book_simulator_spec.rb
 - spec/models/robot_spec.rb
 - spec/models/sell_closing_flow_spec.rb
@@ -353,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A trading robot to do arbitrage between bitex.la and other exchanges!
@@ -364,8 +354,12 @@ test_files:
 - spec/factories/open_buy.rb
 - spec/factories/open_sell.rb
 - spec/factories/sell_opening_flow.rb
+- spec/models/bitex_api_spec.rb
+- spec/models/bitfinex_api_wrapper_spec.rb
+- spec/models/bitstamp_api_wrapper_spec.rb
 - spec/models/buy_closing_flow_spec.rb
 - spec/models/buy_opening_flow_spec.rb
+- spec/models/itbit_api_wrapper_spec.rb
 - spec/models/order_book_simulator_spec.rb
 - spec/models/robot_spec.rb
 - spec/models/sell_closing_flow_spec.rb

data/settings.yml.sample

@@ -1,107 +0,0 @@
-log:
-  # File to write log to. The log is rotated every 10240000 bytes, 10 oldest
-  # logs are kept around.
-  # If you want to log to stdout you can comment this line.
-  file: bitex_bot.log
-  # How much information to show in the log, valid values are debug, info, error
-  level: info
-
-# Seconds to keep an order alive before recalculating the price and replacing it.
-# Given the way in which the robot tries to find the safest price to place an
-# order, if the time to live is too long the price is not going to be
-# competitive. About 20 seconds is a good number here.
-time_to_live: 20
-
-# Use sandbox environments instead of live environments
-# only available for bitex and itbit
-sandbox: false
-
-# Which market to use for taking (we're always makers on bitex)
-# itbit, bitstamp or bitfinex
-taker: bitstamp
-
-# Settings for buying on bitex and selling on bitstamp.
-buying:
-  # Dollars to spend on each initial bitex bid.
-  # Should at least be 10.0 which is the current minimum order size on Bitex.
-  # if it's too large you're taking a higher risk if whatever happens and you
-  # cannot re sell it afterwards. Also, higher amounts result in your bitex
-  # bid price not being competitive.
-  # A number between 10.0 and 1000.0 is reccommended.
-  amount_to_spend_per_order: 10.0
-  
-  # Your profit when buying on bitex, 0.5 means 0.5%.
-  # After calculating the price at which bitcoins can be sold on bitstamp, the
-  # robot deduces your profit from that price, and places a bid on bitex paying
-  # a lower price.
-  profit: 0.5
-
-# Settings for selling on bitex and buying on bitstamp.
-selling:
-  # Quantity to sell on each initial bitex Ask.
-  # It should be at least 10 USD worth of BTC at current market prices, a bit
-  # more just to be safe. Otherwise Bitex will reject your orders for being too
-  # small.
-  # If it's too large then you're taking a risk if whatever happens and you 
-  # If it's too small then the robot is pointless, and if it's too large you're
-  # taking a higher risk if whatever happens ad you cannot re buy afterwards.
-  # Also, higher amounts result in your bitex bid price not being competitive.
-  # A number between 0.05 and 2.0 is recommended.
-  quantity_to_sell_per_order: 0.1
-  
-  # Your profit when selling on bitex, 0.5 means 0.5%.
-  # After calculating the price at which bitcoins can be bought on bitstamp,
-  # the robot deduces your profit from that price and places an ask on bitex
-  # charging a higher price.
-  profit: 0.5
-
-# This is your bitex api key, it's passed in to the
-# bitex gem: https://github.com/bitex-la/bitex-ruby
-bitex: your_bitex_api_key_which_should_be_kept_safe
-
-# These are passed in to the bitstamp gem:
-# see https://github.com/kojnapp/bitstamp for more info.
-bitstamp:
-  key: YOUR_API_KEY
-  secret: YOUR_API_SECRET
-  client_id: YOUR_BITSTAMP_USERNAME
-
-# These are passed in to the itbit gem:
-# see https://github.com/bitex-la/itbit for more info.
-itbit:
-  client_key: 'the-client-key'
-  secret: 'the-secret'
-  user_id: 'the-user-id'
-  default_wallet_id: 'wallet-000'
-
-# These are passed in to the bitfinex gem:
-# see https://github.com/bitfinexcom/bitfinex-api-rb for more info.
-bitfinex:
-  api_key: 'your_api_key'
-  api_secret: 'your_api_secret'
-
-
-# Settings for the ActiveRecord Database to use.
-# sqlite is just fine. Check this link for more options:
-# http://apidock.com/rails/ActiveRecord/Base/establish_connection/class
-database:
-  adapter: sqlite3
-  database: bitex_bot.db 
-
-# The robot sends you emails whenever a problem occurs.
-# If you do not want to receive emails just remove this 'mailer'
-# key and everything under it.
-# It uses https://github.com/mikel/mail under the hood, so method
-# is any valid delivery_method for teh mail gem.
-# Options is the options hash passed in to delivery_method.
-mailer:
-  from: 'robot@example.com'
-  to: 'you@example.com'
-  method: smtp
-  options:
-    address: "your_smtp_server_address.com"
-    port: 587
-    authentication: "plain"
-    enable_starttls_auto: true
-    user_name: 'your_user_name'
-    password: 'your_smtp_password'