rapflag 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44875993e7dd2c5db62512b8a8baf5f760702e39
-  data.tar.gz: 2888fcf78ccb8954979a8dc0ec40e02b0f099ea7
+  metadata.gz: f2b8cff390019633066b98ec809a1b2456eb34aa
+  data.tar.gz: 9c18b14083112387fa4f8b6974fb87eac80da22d
 SHA512:
-  metadata.gz: 28170281a25a075a5c78703b01b1df4522c5cdafc984dc2f3f158188e775ac9e48b60e300223a2179373835d399f9eab5e4a82a27f654c1e5ed62b670e0376f1
-  data.tar.gz: c19989b208d495d251bfb3c77e841780064500492b4ddba084630fde9a70f9174dca46cf9a50f03a02b3b6af28e7b5cc64da0ce773067d8f5793a26b5009cecc
+  metadata.gz: 768075044d00f00929d92ec72b0ed1392a6576c8b5825bb84cb384dbe3db21ce4370b6f2cca5315558ffae822fee645d2e8e0a9a1c86a0621ea49784d79c7947
+  data.tar.gz: 72351fc81bc992b056f530d4edf12b3123876a1af46781cc0027136b78bfb704967b6a7d39fc2005677131683954da62b496fcbb61fa672828ddef2e8d4aea5d

data/README.md

@@ -1,13 +1,14 @@
 # rapflag
 Bitfinex Exporter for your Taxman.
 
-### set your key in
+### set your key, desired currencies in
 ```
  ./etc/config.yml
 ```
 sample
 ```
 ---
+currencies: [ 'USD', 'BTC', 'BFX']
 api_key: ''
 secret: ''
 ```

data/bin/{rapflag.rb → rapflag}

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+dir =  File.expand_path(File.dirname(File.dirname(__FILE__)))
+$LOAD_PATH << File.join(dir, 'lib')
 require 'rapflag/version'
 require 'rapflag/config'
 require 'rapflag/fetch'
@@ -6,7 +8,7 @@ require 'trollop'
 
 begin
 require 'pry'
-rescue LOAD_ERROR
+rescue LoadError
 end
 
 Opts = Trollop::options do
@@ -14,7 +16,7 @@ Opts = Trollop::options do
 end
 
 RAPFLAG::Wallets.each do |wallet|
-  RAPFLAG::Currencies.each do |currency|
+   RAPFLAG::Config['currencies'].each do |currency|
     rap = RAPFLAG::History.new(wallet, currency)
     rap.fetch_csv_history
     rap.create_csv_file

data/lib/rapflag/config.rb

@@ -5,14 +5,26 @@ module RAPFLAG
 
   # Configure the client with the proper KEY/SECRET, you can create a new one from:
   # https://www.bitfinex.com/api
-  config_file = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'etc', 'config.yml'))
-  unless File.exist?(config_file)
-    puts "You must first add #{config_file}"
+  config_file = nil
+  files_to_test =  [ File.join(Dir.pwd, 'etc', 'config.yml'),
+                     File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'etc', 'config.yml'))
+                   ]
+  files_to_test.each do |file_to_check|
+    if File.exist?(file_to_check)
+      config_file = file_to_check
+      puts "Using config from #{file_to_check}"
+      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
 
   Config= YAML.load_file(config_file)
   Config['websocket_api_endpoint'] ||= 'wss://api.bitfinex.com/ws'
+  Config['currencies'] ||= ['BTC', 'BFX', 'XMR', 'ZEC']
+  Config['currencies'] << 'USD' unless Config['currencies'].index('USD')
   Bitfinex::Client.configure do |conf|
     conf.api_key = Config['api_key']
     conf.secret  = Config['secret']

data/lib/rapflag/fetch.rb

@@ -1,6 +1,7 @@
 require 'csv'
 require 'open-uri'
 require 'faraday'
+require 'fileutils'
 
 module RAPFLAG
 
@@ -53,7 +54,8 @@ module RAPFLAG
       from.eql?('BTC') ? @@btc_to_usd = rates.clone : @@bfx_to_usd = rates.clone
       rates[key] ? rates[key] : nil
     rescue => err
-          binding.pry
+      puts "Err #{err}"
+      binding.pry if defined?(MiniTest)
     end
 
     def fetch_csv_history

data/lib/rapflag/version.rb

@@ -1,7 +1,4 @@
 module RAPFLAG
-
-  Currencies = [ 'USD', 'BTC', 'BFX']
   Wallets = ['trading', 'exchange', 'deposit']
-
-  VERSION='0.0.1'
+  VERSION='0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapflag
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitfinex-rb
@@ -125,7 +125,7 @@ dependencies:
 description: Bitfinex Exporter for your Taxman
 email: zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
-- rapflag.rb
+- rapflag
 extensions: []
 extra_rdoc_files: []
 files:
@@ -136,7 +136,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/rapflag.rb
+- bin/rapflag
 - fixtures/vcr_cassettes/rapflag.yml
 - lib/rapflag/config.rb
 - lib/rapflag/fetch.rb