ig_markets 0.28 → 0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb9a35321ec6be744a90297554801dda3b386ac
-  data.tar.gz: a48c71086d5b6384ebcd564bad98125fb4fd660f
+  metadata.gz: 187077cf0cdb9a078657a52a828e246bf7dcfe66
+  data.tar.gz: 1ce4e0be008ef0d432257ecc126ff0637b76bb89
 SHA512:
-  metadata.gz: 377a03f5f52f38011387628d4beda79ba53bf611a4d079bcb6583d32bb8fa6d6a70ad7ce03e8d0d97f44733a80708c3cd0d8469c1dc466a50f7a65ab4f55601c
-  data.tar.gz: ef6fd8c0825baffadcf19a21efe2e02e6bf7146b105f756a27f7bf7d251ae29a8f227c46282dcbfe3bc332b693117f4a34a3b79848c688528d91dbf81927cb75
+  metadata.gz: 4e50a5d55b0b8215a2c03e00f57424c61b0bddb04a8dc46558dd1fdc36a08b1335f0b8d37219bea25fdc8e0a5ca17822135ba3119718461ad0e0b84116c482d8
+  data.tar.gz: e509ac730be8ba25036a347649ebf059148f451405c77125a728de390acdbf30393c3d7ab0dc341f84837bff2adf8185568eb22d50623e74b75ba19e6abbf7e4

data/CHANGELOG.md

@@ -1,9 +1,20 @@
 # IG Markets Changelog
 
+### 0.29 — March 8, 2017
+
+- The `IGMarkets::AccountMethods#activities` and `IGMarkets::AccountMethods#transactions` now take `Time`
+  values for `:from` and `:to` instead of `Date` values
+- The `ig_markets activities`, `ig_markets performance` and `ig_markets transactions` commands now expect
+  their optional `--from` option to be formatted as `yyyy-mm-ddThh:mm:ss`
+- Fixed `IGMarkets::AccountMethods#activities` and `IGMarkets::AccountMethods#transactions` never returning
+  if there were more than 500 activities or transactions in a single day during the specified period
+- Added `IGMarkets::Position#limited_risk_premium` and `IGMarkets::WorkingOrder#limited_risk_premium`
+- Supprt the `chart` transaction type
+
 ### 0.28 — February 24, 2017
 
-- Added IGMarkets::Instrument#limited_risk_premium
-- Added IGMarkets::Transaction#open_date_utc
+- Added `IGMarkets::Instrument#limited_risk_premium`
+- Added `IGMarkets::Transaction#open_date_utc`
 - Added `#currency`, `#good_till_date`, `#order_type` and `#time_in_force` attributes to
   `IGMarkets::Streaming::WorkingOrderUpdate`
 - Fixed `IGMarkets::AccountState` not updating its working orders when a level update is received

data/README.md

@@ -119,7 +119,7 @@ ig_markets account
 # Print EUR/USD transactions from the last week, excluding interest transactions
 ig_markets transactions --days 7 --instrument EUR/USD --no-interest
 
-# Search for EURUSD markets
+# Search for EURUSD currency markets
 ig_markets search EURUSD --type currencies
 
 # Print details for the EURUSD pair and the Dow Jones Industrial Average
@@ -181,13 +181,16 @@ ig = IGMarkets::DealingPlatform.new
 ig.sign_in 'username', 'password', 'api_key', :demo
 ig.sign_out
 
+one_week = 7 * 24 * 60 * 60
+two_weeks = 14 * 24 * 60 * 60
+
 # Account
 ig.account.all
-ig.account.activities from: Date.today - 7
-ig.account.activities from: Date.today - 14, to: Date.today - 7
-ig.account.transactions from: Date.today - 7
-ig.account.transactions from: Date.today - 14, to: Date.today - 7
-ig.account.transactions from: Date.today - 14, to: Date.today - 7, type: :withdrawal
+ig.account.activities from: Time.now - one_week
+ig.account.activities from: Time.now - one_week, to: Time.now - one_week
+ig.account.transactions from: Time.now - one_week
+ig.account.transactions from: Time.now - two_weeks, to: Time.now - one_week
+ig.account.transactions from: Time.now - two_weeks, to: Time.now - one_week, type: :withdrawal
 
 # Dealing
 ig.deal_confirmation 'deal_reference'

data/lib/ig_markets.rb

@@ -35,6 +35,7 @@ require 'ig_markets/dealing_platform/watchlist_methods'
 require 'ig_markets/dealing_platform/working_order_methods'
 require 'ig_markets/errors'
 require 'ig_markets/format'
+require 'ig_markets/limited_risk_premium'
 require 'ig_markets/instrument'
 require 'ig_markets/historical_price_result'
 require 'ig_markets/market'

data/lib/ig_markets/cli/commands/account_command.rb

@@ -8,7 +8,7 @@ module IGMarkets
         self.class.begin_session(options) do |dealing_platform|
           accounts = dealing_platform.account.all
 
-          table = AccountsTable.new accounts
+          table = Tables::AccountsTable.new accounts
 
           puts table
         end

data/lib/ig_markets/cli/commands/activities_command.rb

@@ -5,7 +5,7 @@ module IGMarkets
       desc 'activities', 'Prints account activities'
 
       option :days, type: :numeric, required: true, desc: 'The number of days to print account activities for'
-      option :from, desc: 'The start date to print account activities from, format: yyyy-mm-dd'
+      option :from, desc: 'The date and time to print account activities from, format: yyyy-mm-ddThh:mm:ss'
       option :epic, desc: 'Regex for filtering activities based on their EPIC'
       option :sort_by, enum: %w(channel date epic type), default: 'date', desc: 'The attribute to sort activities by'
 
@@ -15,7 +15,7 @@ module IGMarkets
 
           activities = gather_activities dealing_platform
 
-          table = ActivitiesTable.new activities
+          table = Tables::ActivitiesTable.new activities
 
           puts table
         end

data/lib/ig_markets/cli/commands/markets_command.rb

@@ -8,7 +8,7 @@ module IGMarkets
         self.class.begin_session(options) do |dealing_platform|
           markets = dealing_platform.markets.find(*epics)
 
-          table = MarketsTable.new markets
+          table = Tables::MarketsTable.new markets
 
           puts table
         end

data/lib/ig_markets/cli/commands/orders_command.rb

@@ -8,7 +8,7 @@ module IGMarkets
         Main.begin_session(options) do |dealing_platform|
           working_orders = dealing_platform.working_orders.all
 
-          table = WorkingOrdersTable.new working_orders
+          table = Tables::WorkingOrdersTable.new working_orders
 
           puts table
         end

data/lib/ig_markets/cli/commands/performance_command.rb

@@ -5,14 +5,14 @@ module IGMarkets
       desc 'performance', 'Prints a summary of trading performance over a period'
 
       option :days, type: :numeric, required: true, desc: 'The number of days to print performance for'
-      option :from, desc: 'The start date to show performance from, format: yyyy-mm-dd'
+      option :from, desc: 'The date and time to show performance from, format: yyyy-mm-ddThh:mm:ss'
 
       def performance
         self.class.begin_session(options) do |dealing_platform|
           performances = gather_performances dealing_platform
           lookup_instrument_names performances, dealing_platform
 
-          table = PerformancesTable.new performances
+          table = Tables::PerformancesTable.new performances
 
           puts table
 

data/lib/ig_markets/cli/commands/positions_command.rb

@@ -12,7 +12,7 @@ module IGMarkets
             position.market.instrument_type == :binary
           end
 
-          positions_table = PositionsTable.new positions, aggregate: options[:aggregate]
+          positions_table = Tables::PositionsTable.new positions, aggregate: options[:aggregate]
 
           puts positions_table
 

data/lib/ig_markets/cli/commands/prices_command.rb

@@ -19,7 +19,7 @@ module IGMarkets
           result = historical_price_result dealing_platform
           allowance = result.metadata.allowance
 
-          table = HistoricalPriceResultSnapshotsTable.new result.prices, title: "Prices for #{options[:epic]}"
+          table = Tables::HistoricalPriceResultSnapshotsTable.new result.prices, title: "Prices for #{options[:epic]}"
 
           puts <<-END
 #{table}

data/lib/ig_markets/cli/commands/search_command.rb

@@ -11,7 +11,7 @@ module IGMarkets
         self.class.begin_session(options) do |dealing_platform|
           market_overviews = gather_market_overviews dealing_platform, query
 
-          table = MarketOverviewsTable.new market_overviews
+          table = Tables::MarketOverviewsTable.new market_overviews
 
           puts table
         end

data/lib/ig_markets/cli/commands/sentiment_command.rb

@@ -9,7 +9,7 @@ module IGMarkets
           client_sentiment = dealing_platform.client_sentiment[market]
           client_sentiments = [client_sentiment, :separator, client_sentiment.related_sentiments]
 
-          table = ClientSentimentsTable.new client_sentiments, title: "Client sentiment for '#{market}'"
+          table = Tables::ClientSentimentsTable.new client_sentiments, title: "Client sentiment for '#{market}'"
 
           puts table
         end

data/lib/ig_markets/cli/commands/sprints_command.rb

@@ -10,7 +10,7 @@ module IGMarkets
 
           markets = dealing_platform.markets.find sprints.map(&:epic).uniq
 
-          table = SprintMarketPositionsTable.new sprints, markets: markets
+          table = Tables::SprintMarketPositionsTable.new sprints, markets: markets
 
           puts table
         end

data/lib/ig_markets/cli/commands/stream_command.rb

@@ -109,9 +109,12 @@ module IGMarkets
         account_state.process_queued_data
 
         window.clear
-        window.print_lines AccountsTable.new(account_state.accounts).lines, '',
-                           PositionsTable.new(account_state.positions, aggregate: options[:aggregate]).lines, '',
-                           WorkingOrdersTable.new(account_state.working_orders).lines, ''
+        window.print_lines Tables::AccountsTable.new(account_state.accounts).lines,
+                           '',
+                           Tables::PositionsTable.new(account_state.positions, aggregate: options[:aggregate]).lines,
+                           '',
+                           Tables::WorkingOrdersTable.new(account_state.working_orders).lines,
+                           ''
         window.refresh
       end
     end

data/lib/ig_markets/cli/commands/transactions_command.rb

@@ -5,7 +5,7 @@ module IGMarkets
       desc 'transactions', 'Prints account transactions'
 
       option :days, type: :numeric, required: true, desc: 'The number of days to print account transactions for'
-      option :from, desc: 'The start date to print account transactions from, format: yyyy-mm-dd'
+      option :from, desc: 'The date and time to print account transactions from, format: yyyy-mm-ddThh:mm:ss'
       option :instrument, desc: 'Regex for filtering transactions based on their instrument'
       option :interest, type: :boolean, default: true, desc: 'Whether to show interest deposits and withdrawals'
       option :sort_by, enum: %w(date instrument profit-loss type), default: 'date', desc: 'The attribute to sort ' \
@@ -17,7 +17,7 @@ module IGMarkets
 
           transactions = gather_transactions dealing_platform
 
-          table = TransactionsTable.new transactions
+          table = Tables::TransactionsTable.new transactions
 
           puts table
 

data/lib/ig_markets/cli/commands/watchlists_command.rb

@@ -7,7 +7,7 @@ module IGMarkets
       def list
         Main.begin_session(options) do |dealing_platform|
           dealing_platform.watchlists.all.each_with_index do |watchlist, index|
-            table = MarketOverviewsTable.new watchlist.markets, title: table_title(watchlist)
+            table = Tables::MarketOverviewsTable.new watchlist.markets, title: table_title(watchlist)
 
             puts '' if index > 0
             puts table

data/lib/ig_markets/cli/main.rb

@@ -30,13 +30,15 @@ module IGMarkets
       # Turns the `:days` and `:from` options into a hash with `:from` and `:to` keys that can be passed to
       # {AccountMethods#activities} and {AccountMethods#transactions}.
       def history_options
+        days_in_seconds = options[:days] * 24 * 60 * 60
+
         if options[:from]
-          from = Date.strptime options[:from], '%F'
-          to = from + options[:days]
+          from = Time.strptime options[:from], '%FT%T'
+          to = from + days_in_seconds
 
           { from: from, to: to }
         else
-          { from: Date.today - options[:days] }
+          { from: Time.now - days_in_seconds }
         end
       end
 

data/lib/ig_markets/cli/tables/accounts_table.rb

@@ -1,38 +1,41 @@
 module IGMarkets
   module CLI
-    # Helper class that prints out an array of {IGMarkets::Account} instances in a table.
-    class AccountsTable < Table
-      private
+    module Tables
+      # Helper class that prints out an array of {IGMarkets::Account} instances in a table.
+      class AccountsTable < Table
+        private
 
-      def default_title
-        'Accounts'
-      end
+        def default_title
+          'Accounts'
+        end
 
-      def headings
-        ['Name', 'ID', 'Type', 'Currency', 'Status', 'Preferred', 'Available', 'Balance', 'Margin', 'Profit/loss']
-      end
+        def headings
+          ['Name', 'ID', 'Type', 'Currency', 'Status', 'Preferred', 'Available', 'Balance', 'Margin', 'Profit/loss']
+        end
 
-      def right_aligned_columns
-        [6, 7, 8, 9]
-      end
+        def right_aligned_columns
+          [6, 7, 8, 9]
+        end
 
-      def row(account)
-        type = { cfd: 'CFD', physical: 'Physical', spreadbet: 'Spreadbet' }.fetch account.account_type
-        status = { disabled: 'Disabled', enabled: 'Enabled', suspended_from_dealing: 'Suspended' }.fetch account.status
+        def row(account)
+          type = { cfd: 'CFD', physical: 'Physical', spreadbet: 'Spreadbet' }.fetch account.account_type
+          status = { disabled: 'Disabled', enabled: 'Enabled',
+                     suspended_from_dealing: 'Suspended' }.fetch account.status
 
-        [account.account_name, account.account_id, type, account.currency, status, account.preferred] +
-          [:available, :balance, :deposit, :profit_loss].map do |attribute|
-            Format.currency account.balance.send(attribute), account.currency
-          end
-      end
+          [account.account_name, account.account_id, type, account.currency, status, account.preferred] +
+            [:available, :balance, :deposit, :profit_loss].map do |attribute|
+              Format.currency account.balance.send(attribute), account.currency
+            end
+        end
 
-      def cell_color(value, _model, _row_index, column_index)
-        return unless headings[column_index] == 'Profit/loss'
+        def cell_color(value, _model, _row_index, column_index)
+          return unless headings[column_index] == 'Profit/loss'
 
-        if value =~ /-/
-          :red
-        else
-          :green
+          if value =~ /-/
+            :red
+          else
+            :green
+          end
         end
       end
     end

data/lib/ig_markets/cli/tables/activities_table.rb

@@ -1,33 +1,35 @@
 module IGMarkets
   module CLI
-    # Helper class that prints out an array of {IGMarkets::Activity} instances in a table.
-    class ActivitiesTable < Table
-      private
+    module Tables
+      # Helper class that prints out an array of {IGMarkets::Activity} instances in a table.
+      class ActivitiesTable < Table
+        private
 
-      def default_title
-        'Activities'
-      end
+        def default_title
+          'Activities'
+        end
 
-      def headings
-        %w(Date Channel Type Status EPIC Market Size Level Limit Stop Result)
-      end
+        def headings
+          %w(Date Channel Type Status EPIC Market Size Level Limit Stop Result)
+        end
 
-      def right_aligned_columns
-        [6, 7, 8, 9]
-      end
+        def right_aligned_columns
+          [6, 7, 8, 9]
+        end
 
-      def row(activity)
-        details = activity.details
+        def row(activity)
+          details = activity.details
 
-        [activity.date, activity.channel, activity.type, activity.status, activity.epic, details.market_name,
-         details.size, details.level, details.limit_level, details.stop_level, action_types(details)]
-      end
+          [activity.date, activity.channel, activity.type, activity.status, activity.epic, details.market_name,
+           details.size, details.level, details.limit_level, details.stop_level, action_types(details)]
+        end
 
-      def action_types(details)
-        types = details.actions.map(&:action_type).uniq
-        types.delete :unknown
+        def action_types(details)
+          types = details.actions.map(&:action_type).uniq
+          types.delete :unknown
 
-        types.map { |v| format_cell_value v }.join ', '
+          types.map { |v| format_cell_value v }.join ', '
+        end
       end
     end
   end

data/lib/ig_markets/cli/tables/client_sentiments_table.rb

@@ -1,29 +1,31 @@
 module IGMarkets
   module CLI
-    # Helper class that prints out an array of {IGMarkets::ClientSentiment} instances in a table.
-    class ClientSentimentsTable < Table
-      private
+    module Tables
+      # Helper class that prints out an array of {IGMarkets::ClientSentiment} instances in a table.
+      class ClientSentimentsTable < Table
+        private
 
-      def headings
-        ['Market', 'Long %', 'Short %']
-      end
+        def headings
+          ['Market', 'Long %', 'Short %']
+        end
 
-      def right_aligned_columns
-        [1, 2]
-      end
+        def right_aligned_columns
+          [1, 2]
+        end
 
-      def row(client_sentiment)
-        [client_sentiment.market_id, client_sentiment.long_position_percentage,
-         client_sentiment.short_position_percentage]
-      end
+        def row(client_sentiment)
+          [client_sentiment.market_id, client_sentiment.long_position_percentage,
+           client_sentiment.short_position_percentage]
+        end
 
-      def cell_color(_value, client_sentiment, _row_index, _column_index)
-        distance_from_center = (client_sentiment.long_position_percentage - 50.0).abs
+        def cell_color(_value, client_sentiment, _row_index, _column_index)
+          distance_from_center = (client_sentiment.long_position_percentage - 50.0).abs
 
-        if distance_from_center > 35
-          :red
-        elsif distance_from_center > 20
-          :yellow
+          if distance_from_center > 35
+            :red
+          elsif distance_from_center > 20
+            :yellow
+          end
         end
       end
     end

data/lib/ig_markets/cli/tables/historical_price_result_snapshots_table.rb

@@ -1,24 +1,26 @@
 module IGMarkets
   module CLI
-    # Helper class that prints out an array of {IGMarkets::HistoricalPriceResult::Snapshot} instances in a table.
-    class HistoricalPriceResultSnapshotsTable < Table
-      private
+    module Tables
+      # Helper class that prints out an array of {IGMarkets::HistoricalPriceResult::Snapshot} instances in a table.
+      class HistoricalPriceResultSnapshotsTable < Table
+        private
 
-      def headings
-        %w(Date Open Close Low High)
-      end
+        def headings
+          %w(Date Open Close Low High)
+        end
 
-      def right_aligned_columns
-        [1, 2, 3, 4]
-      end
+        def right_aligned_columns
+          [1, 2, 3, 4]
+        end
 
-      def row(snapshot)
-        [snapshot.snapshot_time_utc, format_price(snapshot.open_price), format_price(snapshot.close_price),
-         format_price(snapshot.low_price), format_price(snapshot.high_price)]
-      end
+        def row(snapshot)
+          [snapshot.snapshot_time_utc, format_price(snapshot.open_price), format_price(snapshot.close_price),
+           format_price(snapshot.low_price), format_price(snapshot.high_price)]
+        end
 
-      def format_price(price)
-        (price.ask + price.bid) / 2.0
+        def format_price(price)
+          (price.ask + price.bid) / 2.0
+        end
       end
     end
   end