unageanu-jiji 1.1.0 → 1.1.1

data/ChangeLog

@@ -1,4 +1,8 @@
 
+2009-6-20 1.1.0
+    * uuidtools 2.0.0 との組み合わせで動作しなかった問題を改修
+    * クリック証券デモトレードにアクセスする際に使用するプロキシを指定できるようにした。
+
 2009-5-6 1.1.0
     * 証券会社へのアクセスロジックを、プラグインで後から追加できるように修正。
 

data/bin/jiji

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems' 
+require 'rubygems'
 require 'jiji/command'
 JIJI::Command.new.run( ARGV )

data/lib/jiji/operator.rb

@@ -50,7 +50,7 @@ module JIJI
     def buy(count, pair=:EURJPY, trader="")
       rate = @rate[pair]
       unit = @rate.pair_infos[pair].trade_unit
-      p = Position.new( UUID.random_create().to_s, Position::BUY, count,
+      p = Position.new( UUIDTools::UUID.random_create().to_s, Position::BUY, count,
         unit, @rate.time, rate.ask, pair, trader, self )
       p.next( @rate )
       @profit_or_loss += p.profit_or_loss
@@ -67,7 +67,7 @@ module JIJI
     def sell(count, pair=:EURJPY, trader="")
       rate = @rate[pair]
       unit = @rate.pair_infos[pair].trade_unit
-      p = Position.new( UUID.random_create().to_s, Position::SELL, count,
+      p = Position.new( UUIDTools::UUID.random_create().to_s, Position::SELL, count,
         unit, @rate.time, rate.bid, pair, trader, self )
       p.next( @rate )
       @profit_or_loss += p.profit_or_loss
@@ -301,11 +301,11 @@ module JIJI
       id = nil
       if @trade_enable
         JIJI::Util.log_if_error_and_throw( @logger ) {
-	        rate = @rate[pair]
-		      # 成り行きで買い
-		      id = @client.order( pair, :buy, count ).position_id
-	      }
-	    end
+          rate = @rate[pair]
+          # 成り行きで買い
+          id = @client.order( pair, :buy, count ).position_id
+        }
+      end
       p = super(count, pair, trader)
       p.raw_position_id = id if id
       p
@@ -317,12 +317,12 @@ module JIJI
     def sell(count, pair=:EURJPY, trader="")
       id = nil
       if @trade_enable
-	      JIJI::Util.log_if_error_and_throw( @logger ) {
-	        rate = @rate[pair]
-	        # 成り行きで売り
-		      id = @client.order( pair, :sell, count ).position_id
-	      }
-	    end
+        JIJI::Util.log_if_error_and_throw( @logger ) {
+          rate = @rate[pair]
+          # 成り行きで売り
+          id = @client.order( pair, :sell, count ).position_id
+        }
+      end
       p = super(count, pair, trader)
       p.raw_position_id = id if id
       p
@@ -331,10 +331,10 @@ module JIJI
     # 取引を確定する
     def commit(position)
       if @trade_enable && position.raw_position_id
-	      JIJI::Util.log_if_error_and_throw( @logger ) {
-	        @client.commit( position.raw_position_id, position.count )
-	      }
-	    end
+        JIJI::Util.log_if_error_and_throw( @logger ) {
+          @client.commit( position.raw_position_id, position.count )
+        }
+      end
       super(position)
     end
 

data/lib/jiji/plugin/embedded/click_securities_demo_plugin.rb

@@ -20,7 +20,8 @@ module JIJI
       #「jiji setting」でユーザーに入力を要求するデータの情報を返します。
       def input_infos
         [ Input.new( :user, "Please input a user name of CLICK Securities DEMO Trade.", false, nil ),
-          Input.new( :password, "Please input a password of CLICK Securities DEMO Trade.", true, nil )]
+          Input.new( :password, "Please input a password of CLICK Securities DEMO Trade.", true, nil ),
+          Input.new( :proxy, "Please input a proxy. example: https://example.com:80 (default: nil )", false, nil )]
       end
       
       #プラグインを初期化します。

data/lib/jiji/plugin/embedded/single_click_client.rb

@@ -76,7 +76,7 @@ module JIJI
           logger.info "start single click client."
           begin
             JIJI::Util.log_if_error_and_throw( @logger ) {
-              client = ClickClient::Client.new
+              client = ClickClient::Client.new( conf[:proxy] ? conf[:proxy] : nil )
               client.host_name = conf[:host] ? conf[:host] : "https://fx-demo.click-sec.com" 
               @logger.info "connect host=#{client.host_name}, user=#{conf[:user]}"
               client.fx_session(conf[:user], conf[:password]){|fx|

data/lib/jiji/process_manager.rb

@@ -23,7 +23,7 @@ module JIJI
         next unless File.exist? "#{d}/props.yaml"
         id = File.basename(d)
         next if id == "rmt"
-        @back_tests[id] = @registry.backtest_process(id, nil )
+        @back_tests[id] = @registry.backtest_process(id, nil )
       }
     end
 
@@ -56,7 +56,7 @@ module JIJI
     # バックテストプロセスを列挙する
     def each( &block )
       @back_tests.each_pair {|k,v|
-        yield v
+        yield v
       }
     end
 
@@ -86,7 +86,7 @@ module JIJI
     # バックテストプロセスを新規に作成する
     def create_back_test( name, memo, start_date, end_date, agent_properties )
 
-      id = UUID.random_create().to_s
+      id = UUIDTools::UUID.random_create().to_s
 
       # プロパティを記録
       props = {
@@ -97,7 +97,7 @@ module JIJI
         "start_date"=>start_date.to_i,
         "end_date"=>end_date.to_i,
         "agents"=>agent_properties,
-        "state"=>:WAITING
+        "state"=>:WAITING
       }
       begin
         btp = @registry.backtest_process(id, props )

data/test/util/test_BlockToSession.rb

@@ -11,7 +11,7 @@ require 'csv'
 
 class BlockToSessionTest <  RUNIT::TestCase
   
-  # 基本動作のテスト 
+  # 基本動作のテスト
   def test_basic
     
     buff = ""

data/test/util/test_CSV.rb

@@ -15,7 +15,7 @@ class CSVTest <  RUNIT::TestCase
     FileUtils.mkdir_p @dir    
   end
 
-  def teardown 
+  def teardown
     FileUtils.rm_rf @dir
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unageanu-jiji
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Masaya Yamauchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.0.2
     version: 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.5.0
     version: 
@@ -38,7 +38,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.3.0
     version: 
@@ -48,7 +48,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
@@ -58,9 +58,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.7
+        version: 2.0.0
     version: 
 description: 
 email: y-masaya@red.hot.co.jp