interactive_brokers_2_tasty_works 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5da3529ee36a231a2ae0f886d9fffca70210ee0f8c6c4e1253942fefaa77a2d
-  data.tar.gz: 98f28bcc63d0bc1ea929d610cc59c130e2d5b4a87023cad08a9b6c3ca73223e7
+  metadata.gz: 863983279975a5eb786885e48bb92933181e179f6c1d99d7a5858a0c72ead21e
+  data.tar.gz: e656aa6e2c917ef034c839553f03d137a7ac37bd9d633bbf8ea86f28873ae5b7
 SHA512:
-  metadata.gz: 23d68aea06ed3f7a252101294e72b8a7566723b819430c5a28a98c1a093b90f2bbadfc5224878ca3509e618b4b4181220e0ce0c93a95311bb08cd2e159828e6f
-  data.tar.gz: d2ebf3afeff29dc2e9b0300b61bc756674bb1740d407539ad9a8d5ef824b4debb122a0e41f91d1fe7d2749ce347b5d9b3d1173ee5de6abcb6ab4042accd4e3d3
+  metadata.gz: 4457b86322469c760021ab2046b7b2aa0ece5e51c279af331aae43e21ad6aecc6e463ab2049295896b30fdbdcf7a16b48ff3aea34b2f969de02d3ef98533bee7
+  data.tar.gz: 19dc89f4ffd60a37ca565eda0b23f860a785b5d62e28f4b53bd90478402c8ab5e5befd92255334b91dca70214fac03fce96dcb3019d79d04deffea9949fa1ec4

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    interactive_brokers_2_tasty_works (0.2.0)
+    interactive_brokers_2_tasty_works (0.3.0)
       activesupport
       xmlhasher
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     byebug (10.0.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     diff-lcs (1.3)
     escape_utils (1.2.1)
-    i18n (1.1.1)
+    i18n (1.3.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     ox (2.10.0)

data/README.md

@@ -5,7 +5,7 @@ This library converts the output of an Interactive Brokers Execution Flex Query
 ### Flex Query Parameters in Interactive Brokers
 
 - Leave all defaults
-- Set time period to LAST 365 DAYS
+- Set time period to LAST 365 DAYS (or whatever you want, really)
 - In Sections, select Trades
     + Select Executions
     + Select All
@@ -26,13 +26,19 @@ Or install it yourself as:
 
     $ gem install interactive_brokers_2_tasty_works
 
-## Command Line Usage
+## Usage
 
-`ib2tw /path/to/input.xml /path/to/output.csv`
+`InteractiveBrokers2TastyWorks.new(input_path: '~/trades.xml').save_as("/tmp/trades.csv")`
 
-## Programatic Usage
+### Adding additional fields to the output (non standard output format)
 
-`InteractiveBrokers2TastyWorks.new(input_path: '~/trades.xml').save_as("/tmp/trades.csv")`
+```
+InteractiveBrokers2TastyWorks.new(input_path: '~/trades.xml', add_output: ['ibExecID', 'ibOrderID'])
+
+# or to specify a different header for the additional fields
+
+InteractiveBrokers2TastyWorks.new(input_path: '~/trades.xml', add_output: { ibExecID: 'IB Execution ID', ibOrderID: 'IB Order ID' })
+```
 
 ## Development
 

data/interactive_brokers_2_tasty_works.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-
-  spec.executables   = ["ib2tw"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/interactive_brokers_2_tasty_works.rb

@@ -19,10 +19,11 @@ class InteractiveBrokers2TastyWorks
                    'Average Price', 'Commissions', 'Fees', 'Multiplier', 'Underlying Symbol', 'Expiration Date',
                    'Strike Price', 'Call or Put']
 
-  def initialize(data_hash: nil, input_path: nil, file_format: :xml)
+  def initialize(data_hash: nil, input_path: nil, file_format: :xml, add_output: nil)
     @data_hash   = data_hash
     @input_path  = input_path
     @file_format = file_format
+    @add_output  = add_output
 
     raise ArgumenrError.new("Must specify `data_hash` or `input_path`.") if data_hash.empty? && input_path.empty?
 
@@ -31,8 +32,6 @@ class InteractiveBrokers2TastyWorks
       file_format = file_format.to_s.to_sym unless file_format.is_a?(Symbol)
       raise ArgumentError.new("Unknown file format: #{file_format}") unless %i(xml json).include?(file_format)
     end
-
-    Time.zone ||= Time.now.getlocal.zone
   end
 
   def save_as(output_path)
@@ -48,7 +47,8 @@ class InteractiveBrokers2TastyWorks
   private
 
   def convert!
-    output = [OUTPUT_HEADER]
+    output = [add_output_headers ? (OUTPUT_HEADER + add_output_headers) : OUTPUT_HEADER]
+    # require 'byebug';byebug
 
     trades = if data_hash[:FlexQueryResponse].is_a?(Array)
       data_hash[:FlexQueryResponse][1][:FlexStatements][1][:FlexStatement][1][:Trades][:Trade]
@@ -77,8 +77,9 @@ class InteractiveBrokers2TastyWorks
         trade[:strike],
         Utils.put_or_call(trade)
       ]
-    end
 
+      output.last.concat(add_output_values(trade)) if add_output_values(trade)
+    end
     output
   end
 
@@ -96,6 +97,34 @@ class InteractiveBrokers2TastyWorks
     end
   end
 
+  def add_output_values(trade)
+    return nil unless @add_output.present?
+
+    add_output_fields.map { |f| Utils.indifferent_fetch(trade, f) }
+    # output = []
+    # add_output_fields.each do |f|
+    #   output << trade[f]
+    # end
+
+    # output
+  end
+
+  def add_output_fields
+    if @add_output.is_a?(Hash)
+      @add_output.keys
+    elsif @add_output.is_a?(Array)
+      @add_output
+    end
+  end
+
+  def add_output_headers
+    if @add_output.is_a?(Hash)
+      @add_output.values
+    elsif @add_output.is_a?(Array)
+      @add_output
+    end
+  end
+
   module Utils
     class << self
       def build_date_time_str(trade)
@@ -165,6 +194,12 @@ class InteractiveBrokers2TastyWorks
         return nil unless trade[:assetCategory] == 'OPT'
         trade[:putCall] == 'P' ? 'PUT' : 'CALL'
       end
+
+      def indifferent_fetch(h, key)
+        h.fetch(key)
+      rescue KeyError
+        h[key.is_a?(String) ? key.to_sym : key.to_s]
+      end
     end
   end
 end

data/lib/interactive_brokers_2_tasty_works/version.rb

@@ -1,3 +1,3 @@
 class InteractiveBrokers2TastyWorks
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactive_brokers_2_tasty_works
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Carl Mercier
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,7 @@ dependencies:
 description: Interactive Brokers to Tasty Works trade statement converter
 email:
 - foss@carlmercier.com
-executables:
-- ib2tw
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,7 +111,6 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/ib2tw
 - bin/setup
 - interactive_brokers_2_tasty_works.gemspec
 - lib/interactive_brokers_2_tasty_works.rb

data/bin/ib2tw

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/interactive_brokers_2_tasty_works'
-
-if ARGV[0].nil? || ARGV[1].nil? || ARGV[0].include?('--help') || ARGV[0].include?('-?')
-  puts "\nUsage: ./ib2tw /path/to/input.xml /path/to/output.csv\n\n"
-  exit 1
-end
-
-input_file = File.expand_path(ARGV[0])
-output_file = File.expand_path(ARGV[1])
-
-unless File.exists?(input_file)
-  puts "\nFile not found: #{input_file}\n\n"
-  exit 1
-end
-
-puts "\n"
-puts "Input: #{input_file}"
-puts "Output: #{output_file}\n"
-puts "Converting..."
-
-InteractiveBrokers2TastyWorks.new(input_path: input_file).save_as(output_file)
-
-puts "Done!"