arxutils_sqlite3 0.1.58 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9869bb5f70a1b84e0b029c73369c71624dd56138009b6926dff1132e36c7e6f6
-  data.tar.gz: 2037193703cd10ca47ddee96acad81200a50ff4194d94bf88d69fd92fe11779d
+  metadata.gz: a3fe12a6d2e70fa7bd8b2756e9f855bdba38dbe8afceee110a35b8d5922423e4
+  data.tar.gz: 4492d9e180393bbba47ef444903462ac7f329380620383cd52f4df48ed6796af
 SHA512:
-  metadata.gz: 508ac749345626f3c1b1bc98ff0a97e011f40a026e88ac12f13e97e107fecd55068c6f25ce737bfbc5ce9ca6600dbcf6dadccc09c68d0e4eaa62d37fe7b712a4
-  data.tar.gz: 68c2597c5e5b09fa9415ee74d0cb7c7146425fdcceade63cfe49e93e5f9c188dcafe113f5491a5df8b44f41c07ec9224eb3f0dec0941711c559231975f0c0ff2
+  metadata.gz: e2ae6d7ce1900a90b3f748a5458580942b3c248906c7faa48ebbeaf0d4d8bd7b2c9db67ff582d9eeb8f26c6094a635e9322b01034774a93f7a3dccc0b9763348
+  data.tar.gz: 9b36ec2adb56b5e6f2e03a1e99c20be60058574855b6a77221b9cae9886015e04a2b7c10aac089640e7a1fe39e0dbf9f4487dce4f81860ba8bd24ad9940abadd

data/.rubocop.yml

@@ -8,9 +8,9 @@ AllCops:
   TargetRubyVersion: 2.6
   NewCops: enable
 
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
+#Style/StringLiterals:
+#  Enabled: true
+#  EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
   Enabled: true

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-09-23 07:28:29 UTC using RuboCop version 1.36.0.
+# on 2022-10-01 01:21:06 UTC using RuboCop version 1.36.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -27,27 +27,6 @@ Layout/IndentationWidth:
   Exclude:
     - 'lib/dbacrecord.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Layout/SpaceBeforeComma:
-  Exclude:
-    # - 'lib/dbacrecord.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, compact, no_space
-Layout/SpaceInsideParens:
-  Exclude:
-    # - 'config/dbsetup.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'db/migrate/050_create_currentxenoplist.rb'
-
 # Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -56,14 +35,14 @@ Metrics/AbcSize:
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 192
+  Max: 190
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 49
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 7
@@ -95,31 +74,17 @@ Naming/ClassAndModuleCamelCase:
 RSpec/MultipleMemoizedHelpers:
   Max: 11
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/BlockComments:
-  Exclude:
-    # - 'config/dbsetup.rb'
-
-# Offense count: 7
+# Offense count: 5
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
-    - 'config/dbsetup.rb'
     - 'db/migrate/010_create_countdatetime.rb'
     - 'db/migrate/020_create_xenop.rb'
     - 'db/migrate/030_create_xenoplist.rb'
     - 'db/migrate/040_create_invalidxenoplist.rb'
     - 'db/migrate/050_create_currentxenoplist.rb'
-    - 'lib/arxutils_sqlite3/util.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/EmptyLiteral:
-  Exclude:
-    # - 'config/dbsetup.rb'
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
@@ -128,24 +93,31 @@ Style/EmptyLiteral:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
-# Offense count: 22
+# Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Exclude:
+    - 'config/dbsetup.rb'
+    - 'db/migrate/010_create_countdatetime.rb'
+    - 'db/migrate/020_create_xenop.rb'
+    - 'db/migrate/030_create_xenoplist.rb'
+    - 'db/migrate/040_create_invalidxenoplist.rb'
+    - 'db/migrate/050_create_currentxenoplist.rb'
+    - 'lib/dbacrecord.rb'
 
-# Offense count: 10
+# Offense count: 11
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 # SupportedShorthandSyntax: always, never, either, consistent
 Style/HashSyntax:
   Exclude:
-    # - 'db/migrate/010_create_countdatetime.rb'
-    # - 'db/migrate/020_create_xenop.rb'
-    # - 'db/migrate/030_create_xenoplist.rb'
-    # - 'db/migrate/040_create_invalidxenoplist.rb'
+    - 'db/migrate/010_create_countdatetime.rb'
+    - 'db/migrate/020_create_xenop.rb'
+    - 'db/migrate/030_create_xenoplist.rb'
+    - 'db/migrate/040_create_invalidxenoplist.rb'
 
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
@@ -153,5 +125,5 @@ Style/HashSyntax:
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
-    # - 'config/dbsetup.rb'
-    # - 'lib/dbacrecord.rb'
+    - 'config/dbsetup.rb'
+    - 'lib/dbacrecord.rb'

data/Gemfile

@@ -1,37 +1,37 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in arxutils_sqlite3.gemspec
 gemspec
 
-gem "simpleoptparse"
+gem 'simpleoptparse'
 # gem "ykutils"
 # gem "ykutils" , :path => "C:\Users\ykomi\cur\ruby\ykutils"
 # gem "ykutils" , :path => "../ykutils"
 # gem "ykutils" , :github => "ykominami/ykutils"
-gem "ykutils", "> 0.1.3"
-gem "ykxutils", "> 0.1.0"
+gem 'ykutils', '> 0.1.3'
+gem 'ykxutils', '> 0.1.0'
 # gem "ykxutils", path: "../ykxutils"
 
-gem "activesupport"
+gem 'activesupport'
 # spec.add_runtime_dependency "erb"
 # spec.add_runtime_dependency "activerecord", "~> 4.2"
-gem "activerecord", "~> 6.1"
-gem "sqlite3"
+gem 'activerecord', '~> 6.1'
+gem 'sqlite3'
 # spec.add_runtime_dependency "mysql2" , "~> 0.4.1"
 # gem "encx"
 
 # spec.add_development_dependency "bundler", "~> 2.2.10"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.0'
 
-gem "rubocop", "~> 1.7"
-gem "rubocop-rake"
-gem "rubocop-rspec"
+gem 'rubocop', '~> 1.7'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
 
 group :development do
-  gem "yard"
+  gem 'yard'
 end
 
 # group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.58)
+    arxutils_sqlite3 (0.1.59)
       activerecord (~> 6.1)
       activesupport
       simpleoptparse

data/Rakefile

@@ -1,4 +1,6 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 # require "rake/testtask"
 
 # Rake::TestTask.new do |t|
@@ -8,14 +10,14 @@ require "bundler/gem_tasks"
 # desc "Run test"
 # task default: :test
 
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 
 # task default: %i[spec rubocop]
 
-require "arxutils_sqlite3/rake_task"
+require 'arxutils_sqlite3/rake_task'

data/arxutils_sqlite3.gemspec

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require_relative "lib/arxutils_sqlite3/version"
+require_relative 'lib/arxutils_sqlite3/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "arxutils_sqlite3"
+  spec.name          = 'arxutils_sqlite3'
   spec.version       = Arxutils_Sqlite3::VERSION
-  spec.authors       = ["yasuo kominami"]
-  spec.email         = ["ykominami@gmail.com"]
+  spec.authors       = ['yasuo kominami']
+  spec.email         = ['ykominami@gmail.com']
 
-  spec.summary       = "utility functions for ActiveRecord."
-  spec.description   = "utility functions for ActiveRecord."
-  spec.homepage      = "https://ykominami.github.io/arxutils_sqlite3/"
-  spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.summary       = 'utility functions for ActiveRecord.'
+  spec.description   = 'utility functions for ActiveRecord.'
+  spec.homepage      = 'https://ykominami.github.io/arxutils_sqlite3/'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.6.0'
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
 
-  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata['homepage_uri'] = spec.homepage
   # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-  spec.metadata["rubygems_mfa_required"] = "true"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,27 +29,27 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   # p spec.executables
-  spec.require_paths = ["lib"]
-  spec.add_runtime_dependency "activesupport"
+  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 '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_development_dependency "bundler", "~> 2.2.10"
-  spec.add_development_dependency "bundler"
-  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"
-  spec.add_development_dependency "yard"
+  spec.add_development_dependency 'bundler'
+  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'
+  spec.add_development_dependency 'yard'
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "arxutils_sqlite3"
+require 'bundler/setup'
+require 'arxutils_sqlite3'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require "arxutils_sqlite3"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/setup

@@ -3,6 +3,8 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
+bundle config path --local vendor/bundle
 bundle install
+bundle exec rake arx:arxutils_sqlite3
 
 # Do any other automated setup that you need to do here

data/exe/arxutils_sqlite3

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "arxutils_sqlite3"
-require "simpleoptparse"
-require "pp"
-require "ykutils"
-require "ykxutils"
+require 'arxutils_sqlite3'
+require 'simpleoptparse'
+require 'pp'
+require 'ykutils'
+require 'ykxutils'
 
 config = Arxutils_Sqlite3::Config.new
 
@@ -13,69 +14,69 @@ opts, mod = config.setupx(self)
 # p mod
 # exit
 
-banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|del|b|y|dm) -y yaml_file --mod=mod"
+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 del b y dm]) { |x| opts["cmd"] = x }
-  parser.on("-y yaml_file", "--yaml yaml_file") { |x| opts["yaml"] = x }
-  parser.on("--mod mod") { |x| opts["mod"] = 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('--mod mod') { |x| opts['mod'] = x }
 end
 
 dbconfig = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
-env = ENV.fetch("ENV", nil)
-env ||= "production"
+env = ENV.fetch('ENV', nil)
+env ||= 'production'
 
 acrecord = opts[:acrecord]
-yaml_fname = opts["yaml"]
-mod ||= opts["mod"]
+yaml_fname = opts['yaml']
+mod ||= opts['mod']
 cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env, acrecord, yaml_fname, mod)
 
-case opts["cmd"]
-when "s"
+case opts['cmd']
+when 's'
   # config.check_file_exist(Arxutils_Sqlite3::Config::SAMPLE_DEST_OPTS_FILE, banner, 10)
 
-  if opts["mod"].nil? || opts["mod"].strip == ""
+  if opts['mod'].nil? || opts['mod'].strip == ''
     puts banner
     exit 20
   end
   cli.setup(mod)
 
-when "cds"
+when 'cds'
   cli.copy_db_scheme
 
-when "co"
+when 'co'
   cli.copy_opts_file
 
-when "c"
+when 'c'
   cli.makeconfig(opts)
 
-when "f"
-  if yaml_fname.nil? || yaml_fname.strip == ""
+when 'f'
+  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.make_migrate_script
-when "m"
+when 'm'
   cli.migrate
 
-when "a"
+when 'a'
   cli.acr
 
-when "d"
+when 'd'
   cli.clean
 
-when "del"
+when 'del'
   cli.delete
 
-when "b"
+when 'b'
   cli.delete_db
 
-when "y"
+when 'y'
   cli.delete_setting_yaml
 
-when "dm"
+when 'dm'
   cli.delete_migrate
 
 else

data/lib/arxutils_sqlite3/arx.rb

@@ -1,5 +1,7 @@
-require "erb"
-require "ykutils"
+# frozen_string_literal: true
+
+require 'erb'
+require 'ykutils'
 
 module Arxutils_Sqlite3
   # スキーマ設定に基づき、テンプレートから変換する

data/lib/arxutils_sqlite3/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arxutils_Sqlite3
   # CLI用クラス
   class Cli
@@ -9,7 +11,7 @@ module Arxutils_Sqlite3
       @dbconfig_path = @config.make_dbconfig_path(@dbconfig)
 
       @db_scheme_ary = nil
-      if yaml_fname && yaml_fname.strip != ""
+      if yaml_fname && yaml_fname.strip != ''
         yaml_pn = Pathname.new(yaml_fname)
         @db_scheme_ary = YAML.load_file(yaml_pn)
       end

data/lib/arxutils_sqlite3/config.rb

@@ -1,43 +1,45 @@
-require "ykutils"
+# frozen_string_literal: true
+
+require 'ykutils'
 
 module Arxutils_Sqlite3
   ##
   # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
   class Config
     # DB格納ディレクトリ名
-    DB_DIR = "db".freeze
+    DB_DIR = 'db'
     # migrate用スクリプト格納ディレクトリ名
-    MIGRATE_BASE_DIR = "migrate".freeze
+    MIGRATE_BASE_DIR = 'migrate'
     # SQLITE3用DB構成名
-    DBCONFIG_SQLITE3 = "sqlite3".freeze
+    DBCONFIG_SQLITE3 = 'sqlite3'
     # MYSQL用DB構成名
-    DBCONFIG_MYSQL = "mysql".freeze
+    DBCONFIG_MYSQL = 'mysql'
     # DB構成格納用ディレクトリ名
-    CONFIG_DIR_NAME = "config".freeze
+    CONFIG_DIR_NAME = 'config'
 
     # コンフィグディレクトリへのパス
     CONFIG_DIR = Pathname.new(CONFIG_DIR_NAME)
     # データベース用ログファイル名
-    DATABASELOG = "database.log".freeze
+    DATABASELOG = 'database.log'
     # テンプレートディレクトリへのパス
-    TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join("template")
+    TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join('template')
     # リレーションテンプレートディレクトリへのパス
-    TEMPLATE_ACRECORD_DIR = TEMPLATE_DIR.join("acrecord")
+    TEMPLATE_ACRECORD_DIR = TEMPLATE_DIR.join('acrecord')
     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_B = "db_scheme".freeze
-    OPTS_FILE_NAME = "opts.tmpl".freeze
-    SAMPLE_OPTS_FILE_NAME = "opts.rb.sample".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
+    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'
+    DB_SCHEME_FILE_NAME_B = 'db_scheme'
+    OPTS_FILE_NAME = 'opts.tmpl'
+    SAMPLE_OPTS_FILE_NAME = 'opts.rb.sample'
+    OPTS_FILE_NAME_B = 'opts'
+    DEST_OPTS_FILE_NAME = 'opts.rb'
+    DEST_OPTS_FILE_NAME_B = 'opts'
+    DBSETUP_FILE_NAME = 'dbsetup.tmpl'
+    DBSETUP_FILE_NAME_B = 'dbsetup'
+    DEST_DBSETUP_FILE_NAME = 'dbsetup.rb'
+    SETTING_YAML_FILE_NAME = 'setting.yml'
     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)
@@ -61,7 +63,7 @@ module Arxutils_Sqlite3
     # 削除しないファイル群
     EXCLUDE_FILES = %w[SETTING_YAML_FILE_NAME].freeze
     # 作成対象のActiveRecordの子クラスのデフォルトクラス名
-    DEFAULT_MOD = "Xenop".freeze
+    DEFAULT_MOD = 'Xenop'
 
     def default_mod
       DEFAULT_MOD
@@ -169,7 +171,7 @@ module Arxutils_Sqlite3
     def require_opts_file
       return unless DEST_OPTS_FILE.exist?
 
-      opts_file = File.join("./", DEST_OPTS_FILE_B.to_s)
+      opts_file = File.join('./', DEST_OPTS_FILE_B.to_s)
       begin
         require opts_file
       rescue LoadError
@@ -188,7 +190,7 @@ module Arxutils_Sqlite3
 
     # Dbsetupファイル(Rubyスクリプトファイル)のrequire
     def require_dbsetup_file
-      dbsetup_file = File.join(".", dest_dbsetup_file_b.to_s)
+      dbsetup_file = File.join('.', dest_dbsetup_file_b.to_s)
       begin
         require dbsetup_file
       rescue LoadError
@@ -287,7 +289,7 @@ module Arxutils_Sqlite3
 
     def make_dbsetup_file(db_scheme_ary, acrecord, _mod, dest_dbsetup_file)
       scope = Object.new
-      hash0 = { mod_name: acrecord[:module].join("::") }
+      hash0 = { mod_name: acrecord[:module].join('::') }
       hash = db_scheme_ary[0].merge(hash0)
       result_content = Ykutils::Erubyx.erubi_render_with_template_file(src_dbsetup_file, scope, hash)
 

data/lib/arxutils_sqlite3/dbutil/dbconnect.rb

@@ -1,17 +1,18 @@
 #! -*- encoding : UTF-8 -*-
+# frozen_string_literal: true
 
-require "fileutils"
-require "yaml"
-require "active_record"
-require "sqlite3"
-require "ykxutils"
+require 'fileutils'
+require 'yaml'
+require 'active_record'
+require 'sqlite3'
+require 'ykxutils'
 
 module Arxutils_Sqlite3
   module Dbutil
     # DB操作用ユーティリティクラス
     class Dbconnect
       def self.make_log_file_name(dbconfig, log_file_base_name)
-        format("%s-%s", dbconfig.to_s, log_file_base_name)
+        format('%s-%s', dbconfig.to_s, log_file_base_name)
       end
 
       def self.db_connect(config, dbconfig, env)

data/lib/arxutils_sqlite3/dbutil.rb

@@ -1,4 +1,6 @@
-require_relative "dbutil/dbconnect"
+# frozen_string_literal: true
+
+require_relative 'dbutil/dbconnect'
 
 module Arxutils_Sqlite3
   # DB操作用ユーティリティクラス

data/lib/arxutils_sqlite3/hier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arxutils_Sqlite3
   # 階層処理
   class HierOp
@@ -93,7 +95,7 @@ module Arxutils_Sqlite3
     def register_parent(hier_ary, child_num, level)
       hier_ary.pop
       parent_hier_ary = hier_ary
-      parent_hier = parent_hier_ary.join("/")
+      parent_hier = parent_hier_ary.join('/')
       parent_num = register(parent_hier)
       hs = { parent_id: parent_num, child_id: child_num, level: level }
       @hier_klass.create(hs)
@@ -101,7 +103,7 @@ module Arxutils_Sqlite3
 
     # 文字列で指定した階層(/を区切り文字として持つ)をhier_klassに登録
     def register(hier)
-      hier_ary = hier.split("/")
+      hier_ary = hier.split('/')
       level = get_level_by_array(hier_ary)
 
       # もしhier_aryがnilだけを1個持つ配列、または空文字列だけを1個もつ配列であれば、hier_nameは空文字列になる
@@ -175,7 +177,7 @@ module Arxutils_Sqlite3
 
     # 階層を表すデータ構造から階層の名前を得る
     def get_name(items_row)
-      items_row ? items_row.name.split("/").pop : ""
+      items_row ? items_row.name.split('/').pop : ''
     end
 
     # 階層を表すデータ構造で指定された階層の下部階層の名前を調整する
@@ -212,7 +214,7 @@ module Arxutils_Sqlite3
 
     # 文字列で指定された親の階層の下の子の名前から、子の名前を作成
     def make_hier(parent_hier, name)
-      [parent_hier, name].join("/")
+      [parent_hier, name].join('/')
     end
   end
 end

data/lib/arxutils_sqlite3/migrate.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # require "arxutils_sqlite3"
-require "ykutils"
-require "fileutils"
+require 'ykutils'
+require 'fileutils'
 # require "active_support"
-require "active_record"
-require "active_record/migration"
-require "pp"
+require 'active_record'
+require 'active_record/migration'
+require 'pp'
 
 # ActiveRecord用ユーティリティモジュール
 module Arxutils_Sqlite3
@@ -58,7 +60,7 @@ module Arxutils_Sqlite3
     def delete_migrate_and_config_and_db
       #    def delete_migrate_and_config
       delete_migrate
-      Dir.glob(File.join(@dest_config_dir, "*")).each do |x|
+      Dir.glob(File.join(@dest_config_dir, '*')).each do |x|
         basename = File.basename(x)
         ret = !@config.exclude_file?(basename)
         ret_file = File.file?(x)
@@ -77,14 +79,14 @@ module Arxutils_Sqlite3
     def delete_migrate
       return unless @migrate_dir
 
-      Dir.glob(File.join(@migrate_dir, "*")).each do |x|
+      Dir.glob(File.join(@migrate_dir, '*')).each do |x|
         FileUtils.rm(x) if File.file?(x)
       end
     end
 
     # DBファイルの削除
     def delete_db
-      Dir.glob(File.join(@db_dir, "*")).each do |x|
+      Dir.glob(File.join(@db_dir, '*')).each do |x|
         FileUtils.rm(x) if File.file?(x)
       end
     end
@@ -106,12 +108,12 @@ module Arxutils_Sqlite3
       if content_array.find { |x| !x.nil? }
         # p "####### 1"
         data_count = {
-          count_classname: "Count",
+          count_classname: 'Count',
           need_count_class_plural: need_count_class_plural
         }
         # p "data_count=#{data_count}"
         ary = content_array.collect { |x| x[:content] }.flatten
-        count_content = convert_count_class_acrecord(data_count, "acrecord_count.tmpl")
+        count_content = convert_count_class_acrecord(data_count, 'acrecord_count.tmpl')
         ary.unshift(count_content)
         content_array = ary
       end
@@ -132,7 +134,7 @@ module Arxutils_Sqlite3
     def make_content_array
       # スキーマ設定配列から、acrecordのmigrate用のスクリプトの内容(ハッシュ形式)の配列を作成する
       acrecords = @db_scheme_ary.map do |x|
-        make_acrecord(x, "count")
+        make_acrecord(x, 'count')
       end
       acrecords.select { |x| x.size.positive? }
     end
@@ -153,7 +155,7 @@ module Arxutils_Sqlite3
     def make_dbconfig(data)
       content = convert(data, @src_config_path, @dbconfig_src_fname)
       File.open(
-        @dbconfig_dest_path, "w:utf-8"
+        @dbconfig_dest_path, 'w:utf-8'
       ) do |f|
         f.puts(content)
       end
@@ -169,8 +171,8 @@ module Arxutils_Sqlite3
         # 指定フィールドのフィールド名に対応したテンプレートファイルを用いて、acrecord設定を作成
         data[:flist].each_with_object({ content: [], need_count_class: nil }) do |field_name, s|
           case field_name
-          when "base", "noitem"
-            name_base = "acrecord"
+          when 'base', 'noitem'
+            name_base = 'acrecord'
             # data[:acrecord]がnilに設定されていたら改めて空の配列を設定
             data[:acrecord] = [] unless data[:acrecord]
           else
@@ -198,13 +200,13 @@ module Arxutils_Sqlite3
     # migrationのスクリプトをファイル出力する
     def output_script(idy, kind, content, classname_downcase)
       additional = case kind
-                   when "base", "noitem"
-                     ""
+                   when 'base', 'noitem'
+                     ''
                    else
                      kind
                    end
-      fname = File.join(@migrate_dir, format("%03d_create_%s%s.rb", idy, additional, classname_downcase))
-      File.open(fname, "w", **{ encoding: Encoding::UTF_8 }) do |f|
+      fname = File.join(@migrate_dir, format('%03d_create_%s%s.rb', idy, additional, classname_downcase))
+      File.open(fname, 'w', **{ encoding: Encoding::UTF_8 }) do |f|
         f.puts(content)
       end
     end
@@ -216,13 +218,13 @@ module Arxutils_Sqlite3
       fpath = File.join(dir, fname)
       ret = :SUCCESS
       begin
-        File.open(fpath, "w") do |file|
+        File.open(fpath, 'w') do |file|
           acrecord_config[:module].map { |mod| file.puts("module #{mod}") }
           content_array.map do |x|
             file.puts x
-            file.puts ""
+            file.puts ''
           end
-          acrecord_config[:module].map { |_mod| file.puts("end") }
+          acrecord_config[:module].map { |_mod| file.puts('end') }
         end
       rescue StandardError
         ret = :StandardError

data/lib/arxutils_sqlite3/rake_task.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Defining a task called default that depends on the tasks setup, makeconfig, migrate, and acr.
-require "arxutils_sqlite3"
+require 'arxutils_sqlite3'
 config = Arxutils_Sqlite3::Config.new
 
 mod = nil
@@ -7,86 +9,86 @@ setting = config.load_setting_yaml_file
 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"
+desc_arxutils_sqlite3 = 'setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr'
 
 desc desc_arxutils_sqlite3.to_s
 task arxutils_sqlite3: %w[arx:setup arx:copy_db_scheme arx:copy_opts arx:makeconfig arx:make_migrate_script arx:migrate arx:acr]
 
 desc desc_arxutils_sqlite3.to_s
-task "arx:arxutils_sqlite3": %w[arxutils_sqlite3]
+task 'arx:arxutils_sqlite3': %w[arxutils_sqlite3]
 
-desc "delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
-task "arx:bootstrap": %w[arx:delete arxutils_sqlite3]
+desc 'delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr'
+task 'arx:bootstrap': %w[arx:delete arxutils_sqlite3]
 
-desc "migrate acr"
-task "arx:ma": %w[arx:migrate arx:acr]
+desc 'migrate acr'
+task 'arx:ma': %w[arx:migrate arx:acr]
 
-desc "delete_db"
-task "arx:b": %w[arx:delete_db]
+desc 'delete_db'
+task 'arx:b': %w[arx:delete_db]
 
-desc "delete setting.yaml"
-task "arx:ds": %w[arx:delete_setting]
+desc 'delete setting.yaml'
+task 'arx:ds': %w[arx:delete_setting]
 
 # コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
 # プトファイルの生成
 desc "produce setting.yml, db_scheme.yml.sample and opts.rb.sample with class name #{mod}"
-task "arx:setup" do
+task 'arx:setup' do
   sh "bundle exec arxutils_sqlite3 --cmd=s --mod=#{mod}"
 end
 
-desc "copy from db_scheme.yml.sample to db_scheme.yml"
-task "arx:copy_db_scheme" do
-  sh "bundle exec arxutils_sqlite3 --cmd=cds"
+desc 'copy from db_scheme.yml.sample to db_scheme.yml'
+task 'arx:copy_db_scheme' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=cds'
 end
 
-desc "copy from opts.rb.sample to opts.rb"
-task "arx:copy_opts" do
-  sh "bundle exec arxutils_sqlite3 --cmd=co"
+desc 'copy from opts.rb.sample to opts.rb'
+task 'arx:copy_opts' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=co'
 end
 
 # DB構成情報の生成
-desc "produce sqlite3.yml"
-task "arx:makeconfig" do
-  sh "bundle exec arxutils_sqlite3 --cmd=c"
+desc 'produce sqlite3.yml'
+task 'arx:makeconfig' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=c'
 end
 
 # マイグレート用スクリプトファイルの生成
-desc "produce migration scripts"
-task "arx:make_migrate_script" do
-  sh "bundle exec arxutils_sqlite3 --cmd=f --yaml=config/db_scheme.yml"
+desc 'produce migration scripts'
+task 'arx:make_migrate_script' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=f --yaml=config/db_scheme.yml'
 end
 # マイグレートの実行
-desc "execute migration"
-task "arx:migrate" do
-  sh "bundle exec arxutils_sqlite3 --cmd=m"
+desc 'execute migration'
+task 'arx:migrate' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=m'
 end
 
-desc "call ActiveRecord instance method"
-task "arx:acr" do
-  sh "bundle exec arxutils_sqlite3 --cmd=a"
+desc 'call ActiveRecord instance method'
+task 'arx:acr' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=a'
 end
 
-desc "delete configuration files adn migration scripts and db files"
-task "arx:delete" do
-  sh "bundle exec arxutils_sqlite3 --cmd=del"
+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"
+desc 'delete configuration files adn migration scripts and db files'
+task 'arx:clean' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=d'
 end
 
-desc "delete db files"
-task "arx:delete_db" do
-  sh "bundle exec arxutils_sqlite3 --cmd=b"
+desc 'delete db files'
+task 'arx:delete_db' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=b'
 end
 
-desc "delete setting yaml"
-task "arx:delete_setting" do
-  sh "bundle exec arxutils_sqlite3 --cmd=y"
+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"
+desc 'delete migrate scripts'
+task 'arx:delete_migrate' do
+  sh 'bundle exec arxutils_sqlite3 --cmd=dm'
 end

data/lib/arxutils_sqlite3/transactstate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arxutils_Sqlite3
   # 簡易的なトランザクション処理
   class TransactState

data/lib/arxutils_sqlite3/util.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Arxutils_Sqlite3
+  # パス操作ユーティリティクラス
   class Util
     # DBログファイルへのパスの作成
     def self.make_log_path(db_dir, dbconfig)
-      log_path = ""
+      log_path = ''
       log_fname = Dbutil::Dbconnect.make_log_file_name(
         dbconfig, Config::DATABASELOG
       )

data/lib/arxutils_sqlite3/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Arxutils_Sqlite3
   # バージョン番号
-  VERSION = "0.1.58".freeze
+  VERSION = '0.1.59'
 end

data/lib/arxutils_sqlite3.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "ykutils"
-require "ykxutils"
+require 'ykutils'
+require 'ykxutils'
 
-require "bigdecimal"
-require "active_support"
-require "active_support/core_ext"
-require "active_record"
-require "pathname"
+require 'bigdecimal'
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_record'
+require 'pathname'
 
 module Arxutils_Sqlite3
   TOP_DIR = Pathname(__FILE__).parent
@@ -15,14 +15,14 @@ module Arxutils_Sqlite3
   # Your code goes here...
 end
 
-require_relative "arxutils_sqlite3/dbutil"
-require_relative "arxutils_sqlite3/config"
-require_relative "arxutils_sqlite3/cli"
+require_relative 'arxutils_sqlite3/dbutil'
+require_relative 'arxutils_sqlite3/config'
+require_relative 'arxutils_sqlite3/cli'
 
-require_relative "arxutils_sqlite3/version"
-require_relative "arxutils_sqlite3/arx"
-require_relative "arxutils_sqlite3/transactstate"
-require_relative "arxutils_sqlite3/hier"
-require_relative "arxutils_sqlite3/migrate"
-require_relative "arxutils_sqlite3/util"
-require_relative "dbacrecord"
+require_relative 'arxutils_sqlite3/version'
+require_relative 'arxutils_sqlite3/arx'
+require_relative 'arxutils_sqlite3/transactstate'
+require_relative 'arxutils_sqlite3/hier'
+require_relative 'arxutils_sqlite3/migrate'
+require_relative 'arxutils_sqlite3/util'
+require_relative 'dbacrecord'

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/acrecord_current.tmpl

@@ -1,3 +1,3 @@
   class Current<%= @data[:classname_downcase] %> < ActiveRecord::Base
-    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: "org_id"
+    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: 'org_id'
   end

data/lib/template/acrecord/acrecord_invalid.tmpl

@@ -1,4 +1,4 @@
   class Invalid<%= @data[:classname_downcase] %> < ActiveRecord::Base
-    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: "org_id"
-    belongs_to :<%= @data[:count_classname_downcase] %>, foreign_key: "<%= @data[:count_field] %>"
+    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: 'org_id'
+    belongs_to :<%= @data[:count_classname_downcase] %>, foreign_key: '<%= @data[:count_field] %>'
   end

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

@@ -1,4 +1,4 @@
-require_relative "../lib/dbacrecord"
+require_relative '../lib/dbacrecord'
 
 # テスト用クラス
 class Dbsetup
@@ -8,49 +8,4 @@ class Dbsetup
     @hs_by_notebook = {}
     @hs_by_id = {}
   end
-=begin
-  # 指定stack(文字列)にノートブック(文字列)、ノートブック数、タグ数を追加
-  def add( stack , notebook, count, tag_count )
-    ennblist = @hs_by_notebook[notebook]
-    unless ennblist
-      cur_ennblist = Currentennblist.where( notebook: notebook ).limit(1)
-      if cur_ennblist.size == 0
-        begin
-          ennblist = Ennblist.create( stack: stack, notebook: notebook ,
-                                      count: count, tag_count: tag_count ,
-                                      start_datetime: @register_time )
-          evnb = Evnb.create( time_id: @ct.id , ennb_id: ennblist.id )
-        rescue => ex
-          p ex.class
-          p ex.message
-          pp ex.backtrace
-
-          ennblist = nil
-          evnb = nil
-        end
-      else
-        current_ennblist = cur_ennblist.first.ennblist
-        hs = {:stack => stack, :count => count , :tag_count => tag_count }
-        value_hs = hs.reduce({}){ |hsx,item|
-          if current_ennblist[ item[0] ] != item[1]
-            hsx[ item[0] ] = item[1]
-          end
-          hsx
-        }
-        if value_hs.size > 0
-          if value_hs.all? { |item| item[1] != nil }
-            current_ennblist.update(value_hs)
-          end
-        end
-      end
-    else
-      # ignore this case.
-    end
-    if ennblist
-      @hs_by_notebook[notebook] = ennblist
-      @hs_by_id[ennblist.id] = ennblist
-    end
-    ennblist
-  end
-=end
 end

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.59
 platform: ruby
 authors:
 - yasuo kominami
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ licenses:
 metadata:
   homepage_uri: https://ykominami.github.io/arxutils_sqlite3/
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -265,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: utility functions for ActiveRecord.
 test_files: []