ib-api 972.3.1 → 972.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308cf77f0e3710e72998e8f645c7fd1465d7be1831a9ddc48b673499e1533709
-  data.tar.gz: 7695bd42bf2d174dd124fc93bb2786d77f0301ef63a62f6918c6115dd6aca5df
+  metadata.gz: fe3f4d98e27f1480eafe5ed066e42410fc97527fef692aba69b02a1db61836de
+  data.tar.gz: 8e9e733f6e383313a4c4275d5f95853944c573fb543c78f85280d41988c0e842
 SHA512:
-  metadata.gz: 3f9da9a7fc9cef3ff061cc48c0f3508be2b7111f70fe65111cf8683efb03b33e7a80ad2a56093206bed15223adb6e2155c104db1e3f5a36cff52faf46a82e064
-  data.tar.gz: f7d6ac4e1a73efdeed9032e6302df00efa3881ffaa98ca6ff557cc9c989d89c245e8a7782ecf0be0ba75f5cea938d839090ac92ca696fa78fef8e8b514b5d769
+  metadata.gz: 306dfc26bb138a25e1f9136a24f590d47ac1f555f94936960287937888e50c107bb7bc6f5c9f802ceb6096218a4c4a22ba363b36bccb47f25c206ea6f71b0772
+  data.tar.gz: 4d97ce95ccc74a2c3b6d1d88b0472433b0a9382bc5433d0fd100337d6906a84570d09c363e8282e44259deb0bf8f21cfe80814a904d46e8379938ec8b7f67b9a

data/Gemfile.lock

@@ -1,22 +1,22 @@
 GIT
   remote: https://github.com/ohler55/ox.git
-  revision: 67ce6ecb45a0d1354e1f8ed9a155826ba986e21e
+  revision: 59c4234fe01fb5de08d49b39ecf5fc7338c1ffdc
   specs:
-    ox (2.13.4)
+    ox (2.14.4)
 
 PATH
   remote: .
   specs:
-    ib-api (972.2)
+    ib-api (972.3.1)
       activemodel
       activesupport (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.2.1)
-      activesupport (= 6.1.2.1)
-    activesupport (6.1.2.1)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -25,7 +25,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    ffi (1.13.1)
+    ffi (1.15.0)
     formatador (0.2.5)
     guard (2.16.2)
       formatador (>= 0.2.4)
@@ -41,52 +41,52 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.3)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     shellany (0.0.1)
-    thor (1.0.1)
+    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     value_semantics (3.6.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -101,4 +101,4 @@ DEPENDENCIES
   value_semantics
 
 BUNDLED WITH
-   1.17.3
+   2.2.3

data/VERSION

@@ -1 +1 @@
-972.3.1
+972.4

data/bin/console

@@ -10,8 +10,6 @@
 require 'bundler/setup'
 require 'yaml'
 
-require 'logger'
-
 require 'ib-api'
 
 class Array
@@ -47,7 +45,6 @@ read_yml = -> (key) do
   puts "Namespace is IB ! "
   puts
   puts '-'* 45
-	include LogDev
   include IB
   require 'irb'
   client_id = ARGV[1] || read_yml[:client_id]
@@ -62,16 +59,15 @@ read_yml = -> (key) do
 					end
 
   ARGV.clear
-  logger = default_logger #  Logger.new  STDOUT
 	
   ## The Block takes instructions which are executed  after initializing all instance-variables
   ## and prior to the connection-process
   ## Here we just subscribe to some events  
   C =  Connection.new  client_id: client_id, port: port  do |c|  # future use__ , optional_capacities: "+PACEAPI"  do |c|
 
-    c.subscribe( :ContractData, :BondContractData) { |msg| logger.info { msg.contract.to_human } }
-    c.subscribe( :Alert, :ContractDataEnd, :ManagedAccounts, :OrderStatus ) {| m| logger.info { m.to_human } }
-    c.subscribe( :PortfolioValue, :AccountValue, :OrderStatus, :OpenOrderEnd, :ExecutionData ) {| m| logger.info { m.to_human }}
+    c.subscribe( :ContractData, :BondContractData) { |msg| c.logger.info { msg.contract.to_human } }
+    c.subscribe( :Alert, :ContractDataEnd, :ManagedAccounts, :OrderStatus ) {| m| c.logger.info { m.to_human } }
+    c.subscribe( :PortfolioValue, :AccountValue, :OrderStatus, :OpenOrderEnd, :ExecutionData ) {| m| c.logger.info { m.to_human }}
 #    c.subscribe :ManagedAccounts do  |msg|
 #        puts "------------------------------- Managed Accounts ----------------------------------"
 #				puts "Detected Accounts: #{msg.accounts.account.join(' -- ')} " 
@@ -79,8 +75,8 @@ read_yml = -> (key) do
 #    end
 
     c.subscribe( :OpenOrder){ |msg|  "Open Order detected and stored: C.received[:OpenOrders] " }
-		c.logger.level = Logger::INFO 
 	end 
+  C.logger.level = Logger::INFO 
   unless  C.received[:OpenOrder].blank?
         puts "------------------------------- OpenOrders ----------------------------------"
     puts C.received[:OpenOrder].to_human.join "\n"

data/lib/ib/connection.rb

@@ -1,14 +1,10 @@
 require 'thread'
 #require 'active_support'
 require 'ib/socket'
-require 'ib/logger'
+require 'logger'
+require 'logging'
 require 'ib/messages'
 
-module TechnicalAnalysis
-  module Signals
-  end
-end
-
 module IB
   # Encapsulates API connection to TWS or Gateway
   class Connection
@@ -23,10 +19,9 @@ module IB
   ## public data-queue: received,  received?, wait_for, clear_received
   ## misc:	      reader_running?
 
-  include LogDev   # provides default_logger
+  include Support::Logging   # provides default_logger
 
     mattr_accessor :current
-    mattr_accessor :logger  ## borrowed from active_support
     # Please note, we are realizing only the most current TWS protocol versions,
     # thus improving performance at the expense of backwards compatibility.
     # Older protocol versions support can be found in older gem versions.
@@ -45,7 +40,7 @@ module IB
                    connect: true, # Connect at initialization
                    received:  true, # Keep all received messages in a @received Hash
 #									 redis: false,    # future plans
-                   logger: default_logger,
+                   logger: nil,
                    client_id:  rand( 1001 .. 9999 ) ,
                    client_version: IB::Messages::CLIENT_VERSION,	# lib/ib/server_versions.rb
 									 optional_capacities: "", # TWS-Version 974: "+PACEAPI"
@@ -54,17 +49,13 @@ module IB
 			 # V 974 release motes
 # API messages sent at a higher rate than 50/second can now be paced by TWS at the 50/second rate instead of potentially causing a disconnection. This is now done automatically by the RTD Server API and can be done with other API technologies by invoking SetConnectOptions("+PACEAPI") prior to eConnect.
 
-
+    self.class.configure_logger logger
     # convert parameters into instance-variables and assign them
-		method(__method__).parameters.each do |type, k|
-			next unless type == :key
-			case k
-			when :logger
-				self.logger = logger
-			else
+    method(__method__).parameters.each do |type, k|
+			next unless type == :key  ##  available: key , keyrest
+      next if k.to_s == 'logger'
 				v = eval(k.to_s)
 				instance_variable_set("@#{k}", v) unless v.nil?
-			end
 		end
 
 		# A couple of locks to avoid race conditions in JRuby
@@ -84,9 +75,9 @@ module IB
 		yield self if block_given?
 
 		self.subscribe(:NextValidId) do |msg|
-			logger.progname = "Connection#connect"
+      self.logger.progname = "Connection#connect"
 			self.next_local_id = msg.local_id
-			logger.info { "Got next valid order id: #{next_local_id}." }
+      self.logger.info { "Got next valid order id: #{next_local_id}." }
 		end
 
 		# Ensure the transmission of NextValidId.

data/lib/ib/logger.rb

@@ -18,7 +18,7 @@ module LogDev
 	end
 
 	# Add universally accessible log method/accessor into Object
-	def log *args
+	def logger *args
 		default_logger.tap do |logger|
 			logger.fatal *args unless args.empty?
 		end

data/lib/logging.rb

@@ -0,0 +1,45 @@
+#module Kernel
+#  private
+#  def this_method_name
+#    caller[0] =~ /`([^']*)'/  and $1
+#  end
+#   see also __method__  and __callee__
+#end
+
+
+
+module Support
+	module Logging
+		def self.included(base)
+			base.extend ClassMethods
+			base.send :define_method, :logger do
+				base.logger
+			end
+		end
+
+		module ClassMethods
+			def logger
+				@logger
+			end
+
+			def logger=(logger)
+				@logger = logger
+			end
+
+			def configure_logger(log=nil)
+				if log
+					@logger = log
+				else
+          @logger = Logger.new(STDOUT)
+					@logger.level = Logger::INFO
+					@logger.formatter = proc do |severity, datetime, progname, msg|
+					#	"#{datetime.strftime("%d.%m.(%X)")}#{"%5s" % severity}->#{msg}\n"
+						"#{"%5s" % severity}::#{msg}\n"
+					end
+            @logger.debug "------------------------------ start logging ----------------------------"
+				end # branch
+			end # def
+		end # module ClassMethods
+	end # module Logging
+end # module Support
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ib-api
 version: !ruby/object:Gem::Version
-  version: 972.3.1
+  version: '972.4'
 platform: ruby
 authors:
 - Hartmut Bischoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - lib/ib/socket.rb
 - lib/ib/support.rb
 - lib/ib/version.rb
+- lib/logging.rb
 - lib/models/ib/account.rb
 - lib/models/ib/account_value.rb
 - lib/models/ib/bag.rb