arxutils_sqlite3 0.1.55 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5088d67aaf0d344baa38409d59917374132f161d7e3f9f24d4e947dfe83ae4ce
-  data.tar.gz: 405fdb8388ab606d8c2036f26966707bf05dddc498cc50ebb4730d0fcf03f73a
+  metadata.gz: fc3d7553db8a9f3ab369bb8cd52ddc1c2dad405a5bc902dab4df7f10cf092371
+  data.tar.gz: 051160b94504da313197d003017d925c30c035b17c7bc14dd8dfd957e23d2014
 SHA512:
-  metadata.gz: 48294fc512c0ea001f5f4e2f2adba8c4e8aea126c921fcdc0e769c70fce1530cf084778b65133cd0402b8c2ca728e8bf971f364f6d7f51451785e41d8808b7e8
-  data.tar.gz: 8a0a987962aad35da0c289b4f716abf70f626b35ad5b5c739981240cebbab08d68f98c9ac61c4c22bd1a1b89da195abae806642a48cfd6e39e56df007c9a7bd2
+  metadata.gz: a0925a9111aa889b00d36609fd1027a5e6b925f855e5bc1934dbbae5df85134c7eb1d1b1edd3d5133b59323151d88bae047954a9febf8fd22837b0ecda2fb06b
+  data.tar.gz: 1fb3f7177523006d793adedb9080557fe6a7d132163d70cc19436e22c4d789c08c0e75060219f53f1d9a026fa2a89d828eaf1c0c02fcd12ac9b559b062c287e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.55)
+    arxutils_sqlite3 (0.1.57)
       activerecord (~> 6.1)
       activesupport
       simpleoptparse
@@ -109,4 +109,4 @@ DEPENDENCIES
   ykxutils (> 0.1.0)
 
 BUNDLED WITH
-   2.3.17
+   2.3.22

data/config/setting.yml

@@ -1,2 +1,2 @@
 ---
-:klass: Xenop
+:mod: Xenop

data/exe/arxutils_sqlite3

@@ -8,34 +8,37 @@ require "ykxutils"
 
 config = Arxutils_Sqlite3::Config.new
 
-opts, klass = config.setupx(self)
+opts, mod = config.setupx(self)
 # p opts
-# p klass
+# p mod
 # exit
 
-banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b|y) -y yaml_file --klass=class"
+banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|del|b|y|dm) -y yaml_file --mod=mod"
 
 Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSION, nil) do |parser|
-  parser.on("--cmd X", %w[s cds co c f m a d b y]) { |x| opts["cmd"] = x }
+  parser.on("--cmd X", %w[s cds co c f m a d del b y dm]) { |x| opts["cmd"] = x }
   parser.on("-y yaml_file", "--yaml yaml_file") { |x| opts["yaml"] = x }
-  parser.on("--klass klass") { |x| opts["klass"] = x }
+  parser.on("--mod mod") { |x| opts["mod"] = x }
 end
 
 dbconfig = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
 env = ENV.fetch("ENV", nil)
 env ||= "production"
 
-cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env)
+acrecord = opts[:acrecord]
+yaml_fname = opts["yaml"]
+mod ||= opts["mod"]
+cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env, acrecord, yaml_fname, mod)
 
 case opts["cmd"]
 when "s"
   # config.check_file_exist(Arxutils_Sqlite3::Config::SAMPLE_DEST_OPTS_FILE, banner, 10)
 
-  if opts["klass"].nil? || opts["klass"].strip == ""
+  if opts["mod"].nil? || opts["mod"].strip == ""
     puts banner
     exit 20
   end
-  cli.setup(klass)
+  cli.setup(mod)
 
 when "cds"
   cli.copy_db_scheme
@@ -44,20 +47,16 @@ when "co"
   cli.copy_opts_file
 
 when "c"
-  acrecord = opts[:acrecord]
-  cli.makeconfig(acrecord, banner, 30, opts)
+  cli.makeconfig(opts)
 
 when "f"
-  yaml_fname = opts["yaml"]
-  acrecord = opts[:acrecord]
   if yaml_fname.nil? || yaml_fname.strip == ""
     puts banner
     exit 40
   end
   yaml_pn = Pathname.new(yaml_fname)
   config.check_file_not_exist(yaml_pn, banner, 55)
-  cli.setup_for_migrate(yaml_pn, acrecord, klass)
-
+  cli.make_migrate_script
 when "m"
   cli.migrate
 
@@ -65,17 +64,20 @@ when "a"
   cli.acr
 
 when "d"
-  db_scheme_ary = nil
-  acrecord = opts["acrecord"]
-  cli.delete(db_scheme_ary, acrecord)
+  cli.clean
+
+when "del"
+  cli.delete
 
 when "b"
-  db_scheme_ary = nil
-  acrecord = opts["acrecord"]
-  cli.delete_db(db_scheme_ary, acrecord)
+  cli.delete_db
 
 when "y"
   cli.delete_setting_yaml
+
+when "dm"
+  cli.delete_migrate
+
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end

data/lib/arxutils_sqlite3/cli.rb

@@ -1,21 +1,30 @@
 module Arxutils_Sqlite3
   # CLI用クラス
   class Cli
-    def initialize(config, dbconfig, env)
+    def initialize(config, dbconfig, env, acrecord, yaml_fname, _mod)
       @config = config
       @dbconfig = dbconfig
       @env = env
+      @acrecord = acrecord
+      @dbconfig_path = @config.make_dbconfig_path(@dbconfig)
+
+      @db_scheme_ary = nil
+      if yaml_fname && yaml_fname.strip != ""
+        yaml_pn = Pathname.new(yaml_fname)
+        @db_scheme_ary = YAML.load_file(yaml_pn)
+      end
+      @mig = @config.prepare_for_migrate(@db_scheme_ary, @dbconfig_path, @dbconfig, @acrecord)
     end
 
-    def setup(klass)
+    def setup(mod)
       # p "make_config_directory"
       @config.make_config_directory
       # p "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)
+      @config.setup_db_scheme_file(mod)
+      # p "setup_opts_file(#{mod})"
+      @config.setup_opts_file(mod)
+      # p "setup_setting_yaml_file(#{mod})"
+      @config.setup_setting_yaml_file(mod)
       # db_scheme_ary = nil
     end
 
@@ -29,24 +38,24 @@ module Arxutils_Sqlite3
       @config.copy_opts_file
     end
 
-    def makeconfig(acrecord, _banner, _exit_code, opts)
+    def setup_for_migrate
+      ret = :SUCCESS
       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, acrecord)
-      mig.make_dbconfig(opts)
+      @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, @acrecord)
+      ret
     end
 
-    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.dest_dbsetup_file
-      @config.make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
+    def makeconfig(opts)
+      @mig.make_dbconfig(opts)
+    end
 
+    def make_migrate_script
+      @dest_dbsetup_file = @config.dest_dbsetup_file
+      @config.make_dbsetup_file(@db_scheme_ary, @acrecord, @mod, @dest_dbsetup_file)
       # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
-      mig.output
+      @mig.output
     end
 
     # マイグレーション実行
@@ -68,32 +77,38 @@ module Arxutils_Sqlite3
       ret = :SUCCESS
       begin
         Dbsetup.new(connect_time)
-      rescue StandardError
+      rescue StandardError => e
+        puts e.message
         ret = :StandardError
       end
 
       ret
     end
 
-    def delete(db_scheme_ary, acrecord)
-      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
+    def clean
+      @mig.delete_migrate_and_config_and_db
     end
 
-    def delete_db(db_scheme_ary, acrecord)
-      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
+    def delete
+      @mig.delete_migrate_and_db
+    end
+
+    def delete_db
+      @mig.delete_db
+    end
+
+    def delete_nigrate
+      @mig.delete_migrate
     end
 
     def delete_setting_yaml
       FileUtils.rm_f(@config.setting_yaml_file)
     end
 
+    def delete_migrate
+      @mig.delete_migrate
+    end
+
     def rm_dbconfig
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
       # p dbconfig_path

data/lib/arxutils_sqlite3/config.rb

@@ -61,10 +61,10 @@ module Arxutils_Sqlite3
     # 削除しないファイル群
     EXCLUDE_FILES = %w[SETTING_YAML_FILE_NAME].freeze
     # 作成対象のActiveRecordの子クラスのデフォルトクラス名
-    DEFAULT_KLASS = "Xenop".freeze
+    DEFAULT_MOD = "Xenop".freeze
 
-    def default_klass
-      DEFAULT_KLASS
+    def default_mod
+      DEFAULT_MOD
     end
 
     def setting_yaml_file
@@ -95,13 +95,13 @@ module Arxutils_Sqlite3
 
       setting = load_setting_yaml_file
       # p "setting=#{setting}"
-      klass = setting[:klass]
-      klass ||= DEFAULT_KLASS
+      mod = setting[:mod]
+      mod ||= DEFAULT_MOD
 
       # DBセットアップクラス
       require_dbsetup_file
 
-      [opts, klass]
+      [opts, mod]
     end
 
     # DB構成ファイル格納ディレクトリの作成
@@ -111,12 +111,12 @@ module Arxutils_Sqlite3
     end
 
     # DBスキームファイルのサンプルファイコピー
-    def setup_db_scheme_file(klass)
+    def setup_db_scheme_file(mod)
       # p "config setup_db_scheme_file"
       # p "DB_SCHEME_FILE=#{DB_SCHEME_FILE}"
       # p "SAMPLE_DB_SCHEME_FILE=#{SAMPLE_DB_SCHEME_FILE}"
       scope = {}
-      value_hash = { klass: klass }
+      value_hash = { mod: mod }
       content = Ykutils::Erubyx.erubi_render_with_template_file(DB_SCHEME_FILE, scope, value_hash)
       Ykxutils.yaml_load_compati(content)
       File.write(SAMPLE_DB_SCHEME_FILE, content)
@@ -130,9 +130,9 @@ module Arxutils_Sqlite3
     end
 
     # optsファイル(Rubyスクリプトファイル)のサンプルファイル書き込み
-    def setup_opts_file(klass)
+    def setup_opts_file(mod)
       scope = Object.new
-      hash = { klass: klass }
+      hash = { mod_name: mod }
       result_content = Ykutils::Erubyx.erubi_render_with_template_file(OPTS_FILE, scope, hash)
       File.write(SAMPLE_OPTS_FILE, result_content)
     end
@@ -147,8 +147,8 @@ module Arxutils_Sqlite3
     end
 
     # setting.ymlへの出力
-    def setup_setting_yaml_file(klass)
-      hash = { klass: klass }
+    def setup_setting_yaml_file(mod)
+      hash = { mod: mod }
       content = YAML.dump(hash)
       ret = :SUCCESS
       begin
@@ -285,11 +285,10 @@ module Arxutils_Sqlite3
       )
     end
 
-    def make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
+    def make_dbsetup_file(db_scheme_ary, acrecord, _mod, dest_dbsetup_file)
       scope = Object.new
-      hash0 = { module_name: acrecord[:module].join("::") }
+      hash0 = { mod_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.write(dest_dbsetup_file, result_content)

data/lib/arxutils_sqlite3/migrate.rb

@@ -85,7 +85,6 @@ module Arxutils_Sqlite3
     # DBファイルの削除
     def delete_db
       Dir.glob(File.join(@db_dir, "*")).each do |x|
-        # puts x
         FileUtils.rm(x) if File.file?(x)
       end
     end

data/lib/arxutils_sqlite3/rake_task.rb

@@ -2,10 +2,10 @@
 require "arxutils_sqlite3"
 config = Arxutils_Sqlite3::Config.new
 
-klass = nil
+mod = nil
 setting = config.load_setting_yaml_file
-klass = setting[:klass]
-klass = config.default_klass if klass.nil?
+mod = setting[:mod]
+mod = config.default_mod if mod.nil?
 
 desc_arxutils_sqlite3 = "setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
 
@@ -29,9 +29,9 @@ task "arx:ds": %w[arx:delete_setting]
 
 # コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
 # プトファイルの生成
-desc "produce setting.yml, db_scheme.yml.sample and opts.rb.sample with class name #{klass}"
+desc "produce setting.yml, db_scheme.yml.sample and opts.rb.sample with class name #{mod}"
 task "arx:setup" do
-  sh "bundle exec arxutils_sqlite3 --cmd=s --klass=#{klass}"
+  sh "bundle exec arxutils_sqlite3 --cmd=s --mod=#{mod}"
 end
 
 desc "copy from db_scheme.yml.sample to db_scheme.yml"
@@ -68,6 +68,11 @@ end
 
 desc "delete configuration files adn migration scripts and db files"
 task "arx:delete" do
+  sh "bundle exec arxutils_sqlite3 --cmd=del"
+end
+
+desc "delete configuration files adn migration scripts and db files"
+task "arx:clean" do
   sh "bundle exec arxutils_sqlite3 --cmd=d"
 end
 
@@ -80,3 +85,8 @@ desc "delete setting yaml"
 task "arx:delete_setting" do
   sh "bundle exec arxutils_sqlite3 --cmd=y"
 end
+
+desc "delete migrate scripts"
+task "arx:delete_migrate" do
+  sh "bundle exec arxutils_sqlite3 --cmd=dm"
+end

data/lib/arxutils_sqlite3/version.rb

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

data/lib/dbacrecord.rb

@@ -14,12 +14,12 @@ module Dbutil
   end
 
   class Invalidxenoplist < ActiveRecord::Base
-    belongs_to :xenoplist, foreign_key: 'org_id'
-    belongs_to :count, foreign_key: ''
+    belongs_to :xenoplist, foreign_key: "org_id"
+    belongs_to :count, foreign_key: ""
   end
 
   class Currentxenoplist < ActiveRecord::Base
-    belongs_to :xenoplist , foreign_key: 'org_id'
+    belongs_to :xenoplist, foreign_key: "org_id"
   end
 
 end

data/lib/template/acrecord/db_scheme/db_scheme.yml

@@ -11,8 +11,8 @@
   :ar_version: 6.0
 - :flist:
     - noitem
-  :classname: <%= klass %>
-  :classname_downcase: <%= klass.downcase %> 
+  :classname: <%= mod %>
+  :classname_downcase: <%= mod.downcase %>
   :items:
     - - time_id
       - integer
@@ -20,14 +20,14 @@
     - - ennb_id
       - integer
       - 'false'
-  :plural: <%= klass.downcase %>s
+  :plural: <%= mod.downcase %>s
   :ar_version: 6.0
 - :flist:
     - noitem
     - invalid
     - current
-  :classname: <%= klass %>list
-  :classname_downcase: <%= klass.downcase %>list
+  :classname: <%= mod %>list
+  :classname_downcase: <%= mod.downcase %>list
   :items:
     - - stack
       - string
@@ -44,5 +44,5 @@
     - - start_datetime
       - datetime
       - 'false'
-  :plural: <%= klass.downcase %>lists
+  :plural: <%= mod.downcase %>lists
   :ar_version: 6.0

data/lib/template/acrecord/db_scheme/dbsetup.tmpl

@@ -3,7 +3,7 @@ require_relative "../lib/dbacrecord"
 class Dbsetup
   def initialize(connect_time)
     @connect_time = connect_time
-    @ct = <%= klass %>::Dbutil::Countdatetime.create(countdatetime: @connect_time)
+    @ct = <%= mod_name %>::Countdatetime.create(countdatetime: @connect_time)
     @hs_by_notebook = {}
     @hs_by_id = {}
   end

data/lib/template/acrecord/db_scheme/opts.rb.sample

@@ -1,6 +1,6 @@
 @opts = {
   acrecord: {
-    module: %w[<%= klass %> Dbutil],
+    module: %w[<%= mod %> Dbutil],
     filename: "dbacrecord.rb",
     dir: "lib"
   }

data/lib/template/acrecord/db_scheme/opts.tmpl

@@ -1,6 +1,6 @@
 @opts = {
   acrecord: {
-    module: %w[<%= klass %> Dbutil],
+    module: %w[<%= mod_name %> Dbutil],
     filename: "dbacrecord.rb",
     dir: "lib"
   }

data/memo.md

@@ -0,0 +1,7 @@
+```mermaid
+graph TD;
+    Cli#makeconfig-->config.prepare_for_migrate;
+    Cli#delete-->config.prepare_for_migrate;
+    Cli#delete_db-->config.prepare_for_migrate;
+    Cli#delete_migrate-->config.prepare_for_migrate;
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.57
 platform: ruby
 authors:
 - yasuo kominami
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,13 +243,14 @@ files:
 - lib/template/acrecord/noitem.tmpl
 - lib/template/config/mysql.tmpl
 - lib/template/config/sqlite3.tmpl
+- memo.md
 homepage: https://ykominami.github.io/arxutils_sqlite3/
 licenses:
 - MIT
 metadata:
   homepage_uri: https://ykominami.github.io/arxutils_sqlite3/
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -264,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: utility functions for ActiveRecord.
 test_files: []