dango 0.0.9 → 0.0.10

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/dango/monitor/dango_monitor_client.rb
 lib/dango/script/dango_server.rb
 lib/dango/shared/memory_store.rb
 lib/dango/tasks/dango_rake.rb
+lib/dango/tester/dango_tester_client.rb
 lib/dango/version.rb
 setup.rb
 test/test_helper.rb

data/lib/dango/monitor/dango_monitor_client.rb

@@ -17,7 +17,8 @@ class DangoMonitorClient < DangoClientFramework
   ConnTimeout = 6
   
   def initialize()
-    super(ENV['RAILS_ENV'])
+    env = ENV['RAILS_ENV'] || 'development'
+    super(env)
   end
   
   public

data/lib/dango/script/dango_server.rb

@@ -14,7 +14,9 @@ class ScriptDangoServer
 			k =~ /\-\-(\w+?):(\w+?)$/
 			key1 = Regexp.last_match(1)
 			key2 = Regexp.last_match(2)
-			config[key1][key2] = v
+			if key1 && key2
+				config[key1][key2] = v
+			end
 		end
 		
 		# serverファイル名一覧を取得

data/lib/dango/tester/dango_tester_client.rb

@@ -0,0 +1,171 @@
+#!ruby -Ku
+
+=begin
+= コネクション型サーバーフレームワーク
+=end
+
+require 'dango/client_framework' # コネクションクライアントフレームワークの呼び出し
+
+# テスタークラス
+class DangoTesterClient
+  # テスターのイニシャライズ
+  def initialize
+    @client_conns = {}
+  end
+  
+  # クライアントを１個接続
+  def new_client(c_name, serv_info)
+    config = {
+      "network" => {
+        "host"=>serv_info["host"],
+        "port"=>serv_info["port"],
+      }, 
+    }
+    env = "development"
+    
+    # 接続
+    client_conn = TestClient.new(env, config)
+    
+    # client_nameメソッド作成とclient_nameを定義
+    client_conn.client_name = c_name
+    
+    # 接続を入れて
+    @client_conns[c_name] = client_conn
+    
+    # 接続インスタンスを返す
+    client_conn
+  end
+  
+  attr_reader(:client_conns)
+end
+
+# テスト接続用のクラス
+class TestClient < DangoClientFramework
+  SendReceiveSleepIntervalSec = 0.1 # データ送信後の順の際のタイムアウトチェック間隔秒
+  SendReceiveTimeoutSec = 5       # データ送信後の順の際のタイムアウトチェック間隔秒
+  
+  def initialize(env, config)
+    @config = config
+    super(env, config)
+    
+    @receive_mutex = Mutex.new # 送受信用の排他処理
+    @receive_arr = []
+    @receive_defined_names = []
+    
+    @client_name = nil # クライアント名
+    
+    send_receive_shared_init()
+  end
+  
+  attr_accessor(:client_name)
+  
+  # cs_client_send_receive_data用の共有メモリ
+  def send_receive_shared_init
+    @send_receive_shared = SharedMemoryStore.new
+  end
+  attr_reader(:send_receive_shared)
+  
+  # 起動処理
+  def cs_client_init
+    # サーバー接続情報など
+    @connection_client_host = @config["network"]["host"] # 自動でこのホスト名でサーバー開始
+    @connection_client_port = @config["network"]["port"] # 自動でこのポートでサーバー開始
+    
+    # ログ出力情報
+    @connection_client_log_file = "log/lt_client_base.log" # 自動でこのログファイル名を使う
+    @connection_client_log_level = Logger::DEBUG # 自動でこのログレベルになる
+  end
+  
+  # テストサーバー
+  def send(name, send_obj = {})
+    cs_logger.debug("tester.send:send_obj=#{send_obj.inspect} #{Time.now}")
+    cs_client_send_data(name, send_obj)
+  end
+  
+  # make_receive_stack
+  def make_receive_stack(receive_name, options = {})
+    timeout = options[:timeout] || SendReceiveTimeoutSec
+    
+    @receive_defined_names.push(receive_name)
+    
+    Thread.start do
+      send_receive_shared[receive_name] = nil
+      end_reserved_time = Time.now + timeout
+      
+      # 戻ってきたデータのチェック
+      receive_name_sym = (receive_name.class == Symbol) ? (":"+receive_name.to_s) : ('"'+receive_name+'"')
+      instance_method_name = "cs_receive_#{receive_name}"
+      expr = <<-EOF
+        def self.#{instance_method_name}(ret_obj)
+          cs_logger.debug "ret_obj:" + ret_obj.inspect
+          send_receive_shared[#{receive_name_sym}] = ret_obj
+        end
+      EOF
+      instance_eval expr
+      
+      # タイムアウトチェック
+      (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
+        if Time.now > end_reserved_time
+          raise(DangoFrameworkTimeoutError, "timeout:client_name=#{@client_name}:receive_name=#{receive_name}") 
+        end
+        
+        # 戻ってきたデータがあれば
+        if send_receive_shared[receive_name]
+          cs_logger.debug "receive_name:#{send_receive_shared[receive_name].inspect}"
+          break 
+        end
+        
+        sleep SendReceiveSleepIntervalSec # スリープ
+      end
+      
+      if !send_receive_shared[receive_name] # 戻ってきたデータがあるかどうかチェック
+        raise(DangoFrameworkError, "received data is none") 
+      end
+      
+      @receive_mutex.synchronize do
+        @receive_arr.push([receive_name, send_receive_shared[receive_name]])
+#        p @receive_arr
+      end
+    end
+  end
+  
+  # wait_receive_data
+  def wait_receive_data(receive_name, options = {})
+    timeout = options[:timeout] || SendReceiveTimeoutSec
+    
+    # データ受信待ち
+    receive_data = nil
+    (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
+      @receive_mutex.synchronize do
+        receive_data = @receive_arr.find{|r| r[0] == receive_name}.deep_dup
+#        p @receive_arr
+      end
+      break if receive_data != nil
+      sleep SendReceiveSleepIntervalSec # スリープ
+    end
+    
+    # タイムアウトなら
+    if receive_data == nil
+      raise(DangoFrameworkTimeoutError, "timeout:client_name=#{@client_name}:receive_name=#{receive_name}") 
+    end
+    
+    # 結果を削除しておく
+    @receive_mutex.synchronize do
+      @receive_arr.delete_if{|r| r[0] == receive_name}
+    end
+    
+    receive_data[1]
+  end
+  
+  # receive_arrの状態確認
+  def receive_arr
+    receive_arr = nil
+    @receive_mutex.synchronize do
+      receive_arr = @receive_arr.deep_dup
+    end
+    receive_arr
+  end
+  
+end
+
+

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 9
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 date: 2007-10-15 00:00:00 +09:00
 summary: Ruby - Flash conneciton network flamework
 require_paths: 
@@ -38,6 +38,7 @@ files:
 - lib/dango/script/dango_server.rb
 - lib/dango/shared/memory_store.rb
 - lib/dango/tasks/dango_rake.rb
+- lib/dango/tester/dango_tester_client.rb
 - lib/dango/version.rb
 - setup.rb
 - test/test_helper.rb