arxutils_sqlite3 0.1.49 → 0.1.50

data/Gemfile.lock

@@ -0,0 +1,112 @@
+PATH
+  remote: .
+  specs:
+    arxutils_sqlite3 (0.1.50)
+      activerecord (~> 6.1)
+      activesupport
+      simpleoptparse
+      sqlite3
+      ykutils
+      ykxutils
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.7)
+      activesupport (= 6.1.7)
+    activerecord (6.1.7)
+      activemodel (= 6.1.7)
+      activesupport (= 6.1.7)
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    erubi (1.11.0)
+    erubis (2.7.0)
+    filex (0.1.7)
+      erubis
+      messagex
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    messagex (0.1.5)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.13.1)
+      rubocop (~> 1.33)
+    ruby-progressbar (1.11.0)
+    simpleoptparse (0.1.2)
+    sqlite3 (1.5.0-x86_64-linux)
+    tilt (2.0.11)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.3.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    ykutils (0.1.6)
+      erubi
+      filex
+      tilt
+    ykxutils (0.1.5)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1)
+  activesupport
+  arxutils_sqlite3!
+  bundler
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rubocop (~> 1.7)
+  rubocop-rake
+  rubocop-rspec
+  simpleoptparse
+  sqlite3
+  yard
+  ykutils (> 0.1.3)
+  ykxutils (> 0.1.0)
+
+BUNDLED WITH
+   2.3.17

data/Rakefile

@@ -1,104 +1,21 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+# require "rake/testtask"
 
-Rake::TestTask.new do |t|
-  t.libs  << "test"
-end
+# Rake::TestTask.new do |t|
+#  t.libs  << "test"
+# end
 
-#desc "Run test"
-#task default: :test
+# desc "Run test"
+# task default: :test
 
-# Defining a task called default that depends on the tasks setup, makeconfig, migrate, and acr.
+require "rspec/core/rake_task"
 
-desc "setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
-task default: %w[setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr]
+RSpec::Core::RakeTask.new(:spec)
 
-desc "delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
-task bootstrap: %w[delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr]
+require "rubocop/rake_task"
 
-desc "setup makeconfig migrate acr"
-task scfma: %w[setup makeconfig migrate acr]
-
-desc "delete setup makeconfig"
-task dsc: %w[delete setup makeconfig]
-
-desc "delete setup"
-task ds: %w[delete setup]
-
-desc "setup"
-task s: %w[setup]
-
-desc "setup makeconfig"
-task sc: %w[setup makeconfig]
-
-desc "delete setup makeconfig migrate"
-task dscm: %w[delete setup makeconfig migrate]
-
-desc "setup makeconfig migrate"
-task scm: %w[setup makeconfig migrate]
-
-desc "delete setup makeconfig migrate acr"
-task dscma: %w[delete setup makeconfig migrate acr]
-
-desc "setup makeconfig migrate acr"
-task scma: %w[setup makeconfig migrate acr]
-
-desc "migrate acr"
-task ma: %w[migrate acr]
-
-desc "delete_db migrate acr"
-task bma: %w[delete_db migrate acr]
-
-desc "delete_db"
-task b: %w[delete_db]
-
-# コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
-# プトファイルの生成
-desc "produce setting.yml, db_scheme.yml.sample and opts.rb.sample with class name Enop"
-task :setup do
-  sh "bundle exec arxutils_sqlite3 --cmd=s --klass=Enop"
-end
-
-desc "copy from db_scheme.yml.sample to db_scheme.yml"
-task :copy_db_scheme do
-  sh "bundle exec arxutils_sqlite3 --cmd=cds"
-end
-
-desc "copy from opts.rb.sample to opts.rb"
-task :copy_opts do
-  sh "bundle exec arxutils_sqlite3 --cmd=co"
-end
-
-# DB構成情報の生成
-desc "produce sqlite3.yml"
-task :makeconfig do
-  sh "bundle exec arxutils_sqlite3 --cmd=c"
-end
-
-# マイグレート用スクリプトファイルの生成
-desc "produce migration scripts"
-task :make_migrate_script do
-  sh "bundle exec arxutils_sqlite3 --cmd=f --yaml=config/db_scheme.yml"
-end
-# マイグレートの実行
-desc "execute migration"
-task :migrate do
-  sh "bundle exec arxutils_sqlite3 --cmd=m"
-end
-
-desc "call ActiveRecord instance method"
-task :acr do
-  sh "bundle exec arxutils_sqlite3 --cmd=a"
-end
-
-desc "delete configuration files adn migration scripts and db files"
-task :delete do
-  sh "bundle exec arxutils_sqlite3 --cmd=d"
-end
-
-desc "delete db files"
-task :delete_db do
-  sh "bundle exec arxutils_sqlite3 --cmd=b"
-end
+RuboCop::RakeTask.new
 
+# task default: %i[spec rubocop]
 
+require "arxutils_sqlite3_rake_task"

data/arxutils_sqlite3.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "utility functions for ActiveRecord."
   spec.homepage      = "https://ykominami.github.io/arxutils_sqlite3/"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
 
@@ -31,21 +31,21 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  #p spec.executables
+  # p spec.executables
   spec.require_paths = ["lib"]
   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 "simpleoptparse"
   spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "ykutils"
   spec.add_runtime_dependency "ykxutils"
-  spec.add_runtime_dependency "simpleoptparse"
   # spec.add_development_dependency "bundler", "~> 2.2.10"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec" , "~> 3.0"
   spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "rubocop-rake"
   spec.add_development_dependency "rubocop-rspec"

data/config/.gitignore

@@ -1,3 +1,4 @@
 *
+!setting.yml
 !.gitignore
 

data/config/setting.yml

@@ -0,0 +1,2 @@
+---
+:klass: Enop

data/exe/arxutils_sqlite3

@@ -10,7 +10,7 @@ config = Arxutils_Sqlite3::Config.new
 
 config.require_opts_file
 
-opts = @opts ? @opts : {}
+opts = @opts || {}
 
 acrecord = opts[:acrecord]
 if acrecord
@@ -18,15 +18,14 @@ if acrecord
   basename = File.basename(filename)
 
   begin
-    require "#{basename}"
-  rescue LoadError => ex
-    #pp ex.message
+    require basename.to_s
+  rescue LoadError
+    # pp ex.message
   end
 end
 
 opts[:db_dir] = Arxutils_Sqlite3::Config::DB_DIR
 
-klass = nil
 setting = config.load_setting_yaml_file
 klass = setting[:klass]
 
@@ -50,7 +49,7 @@ cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env)
 
 case opts["cmd"]
 when "s"
-  #config.check_file_exist(Arxutils_Sqlite3::Config::SAMPLE_DEST_OPTS_FILE, banner, 10)
+  # config.check_file_exist(Arxutils_Sqlite3::Config::SAMPLE_DEST_OPTS_FILE, banner, 10)
 
   if opts["klass"].nil? || opts["klass"].strip == ""
     puts banner

data/lib/arxutils_sqlite3/arx.rb

@@ -22,7 +22,7 @@ module Arxutils_Sqlite3
       @data = data
 
       # スキーマ設定の:itemsの値を展開後格納するためのStructクラス
-      #@field ||= Struct.new("Field", :name, :type, :null)
+      # @field ||= Struct.new("Field", :name, :type, :null)
       @field ||= Struct.new(:name, :type, :null)
 
       @data[:ary] = if @data[:items]
@@ -35,7 +35,7 @@ module Arxutils_Sqlite3
     # テンプレートファイルを元にした変換結果を返す
     def create
       scope = Object.new
-      scope.instance_variable_set(:@data , @data)
+      scope.instance_variable_set(:@data, @data)
       Ykutils::Erubyx.erubi_render_with_template_file(@fname, scope)
     end
   end

data/lib/arxutils_sqlite3/cli.rb

@@ -8,15 +8,15 @@ module Arxutils_Sqlite3
     end
 
     def setup(klass)
-      p "make_config_directory"
+      # p "make_config_directory"
       @config.make_config_directory
-      p "setup_db_scheme_file"
+      # p "setup_db_scheme_file"
       @config.setup_db_scheme_file
-      p "setup_opts_file(#{klass})"
+      # p "setup_opts_file(#{klass})"
       @config.setup_opts_file(klass)
-      p "setup_setting_yaml_file(#{klass})"
+      # p "setup_setting_yaml_file(#{klass})"
       @config.setup_setting_yaml_file(klass)
-      #db_scheme_ary = nil
+      # db_scheme_ary = nil
     end
 
     def copy_db_scheme
@@ -29,23 +29,21 @@ module Arxutils_Sqlite3
       @config.copy_opts_file
     end
 
-    def makeconfig(acrecord, banner, exit_code, opts)
+    def makeconfig(acrecord, _banner, _exit_code, opts)
       db_scheme_ary = nil
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
-      #@config.check_file_exist(dbconfig_path, banner, exit_code)
+      # @config.check_file_exist(dbconfig_path, banner, exit_code)
       mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
       mig.make_dbconfig(opts)
     end
 
     def setup_for_migrate(yaml_pn, acrecord, klass)
-      db_scheme_ary = YAML.load_file( yaml_pn )
+      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, acrecord, klass, dest_dbsetup_file)
 
-      # migrate用スクリプトの出力先ディレクトリ名
-      migrate_dir = @config.get_migrate_dir
       # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
       mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
       mig.output
@@ -55,7 +53,7 @@ module Arxutils_Sqlite3
       # migrate用スクリプトの出力先ディレクトリ名
       migrate_dir = @config.get_migrate_dir
 
-      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
+      Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
 
       # マイグレーション実行
       ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
@@ -83,7 +81,7 @@ module Arxutils_Sqlite3
 
     def rm_dbconfig
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
-      #p dbconfig_path
+      # p dbconfig_path
       FileUtils.rm_f(dbconfig_path)
     end
   end

data/lib/arxutils_sqlite3/config.rb

@@ -4,6 +4,7 @@ module Arxutils_Sqlite3
   ##
   # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
   class Config
+    EXCLUDE_FILES = %W!setting.yml!
     # DB格納ディレクトリ名
     DB_DIR = "db".freeze
     # migrate用スクリプト格納ディレクトリ名
@@ -23,33 +24,36 @@ module Arxutils_Sqlite3
     TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join("template")
     # リレーションテンプレートディレクトリへのパス
     TEMPLATE_ACRECORD_DIR = TEMPLATE_DIR.join("acrecord")
-    TEMPLATE_CONFIG_DIR = TEMPLATE_DIR.join( CONFIG_DIR )
+    TEMPLATE_CONFIG_DIR = TEMPLATE_DIR.join(CONFIG_DIR)
     DB_SCHEME_DIR = TEMPLATE_ACRECORD_DIR.join("db_scheme")
     DB_SCHEME_FILE = DB_SCHEME_DIR.join("db_scheme.yml")
     SAMPLE_DB_SCHEME_FILE = CONFIG_DIR.join("db_scheme.yml.sample")
     DB_SCHEME_FILE_NAME = "db_scheme.yml".freeze
-    DB_SCHEME_FILE_NAME_2 = "db_scheme".freeze
-    OPTS_FILE_NAME = "opts.rb".freeze
+    DB_SCHEME_FILE_NAME_B = "db_scheme".freeze
+    OPTS_FILE_NAME = "opts.tmpl".freeze
     SAMPLE_OPTS_FILE_NAME = "opts.rb.sample".freeze
-    OPTS_FILE_NAME_2 = "opts".freeze
-    DBSETUP_FILE_NAME = "dbsetup.rb".freeze
-    DBSETUP_FILE_NAME_2 = "dbsetup".freeze
+    OPTS_FILE_NAME_B = "opts".freeze
+    DEST_OPTS_FILE_NAME = "opts.rb".freeze
+    DEST_OPTS_FILE_NAME_B = "opts".freeze
+    DBSETUP_FILE_NAME = "dbsetup.tmpl".freeze
+    DBSETUP_FILE_NAME_B = "dbsetup".freeze
+    DEST_DBSETUP_FILE_NAME = "dbsetup.rb".freeze
     SETTING_YAML_FILE_NAME = "setting.yml".freeze
-    DEST_CONFIG_DIR = Pathname.new( CONFIG_DIR )
+    DEST_CONFIG_DIR = Pathname.new(CONFIG_DIR)
     OPTS_FILE = DB_SCHEME_DIR.join(OPTS_FILE_NAME)
     SAMPLE_OPTS_FILE = CONFIG_DIR.join(SAMPLE_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)
+    DEST_OPTS_FILE = DEST_CONFIG_DIR.join(DEST_OPTS_FILE_NAME)
+    DEST_OPTS_FILE_B = DEST_CONFIG_DIR.join(OPTS_FILE_NAME_B)
     # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
-    DEST_DBSETUP_FILE = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME)
+    DEST_DBSETUP_FILE = DEST_CONFIG_DIR.join(DEST_DBSETUP_FILE_NAME)
     # 変換先Dbsetupクラス定義のRubyスクリプトファイル(拡張子無し)へのパス
-    DEST_DBSETUP_FILE_2 = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME_2)
+    DEST_DBSETUP_FILE_B = DEST_CONFIG_DIR.join(DBSETUP_FILE_NAME_B)
     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)
+    DEST_DB_SCHEME_FILE_B = DEST_CONFIG_DIR.join(DB_SCHEME_FILE_NAME_B)
     SETTING_YAML_FILE = CONFIG_DIR.join(SETTING_YAML_FILE_NAME)
     DB_PN = Pathname.new(DB_DIR)
     # migrateディレクトリへのパス
@@ -57,51 +61,47 @@ module Arxutils_Sqlite3
 
     # DB構成ファイル格納ディレクトリの作成
     def make_config_directory
-      p "config make_config_directory"
+      # p "config make_config_directory"
       FileUtils.mkdir_p(CONFIG_DIR)
     end
 
     # DBスキームファイルのサンプルファイルコピー
     def setup_db_scheme_file
-      p "config setup_db_scheme_file"
-      p "DB_SCHEME_FILE=#{DB_SCHEME_FILE}"
-      p "SAMPLE_DB_SCHEME_FILE=#{SAMPLE_DB_SCHEME_FILE}"
-      FileUtils.cp(DB_SCHEME_FILE,  SAMPLE_DB_SCHEME_FILE)
+      # p "config setup_db_scheme_file"
+      # p "DB_SCHEME_FILE=#{DB_SCHEME_FILE}"
+      # p "SAMPLE_DB_SCHEME_FILE=#{SAMPLE_DB_SCHEME_FILE}"
+      FileUtils.cp(DB_SCHEME_FILE, SAMPLE_DB_SCHEME_FILE)
     end
 
     # DBスキームファイルが存在しなければ、サンプルファイルをDBスキームファイルとしてコピー
     def copy_db_scheme_file
-      if !File.exist?(DEST_DB_SCHEME_FILE)
-        FileUtils.cp(SAMPLE_DB_SCHEME_FILE,  DEST_DB_SCHEME_FILE)
-      end
+      return if File.exist?(DEST_DB_SCHEME_FILE)
+
+      FileUtils.cp(SAMPLE_DB_SCHEME_FILE, DEST_DB_SCHEME_FILE)
     end
 
     # optsファイル(Rubyスクリプトファイル)のサンプルファイル書き込み
     def setup_opts_file(klass)
       scope = Object.new
-      hash = {klass: klass}
+      hash = { klass: klass }
       result_content = Ykutils::Erubyx.erubi_render_with_template_file(OPTS_FILE, scope, hash)
-      File.open(SAMPLE_OPTS_FILE, "w"){|file|
-        file.write(result_content)
-      }
+      File.write(SAMPLE_OPTS_FILE, result_content)
     end
 
     # optsファイルが存在しなければ、サンプルファイルをoptsファイルとしてコピー
     def copy_opts_file
-      if !File.exist?(DEST_OPTS_FILE)
-        p "exist? #{File.exist?(DEST_OPTS_FILE)}"
-        p "copy SAMPLE_OPTS_FILE(#{SAMPLE_OPTS_FILE}) to DEST_OPTS_FILE(#{DEST_OPTS_FILE})"
-        FileUtils.cp(SAMPLE_OPTS_FILE,  DEST_OPTS_FILE)
-      end
+      return if File.exist?(DEST_OPTS_FILE)
+
+      # p "exist? #{File.exist?(DEST_OPTS_FILE)}"
+      # p "copy SAMPLE_OPTS_FILE(#{SAMPLE_OPTS_FILE}) to DEST_OPTS_FILE(#{DEST_OPTS_FILE})"
+      FileUtils.cp(SAMPLE_OPTS_FILE, DEST_OPTS_FILE)
     end
 
     # setting.ymlへの出力
     def setup_setting_yaml_file(klass)
-      hash = { "klass": klass }
+      hash = { klass: klass }
       content = YAML.dump(hash)
-      File.open(SETTING_YAML_FILE, "w"){|file|
-        file.write(content)
-      }
+      File.write(SETTING_YAML_FILE, content)
     end
 
     # DB構成ファイルの作成
@@ -112,13 +112,13 @@ module Arxutils_Sqlite3
 
     # 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
+      return unless DEST_OPTS_FILE.exist?
+
+      opts_file = File.join("./", DEST_OPTS_FILE_B.to_s)
+      begin
+        require opts_file
+      rescue LoadError
+        # pp ex.message
       end
     end
 
@@ -127,40 +127,38 @@ module Arxutils_Sqlite3
       setting = {}
       # settingファイル
       setting_yaml_file = SETTING_YAML_FILE
-      if setting_yaml_file.exist?
-        setting = YAML.load_file( setting_yaml_file )
-      end
+      setting = YAML.load_file(setting_yaml_file) if setting_yaml_file.exist?
       setting
     end
 
     # Dbsetupファイル(Rubyスクリプトファイル)のrequire
     def require_dbsetup_file
-      dbsetup_file = File.join(".", get_dest_dbsetup_file_2.to_s)
+      dbsetup_file = File.join(".", get_dest_dbsetup_file_b.to_s)
       begin
         require dbsetup_file
-      rescue LoadError => ex
+      rescue LoadError
         # 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
+      return unless file_pn.exist?
+
+      puts "#{file_pn} exists!"
+      puts banner
+      exit exit_code
     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
+      return if file_pn.exist?
+
+      puts "#{file_pn} does not exists!"
+      puts banner
+      exit exit_code
     end
-    
+
     # 変換先optsファイル(Rubyスクリプトファイル)へのパス
     def get_dest_opts_file
       DEST_OPTS_FILE
@@ -175,6 +173,7 @@ module Arxutils_Sqlite3
     def get_migrate_dir
       MIGRATE_DIR
     end
+
     # コンフィグディレクトリへのパス
     def get_config_dir
       CONFIG_DIR
@@ -201,13 +200,13 @@ module Arxutils_Sqlite3
     end
 
     # 変換先Dbsetupクラス定義のRubyスクリプトファイル(拡張子無し)へのパス
-    def get_dest_dbsetup_file_2
-      DEST_DBSETUP_FILE_2
+    def get_dest_dbsetup_file_b
+      DEST_DBSETUP_FILE_B
     end
 
     # 変換後DBスキームファイル名(拡張子無し)
     def get_dest_db_scheme_file
-      DEST_DB_SCHEME_FILE_2
+      DEST_DB_SCHEME_FILE_B
     end
 
     # DBログファイルの作成
@@ -233,14 +232,12 @@ module Arxutils_Sqlite3
 
     # migrateの準備
     def prepare_for_migrate(db_scheme_ary, dbconfig_dest_path, dbconfig, acrecord)
-      #db_dir = config.DB_DIR
-      db_dir = get_db_dir
       # DB構成ファイルの出力先ディレクトリ
       dbconfig_src_fname = "#{dbconfig}.tmpl"
       # migrate用スクリプトの出力先ディレクトリ名
       migrate_dir = get_migrate_dir
 
-      mig = Migrate.new(
+      Migrate.new(
         self,
         dbconfig_dest_path,
         dbconfig_src_fname,
@@ -254,14 +251,16 @@ module Arxutils_Sqlite3
       src_dbsetup_file = get_src_dbsetup_file
 
       scope = Object.new
-      hash0 = {module_name: acrecord[:module].join("::")}
-      hash = db_scheme_ary[0].merge( hash0 )
+      hash0 = { module_name: acrecord[: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)
 
-      File.open(dest_dbsetup_file, "w"){|file|
-        file.write(result_content)
-      }
+      File.write(dest_dbsetup_file, result_content)
+    end
+
+    def exclude_file?( fname )
+      EXCLUDE_FILES.index( fname ) != nil
     end
   end
-end
+end