arxutils_sqlite3 0.1.44 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5f6ede0a6841ea546179192fe18757e9f35669baae096b5c7f0ed9ec79c687
-  data.tar.gz: 592da7e2edf26c4e4a41e7d9d1ed74ebf67ffdb7dddc6e2a2732f3643a545570
+  metadata.gz: 68d6c8715c3a6aa14cd2d32e85d6757831555b23b5b1241417b01bf6d2527e91
+  data.tar.gz: 97612549672e709093582b1ccc1145cf4f5390c8fb9c17101f7c3e8e4e060db2
 SHA512:
-  metadata.gz: 3ade5c9990a6c5553a71b62adda473541415bdba26b1c6c7162d2d588e66750d9ebe80367c8efa7bbccff064aa4410a18138fc254a571f14ea27ca2e07b03096
-  data.tar.gz: aedfc8af290c382f5cd2eb4c67dde8b94ef533de95ee5607236a480c0cf0443a1f5a249258efaefdc35193f681f44ab6ce9502232ba388967c85a0eb6e8bd615
+  metadata.gz: 2b0adfce62098bfe191391da978f3a3e7387201bc3161a46359165f694744a70730ff8b92b4b9ee8748ee46b7ecabc2b81e88718b15fae29ed0ed0db7638a745
+  data.tar.gz: 22b7ffc62b39e1b7b227f8298ee1d1da3ed72cbc52358364657a27578cbfd50cc6f0bdbd8393931405f4574d7d1667c15ca79f24ab6fccf522531f335f504361

data/Gemfile

@@ -20,7 +20,7 @@ gem "activesupport"
 gem "activerecord", "~> 6.1"
 gem "sqlite3"
   # spec.add_runtime_dependency "mysql2" , "~> 0.4.1"
-gem "encx"
+#gem "encx"
 
 # spec.add_development_dependency "bundler", "~> 2.2.10"
 gem "rake", "~> 13.0"

data/Rakefile

@@ -10,16 +10,39 @@ desc "Run test"
 task default: :test
 =end
 
-#=begin
-task default: %w[setup makeconfig migrate integrate]
+# Defining a task called default that depends on the tasks setup, makeconfig, migrate, and integrate.
+task default: %w[delete setup makeconfig migrate integrate]
 
-task cmi: %w[makeconfig migrate integrate]
+task scmi: %w[setup makeconfig migrate integrate]
+
+task dsc: %w[delete setup makeconfig]
+
+task ds: %w[delete setup]
+
+task s: %w[setup]
+
+task sc: %w[setup makeconfig]
+
+task dscm: %w[delete setup makeconfig migrate]
+
+task scm: %w[setup makeconfig migrate]
+
+task dscmi: %w[delete setup makeconfig migrate integrate]
+
+task scmi: %w[setup makeconfig migrate integrate]
+
+task mi: %w[migrate integrate]
+
+task bmi: %w[delete_db migrate integrate]
+
+task b: %w[delete_db]
 
 # コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
 # プトファイルの生成
 task :setup do
   sh "bundle exec arxutils_sqlite3 --cmd=s --klass=Enop"
 end
+
 # DB構成情報の生成
 task :makeconfig do
   sh "bundle exec arxutils_sqlite3 --cmd=c"
@@ -28,6 +51,7 @@ end
 task :migrate do
   sh "bundle exec arxutils_sqlite3 --cmd=m --yaml=config/db_scheme.yml"
 end
+
 task :integrate do
   sh "bundle exec arxutils_sqlite3 --cmd=i"
 end
@@ -36,5 +60,8 @@ task :delete do
   sh "bundle exec arxutils_sqlite3 --cmd=d"
 end
 
-#=end
+task :delete_db do
+  sh "bundle exec arxutils_sqlite3 --cmd=b"
+end
+
 

data/arxutils_sqlite3.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   # spec.add_runtime_dependency "erb"
   # spec.add_runtime_dependency "activerecord", "~> 4.2"
+
   spec.add_runtime_dependency "activerecord", "~> 6.1"
   spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "ykutils"
@@ -43,10 +44,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "simpleoptparse"
   # spec.add_development_dependency "bundler", "~> 2.2.10"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  #spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rspec" , "~> 3.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "rubocop-rake"
   spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "yard"

data/exe/arxutils_sqlite3

@@ -6,14 +6,11 @@ require "pp"
 require "ykutils"
 require "ykxutils"
 
-if File.exist?(Arxutils_Sqlite3::DEST_OPTS_FILE)
-  opts_file = File.join("./" , Arxutils_Sqlite3::DEST_OPTS_FILE_2.to_s)
-  begin
-    require opts_file
-  rescue LoadError => ex
-    pp ex.message
-  end
-end
+config = Arxutils_Sqlite3::Config.new
+
+cli = Arxutils_Sqlite3::Cli.new(config)
+
+config.require_opts_file
 
 begin
   require "dbrelation"
@@ -21,120 +18,72 @@ rescue LoadError => ex
   pp ex.message
 end
 
+
+klass = nil
+setting = config.load_setting_yaml_file
+klass = setting[:klass]
+
 # DBセットアップクラス
-if File.exist?(Arxutils_Sqlite3::DEST_DBSETUP_FILE)
-  dbsetup_file = File.join("./" , Arxutils_Sqlite3::DEST_DBSETUP_FILE_2.to_s)
-  begin
-    require dbsetup_file
-  rescue LoadError => ex
-    pp ex.message
-  end
-end
+config.require_dbsetup_file
 
-banner = "Usage: bundle exec ruby exe/makemigrate --cmd=(s|c|m|i|d) -y yaml_file --klass=class"
+banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|c|m|i|d|b) -y yaml_file --klass=class"
 
 opts = @opts ? @opts : {}
-
-opts["dbconfig"] = Arxutils_Sqlite3::Dbutil::DBCONFIG_SQLITE3
+opts["dbconfig"] = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
 
 Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSION, nil) do |parser|
-  parser.on("--cmd X", %w[s c m i d]) { |x| opts["cmd"] = x }
+  parser.on("--cmd X", %w[s c m i d b]) { |x| opts["cmd"] = x }
   parser.on("-y yaml_file", "--yaml yaml_file") { |x| opts["yaml"] = x }
   parser.on("--klass klass") { |x| opts["klass"] = x }
 end
+klass = opts["klass"] if opts["klass"]
 
 env = ENV.fetch("ENV", nil)
 env ||= "production"
 
 case opts["cmd"]
 when "s"
-  FileUtils.cp(Arxutils_Sqlite3::DB_SCHEME_FILE, Arxutils_Sqlite3::Dbutil::CONFIG_DIR )
+  config.check_file_exist(Arxutils_Sqlite3::Config::DEST_OPTS_FILE, banner, 10)
+
   if opts["klass"].nil? || opts["klass"].strip == ""
     puts banner
-    exit 10
+    exit 20
   end
-
-  scope = Object.new
-  hash = {klass: opts["klass"]}
-  result_content = Ykutils::Erubyx.erubi_render_with_template_file(Arxutils_Sqlite3::OPTS_FILE, scope, hash)
-
-  File.open(Arxutils_Sqlite3::DEST_OPTS_FILE, "w"){|file|
-    file.write(result_content)
-  }
-  db_scheme_ary = nil
+  cli.setup(klass)
 
 when "c"
-  db_scheme_ary = nil
-  db_dir = Arxutils_Sqlite3::Dbutil::DB_DIR
-  config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
-  # DB構成ファイル名
-  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, opts["dbconfig"])
-
-  mig = Arxutils_Sqlite3::Util.prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_path, opts)
-  mig.make_dbconfig(opts)
+  dbconfig = opts["dbconfig"]
+  relation = opts["relation"]
+  cli.makeconfig(dbconfig, relation, banner, 30, opts)
 
 when "m"
-  if opts["yaml"].nil? || opts["yaml"].strip == ""
+  yaml_fname = opts["yaml"]
+  relation = opts[:relation]
+  dbconfig = opts["dbconfig"]
+  if yaml_fname.nil? || yaml_fname.strip == ""
     puts banner
-    exit 20
+    exit 40
   end
+  yaml_pn = Pathname.new(yaml_fname)
+  config.check_file_not_exist(yaml_pn, banner, 55)
 
-  opts["migrate_cmd"] = "migrate"
-  db_scheme_ary = YAML.load_file( opts["yaml"] )
-
-  scope = Object.new
-
-  hash0 = {module_name: opts[:relation][:module].join("::")}
-  hash = db_scheme_ary[0].merge( hash0 )
-  result_content = Ykutils::Erubyx.erubi_render_with_template_file(Arxutils_Sqlite3::DBSETUP_FILE, scope, hash)
-
-  File.open(Arxutils_Sqlite3::DEST_DBSETUP_FILE, "w"){|file|
-    file.write(result_content)
-  }
-  db_dir = Arxutils_Sqlite3::Dbutil::DB_DIR
-
-  config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
-  # DB構成ファイル名
-  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, opts["dbconfig"])
-  # DBログファイルへのパス
-  log_path = Arxutils_Sqlite3::Util.make_log_path(db_dir, opts["dbconfig"])
-  mig = Arxutils_Sqlite3::Util.prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_path, opts)
-  mig.process
-  dbconnect = Arxutils_Sqlite3::Dbutil::Dbconnect.new(
-    dbconfig_path,
-    env,
-    log_path
-  )
-  connect_time = dbconnect.connect
-  #p "connect_time=#{connect_time}"
-  ActiveRecord::MigrationContext.new(mig.migrate_dir, ActiveRecord::SchemaMigration).up
+  cli.migrate(yaml_pn, relation, klass, dbconfig, env)
 
 when "i"
-  #db_scheme_ary = YAML.load_file( opts["yaml"] )
-  db_scheme_ary = nil
-  db_dir = Arxutils_Sqlite3::Dbutil::DB_DIR
-
-  config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
-  # DB構成ファイルへのパス
-  dbconfig_dest_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, opts["dbconfig"])
-  # DBログファイルへのパス
-  log_path = Arxutils_Sqlite3::Util.make_log_path(db_dir, opts["dbconfig"])
-  dbconnect = Arxutils_Sqlite3::Dbutil::Dbconnect.new(
-    dbconfig_dest_path,
-    env,
-    log_path
-  )
-  connect_time = dbconnect.connect
-
-  Dbsetup.new(connect_time)
+  dbconfig = opts["dbconfig"]
+  cli.integrate(dbconfig, env)
 
 when "d"
   db_scheme_ary = nil
-  mig = Arxutils_Sqlite3::Util.repare_for_migrate(env, db_scheme_ary, opts)
-  mig.delete_migrate_config_and_db
+  dbconfig = opts["dbconfig"]
+  relation = opts["relation"]
+  cli.delete(dbconfig, db_scheme_ary, relation)
 
+when "b"
+  db_scheme_ary = nil
+  dbconfig = opts["dbconfig"]
+  relation = opts["relation"]
+  cli.delete_db(dbconfig, db_scheme_ary, relation)
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end
-#
-

data/lib/arxutils_sqlite3/arx.rb

@@ -1,5 +1,6 @@
 require "erb"
 require "ykutils"
+
 module Arxutils_Sqlite3
   # スキーマ設定に基づき、テンプレートから変換する
   class Arx

data/lib/arxutils_sqlite3/cli.rb

@@ -0,0 +1,67 @@
+module Arxutils_Sqlite3
+  # CLI用クラス
+  class Cli
+    def initialize(config)
+      @config = config
+    end
+
+    def setup(klass)
+      @config.make_config_directory
+      @config.setup_db_scheme_file
+      @config.setup_opts_file(klass)
+      @config.setup_setting_yaml_file(klass)
+      #db_scheme_ary = nil
+    end
+
+    def makeconfig(dbconfig, relation, banner, exit_code, opts)
+      db_scheme_ary = nil
+      dbconfig_path = @config.make_dbconfig_path(dbconfig)
+      @config.check_file_exist(dbconfig_path, banner, exit_code)
+      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      mig.make_dbconfig(opts)
+    end
+
+    def migrate(yaml_pn, relation, klass, dbconfig, env)
+      db_scheme_ary = YAML.load_file( yaml_pn )
+      dbconfig_path = @config.make_dbconfig_path(dbconfig)
+
+      dest_dbsetup_file = @config.get_dest_dbsetup_file
+      @config.make_dbsetup_file(db_scheme_ary, relation, klass, dest_dbsetup_file)
+
+      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, dbconfig, env)
+
+      # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
+      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      mig.output
+
+      # マイグレーション実行
+      ActiveRecord::MigrationContext.new(mig.migrate_dir, ActiveRecord::SchemaMigration).up
+    end
+
+    def integrate(dbconfig, env)
+      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, dbconfig, env)
+      Dbsetup.new(connect_time)
+    end
+
+    def delete(dbconfig, db_scheme_ary, relation)
+      config_dir = @config.get_config_dir
+      dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
+      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      mig.delete_migrate_and_config_and_db
+    end
+
+    def delete_db(dbconfig, db_scheme_ary, relation)
+      config_dir = config.get_config_dir
+      dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
+      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      # mig.delete_migrate_config_and_db
+      mig.delete_db
+    end
+
+    def rm_dbconfig(dbconfig)
+      dbconfig_path = @config.make_dbconfig_path(dbconfig)
+      p dbconfig_path
+      FileUtils.rm_f(dbconfig_path)
+    end
+  end
+end

data/lib/arxutils_sqlite3/config.rb

@@ -0,0 +1,242 @@
+require "ykutils"
+
+module Arxutils_Sqlite3
+  ##
+  # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
+  class Config
+    # DB格納ディレクトリ名
+    DB_DIR = "db".freeze
+    # migrate用スクリプト格納ディレクトリ名
+    MIGRATE_BASE_DIR = "migrate".freeze
+    # SQLITE3用DB構成名
+    DBCONFIG_SQLITE3 = "sqlite3".freeze
+    # MYSQL用DB構成名
+    DBCONFIG_MYSQL = "mysql".freeze
+    # DB構成格納用ディレクトリ名
+    CONFIG_DIR_NAME = "config".freeze
+
+    # コンフィグディレクトリへのパス
+    CONFIG_DIR = Pathname.new(CONFIG_DIR_NAME)
+    # データベース用ログファイル名
+    DATABASELOG = "database.log".freeze
+    # テンプレートディレクトリへのパス
+    TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join("template")
+    # リレーションテンプレートディレクトリへのパス
+    TEMPLATE_RELATION_DIR = TEMPLATE_DIR.join("relation")
+    TEMPLATE_CONFIG_DIR = TEMPLATE_DIR.join( CONFIG_DIR )
+    DB_SCHEME_DIR = TEMPLATE_RELATION_DIR.join("db_scheme")
+    DB_SCHEME_FILE = DB_SCHEME_DIR.join("db_scheme.yml")
+    DB_SCHEME_FILE_NAME = "db_scheme.yml".freeze
+    DB_SCHEME_FILE_NAME_2 = "db_scheme".freeze
+    OPTS_FILE_NAME = "opts.rb".freeze
+    OPTS_FILE_NAME_2 = "opts".freeze
+    DBSETUP_FILE_NAME = "dbsetup.rb".freeze
+    DBSETUP_FILE_NAME_2 = "dbsetup".freeze
+    SETTING_YAML_FILE_NAME = "setting.yml".freeze
+    DEST_CONFIG_DIR = Pathname.new( CONFIG_DIR )
+    OPTS_FILE = DB_SCHEME_DIR.join(OPTS_FILE_NAME)
+    # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
+    DBSETUP_FILE = DB_SCHEME_DIR.join(DBSETUP_FILE_NAME)
+    # 変換先optsファイル(Rubyスクリプトファイル)へのパス
+    DEST_OPTS_FILE = DEST_CONFIG_DIR.join(OPTS_FILE_NAME)
+    DEST_OPTS_FILE_2 = DEST_CONFIG_DIR.join(OPTS_FILE_NAME_2)
+    # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
+    DEST_DBSETUP_FILE = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME)
+    # 変換先Dbsetupクラス定義のRubyスクリプトファイル(拡張子無し)へのパス
+    DEST_DBSETUP_FILE_2 = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME_2)
+    DEST_DB_SCHEME_FILE = DEST_CONFIG_DIR.join(DB_SCHEME_FILE_NAME)
+    # 変換後DBスキームファイル(拡張子無し)へのパス
+    DEST_DB_SCHEME_FILE_2 = DEST_CONFIG_DIR.join(DB_SCHEME_FILE_NAME_2)
+    SETTING_YAML_FILE = CONFIG_DIR.join(SETTING_YAML_FILE_NAME)
+    DB_PN = Pathname.new(DB_DIR)
+    # migrateディレクトリへのパス
+    MIGRATE_DIR = DB_PN.join(MIGRATE_BASE_DIR)
+
+    # DB構成ファイル格納ディレクトリの作成
+    def make_config_directory
+      FileUtils.mkdir_p(CONFIG_DIR)
+    end
+
+    # DBスキームファイルのひな型コピー
+    def setup_db_scheme_file
+      FileUtils.cp(DB_SCHEME_FILE,  DEST_DB_SCHEME_FILE)
+    end
+
+    # optsファイル(Rubyスクリプトファイル)のrequire
+    def setup_opts_file(klass)
+      scope = Object.new
+      hash = {klass: klass}
+      result_content = Ykutils::Erubyx.erubi_render_with_template_file(OPTS_FILE, scope, hash)
+      File.open(DEST_OPTS_FILE, "w"){|file|
+        file.write(result_content)
+      }
+    end
+
+    # setting.ymlへの出力
+    def setup_setting_yaml_file(klass)
+      hash = { "klass": klass }
+      content = YAML.dump(hash)
+      File.open(SETTING_YAML_FILE, "w"){|file|
+        file.write(content)
+      }
+    end
+
+    # DB構成ファイルの作成
+    def make_dbconfig_path(dbconfig)
+      # DB構成ファイル名
+      Arxutils_Sqlite3::Util.make_dbconfig_path(CONFIG_DIR, dbconfig)
+    end
+
+    # optsファイル(Rubyスクリプトファイル)のrequire
+    def require_opts_file
+      if DEST_OPTS_FILE.exist?
+        opts_file = File.join("./" , DEST_OPTS_FILE_2.to_s)
+        begin
+          require opts_file
+        rescue LoadError => ex
+          pp ex.message
+        end
+      end
+    end
+
+    # setting.ymlのロード
+    def load_setting_yaml_file
+      setting = {}
+      # settingファイル
+      setting_yaml_file = SETTING_YAML_FILE
+      if setting_yaml_file.exist?
+        setting = YAML.load_file( setting_yaml_file )
+      end
+      setting
+    end
+
+    # Dbsetupファイル(Rubyスクリプトファイル)のrequire
+    def require_dbsetup_file
+      dbsetup_file = File.join(".", get_dest_dbsetup_file_2.to_s)
+      begin
+        require dbsetup_file
+      rescue LoadError => ex
+        pp ex.message
+      end
+    end
+
+    # 指定ファイルの存在確認
+    def check_file_exist(file_pn, banner, exit_code)
+      if file_pn.exist?
+        puts "#{file_pn} exists!"
+        puts banner
+        exit exit_code
+      end
+    end
+
+    # 指定ファイルの非存在確認
+    def check_file_not_exist(file_pn, banner, exit_code)
+      if !file_pn.exist?
+        puts "#{file_pn} does not exists!"
+        puts banner
+        exit exit_code
+      end
+    end
+    
+    # 変換先optsファイル(Rubyスクリプトファイル)へのパス
+    def get_dest_opts_file
+      DEST_OPTS_FILE
+    end
+
+    # DB格納ディレクトリ名
+    def get_db_dir
+      DB_DIR
+    end
+
+    # migrateディレクトリへのパス
+    def get_migrate_dir
+      MIGRATE_DIR
+    end
+    # コンフィグディレクトリへのパス
+    def get_config_dir
+      CONFIG_DIR
+    end
+
+    # リレーションテンプレートディレクトリへのパス
+    def get_template_relation_dir
+      TEMPLATE_RELATION_DIR
+    end
+
+    # テンプレートディレクトリへのパス
+    def get_template_config_dir
+      TEMPLATE_CONFIG_DIR
+    end
+
+    # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
+    def get_src_dbsetup_file
+      DBSETUP_FILE
+    end
+
+    # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
+    def get_dest_dbsetup_file
+      DEST_DBSETUP_FILE
+    end
+
+    # 変換先Dbsetupクラス定義のRubyスクリプトファイル(拡張子無し)へのパス
+    def get_dest_dbsetup_file_2
+      DEST_DBSETUP_FILE_2
+    end
+
+    # 変換後DBスキームファイル名(拡張子無し)
+    def get_dest_db_scheme_file
+      DEST_DB_SCHEME_FILE_2
+    end
+
+    # DBログファイルの作成
+    def setup_for_db_log_path(dbconfig)
+      db_dir = get_db_dir
+      # DBログファイルへのパス
+      Arxutils_Sqlite3::Util.make_log_path(db_dir, dbconfig)
+    end
+
+    # DB構成ファイルの作成
+    def setup_for_dbconfig_path(dbconfig)
+      config_dir = get_config_dir
+      # DB構成ファイル名
+      Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
+    end
+
+    # migrate用スクリプトの生成
+    def make_migrate_script(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      mig = Arxutils_Sqlite3::Util.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
+      mig.output
+    end
+
+    # migrateの準備
+    def prepare_for_migrate(db_scheme_ary, dbconfig_dest_path, dbconfig, relation)
+      #db_dir = config.DB_DIR
+      db_dir = get_db_dir
+      migrate_dir = get_migrate_dir
+      # DB構成ファイルの出力先ディレクトリ
+      dbconfig_src_fname = "#{dbconfig}.tmpl"
+      mig = Migrate.new(
+        self,
+        dbconfig_dest_path,
+        dbconfig_src_fname,
+        db_scheme_ary,
+        relation
+        )
+    end
+
+    def make_dbsetup_file(db_scheme_ary, relation, klass, dest_dbsetup_file)
+      src_dbsetup_file = get_src_dbsetup_file
+
+      scope = Object.new
+      hash0 = {module_name: relation[:module].join("::")}
+      hash = db_scheme_ary[0].merge( hash0 )
+      hash["klass"] = klass
+      result_content = Ykutils::Erubyx.erubi_render_with_template_file(src_dbsetup_file, scope, hash)
+
+      #p "################ dest_dbsetup_file=#{dest_dbsetup_file}"
+      File.open(dest_dbsetup_file, "w"){|file|
+        file.write(result_content)
+      }
+    end
+  end
+end

data/lib/arxutils_sqlite3/dbutil/dbconnect.rb

@@ -36,6 +36,20 @@ module Arxutils_Sqlite3
         format("%s-%s", dbconfig.to_s, log_file_base_name)
       end
 
+      def self.db_connect(config, dbconfig, env)
+        # DB構成ファイルへのパス
+        dbconfig_path = config.setup_for_dbconfig_path(dbconfig)
+        # DB用ログファイルへのパス
+        log_path = config.setup_for_db_log_path(dbconfig)
+        # DB接続
+        dbconnect = Arxutils_Sqlite3::Dbutil::Dbconnect.new(
+          dbconfig_path,
+          env,
+          log_path
+        )
+        dbconnect.connect
+      end
+
       # DB接続までの初期化に必要なディレクトリの確認、作成
       def initialize(dbconfig_dest_path, env, log_path)
         # 接続開始時刻

data/lib/arxutils_sqlite3/dbutil/dbrelation.rb

@@ -0,0 +1,26 @@
+module Enop
+module Dbutil
+  class Count < ActiveRecord::Base
+    has_many :invalidennblists
+  end
+
+  class Countdatetime < ActiveRecord::Base
+  end
+
+  class Evnb < ActiveRecord::Base
+  end
+
+  class Ennblist < ActiveRecord::Base
+  end
+
+  class Invalidennblist < ActiveRecord::Base
+    belongs_to :ennblist , foreign_key: 'org_id'
+    belongs_to :count , foreign_key: ''
+  end
+
+  class Currentennblist < ActiveRecord::Base
+    belongs_to :ennblist , foreign_key: 'org_id'
+  end
+
+end
+end

data/lib/arxutils_sqlite3/dbutil.rb

@@ -3,17 +3,6 @@ require_relative "dbutil/dbconnect"
 module Arxutils_Sqlite3
   # DB操作用ユーティリティクラス
   module Dbutil
-    # DB格納ディレクトリ名
-    DB_DIR = "db".freeze
-    # migrate用スクリプト格納ディレクトリ名
-    MIGRATE_DIR = "migrate".freeze
-    # SQLITE3用DB構成名
-    DBCONFIG_SQLITE3 = "sqlite3".freeze
-    # MYSQL用DB構成名
-    DBCONFIG_MYSQL = "mysql".freeze
-    # DB構成格納用ディレクトリ名
-    CONFIG_DIR = "config".freeze
-    # データベース用ログファイル名
-    DATABASELOG = "database.log".freeze
+    #
   end
 end

data/lib/arxutils_sqlite3/migrate.rb

@@ -10,7 +10,7 @@ require "pp"
 module Arxutils_Sqlite3
 ##
 # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
-class Migrate
+  class Migrate
     attr_reader :migrate_dir
     # migrate用スクリプトファイル名の先頭の番号の間隔
     FILENAME_COUNTER_STEP = 10
@@ -19,34 +19,33 @@ class Migrate
 
     # migrate用のスクリプトの生成、migrateの実行を行うmigratexの生成
     def initialize(
+      config,
       dbconfig_dest_path,
       dbconfig_src_fname,
-      migrate_dir,
-      db_dir,
       db_scheme_ary,
-      relation,
-      opts)
+      relation_config
+      )
       # DB格納ディレクトリ名
-      @db_dir = db_dir
+      @db_dir = config.get_db_dir
       # DB構成ファイルの出力先ディレクトリ
-      @dest_config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
+      @dest_config_dir = config.get_config_dir
       # 生成するDB構成情報ファイルパス
       @dbconfig_dest_path = dbconfig_dest_path
       # 参照用DB構成情報ファイル名
       @dbconfig_src_fname = dbconfig_src_fname
 
       # migrate用スクリプトの出力先ディレクトリ名
-      @migrate_dir = migrate_dir
+      @migrate_dir = config.get_migrate_dir
       # テンプレートファイル格納ディレクトリ名
-      @src_path = Arxutils_Sqlite3::TEMPLATE_RELATION_DIR
+      @src_path = config.get_template_relation_dir
+      #@src_path = Arxutils_Sqlite3::TEMPLATE_RELATION_DIR
       # 構成ファイル格納ディレクトリ
-      @src_config_path = Arxutils_Sqlite3::TEMPLATE_CONFIG_DIR
+      @src_config_path = config.get_template_config_dir
+#      @src_config_path = Arxutils_Sqlite3::TEMPLATE_CONFIG_DIR
       # データベーススキーマ定義配列
       @db_scheme_ary = db_scheme_ary
       # リレーション指定
-      @relation = relation
-      # オプション指定
-      @opts = opts
+      @relation_config = relation_config
 
       FileUtils.mkdir_p(@db_dir) if @db_dir
       FileUtils.mkdir_p(@migrate_dir) if @migrate_dir
@@ -54,17 +53,44 @@ class Migrate
     end
 
     # マイグレート用スクリプト、DB構成情報ファイル、DBファイルの削除
-    def delete_migrate_config_and_db
-      FileUtils.rm(Dir.glob(File.join(@migrate_dir, "*"))) if @migrate_dir
-      FileUtils.rm(Dir.glob(File.join(@dest_config_dir, "*")))
+    def delete_migrate_and_config_and_db
+      if @migrate_dir
+        Dir.glob(File.join(@migrate_dir, "*")).each do |x|
+          FileUtils.rm(x) if File.file?(x)
+        end
+      end
+      Dir.glob(File.join(@dest_config_dir, "*")).each do |x|
+        FileUtils.rm(x) if File.file?(x)
+      end
+      Dir.glob(File.join(@db_dir, "*")).each do |x|
+        # puts x
+        FileUtils.rm(x) if File.file?(x)
+      end
+    end
+
+    # マイグレート用スクリプト、DBファイルの削除
+    def delete_migrate_and_db
+      if @migrate_dir
+        Dir.glob(File.join(@migrate_dir, "*")).each do |x|
+          FileUtils.rm(x) if File.file?(x)
+        end
+      end
+      Dir.glob(File.join(@db_dir, "*")).each do |x|
+        # puts x
+        FileUtils.rm(x) if File.file?(x)
+      end
+    end
+
+    # DBファイルの削除
+    def delete_db
       Dir.glob(File.join(@db_dir, "*")).each do |x|
         # puts x
         FileUtils.rm(x) if File.file?(x)
       end
     end
 
-    # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成、migrate実行
-    def process
+    # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
+    def output
       # migrationのスクリプトをファイル出力する
       output_all_script
 
@@ -90,7 +116,7 @@ class Migrate
         content_array = ary
       end
       # relationのスクリプトを作成
-      output_relation_script(content_array, @relation)
+      output_relation_script(content_array, @relation_config)
     end
 
     # migrationのスクリプトをファイル出力する
@@ -184,19 +210,17 @@ class Migrate
     end
 
     # relationのスクリプトをファイル出力する
-    def output_relation_script(content_array, opts)
-      # pp "=="
-      # pp opts
-      dir = opts[:dir]
-      fname = opts[:filename]
+    def output_relation_script(content_array, relation_config)
+      dir = relation_config[:dir]
+      fname = relation_config[:filename]
       fpath = File.join(dir, fname)
       File.open(fpath, "w") do |file|
-        opts[:module].map { |mod| file.puts("module #{mod}") }
+        relation_config[:module].map { |mod| file.puts("module #{mod}") }
         content_array.map do |x|
           file.puts x
           file.puts ""
         end
-        opts[:module].map { |_mod| file.puts("end") }
+        relation_config[:module].map { |_mod| file.puts("end") }
       end
     end
   end

data/lib/arxutils_sqlite3/util.rb

@@ -1,29 +1,10 @@
 module Arxutils_Sqlite3
   class Util
-    # migrateの準備
-    def self.prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_dest_path, opts)
-      migrate_base_dir = Dbutil::MIGRATE_DIR
-      # migrate用スクリプト格納ディレクトリへのパス
-      migrate_dir = File.join(db_dir, migrate_base_dir)
-      # DB構成ファイルの出力先ディレクトリ
-      dest_config_dir = Dbutil::CONFIG_DIR
-      dbconfig_src_fname = "#{opts["dbconfig"]}.tmpl"
-      relation = opts[:relation]
-      mig = Migrate.new(
-        dbconfig_dest_path,
-        dbconfig_src_fname,
-        migrate_dir,
-        db_dir,
-        db_scheme_ary,
-        relation,
-        opts)
-    end
-
     # DBログファイルへのパスの作成
     def self.make_log_path(db_dir, dbconfig)
       log_path = ""
       log_fname = Dbutil::Dbconnect.make_log_file_name(
-        dbconfig, Dbutil::DATABASELOG)
+        dbconfig, Config::DATABASELOG)
       if db_dir && log_fname
         # DB用ログファイルへのパス
         log_path = File.join(db_dir, log_fname)
@@ -33,7 +14,7 @@ module Arxutils_Sqlite3
 
     # DB構成ファイルへのパスの作成
     def self.make_dbconfig_path(config_dir, dbconfig)
-      File.join( config_dir, "#{dbconfig}.yml")
+      Pathname.new(config_dir).join("#{dbconfig}.yml")
     end
   end
 end

data/lib/arxutils_sqlite3/version.rb

@@ -1,4 +1,4 @@
 module Arxutils_Sqlite3
   # バージョン番号
-  VERSION = "0.1.44".freeze
+  VERSION = "0.1.48".freeze
 end

data/lib/arxutils_sqlite3.rb

@@ -8,34 +8,20 @@ require "active_support/core_ext"
 require "active_record"
 require "pathname"
 
+module Arxutils_Sqlite3
+  TOP_DIR = Pathname(__FILE__).parent
+  class Error < StandardError; end
+  # Your code goes here...
+end
+
+require_relative "arxutils_sqlite3/dbutil"
+require_relative "arxutils_sqlite3/config"
+require_relative "arxutils_sqlite3/cli"
+
 require_relative "arxutils_sqlite3/version"
 require_relative "arxutils_sqlite3/arx"
 require_relative "arxutils_sqlite3/transactstate"
 require_relative "arxutils_sqlite3/hier"
 require_relative "arxutils_sqlite3/migrate"
-require_relative "arxutils_sqlite3/dbutil"
 require_relative "arxutils_sqlite3/migrate"
 require_relative "arxutils_sqlite3/util"
-
-module Arxutils_Sqlite3
-  TOP_DIR = Pathname(__FILE__).parent
-  TEMPLATE_DIR = TOP_DIR.join("template")
-  TEMPLATE_RELATION_DIR = TEMPLATE_DIR.join("relation")
-  TEMPLATE_CONFIG_DIR = TEMPLATE_DIR.join( Dbutil::CONFIG_DIR )
-  DB_SCHEME_DIR = TEMPLATE_RELATION_DIR.join("db_scheme")
-  DB_SCHEME_FILE = DB_SCHEME_DIR.join("db_scheme.yml")
-  OPTS_FILE_NAME = "opts.rb"
-  OPTS_FILE_NAME_2 = "opts"
-  DBSETUP_FILE_NAME = "dbsetup.rb"
-  DBSETUP_FILE_NAME_2 = "dbsetup"
-  DEST_CONFIG_DIR = Pathname.new( Dbutil::CONFIG_DIR )
-  OPTS_FILE = DB_SCHEME_DIR.join(OPTS_FILE_NAME)
-  DBSETUP_FILE = DB_SCHEME_DIR.join(DBSETUP_FILE_NAME)
-  DEST_OPTS_FILE = DEST_CONFIG_DIR.join(OPTS_FILE_NAME)
-  DEST_OPTS_FILE_2 = DEST_CONFIG_DIR.join(OPTS_FILE_NAME_2)
-  DEST_DBSETUP_FILE = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME)
-  DEST_DBSETUP_FILE_2 = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME_2)
-
-  class Error < StandardError; end
-  # Your code goes here...
-end

data/lib/template/relation/db_scheme/dbsetup.rb

@@ -1,7 +1,7 @@
 class Dbsetup
   def initialize(connect_time)
     @connect_time = connect_time
-    @ct = <%= module_name %>::<%= classname %>.create( <%= classname_downcase %>: @connect_time )
+    @ct = <%= klass %>::Dbutil::Countdatetime.create( countdatetime: @connect_time )
     @hs_by_notebook = {}
     @hs_by_id = {}
   end

data/lib/template/relation/db_scheme/opts.rb

@@ -1,5 +1,5 @@
 @opts = {
-  db_dir: Arxutils_Sqlite3::Dbutil::DB_DIR,
+  db_dir: Arxutils_Sqlite3::Config::DB_DIR,
   relation: {
     module: %w[<%= klass %> Dbutil],
     filename: "dbrelation.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.44
+  version: 0.1.48
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-10 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,47 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -217,8 +217,11 @@ files:
 - exe/arxutils_sqlite3
 - lib/arxutils_sqlite3.rb
 - lib/arxutils_sqlite3/arx.rb
+- lib/arxutils_sqlite3/cli.rb
+- lib/arxutils_sqlite3/config.rb
 - lib/arxutils_sqlite3/dbutil.rb
 - lib/arxutils_sqlite3/dbutil/dbconnect.rb
+- lib/arxutils_sqlite3/dbutil/dbrelation.rb
 - lib/arxutils_sqlite3/hier.rb
 - lib/arxutils_sqlite3/migrate.rb
 - lib/arxutils_sqlite3/transactstate.rb