arxutils_sqlite3 0.1.45 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7186c960b82d6762345ea6f0d8a52282025c001a52a4a9398ca7c7f15e4c21eb
-  data.tar.gz: 859c88d305e3b9227a9ed1464d5a254d13b096ccc30447acb6043cd7fd73a71f
+  metadata.gz: e09dc03b438aa54a9f0bb3e49c46b7592593e52a4e4275220a1b66890694054e
+  data.tar.gz: 1afd929a60c9e1fed27e11b9ff4ea87761be5dd77e15cf87cb2e090a153dbc07
 SHA512:
-  metadata.gz: 357450af1e2fc3051d4c0b9c3289022a39b779de484db79ca3576baff144c5a8c25529f181dc5e77ca0a6de5453d20bfae409898dc84d430cd46afaea48d8c21
-  data.tar.gz: 00142e1c2494bea9a3158628f778f553aae4ac1d4b02a18c7e576aea2b947b47f3ab5df1ffc200d58c9f84d4570ac916076b4acb41437d6e0be64179e668604b
+  metadata.gz: 3f63fa45e2827cc7c16ae8fc534c2ef725e1359c4d2c9f99c4edc73af78b846eaf43319c25cb177636cffef8d997fc939e6d97e865ece6ea0a0a064d398d90df
+  data.tar.gz: 508aa3ff67bddd7e1ec59403e6f18d024f71e79dbd23aa750dd6c736bd3a3183091f7ec9fde7b61d634091dddf41ef5885f5d6b900fcb8c4eb5a97bdde077ed7

data/Rakefile

@@ -10,7 +10,6 @@ desc "Run test"
 task default: :test
 =end
 
-#=begin
 # Defining a task called default that depends on the tasks setup, makeconfig, migrate, and integrate.
 task default: %w[delete setup makeconfig migrate integrate]
 
@@ -32,11 +31,18 @@ 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"
@@ -45,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
@@ -53,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/exe/arxutils_sqlite3

@@ -24,13 +24,13 @@ klass = setting[:klass]
 # DBセットアップクラス
 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::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
@@ -66,7 +66,6 @@ when "m"
   yaml_fname = opts["yaml"]
   relation = opts[:relation]
   dbconfig = opts["dbconfig"]
-
   if yaml_fname.nil? || yaml_fname.strip == ""
     puts banner
     exit 40
@@ -76,8 +75,6 @@ when "m"
   db_scheme_ary = YAML.load_file( yaml_pn )
 
   dest_dbsetup_file = config.get_dest_dbsetup_file
-  config.check_file_exist(dest_dbsetup_file, banner, 50)
-
   config.make_dbsetup_file(db_scheme_ary, relation, klass, dest_dbsetup_file)
 
   connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(config, dbconfig, env)
@@ -102,7 +99,29 @@ when "d"
   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, replation)
-  mig.delete_migrate_config_and_db
+  mig.delete_migrate_and_config_and_db
+
+when "b"
+  db_scheme_ary = nil
+  dbconfig = opts["dbconfig"]
+  replation = opts["replation"]
+
+  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, replation)
+  # mig.delete_migrate_config_and_db
+  mig.delete_db
+
+when "b"
+  db_scheme_ary = nil
+  dbconfig = opts["dbconfig"]
+  replation = opts["replation"]
+
+  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, replation)
+  # mig.delete_migrate_config_and_db
+  mig.delete_db
 
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"

data/lib/arxutils_sqlite3/config.rb

@@ -125,7 +125,7 @@ module Arxutils_Sqlite3
       if file_pn.exist?
         puts "#{file_pn} exists!"
         puts banner
-        exit 10
+        exit exit_code
       end
     end
 
@@ -134,7 +134,7 @@ module Arxutils_Sqlite3
       if !file_pn.exist?
         puts "#{file_pn} does not exists!"
         puts banner
-        exit 10
+        exit exit_code
       end
     end
     

data/lib/arxutils_sqlite3/dbutil.rb

@@ -3,7 +3,6 @@ require_relative "dbutil/dbconnect"
 module Arxutils_Sqlite3
   # DB操作用ユーティリティクラス
   module Dbutil
-    # DB格納ディレクトリ名
-    DB_DIR = "db".freeze
+    #
   end
 end

data/lib/arxutils_sqlite3/migrate.rb

@@ -53,9 +53,36 @@ module Arxutils_Sqlite3
     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)

data/lib/arxutils_sqlite3/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.47
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport