rbtc_arbitrage_simple 1.4.4 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0a86fb8de589d7b45bc44e07ce93222bad2e17
-  data.tar.gz: b78c0c931af1ff282bba897320eb59c0b5279615
+  metadata.gz: f4cfee1b5de308aa0ec6007b8173a7220b4d4501
+  data.tar.gz: b67691a517aa55e2d8fe337f493acc172de76f68
 SHA512:
-  metadata.gz: ff3874ce7ee3bdecf7b30e8338d2472fe33371f1a62ecb135e1dfcbcb04e1342828415907990aba602262450a59096e0fc4f34447ac65930269d116f7e73e826
-  data.tar.gz: 77c3cdb383df68cd78e3facc9122f7001e55fd0179b1aca441abd5a286e2b771c2a731ed66a5e6c7c7708c7c406cbba1608bd80640462f212bc7a3d21478f167
+  metadata.gz: 827f92b92f8728f3802e0a8c341d5f2d0958a3b659841934cd1c15f790ea5dd9ddc1130831af239fa44d1f9e6b06564e680c922894cb12f9a60f2ef69e269aaa
+  data.tar.gz: 303826e5db0cf919370ed927c60930747b99b6d00962d18547a465743a819c8b38d72907d532f22ff783dc1e88c4b66fdcc8f8e4bb03c1147f246c2fbdd36557

data/Gemfile

@@ -2,17 +2,19 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rbtc_arbitrage.gemspec
 gemspec
-gem 'rspec'
-gem "activemodel", ">= 3.1"
-gem "activesupport", ">= 3.1"
-gem 'guard'
-gem 'ruby_gntp'
-# gem 'awesome_print'
-gem 'guard-rspec'
-gem 'simplecov'
-gem 'coveralls', require: false
-gem "webmock"
-gem 'vcr'
-gem 'codeclimate-test-reporter'
-gem 'hashie'
-gem 'sinatra'
+group :development do
+  gem 'rspec'
+  gem "activemodel", ">= 3.1"
+  gem "activesupport", ">= 3.1"
+  gem 'guard'
+  gem 'ruby_gntp'
+  # gem 'awesome_print'
+  gem 'guard-rspec'
+  gem 'simplecov'
+  gem 'coveralls', require: false
+  gem "webmock"
+  gem 'vcr'
+  gem 'codeclimate-test-reporter'
+  gem 'hashie'
+  gem 'sinatra'
+end

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    rbtc_arbitrage_simple (1.4.4)
+    rbtc_arbitrage_simple (2.0.1)
       activemodel (>= 3.1)
       activesupport (>= 3.1)
       btce (= 0.2.4)
       coinbase (= 1.2.6)
-      mtgox
+      faraday (= 0.8.8)
       pony
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
-    atomic (1.1.14)
+    atomic (1.1.16)
     btce (0.2.4)
       monkey-patch
     builder (3.1.4)
@@ -61,7 +61,7 @@ GEM
       guard (>= 2.1.1)
       rspec (~> 3.0.0.beta, >= 2.14, < 4.0)
     hashie (2.0.5)
-    httparty (0.12.0)
+    httparty (0.13.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.6.9)
@@ -80,16 +80,13 @@ GEM
     minitest (4.7.5)
     money (5.1.1)
       i18n (~> 0.6.0)
-    monkey-patch (0.0.14)
+    monkey-patch (0.0.16)
       activesupport
-    mtgox (1.1.0)
-      faraday (~> 0.8, < 0.10)
-      json (~> 1.7, >= 1.7.7)
-    multi_json (1.8.2)
+    multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    polyglot (0.3.3)
-    pony (1.6.2)
+    polyglot (0.3.4)
+    pony (1.8)
       mail (>= 2.0)
     pry (0.9.12.4)
       coderay (~> 1.0)
@@ -131,15 +128,14 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     timers (1.1.0)
     tins (0.13.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    treetop (1.5.3)
+      polyglot (~> 0.3)
+    tzinfo (0.3.39)
     vcr (2.8.0)
     webmock (1.16.1)
       addressable (>= 2.2.7)

data/lib/rbtc_arbitrage.rb

@@ -1,10 +1,12 @@
+require 'bundler'
+Bundler.require(:default)
 require 'thor'
-require 'mtgox'
 require_relative 'rbtc_arbitrage/campbx.rb'
 require 'btce'
 require 'coinbase'
 require 'pony'
 require_relative 'rbtc_arbitrage/client.rb'
+Dir["#{File.dirname(__FILE__)}/rbtc_arbitrage/trader/*.rb"].each { |f| require(f) }
 Dir["#{File.dirname(__FILE__)}/rbtc_arbitrage/**/*.rb"].each { |f| require(f) }
 
 module RbtcArbitrage

data/lib/rbtc_arbitrage/campbx.rb

@@ -70,10 +70,10 @@ module CampBX
         request.set_form_data( post_data )
       end
 
-      # debug # need to test w/valid credentials
-      #puts "Sending request to #{uri}"
-      #puts "Post Data: #{post_data}"
+      make_request(http, request)
+    end
 
+    def make_request http, request
       # CampBX API: max 1 request per 500ms
       delta = Time.now - @@last
       #puts delta*1000
@@ -90,7 +90,6 @@ module CampBX
       else # HTTP ERROR
         warn "HTTP Error: + #{res.code}"
       end
-
     end
 
   end

data/lib/rbtc_arbitrage/cli.rb

@@ -6,8 +6,8 @@ module RbtcArbitrage
     option :cutoff, type: :numeric, default: 2, desc: "The minimum profit level required to execute a trade."
     option :volume, type: :numeric, default: 0.01, desc: "The amount of bitcoins to trade per transaction."
     option :verbose, type: :boolean, default: true, desc: "Whether you wish to log information."
-    option :buyer, type: :string, default: "campbx"
-    option :seller, type: :string, default: "mtgox"
+    option :buyer, type: :string, default: "btce"
+    option :seller, type: :string, default: "campbx"
     option :repeat, type: :numeric, default: nil
     option :notify, type: :boolean, default: false
     def trade

data/lib/rbtc_arbitrage/clients/coinbase_client.rb

@@ -16,10 +16,11 @@ module RbtcArbitrage
         if @options[:verbose]
           warning = "Coinbase doesn't provide a USD balance because"
           warning << " it connects to your bank account. Be careful, "
-          warning << "because this will withdraw directly from your accounts."
+          warning << "because this will withdraw directly from your accounts"
+          warning << "when you trade live."
           logger.warn warning
         end
-        @balance ||= [interface.balance.to_f, max_float]
+        @balance ||= [max_float, max_float]
       end
 
       # Configures the client's API keys.

data/lib/rbtc_arbitrage/trader.rb

@@ -1,5 +1,8 @@
 module RbtcArbitrage
   class Trader
+    include RbtcArbitrage::TraderHelpers::Notifier
+    include RbtcArbitrage::TraderHelpers::Logger
+
     attr_reader :buy_client, :sell_client, :received
     attr_accessor :buyer, :seller, :options
 
@@ -19,10 +22,10 @@ module RbtcArbitrage
       set_key opts, :verbose, true
       set_key opts, :live, false
       set_key opts, :repeat, nil
-      exchange = opts[:buyer] || :campbx
+      exchange = opts[:buyer] || :btce
       set_key opts, :notify, false
       @buy_client = client_for_exchange(exchange)
-      exchange = opts[:seller] || :mtgox
+      exchange = opts[:seller] || :campbx
       @sell_client = client_for_exchange(exchange)
       self
     end
@@ -64,14 +67,7 @@ module RbtcArbitrage
       raise SecurityError, "--live flag is false. Not executing trade." unless options[:live]
       get_balance
       if @percent > @options[:cutoff]
-        if @paid > buyer[:usd] || @options[:volume] > seller[:btc]
-          raise SecurityError, "Not enough funds. Exiting."
-        else
-          logger.info "Trading live!" if options[:verbose]
-          @buy_client.buy
-          @sell_client.sell
-          @buy_client.transfer @sell_client
-        end
+        buy_and_transfer!
       else
         logger.info "Not trading live because cutoff is higher than profit." if @options[:verbose]
       end
@@ -82,19 +78,8 @@ module RbtcArbitrage
       buyer[:price] = @buy_client.price(:buy)
       seller[:price] = @sell_client.price(:sell)
       prices = [buyer[:price], seller[:price]]
-      @paid = buyer[:price] * 1.006 * @options[:volume]
-      @received = seller[:price] * 0.994 * @options[:volume]
-      @percent = ((received/@paid - 1) * 100).round(2)
-    end
 
-    def log_info
-      lower_ex = @buy_client.exchange.to_s.capitalize
-      higher_ex = @sell_client.exchange.to_s.capitalize
-      logger.info "#{lower_ex}: $#{buyer[:price].round(2)}"
-      logger.info "#{higher_ex}: $#{seller[:price].round(2)}"
-      logger.info "buying #{@options[:volume]} btc from #{lower_ex} for $#{@paid.round(2)}"
-      logger.info "selling #{@options[:volume]} btc on #{higher_ex} for $#{@received.round(2)}"
-      logger.info "profit: $#{(@received - @paid).round(2)} (#{@percent.round(2)}%)"
+      calculate_profit
     end
 
     def get_balance
@@ -102,10 +87,6 @@ module RbtcArbitrage
       @buyer[:btc], @buyer[:usd] = @buy_client.balance
     end
 
-    def logger
-      @options[:logger]
-    end
-
     def validate_env
       [@sell_client, @buy_client].each do |client|
         client.validate_env
@@ -135,59 +116,24 @@ module RbtcArbitrage
       end
     end
 
-    def notify
-      return false unless options[:notify]
-      return false unless @percent > options[:cutoff]
-      setup_pony
+    private
 
-      options[:logger].info "Sending email to #{ENV['SENDGRID_EMAIL']}"
-      Pony.mail({
-        body: notification,
-        to: ENV['SENDGRID_EMAIL'],
-      })
+    def calculate_profit
+      @paid = buyer[:price] * 1.006 * @options[:volume]
+      @received = seller[:price] * 0.994 * @options[:volume]
+      @percent = ((received/@paid - 1) * 100).round(2)
     end
 
-    def setup_pony
-      Pony.options = {
-        from: ENV['FROM_EMAIL'] || "info@example.org",
-        subject: "rbtc_arbitrage notification",
-        via: :smtp,
-        via_options: {
-          address: 'smtp.sendgrid.net',
-          port: '587',
-          domain: 'heroku.com',
-          user_name: ENV['SENDGRID_USERNAME'],
-          password: ENV['SENDGRID_PASSWORD'],
-          authentication: :plain,
-          enable_starttls_auto: true
-        }
-      }
+    def buy_and_transfer!
+      if @paid > buyer[:usd] || @options[:volume] > seller[:btc]
+        raise SecurityError, "Not enough funds. Exiting."
+      else
+        logger.info "Trading live!" if options[:verbose]
+        @buy_client.buy
+        @sell_client.sell
+        @buy_client.transfer @sell_client
+      end
     end
 
-    def notification
-      lower_ex = @buy_client.exchange.to_s.capitalize
-      higher_ex = @sell_client.exchange.to_s.capitalize
-      <<-eos
-      Update from your friendly rbtc_arbitrage trader:
-
-      -------------------
-
-      #{lower_ex}: $#{buyer[:price].round(2)}
-      #{higher_ex}: $#{seller[:price].round(2)}
-      buying #{@options[:volume]} btc from #{lower_ex} for $#{@paid.round(2)}
-      selling #{@options[:volume]} btc on #{higher_ex} for $#{@received.round(2)}
-      profit: $#{(@received - @paid).round(2)} (#{@percent.round(2)}%)
-
-      -------------------
-
-      options:
-
-      #{options.reject{|k,v| v.is_a?(Logger)}.collect{|k,v| "#{k}: #{v.to_s}"}.join(" | ")}
-
-      -------------------
-
-      https://github.com/hstove/rbtc_arbitrage
-      eos
-    end
   end
 end

data/lib/rbtc_arbitrage/trader/logger.rb

@@ -0,0 +1,31 @@
+module RbtcArbitrage
+  module TraderHelpers
+    module Logger
+      def logger
+        @options[:logger]
+      end
+
+      def log_info
+        lower_ex = @buy_client.exchange.to_s.capitalize
+        higher_ex = @sell_client.exchange.to_s.capitalize
+        logger.info "#{lower_ex}: $#{buyer[:price].round(2)}"
+        logger.info "#{higher_ex}: $#{seller[:price].round(2)}"
+        logger.info "buying #{@options[:volume]} btc from #{lower_ex} for $#{@paid.round(2)}"
+        logger.info "selling #{@options[:volume]} btc on #{higher_ex} for $#{@received.round(2)}"
+
+        log_profit
+      end
+      
+      private
+
+      def log_profit
+        profit_msg = "profit: $#{(@received - @paid).round(2)} (#{@percent.round(2)}%)"
+        if cutoff = @options[:cutoff]
+          profit_msg << " is #{@percent < cutoff ? 'below' : 'above'} cutoff"
+          profit_msg << " of #{cutoff}%."
+        end
+        logger.info profit_msg
+      end
+    end
+  end
+end

data/lib/rbtc_arbitrage/trader/notifier.rb

@@ -0,0 +1,60 @@
+module RbtcArbitrage
+  module TraderHelpers
+    module Notifier
+      def notify
+        return false unless options[:notify]
+        return false unless @percent > options[:cutoff]
+        setup_pony
+
+        options[:logger].info "Sending email to #{ENV['SENDGRID_EMAIL']}"
+        Pony.mail({
+          body: notification,
+          to: ENV['SENDGRID_EMAIL'],
+        })
+      end
+
+      def setup_pony
+        Pony.options = {
+          from: ENV['FROM_EMAIL'] || "info@example.org",
+          subject: "rbtc_arbitrage notification",
+          via: :smtp,
+          via_options: {
+            address: 'smtp.sendgrid.net',
+            port: '587',
+            domain: 'heroku.com',
+            user_name: ENV['SENDGRID_USERNAME'],
+            password: ENV['SENDGRID_PASSWORD'],
+            authentication: :plain,
+            enable_starttls_auto: true
+          }
+        }
+      end
+
+      def notification
+        lower_ex = @buy_client.exchange.to_s.capitalize
+        higher_ex = @sell_client.exchange.to_s.capitalize
+        <<-eos
+        Update from your friendly rbtc_arbitrage trader:
+
+        -------------------
+
+        #{lower_ex}: $#{buyer[:price].round(2)}
+        #{higher_ex}: $#{seller[:price].round(2)}
+        buying #{@options[:volume]} btc from #{lower_ex} for $#{@paid.round(2)}
+        selling #{@options[:volume]} btc on #{higher_ex} for $#{@received.round(2)}
+        profit: $#{(@received - @paid).round(2)} (#{@percent.round(2)}%)
+
+        -------------------
+
+        options:
+
+        #{options.reject{|k,v| v.is_a?(Logger)}.collect{|k,v| "#{k}: #{v.to_s}"}.join(" | ")}
+
+        -------------------
+
+        https://github.com/hstove/rbtc_arbitrage
+        eos
+      end
+    end
+  end
+end

data/lib/rbtc_arbitrage/version.rb

@@ -1,3 +1,3 @@
 module RbtcArbitrage
-  VERSION = "1.4.4"
+  VERSION = "2.0.1"
 end

data/rbtc_arbitrage.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "mtgox"
+  spec.add_dependency "faraday", "0.8.8"
   spec.add_dependency "activemodel", ">= 3.1"
   spec.add_dependency "activesupport", ">= 3.1"
   spec.add_dependency "thor"