arxutils_sqlite3 0.1.48 → 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,67 +1,21 @@
 require "bundler/gem_tasks"
-=begin
-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
-=end
+# desc "Run test"
+# task default: :test
 
-# Defining a task called default that depends on the tasks setup, makeconfig, migrate, and integrate.
-task default: %w[delete setup makeconfig migrate integrate]
+require "rspec/core/rake_task"
 
-task scmi: %w[setup makeconfig migrate integrate]
+RSpec::Core::RakeTask.new(:spec)
 
-task dsc: %w[delete setup makeconfig]
+require "rubocop/rake_task"
 
-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"
-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
-
-task :delete do
-  sh "bundle exec arxutils_sqlite3 --cmd=d"
-end
-
-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

@@ -8,42 +8,48 @@ require "ykxutils"
 
 config = Arxutils_Sqlite3::Config.new
 
-cli = Arxutils_Sqlite3::Cli.new(config)
-
 config.require_opts_file
 
-begin
-  require "dbrelation"
-rescue LoadError => ex
-  pp ex.message
+opts = @opts || {}
+
+acrecord = opts[:acrecord]
+if acrecord
+  filename = acrecord[:filename]
+  basename = File.basename(filename)
+
+  begin
+    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]
 
 # DBセットアップクラス
 config.require_dbsetup_file
 
-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
+banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b) -y yaml_file --klass=class"
 
 Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSION, nil) do |parser|
-  parser.on("--cmd X", %w[s c m i d b]) { |x| opts["cmd"] = x }
+  parser.on("--cmd X", %w[s cds co c f m a 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"]
 
+dbconfig = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
 env = ENV.fetch("ENV", nil)
 env ||= "production"
 
+cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env)
+
 case opts["cmd"]
 when "s"
-  config.check_file_exist(Arxutils_Sqlite3::Config::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
@@ -51,39 +57,42 @@ when "s"
   end
   cli.setup(klass)
 
+when "cds"
+  cli.copy_db_scheme
+
+when "co"
+  cli.copy_opts_file
+
 when "c"
-  dbconfig = opts["dbconfig"]
-  relation = opts["relation"]
-  cli.makeconfig(dbconfig, relation, banner, 30, opts)
+  acrecord = opts[:acrecord]
+  cli.makeconfig(acrecord, banner, 30, opts)
 
-when "m"
+when "f"
   yaml_fname = opts["yaml"]
-  relation = opts[:relation]
-  dbconfig = opts["dbconfig"]
+  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.migrate(yaml_pn, relation, klass, dbconfig, env)
+when "m"
+  cli.migrate
 
-when "i"
-  dbconfig = opts["dbconfig"]
-  cli.integrate(dbconfig, env)
+when "a"
+  cli.acr
 
 when "d"
   db_scheme_ary = nil
-  dbconfig = opts["dbconfig"]
-  relation = opts["relation"]
-  cli.delete(dbconfig, db_scheme_ary, relation)
+  acrecord = opts["acrecord"]
+  cli.delete(db_scheme_ary, acrecord)
 
 when "b"
   db_scheme_ary = nil
-  dbconfig = opts["dbconfig"]
-  relation = opts["relation"]
-  cli.delete_db(dbconfig, db_scheme_ary, relation)
+  acrecord = opts["acrecord"]
+  cli.delete_db(db_scheme_ary, acrecord)
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end

data/lib/arxutils_sqlite3/arx.rb

@@ -18,11 +18,11 @@ module Arxutils_Sqlite3
       # :items
       #  フィールド名, 型, null許容 の配列
       # :plural
-      # :relation
+      # :acrecord
       @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

@@ -1,66 +1,87 @@
 module Arxutils_Sqlite3
   # CLI用クラス
   class Cli
-    def initialize(config)
+    def initialize(config, dbconfig, env)
       @config = config
+      @dbconfig = dbconfig
+      @env = env
     end
 
     def setup(klass)
+      # p "make_config_directory"
       @config.make_config_directory
+      # p "setup_db_scheme_file"
       @config.setup_db_scheme_file
+      # 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
+      # db_scheme_ary = nil
     end
 
-    def makeconfig(dbconfig, relation, banner, exit_code, opts)
+    def copy_db_scheme
+      # DBスキームファイルが存在しなければ、サンプルファイルをDBスキームファイルとしてコピー
+      @config.copy_db_scheme_file
+    end
+
+    def copy_opts_file
+      # optsファイルが存在しなければ、サンプルファイルをoptsファイルとしてコピー
+      @config.copy_opts_file
+    end
+
+    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)
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      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)
     end
 
-    def migrate(yaml_pn, relation, klass, dbconfig, env)
-      db_scheme_ary = YAML.load_file( yaml_pn )
-      dbconfig_path = @config.make_dbconfig_path(dbconfig)
+    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
-      @config.make_dbsetup_file(db_scheme_ary, relation, klass, dest_dbsetup_file)
-
-      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, dbconfig, env)
+      @config.make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
 
-      # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
+      # マイグレーション用スクリプトの生成、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
+
+      Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
 
       # マイグレーション実行
-      ActiveRecord::MigrationContext.new(mig.migrate_dir, ActiveRecord::SchemaMigration).up
+      ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
     end
 
-    def integrate(dbconfig, env)
-      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, dbconfig, env)
+    def acr
+      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
       Dbsetup.new(connect_time)
     end
 
-    def delete(dbconfig, db_scheme_ary, relation)
+    def delete(db_scheme_ary, acrecord)
       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)
+      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(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)
+    def delete_db(db_scheme_ary, acrecord)
+      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, acrecord)
       # mig.delete_migrate_config_and_db
       mig.delete_db
     end
 
-    def rm_dbconfig(dbconfig)
-      dbconfig_path = @config.make_dbconfig_path(dbconfig)
-      p dbconfig_path
+    def rm_dbconfig
+      dbconfig_path = @config.make_dbconfig_path(@dbconfig)
+      # p dbconfig_path
       FileUtils.rm_f(dbconfig_path)
     end
   end