unageanu-jiji 1.0.2 → 1.0.3

data/ChangeLog

@@ -1,10 +1,13 @@
 
-2009-4-14
+2009-4-19 1.0.3
+    * グラフの色を変更してもリロードすると元に戻る不具合を修正。
+
+2009-4-14 1.0.2
     * 以下の不具合を修正。
         - システムを再起動すると、動作中のエージェントが全て停止状態となる。
         - リアルトレードで建玉にエージェント名が設定されない場合がある。
         - リアルトレードで追加したエージェントのグラフ設定ができない。
         - 月の初めに、取引一覧の範囲絞込みの初期値が不正な値になる。
 
-2009-3-29
+2009-3-29 1.0.0
     * 初版リリース

data/lib/jiji/migration/migrator.rb

@@ -0,0 +1,50 @@
+
+require 'rubygems'
+require 'fileutils'
+require 'logger'
+require 'jiji/util/file_lock'
+
+module JIJI
+  module Migration
+    
+    #==サーバー起動時にデータ移行を行うクラス。
+    class Migrator
+
+      #データを移行する。
+      def migrate
+        logger = server_logger
+        begin
+          data_version = version
+          new_version = data_version
+          tmp = nil
+          @migrators.sort_by {|item| item[:version] }.each {|d|
+            tmp = d[:version]
+            if ( data_version < d[:version] )
+              d[:migrator].migrate(registry)
+              new_version = d[:version]
+              logger.info "data migration succesful! new_version=#{new_version.to_s}."
+            end
+          }
+        rescue Exception
+          logger.error "data migration failed. current=#{data_version.to_s} new_version=#{tmp.to_s}"
+          logger.error $!
+        ensure
+          FileLock.new( version_file ).writelock {|f| f << new_version.to_s }
+        end
+      end
+      
+      # 現在のデータバージョンを取得する。
+      def version
+        version_str = File.exist?(version_file) ? 
+          FileLock.new( version_file ).readlock {|f| f.read } : "1.0.0"
+        return Gem::Version.new( version_str )
+      end
+      
+      attr :migrators, true
+      attr :server_logger, true
+      attr :version_file, true
+      attr :registry, true
+    end
+  end
+end
+

data/lib/jiji/migration/migrator1_0_3.rb

@@ -0,0 +1,26 @@
+
+require 'fileutils'
+require 'yaml'
+require 'jiji/util/fix_yaml_bug'
+require 'jiji/util/file_lock'
+
+module JIJI
+  module Migration
+
+    #===1.0.0 → 1.0.3
+    class Migrator1_0_3
+      def migrate( registry )
+        # outputのプロパティキーを変換
+        Dir.glob( "#{registry.process_dir}/*/out/**/meta.yaml").each {|meta|
+          props = YAML.load_file meta
+          props = props.inject({}) {|r,p| r[p[0].to_sym] = p[1]; r }
+          FileLock.new( meta ).writelock { |f|
+            f.write( YAML.dump( props ) )
+          }
+        }
+      end
+    end
+    
+  end
+end
+

data/lib/jiji/output.rb

@@ -26,8 +26,8 @@ module JIJI
           next unless File.directory? d
           next unless File.exist? "#{d}/meta.yaml"
           props = YAML.load_file "#{d}/meta.yaml"
-          @outs[props["name"]] =
-            create_output( d, props["name"], props["type"].to_sym, props )
+          @outs[props[:name]] =
+            create_output( d, props[:name], props[:type].to_sym, props )
         }
       }
     end
@@ -52,8 +52,8 @@ module JIJI
       DirLock.new( @dir ).writelock {
         sub_dir = "#{@dir}/#{JIJI::Util.encode(name).gsub(/\//, "_")}"
         FileUtils.mkdir_p sub_dir
-        options["type"] = type.to_s
-        options["name"] = name
+        options[:type] = type.to_s
+        options[:name] = name
         @outs[name] = create_output( sub_dir, name, type, options )
         @outs[name].time = time
         @outs[name].save
@@ -114,7 +114,7 @@ module JIJI
     #props:: プロパティ
     def set_properties( props )
       props.each_pair {|k,v|
-        @options[k] = v
+        @options[k.to_sym] = v
       }
       save
     end

data/lib/jiji/registry.rb

@@ -1,6 +1,7 @@
 
 require 'rubygems'
 require 'yaml'
+require 'jiji/util/fix_yaml_bug'
 require 'needle'
 require 'jiji/collector'
 require 'jiji/configuration'
@@ -29,6 +30,9 @@ require 'jiji/service/output_service'
 require 'jiji/service/process_service'
 require 'jiji/service/system_service'
 
+require 'jiji/migration/migrator'
+require 'jiji/migration/migrator1_0_3'
+
 module JIJI
 
   #
@@ -69,6 +73,10 @@ module JIJI
 	        FileUtils.mkdir_p process_dir
           process_dir
         }
+        # バージョンファイル
+        r.register( :version_file ) {
+          r.base_dir + "/data_version"
+        }
 
         # ロガー
         r.register( :server_logger ) {
@@ -240,6 +248,18 @@ module JIJI
           c.server = r.server
           c
         }
+        
+        # データ移行
+        r.register( :migrator ) {
+          c = JIJI::Migration::Migrator.new
+          c.registry = r
+          c.server_logger = r.server_logger
+          c.version_file = r.version_file
+          c.migrators = [
+            { :version=>Gem::Version.new( "1.0.3" ), :migrator=>JIJI::Migration::Migrator1_0_3.new}
+          ]
+          c
+        }
       }
     end
 

data/lib/jiji/server.rb

@@ -12,6 +12,11 @@ module JIJI
       registry = JIJI::Registry.new(base, self)
       registry.server_logger.info "base dir : #{base}"
       
+      # データ移行
+      JIJI::Util.log_if_error_and_throw(registry.server_logger) {
+        registry.migrator.migrate
+      }
+      
       conf = registry[:conf]
       param[:Port] = conf.get([:server,:port], 7000).to_i 
       begin

data/test/all_tests.rb

@@ -24,3 +24,6 @@ require "test_ProcessManager"
 require "test_RateDao"
 require "test_Permitter"
 require "test_TradeResultDao"
+
+require "migration/test_Migrator"
+require "migration/test_Migrator1_0_3"

data/test/migration/migrator1_0_3test_data/rmt/out/M2NlOTA2ODEtZDdlNi00NWU1LWIwNDQtMjBmODY2ZGNkNzBj/56e75YuV5bmz5Z2H57ea/meta.yaml

@@ -0,0 +1,8 @@
+--- 
+name: "\xE7\xA7\xBB\xE5\x8B\x95\xE5\xB9\xB3\xE5\x9D\x87\xE7\xB7\x9A"
+:column_count: 2
+:graph_type: :rate
+type: graph
+:colors: 
+- "#779999"
+- "#557777"

data/test/migration/migrator1_0_3test_data/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75YuV5bmz5Z2H57ea/meta.yaml

@@ -0,0 +1,12 @@
+--- 
+name: "\xE7\xA7\xBB\xE5\x8B\x95\xE5\xB9\xB3\xE5\x9D\x87\xE7\xB7\x9A"
+:column_count: 2
+type: graph
+:graph_type: :rate
+colors: 
+- "#ff33bb"
+- "#557777"
+visible: true
+:colors: 
+- "#ff33bb"
+- "#557777"

data/test/migration/migrator1_0_3test_data/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75Yuasdwqdd/meta.yaml

@@ -0,0 +1,12 @@
+--- 
+name: "\xE7\xA7\xBB\xE5\x8B\x95\xE5\xB9\xB3\xE5\x9D\x87\xE7\xB7\x9A"
+:column_count: 2
+type: graph
+:graph_type: :rate
+colors: 
+- "#ff33bb"
+- "#557777"
+visible: true
+:colors: 
+- "#ff33bb"
+- "#557777"

data/test/migration/test_Migrator.rb

@@ -0,0 +1,117 @@
+#!/usr/bin/ruby
+
+$: << "../../lib"
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/migration/migrator'
+
+# Migrator のテスト
+class MigratorTest <  RUNIT::TestCase
+
+  def setup
+    @dir = File.dirname(__FILE__) + "/migrator_test"
+    FileUtils.mkdir_p @dir
+    
+    @registry = {}
+  end
+
+  def teardown
+    FileUtils.rm_rf @dir
+  end
+
+  # 基本動作のテスト
+  def test_basic
+    
+    log = []
+    
+    # バージョンファイルはないので、1.0.0と判定される。
+    # 同じバージョンのものは実行されない
+    # 下位バージョンのものは実行されない。
+    m = JIJI::Migration::Migrator.new
+    m.registry = @registry
+    m.version_file = "#{@dir}/version"
+    m.server_logger = Logger.new(STDOUT)
+    m.migrators = [
+      {:version=>Gem::Version.new("1.1.0"), :migrator=>TestMigrator.new( "1.1.0", log )},
+      {:version=>Gem::Version.new("1.0.0"), :migrator=>TestMigrator.new( "1.0.0", log )}, # 実行されない
+      {:version=>Gem::Version.new("2.0.1"), :migrator=>TestMigrator.new( "2.0.1", log )},
+      {:version=>Gem::Version.new("1.0.2"), :migrator=>TestMigrator.new( "1.0.2", log )}, 
+      {:version=>Gem::Version.new("0.9.99"), :migrator=>TestMigrator.new( "0.9.99", log )} # 実行されない
+    ]
+    assert_equals( m.version.to_s, "1.0.0" )
+    
+    # データ移行を実行
+    m.migrate
+    assert_equals( log, ["1.0.2","1.1.0","2.0.1"] )
+    assert_equals( m.version.to_s, "2.0.1" )
+
+    # 再実行→すでに最新バージョンなので何も実行されない
+    log.clear
+    m.migrate
+    assert_equals( log, [] )
+    assert_equals( m.version.to_s, "2.0.1" )
+    
+    # 新しいデータ移行処理を追加。
+    # 現在のバージョンより上位のもののみ実行される。
+    m = JIJI::Migration::Migrator.new
+    m.registry = @registry
+    m.version_file = "#{@dir}/version"
+    m.server_logger = Logger.new(STDOUT)
+    m.migrators = [
+      {:version=>Gem::Version.new("1.0.0"), :migrator=>TestMigrator.new( "1.0.0", log )}, # 実行されない
+      {:version=>Gem::Version.new("2.0.1"), :migrator=>TestMigrator.new( "2.0.1", log )}, # 実行されない
+      {:version=>Gem::Version.new("2.1.5"), :migrator=>TestMigrator.new( "2.1.5", log )}, # 実行される
+    ]
+    assert_equals( m.version.to_s, "2.0.1" )
+    m.migrate
+    assert_equals( log, ["2.1.5"] )
+    assert_equals( m.version.to_s, "2.1.5" )
+  end
+  
+  # データ移行の途中でエラーになる場合のテスト
+  def test_error
+    log = []
+    
+    # バージョンファイルはないので、1.0.0と判定される。
+    # エラーになったバージョンまで移行できる。
+    m = JIJI::Migration::Migrator.new
+    m.registry = @registry
+    m.version_file = "#{@dir}/version"
+    m.server_logger = Logger.new(STDOUT)
+    m.migrators = [
+      {:version=>Gem::Version.new("1.1.0"), :migrator=>TestMigrator.new( "1.1.0", log )}, # 実行される
+      {:version=>Gem::Version.new("1.0.0"), :migrator=>TestMigrator.new( "1.0.0", log )}, # 実行されない
+      {:version=>Gem::Version.new("2.0.1"), :migrator=>TestMigrator.new( "2.0.1", log )}, # エラーのため実行されない
+      {:version=>Gem::Version.new("1.1.2"), :migrator=>ErrorMigrator.new}, # エラー
+      {:version=>Gem::Version.new("0.9.99"), :migrator=>TestMigrator.new( "0.9.99", log )} # 実行されない
+    ]
+    assert_equals( m.version.to_s, "1.0.0" )
+    m.migrate
+    assert_equals( log, ["1.1.0"] )
+    assert_equals( m.version.to_s, "1.1.0" )
+    
+    log.clear
+    m.migrate
+    assert_equals( log, [] )
+    assert_equals( m.version.to_s, "1.1.0" )
+  end
+  
+  class TestMigrator
+    def initialize(id,log)
+      super()
+      @id = id
+      @log = log
+    end
+    def migrate( registry )
+      @log << @id
+    end
+  end
+  class ErrorMigrator
+    def migrate( registry )
+      raise "test"
+    end
+  end
+end
+

data/test/migration/test_Migrator1_0_3.rb

@@ -0,0 +1,118 @@
+#!/usr/bin/ruby
+
+$: << "../../lib"
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'fileutils'
+require 'jiji/migration/migrator1_0_3'
+
+# Migrator1_0_3 のテスト
+class Migrator1_0_3Test <  RUNIT::TestCase
+
+  def setup
+    @dir = File.dirname(__FILE__) + "/migrator1_0_3_test"
+    FileUtils.rm_rf @dir
+    FileUtils.mkdir_p @dir
+    
+    @registry = {}
+  end
+
+  def teardown
+    FileUtils.rm_rf @dir
+  end
+
+  # 基本動作のテスト
+  def test_basic
+    
+    FileUtils.mkdir_p "#{@dir}/rmt/out/a/b"
+    FileUtils.mkdir_p "#{@dir}/rmt/out/a/c"
+    FileUtils.mkdir_p "#{@dir}/rmt/out/x/"
+    FileUtils.mkdir_p "#{@dir}/rmt/outa/a/"
+    FileUtils.mkdir_p "#{@dir}/foo/out/a/b"
+    FileUtils.mkdir_p "#{@dir}/foo/var"
+    
+    # 更新されるファイル
+    files = [
+      "#{@dir}/rmt/out/a/b/meta.yaml",
+      "#{@dir}/rmt/out/a/c/meta.yaml",
+      "#{@dir}/rmt/out/x/meta.yaml",
+      "#{@dir}/rmt/out/a/meta.yaml",
+      "#{@dir}/rmt/out/meta.yaml",
+      "#{@dir}/foo/out/a/b/meta.yaml",
+      "#{@dir}/foo/out/a/meta.yaml"
+    ]
+    # 更新されないファイル
+    ignore_files = [
+      "#{@dir}/rmt/out/a/b/foo.yaml",
+      "#{@dir}/rmt/outa/a/meta.yaml",
+      "#{@dir}/rmt/meta.yaml",
+      "#{@dir}/meta.yaml",
+      "#{@dir}/foo/var/meta.yaml"
+    ]
+    props = {
+      "name"=>"名前",
+      :column_count=>2,
+      "type"=>"graph",
+      :graph_type=> :rate,
+      "colors"=> ["#ff33bb","#557777"],
+      "visible"=> true,
+      :colors => ["#ff33bb","#557777"]
+    }
+    (files + ignore_files).each {|file|
+      open( file, "w" ) { |f| f.write( YAML.dump( props )) }
+      assert_equals( YAML.load_file(file), props)
+    }
+    
+    # データ移行
+    m = JIJI::Migration::Migrator1_0_3.new
+    m.migrate( Struct.new( :process_dir ).new( @dir ) )
+    
+    converted_props = {
+      :name=>"名前",
+      :column_count=>2,
+      :type=>"graph",
+      :graph_type=> :rate,
+      :visible=> true,
+      :colors => ["#ff33bb","#557777"]
+    }
+    files.each {|file|assert_equals( YAML.load_file(file), converted_props)}
+    ignore_files.each {|file|assert_equals( YAML.load_file(file), props)}
+  end
+  
+  # 実際のデータを変更するテスト
+  def test_real_data
+    FileUtils.cp_r File.dirname(__FILE__) + "/migrator1_0_3test_data/rmt", @dir
+    
+    # データ移行
+    m = JIJI::Migration::Migrator1_0_3.new
+    m.migrate( Struct.new( :process_dir ).new( @dir ) )
+    
+    assert_equals( YAML.load_file("#{@dir}/rmt/out/M2NlOTA2ODEtZDdlNi00NWU1LWIwNDQtMjBmODY2ZGNkNzBj/56e75YuV5bmz5Z2H57ea/meta.yaml"), {
+      :name=>"移動平均線",
+      :column_count=> 2,
+      :graph_type=> :rate,
+      :type=> "graph",
+      :colors=>["#779999","#557777"]
+    })
+    assert_equals( YAML.load_file("#{@dir}/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75Yuasdwqdd/meta.yaml"), {
+      :name=>"移動平均線",
+      :column_count=> 2,
+      :graph_type=> :rate,
+      :visible=>true,
+      :type=> "graph",
+      :colors=>["#ff33bb","#557777"]
+    })
+    assert_equals( YAML.load_file("#{@dir}/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75YuV5bmz5Z2H57ea/meta.yaml"), {
+      :name=>"移動平均線",
+      :column_count=> 2,
+      :graph_type=> :rate,
+      :visible=>true,
+      :type=> "graph",
+      :colors=>["#ff33bb","#557777"]
+    })
+  end
+  
+end
+

data/test/test_Output.rb

@@ -25,11 +25,11 @@ class OutputTest <  RUNIT::TestCase
   def test_basic
     
     # 書き込み
-    out  = @o.get( "テスト",  :event, { "a"=>"aaa", "b"=>"bbb" } )
+    out  = @o.get( "テスト",  :event, { :a=>"aaa", :b=>"bbb" } )
     out2 = @o.get( "テスト2", :graph )
     
-    assert_equals out.options, { "a"=>"aaa", "b"=>"bbb", "name"=>"テスト", "type"=>"event" }
-    assert_equals out2.options, { "name"=>"テスト2", "type"=>"graph" }
+    assert_equals out.options, { :a=>"aaa", :b=>"bbb", :name=>"テスト", :type=>"event" }
+    assert_equals out2.options, { :name=>"テスト2", :type=>"graph" }
     
     @o.time = Time.local(2008, 8, 1, 10, 0, 0)
     out.put( "type", "データ\nデータ" )
@@ -123,14 +123,14 @@ class OutputTest <  RUNIT::TestCase
     assert_equals out2.object_id, @o.get( "テスト2",  :event ).object_id
     
     #プロパティの更新
-    assert_equals out.options, { "a"=>"aaa", "b"=>"bbb", "name"=>"テスト", "type"=>"event" }
-    assert_equals out2.options, { "name"=>"テスト2", "type"=>"graph" }    
+    assert_equals out.options, { :a=>"aaa", :b=>"bbb", :name=>"テスト", :type=>"event" }
+    assert_equals out2.options, { :name=>"テスト2", :type=>"graph" }    
     
-    out.set_properties( {"x"=>"xxx", "a"=>"abc"} )
-    out2.set_properties( {"y"=>"yyy", "a"=>"ab"} )
+    out.set_properties( {:x=>"xxx", "a"=>"abc"} ) # 文字列をキーにしてもto_symされたものがキーにされる。
+    out2.set_properties( {:y=>"yyy", :a=>"ab"} )
     
-    assert_equals out.options, {"x"=>"xxx", "a"=>"abc", "b"=>"bbb", "name"=>"テスト", "type"=>"event" }
-    assert_equals out2.options, { "y"=>"yyy", "a"=>"ab", "name"=>"テスト2", "type"=>"graph" }    
+    assert_equals out.options, {:x=>"xxx", :a=>"abc", :b=>"bbb", :name=>"テスト", :type=>"event" }
+    assert_equals out2.options, { :y=>"yyy", :a=>"ab", :name=>"テスト2", :type=>"graph" }    
     
     # 再作成 # 既存のデータがロードされる
     @o = JIJI::Output.new( "テストエージェント", @dir )
@@ -147,8 +147,8 @@ class OutputTest <  RUNIT::TestCase
       ["200", "220", Time.local(2008, 8, 1, 12, 10, 20).to_i.to_s],
       ["10" , "20",  Time.local(2008, 8, 3, 10, 0, 0).to_i.to_s]
     ]
-    assert_equals @o.get("テスト").options, {"x"=>"xxx", "a"=>"abc", "b"=>"bbb", "name"=>"テスト", "type"=>"event" }
-    assert_equals @o.get("テスト2").options, { "y"=>"yyy", "a"=>"ab", "name"=>"テスト2", "type"=>"graph" }
+    assert_equals @o.get("テスト").options, {:x=>"xxx", :a=>"abc", :b=>"bbb", :name=>"テスト", :type=>"event" }
+    assert_equals @o.get("テスト2").options, { :y=>"yyy", :a=>"ab", :name=>"テスト2", :type=>"graph" }
     @o.each {|k, v|
       case k
       when "テスト"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unageanu-jiji
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Masaya Yamauchi
@@ -438,6 +438,8 @@ files:
 - lib/jiji/dao/timed_data_dao.rb
 - lib/jiji/dao/trade_result_dao.rb
 - lib/jiji/error.rb
+- lib/jiji/migration/migrator.rb
+- lib/jiji/migration/migrator1_0_3.rb
 - lib/jiji/models.rb
 - lib/jiji/observer.rb
 - lib/jiji/operator.rb
@@ -610,6 +612,11 @@ files:
 - test/BackCollectorTest/lack/ZARJPY/raw/2008-08-04.csv
 - test/BackCollectorTest/lack/ZARJPY/raw/2008-08-06.csv
 - test/BackCollectorTest/lack/ZARJPY/raw/2008-08-07.csv
+- test/migration/migrator1_0_3test_data/rmt/out/M2NlOTA2ODEtZDdlNi00NWU1LWIwNDQtMjBmODY2ZGNkNzBj/56e75YuV5bmz5Z2H57ea/meta.yaml
+- test/migration/migrator1_0_3test_data/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75Yuasdwqdd/meta.yaml
+- test/migration/migrator1_0_3test_data/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75YuV5bmz5Z2H57ea/meta.yaml
+- test/migration/test_Migrator.rb
+- test/migration/test_Migrator1_0_3.rb
 - test/ProcessManagerTest/agents/moving_average.rb
 - test/ProcessManagerTest/conf/configuration.yaml
 - test/ProcessManagerTest/rate_datas/EURJPY/raw/2008-08-21.csv
@@ -717,6 +724,11 @@ test_files:
 - test/BackCollectorTest/lack/ZARJPY/raw/2008-08-04.csv
 - test/BackCollectorTest/lack/ZARJPY/raw/2008-08-06.csv
 - test/BackCollectorTest/lack/ZARJPY/raw/2008-08-07.csv
+- test/migration/migrator1_0_3test_data/rmt/out/M2NlOTA2ODEtZDdlNi00NWU1LWIwNDQtMjBmODY2ZGNkNzBj/56e75YuV5bmz5Z2H57ea/meta.yaml
+- test/migration/migrator1_0_3test_data/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75Yuasdwqdd/meta.yaml
+- test/migration/migrator1_0_3test_data/rmt/out/NjM5YWFhZmQtNDFjNy00NjUxLWIwYmItNTc3ZjAyZTg5ODA5/56e75YuV5bmz5Z2H57ea/meta.yaml
+- test/migration/test_Migrator.rb
+- test/migration/test_Migrator1_0_3.rb
 - test/ProcessManagerTest/agents/moving_average.rb
 - test/ProcessManagerTest/conf/configuration.yaml
 - test/ProcessManagerTest/rate_datas/EURJPY/raw/2008-08-21.csv