mytradewizard 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzZmYjUwYzM5NTUxNzZhOTQxZDFhMDJlNDE2YTRkNzk1Yzc2NjZjNA==
+    MmFjYjM5ZGE0Zjc3YWQ2ODIzNTkwNjNhZGYxZDg2OTdkYjllMDQ4Yg==
   data.tar.gz: !binary |-
-    M2MzMWVjYTAzMDU3NmVhNWQzMDdjYTUzMjI0YzhhZjdlZGM2YTJlZA==
+    ODk3N2JiZWZlY2ZkYTU5NDM5NzJjODE3ODliMWI4YzQ2OWRiMTUyMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGYwNDMzYTIxYzQzZDkxM2ExOTQ0MGQ2OTM1NDA3ZmE1NDU2MjkyNGVlY2U2
-    MGUyMWNmMDM2NDBmMGZhZjVjYTBhZjExMjdkODcyNGNkZDBiNGQ4ZjU0YTNl
-    ZGY1NDBiMThkYTY4ZDdlMWU0MjEwNWE3NGRmZGQ3ZmFjODk2ZTI=
+    MmU2ZTQ0OGFlMTgzMjVjNmU4ZGM1MzM0NTZmOGQzNWMwYzdhMzQ0MjVkYTI3
+    ZjAzZGNjMDE4NDMxYjFmZTY5YmRmYzg0ZTYzZWRmMzcyNzBhZTBhOWEyNTVh
+    Y2E2YWU2MTMyYzhlYTI2YWZjZWE4OWQ5N2I5NzQ2ZWVkNWM5ZDA=
   data.tar.gz: !binary |-
-    OGY2OTRlOTk5MDYxMmNmMDQ2ODAwYWFkNDRlYmZjZTcxODY3MmZmYjRkZDVl
-    ODlmMzBmZjM3ZDQ5OTQ0OGRkZWY5ZTE1MzJjMjE3ZmUxYWZlNDcyOWJkODlj
-    NjFhNzE3MzU0NTcyYWEyODYwNzcyNzVjMjllNjYwZDkwMjI2NTM=
+    YTM1Y2I3YjQzNjMzY2JiNzhmODVmMWE5MWI0NjIwMzUyNWExMmY2OWM4YjZm
+    ZDUyNzg5YWUxZWZkYjVjMzlmNmQ3OGM3MTQzNGFhZjBhZTg1YTk0OTgwZTdk
+    YmQ1NjFjNDdjOTkzNGYyNzNiODRlOWUxMmQ1NTIwZjFmZWY1YmM=

data/features/generator.feature

@@ -4,11 +4,11 @@ Feature: Interactive Brokers configuration
 	I want My Trade Wizard to create and use a config file
 	
 	Scenario: Generate Interactive Brokers configuration
-		When I run `mtw configure localhost 7496`
+		When I run `mtw configure --host localhost --port 7496`
 		Then the following files should exist:
-			| ../../config/interactive_brokers.rb |
-		Then the file "../../config/interactive_brokers.rb" should contain "localhost"
-		Then the file "../../config/interactive_brokers.rb" should contain "7496"
+			| ../../config/mytradewizard.rb |
+		Then the file "../../config/mytradewizard.rb" should contain "localhost"
+		Then the file "../../config/mytradewizard.rb" should contain "7496"
 
 	Scenario: Display Interactive Brokers configuration
 		When I run `mtw config`

data/lib/mytradewizard.rb

@@ -15,6 +15,11 @@ require 'mytradewizard/future_trading_system'
 require 'mytradewizard/action'
 require 'mytradewizard/position'
 require 'mytradewizard/order'
+begin
+  require "#{Dir.pwd}/config/mytradewizard"
+rescue LoadError
+  puts "Please configure!"
+end
 
 module MyTradeWizard
 end

data/lib/mytradewizard/cli.rb

@@ -1,20 +1,23 @@
 require 'thor'
 require 'mytradewizard'
-require 'mytradewizard/generators/interactive_brokers'
+require 'mytradewizard/generators/mytradewizard'
 
 module MyTradeWizard
   class CLI < Thor
 
-    desc "configure [-- host HOST] [-- port PORT]", "Generate Interactive Brokers configuration"
-    method_options :host => :string, :port => :numeric
+    desc "configure [-- env ENV] [-- email EMAIL] [-- host HOST] [-- port PORT] [-- account ACCOUNT]", "Generate Interactive Brokers configuration"
+    method_options :env => :string, :email => :string, :host => :string, :port => :numeric, :account => :string
     def configure
-      MyTradeWizard::Generators::InteractiveBrokers.start([options[:host] || "localhost", options[:port] || 7496])
+      MyTradeWizard::Generators::MyTradeWizard.start([options[:env] || "local", options[:email] || "", options[:host] || "localhost", options[:port] || 7496, options[:account] || ""])
     end
 
     desc "config", "Display Interactive Brokers configuration"
     def config
-      puts "Host: " + MyTradeWizard::InteractiveBrokers.host
-      puts "Port: " + MyTradeWizard::InteractiveBrokers.port.to_s
+      puts "Env: " + MyTradeWizard::Configuration::ENV
+      puts "Email: " + MyTradeWizard::Configuration::EMAIL
+      puts "Host: " + MyTradeWizard::Configuration::InteractiveBrokers::HOST
+      puts "Port: " + MyTradeWizard::Configuration::InteractiveBrokers::PORT.to_s
+      puts "Account: " + MyTradeWizard::Configuration::InteractiveBrokers::ACCOUNT
     end
 
     desc "connect", "Connects to Interactive Brokers"

data/lib/mytradewizard/date_time.rb

@@ -3,14 +3,20 @@ module MyTradeWizard
 
     HR = 360
 
-    def wait_until(hour, minute)
-      print "Waiting until #{hour}:#{minute} ..."    
-      until time_is(hour, minute)
-        sleep 60
-        print '.'
+    def at(hour, minute)
+      unless MyTradeWizard::Configuration::ENV == 'local'
+        print "Waiting until #{hour}:#{minute} ..."    
+        until time_is(hour, minute)
+          sleep 60
+          print '.'
+        end
       end
     end
 
+    def idle(seconds)
+      sleep(seconds) unless MyTradeWizard::Configuration::ENV == 'local'
+    end
+
     def friday
       Time.now.utc.wday == 5
     end

data/lib/mytradewizard/generators/config/mytradewizard.rb

@@ -0,0 +1,11 @@
+module MyTradeWizard
+  module Configuration
+    ENV = "<%= env %>"
+    EMAIL = "<%= email %>"
+    module InteractiveBrokers
+      HOST = "<%= host %>"
+      PORT = <%= port %>
+      ACCOUNT = "<%= account %>"
+    end
+  end
+end

data/lib/mytradewizard/generators/{interactive_brokers.rb → mytradewizard.rb}

@@ -2,19 +2,22 @@ require 'thor/group'
 
 module MyTradeWizard
   module Generators
-    class InteractiveBrokers < Thor::Group
+    class MyTradeWizard < Thor::Group
 
       include Thor::Actions
-      
+
+      argument :env, :type => :string
+      argument :email, :type => :string      
       argument :host, :type => :string
       argument :port, :type => :numeric
+      argument :account, :type => :string
       
       def create_config
         empty_directory("config")
       end
       
       def copy_config
-        template("interactive_brokers.rb", "config/interactive_brokers.rb", {force: true})
+        template("mytradewizard.rb", "config/mytradewizard.rb", {force: true})
       end
       
       def self.source_root

data/lib/mytradewizard/interactive_brokers.rb

@@ -1,9 +1,4 @@
 require 'ib'
-begin
-  require "#{Dir.pwd}/config/interactive_brokers"
-rescue LoadError
-  puts "Please configure Interactive Brokers!"
-end
 
 module MyTradeWizard
   class InteractiveBrokers
@@ -16,7 +11,7 @@ module MyTradeWizard
       exception = nil
       while (timeout.nil? || Time.now - start_time <= timeout)
         begin
-          @ib_ruby = IB::Connection.new :host => self.class.host, :port => self.class.port
+          @ib_ruby = IB::Connection.new :host => MyTradeWizard::Configuration::InteractiveBrokers::HOST, :port => MyTradeWizard::Configuration::InteractiveBrokers::PORT
           subscribe_to_alerts
           sleep 0.1
           fetch_accounts

data/lib/mytradewizard/trading_system.rb

@@ -7,17 +7,12 @@ module MyTradeWizard
     def initialize
       @ib = MyTradeWizard::InteractiveBrokers.new
       @ib_ruby = @ib.connect
-      @live = false
-      @account = @ib.accounts.first
-      #fetch_positions
+      @env = MyTradeWizard::Configuration::ENV
+      @account = MyTradeWizard::Configuration::InteractiveBrokers::ACCOUNT.empty? ? @ib.accounts.first : MyTradeWizard::Configuration::InteractiveBrokers::ACCOUNT
+      @logger = Logger.new("/mtw/sys/#{self.class.to_s.downcase}/log/#{Time.now.strftime('%Y%m%d-%H%M')}") unless test?
       @orders = []
     end
 
-    def account=(a)
-      @account = a
-      make_live
-    end
-
     def positions
       @positions = @ib.positions(@account)
     end
@@ -26,20 +21,6 @@ module MyTradeWizard
       @ib.place_market_order(@account, action, quantity, contract)
     end
 
-    def make_live
-      @live = true
-      @logger = Logger.new("/mtw/log/#{self.class}/#{Time.now.strftime('%Y%m%d-%H%M')}.log")
-      #fetch_positions
-    end
-
-    def at(hour, minute)
-      wait_until(hour, minute) if @live
-    end
-
-    def idle(seconds)
-      sleep(seconds) if @live
-    end
-
     def output(msg)
       if @logger.present?
         @logger.info msg
@@ -49,7 +30,7 @@ module MyTradeWizard
     end
 
     def test?
-      !@live
+      @env == 'local'
     end
 
   end

data/lib/mytradewizard/version.rb

@@ -1,3 +1,3 @@
 module MyTradeWizard
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mytradewizard
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - mytradewizard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -180,7 +180,6 @@ files:
 - README.md
 - Rakefile
 - bin/mtw
-- config/interactive_brokers.rb
 - features/cme.feature
 - features/generator.feature
 - features/interactive_brokers.feature
@@ -192,8 +191,8 @@ files:
 - lib/mytradewizard/daily_bars.rb
 - lib/mytradewizard/date_time.rb
 - lib/mytradewizard/future_trading_system.rb
-- lib/mytradewizard/generators/config/interactive_brokers.rb
-- lib/mytradewizard/generators/interactive_brokers.rb
+- lib/mytradewizard/generators/config/mytradewizard.rb
+- lib/mytradewizard/generators/mytradewizard.rb
 - lib/mytradewizard/interactive_brokers.rb
 - lib/mytradewizard/ohlc.rb
 - lib/mytradewizard/order.rb

data/config/interactive_brokers.rb

@@ -1,12 +0,0 @@
-module MyTradeWizard
-  class InteractiveBrokers
-    class << self
-      def host
-        "localhost"
-      end
-      def port
-        7496
-      end
-    end
-  end
-end

data/lib/mytradewizard/generators/config/interactive_brokers.rb

@@ -1,12 +0,0 @@
-module MyTradeWizard
-  class InteractiveBrokers
-    class << self
-      def host
-        "<%= host %>"
-      end
-      def port
-        <%= port %>
-      end
-    end
-  end
-end