rbtc_arbitrage 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac55aba1d4c56ccf2a54c8730c4e852939fb634
-  data.tar.gz: d7484960f957e4b317cba4c591a71bf2bc7ac573
+  metadata.gz: 343e03101953463b1fe628965585c402baf85ec0
+  data.tar.gz: bd1db8a57c03e20a6e7a3c8f8750883159e0625b
 SHA512:
-  metadata.gz: a2403ad6d3f378a189b1abef215ba44d0ffd8c097c4d2d0f585fc544509c392a3c871ed18fb46bfda83e982fe5d7a410dcfef9f93b7b84a4ddf154212596f377
-  data.tar.gz: 81a63d4f6b4aa587e9db4c9968bb8561a56a313f795ebf62af191106e584344cea0f34d7d5f9ab0da136e5a4974795dfdf3e84a0d7da71b87db721a4c4b15b15
+  metadata.gz: f94c8549b48deab8e7d56ef63f0a992358fd948e6a78218f7325c56c3c3f9716950a66c4392dcfb328acbf0a4b07c1216ca512f120a05a90813796a6524708a1
+  data.tar.gz: bb2e4ebc741ecf66bae436ad59e98ddea561106a9219b0f6c18f74f6fcfd12fc5b2f88b7e15311c228da60bcb6a2ba595c7837ca8d5527b367e935a27f07ae7d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbtc_arbitrage (2.0.1)
+    rbtc_arbitrage (2.0.2)
       activemodel (>= 3.1)
       activesupport (>= 3.1)
       btce (= 0.2.4)

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/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/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
 
@@ -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,25 +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)}"
-
-      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
+      calculate_profit
     end
 
     def get_balance
@@ -108,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
@@ -141,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/version.rb

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

data/lib/rbtc_arbitrage.rb

@@ -6,6 +6,7 @@ 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/spec/spec_helper.rb

@@ -10,6 +10,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start do
   add_filter "/spec/"
   add_filter "/lib/rbtc_arbitrage/campbx.rb"
+  add_filter "/bitstamp/"
 end
 
 require 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtc_arbitrage
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Hank Stoever
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,8 @@ files:
 - lib/rbtc_arbitrage/clients/client.rb.example
 - lib/rbtc_arbitrage/clients/coinbase_client.rb
 - lib/rbtc_arbitrage/trader.rb
+- lib/rbtc_arbitrage/trader/logger.rb
+- lib/rbtc_arbitrage/trader/notifier.rb
 - lib/rbtc_arbitrage/version.rb
 - rbtc_arbitrage.gemspec
 - spec/cli_spec.rb