lib/arxutils_sqlite3/cli.rb in arxutils_sqlite3-0.1.53 vs lib/arxutils_sqlite3/cli.rb in arxutils_sqlite3-0.1.54

@@ -9,11 +9,11 @@
 
     def setup(klass)
       # p "make_config_directory"
       @config.make_config_directory
       # p "setup_db_scheme_file"
-      @config.setup_db_scheme_file
+      @config.setup_db_scheme_file(klass)
       # p "setup_opts_file(#{klass})"
       @config.setup_opts_file(klass)
       # p "setup_setting_yaml_file(#{klass})"
       @config.setup_setting_yaml_file(klass)
       # db_scheme_ary = nil
@@ -39,45 +39,60 @@
 
     def setup_for_migrate(yaml_pn, acrecord, klass)
       db_scheme_ary = YAML.load_file(yaml_pn)
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
 
-      dest_dbsetup_file = @config.get_dest_dbsetup_file
+      dest_dbsetup_file = @config.dest_dbsetup_file
       @config.make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
 
       # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
       mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
       mig.output
     end
 
+    # マイグレーション実行
     def migrate
       # migrate用スクリプトの出力先ディレクトリ名
-      migrate_dir = @config.get_migrate_dir
+      migrate_dir = @config.migrate_dir
 
+      # DB接続
       Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
 
       # マイグレーション実行
       ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
     end
 
     def acr
+      # DB接続
       connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
-      Dbsetup.new(connect_time)
+      # `s` is a variable that is being used to store the value of the `gets` method.
+      ret = :SUCCESS
+      begin
+        Dbsetup.new(connect_time)
+      rescue StandardError
+        ret = :StandardError
+      end
+
+      ret
     end
 
     def delete(db_scheme_ary, acrecord)
-      config_dir = @config.get_config_dir
+      config_dir = @config.config_dir
       dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, @dbconfig)
       mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
       mig.delete_migrate_and_config_and_db
     end
 
     def delete_db(db_scheme_ary, acrecord)
-      config_dir = @config.get_config_dir
+      config_dir = @config.config_dir
       dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, @dbconfig)
       mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
       # mig.delete_migrate_config_and_db
       mig.delete_db
+    end
+
+    def delete_setting_yaml
+      FileUtils.rm_f(@config.setting_yaml_file)
     end
 
     def rm_dbconfig
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
       # p dbconfig_path