rapflag 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ffaa4c17111d1c37c02118a096dff0930a93819
-  data.tar.gz: 2787ec4a5db18aee84c1947aeb2c5cfeac173a08
+  metadata.gz: 72ac31a1ed8f02d2602c12a87d0ca55a79b00d67
+  data.tar.gz: c6e7abce5e56208207a88a2d98b585555f25cdae
 SHA512:
-  metadata.gz: ae3137d9aee15c69368d7d61d98effb9d8c383ad4cd338a4e63bdeb33264348af3de3d57b5a4175bc09c9250b18efecc798de10eab82c53eae4a4c74f064a336
-  data.tar.gz: 893844bbc5508ce8effda45098b1de91baaae9834ebb86d7359926662d901d248e5adbacbdfabe37cda8880429575151535d1757b85887a7faab220521191f4a
+  metadata.gz: e72b855a3bf4f541f72abd75dbdb3ef2a3150fdd2e71ffced58c22b41d4fc19c51af6cf817e1421308f2ce56405020c4a0d77861d9ee85ccc6fd3c7715455217
+  data.tar.gz: 00c95b069c5eb24d6ec2eb50e958bdb40aba1cd341ae238be597b0d8c573788f1c7fa9b1de2099f32c2510647081042888083daa942886295bda673c216adc97

data/History.md

@@ -1,3 +1,7 @@
+# 0.0.7 of 2017.04.17
+
+* Wait (possibly several times) when we hit the rate limiter of the bitfinex REST API
+
 # 0.0.6 of 2017.04.11
 
 * Download complete lending history not only he default of 500 items

data/README.md

@@ -1,5 +1,5 @@
 # rapflag
-Bitfinex Exporter for your Taxman.
+Bitfinex and Poloniex Exporter for your Taxman.
 
 ### set your key, desired currencies in
 ```
@@ -12,10 +12,14 @@ currencies: [ 'USD', 'BTC', 'BFX']
 api_key: ''
 secret: ''
 ```
+comment out "currencies" if you want to export all currencies.
 ### run as follows
 ```
-ruby rapflag.rb
-ruby rapflag.rb -c (clean option to show daily income and daily value of your wallet)
+Options:
+  -c, --clean       Create Bitfinex summary of transactions by day
+  -p, --poloniex    Use Poloniex API instead of Bitfinex API
+  -d, --dump        Use Poloniex API and dump history into CSV files
+  -h, --help        Show this message
 ```
 Enjoy your reports. More to come. Feedback always welcome.
 

data/bin/rapflag

@@ -13,7 +13,7 @@ rescue LoadError
 end
 
 Opts = Trollop::options do
-  opt :clean, "Create summary of transactions by day"
+  opt :clean, "Create Bitfinex summary of transactions by day"
   opt :poloniex, "Use Poloniex API instead of Bitfinex API"
   opt :dump, "Use Poloniex API and dump history into CSV files"
 end

data/lib/rapflag/bitfinex.rb

@@ -52,25 +52,31 @@ module RAPFLAG
 
     def fetch_csv_history
       @history = []
+      delay_in_seconds = 30
       check_config
       client = ::Bitfinex::Client.new
       timestamp = Time.now.to_i + 1
       while true
         begin
-          partial = client.history(@currency, { :limit => 500, :until => timestamp, :wallet => @wallet})
-          break unless partial && partial.size > 0
-          if partial.is_a?(Hash)
-            puts "Got #{partial['error']} while fetching #{@wallet} #{@currency} until #{Time.at(timestamp)}"
-            exit 3
+          partial = nil
+          while true
+            partial = client.history(@currency, { :limit => 1000, :until => timestamp, :wallet => @wallet})
+            if partial.is_a?(Hash) && (partial.size > 0) && partial['error'].eql?('ERR_RATE_LIMIT')
+              puts "Got #{partial['error']} while fetching #{@wallet} #{@currency} #{client.history} items"
+              puts "  Will wait #{delay_in_seconds} seconds before retrying"
+              sleep(delay_in_seconds)
+            end
+            break if partial && partial.is_a?(Array)
           end
+          break if partial.size <= 1
           first_time = Time.at(partial.first['timestamp'].to_i).strftime(DATE_TIME_FORMAT)
           last_time = Time.at(partial.last['timestamp'].to_i).strftime(DATE_TIME_FORMAT)
-          puts "Feched #{partial.size} @history entries #{first_time} -> #{last_time}"  if $VERBOSE
+          puts "Fetched #{partial.size} @history entries #{first_time} -> #{last_time}"  if $VERBOSE
           timestamp = (partial.last['timestamp'].to_i - 1)
           @history = @history | partial
-          break if partial.size <= 1
         rescue => error
           puts "error #{error}"
+          puts " backtrace: #{error.backtrace[0..10].join("\n")}"
         end
       end
       puts "Feched #{@history.size} history entries" if $VERBOSE

data/lib/rapflag/config.rb

@@ -16,12 +16,16 @@ module RAPFLAG
       break
     end
   end
-  unless config_file && File.exist?(config_file)
-    puts "You must first add. Use one of the following places #{files_to_test}"
-    exit 2
-  end
+  if defined?(RSpec)
+    Config = Hash.new
+  else
+    unless config_file && File.exist?(config_file)
+      puts "You must first add a config.yml. Use one of the following places #{files_to_test}"
+      exit 2
+    end
 
-  Config= YAML.load_file(config_file)
+    Config= YAML.load_file(config_file)
+  end
   Config['currencies'] ||= ['BTC', 'BFX', 'XMR', 'ZEC']
   Config['currencies'] << 'USD' unless Config['currencies'].index('USD')
 end

data/lib/rapflag/version.rb

@@ -1,4 +1,4 @@
 module RAPFLAG
   Wallets = ['trading', 'exchange', 'deposit']
-  VERSION='0.0.6'
+  VERSION='0.0.7'
 end

data/spec/spec_helper.rb

@@ -8,6 +8,11 @@ require 'rapflag/config'
 require 'bitfinex-api-rb'
 require 'poloniex'
 
+RAPFLAG::Config['poloniex_api_key'] = 'dummy poloniex_api_key'
+RAPFLAG::Config['poloniex_secret']  = 'dummy poloniex_secret'
+RAPFLAG::Config['api_key'] = 'dummy bitfinex api_key'
+RAPFLAG::Config['secret']  = 'dummy bitfinex secret'
+
 module RAPFLAG
   # create dummy config for spec tests
   Bitfinex::Client.configure do |conf|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapflag
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ypoloniex