merge branch 'master' into 'rbtc_arbitrage'

.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 rvm:
-- 2.1.0
+- 2.1.1
 - 2.0.0
 - 1.9.3
 - ruby-head
 
 matrix:
   allow_failures:
-    - rvm: 2.1.0
+    - rvm: 2.1.1
     - rvm: ruby-head
 env:
   global:

Gemfile

@@ -1,14 +1,12 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rbtc_arbitrage.gemspec
 gemspec
 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
@@ -17,5 +15,4 @@ group :development do
   gem 'codeclimate-test-reporter'
   gem 'hashie'
   gem 'sinatra'
-end
-gem 'bitstamp', path: './bitstamp'
+end

Gemfile.lock

@@ -1,28 +1,20 @@
 PATH
   remote: .
   specs:
-    rbtc_arbitrage (2.3.0)
+    rbtc_arbitrage (2.4.1)
       activemodel (>= 3.1)
       activesupport (>= 3.1)
+      bitstamp-rbtc-arbitrage
       btce (= 0.2.4)
       bundler (~> 1.3)
-      coinbase (= 1.3.0)
+      coinbase (= 2.1.0)
       faraday (= 0.8.8)
       pony
       rake (= 10.1.1)
       stathat
       tco (= 0.1.0)
       thor
 
-PATH
-  remote: ./bitstamp
-  specs:
-    bitstamp (0.4.0)
-      activemodel (>= 3.1)
-      activesupport (>= 3.1)
-      curb (> 0.8.1)
-      ruby-hmac (= 0.4.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -37,6 +29,13 @@ GEM
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
     atomic (1.1.16)
+    bitstamp-rbtc-arbitrage (0.4.0)
+      activemodel (>= 3.1)
+      activesupport
+      curb (> 0.8.1)
+      i18n (= 0.6.9)
+      ruby-hmac (= 0.4.0)
+      tzinfo
     btce (0.2.4)
       monkey-patch
     builder (3.1.4)
@@ -45,11 +44,13 @@ GEM
     codeclimate-test-reporter (0.2.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    coinbase (1.3.0)
+    coinbase (2.1.0)
       hashie (>= 1.2.0)
       httparty (>= 0.8.3)
-      money (= 5.1.1)
+      monetize (~> 0.3.0)
+      money (~> 6.0)
       multi_json (>= 1.3.4)
+      oauth2 (~> 0.9)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -58,7 +59,7 @@ GEM
       thor
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
-    curb (0.8.5)
+    curb (0.8.6)
     diff-lcs (1.2.5)
     docile (1.1.1)
     faraday (0.8.8)
@@ -80,27 +81,33 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.6.9)
     json (1.8.1)
+    jwt (1.0.0)
     listen (2.4.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
-    mail (2.2.7)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.0)
     minitest (4.7.5)
-    money (5.1.1)
-      i18n (~> 0.6.0)
+    monetize (0.3.0)
+      money (~> 6.1.0.beta1)
+    money (6.1.1)
+      i18n (~> 0.6.4)
     monkey-patch (0.0.16)
       activesupport
     multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    polyglot (0.3.4)
-    pony (1.8)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pony (1.10)
       mail (>= 2.0)
     pry (0.9.12.4)
       coderay (~> 1.0)
@@ -150,8 +157,6 @@ GEM
     tilt (1.4.1)
     timers (1.1.0)
     tins (0.13.1)
-    treetop (1.5.3)
-      polyglot (~> 0.3)
     tzinfo (0.3.39)
     vcr (2.8.0)
     webmock (1.16.1)
@@ -164,7 +169,6 @@ PLATFORMS
 DEPENDENCIES
   activemodel (>= 3.1)
   activesupport (>= 3.1)
-  bitstamp!
   codeclimate-test-reporter
   coveralls
   guard

lib/rbtc_arbitrage/trader/notifier.rb

@@ -15,10 +15,10 @@ def notify
         end
 
         if (stathat_api_key = ENV['STATHAT_API_KEY']).present?
-         options[:logger].info "Notifying #{ stathat_api_key } via stathat"
+          options[:logger].info "Notifying #{ stathat_api_key } via stathat"
 
-         StatHat::SyncAPI.ez_post_value("#{@buy_client.exchange}_to_#{@sell_client.exchange}_percent", stathat_api_key, @percent)
-         StatHat::SyncAPI.ez_post_value("#{@buy_client.exchange}_to_#{@sell_client.exchange}_profit", stathat_api_key, @received - @paid)
+          StatHat::SyncAPI.ez_post_value("#{@buy_client.exchange}_to_#{@sell_client.exchange}_percent", stathat_api_key, @percent)
+          StatHat::SyncAPI.ez_post_value("#{@buy_client.exchange}_to_#{@sell_client.exchange}_profit", stathat_api_key, @received - @paid)
        end
       end
 

lib/rbtc_arbitrage/version.rb

@@ -1,3 +1,3 @@
 module RbtcArbitrage
-  VERSION = "2.3.0"
+  VERSION = "2.4.1"
 end

rbtc_arbitrage.gemspec

@@ -14,25 +14,6 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  # get an array of submodule dirs by executing 'pwd' inside each submodule
-  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
-    # for each submodule, change working directory to that submodule
-    Dir.chdir(submodule_path) do
-      # issue git ls-files in submodule's directory
-      submodule_files = `git ls-files`.split($\)
-      # prepend the submodule path to create absolute file paths
-      submodule_files_fullpaths = submodule_files.map do |filename|
-        "#{submodule_path}/#{filename}"
-      end
-      # remove leading path parts to get paths relative to the gem's root dir
-      # (this assumes, that the gemspec resides in the gem's root dir)
-      submodule_files_paths = submodule_files_fullpaths.map do |filename|
-        filename.gsub "#{File.dirname(__FILE__)}/", ""
-      end
-      # add relative paths to gem.files
-      spec.files += submodule_files_paths
-    end
-  end
 
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -47,8 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 3.1"
   spec.add_dependency "thor"
   spec.add_dependency "btce", '0.2.4'
-  spec.add_dependency "coinbase", '1.3.0'
   spec.add_dependency "stathat"
+  spec.add_dependency "coinbase", '2.1.0'
   spec.add_dependency "pony"
   spec.add_dependency "tco", "0.1.0"
+  spec.add_dependency "bitstamp-rbtc-arbitrage"
 end

spec/spec_helper.rb

@@ -24,6 +24,7 @@
   c.ignore_request do |request|
     # true
   end
+  c.filter_sensitive_data("<COINBASE_KEY>") { ENV['COINBASE_KEY'] }
   c.configure_rspec_metadata!
 end