arxutils_sqlite3 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd619405f651016b19a09bb7dc65fe14eed439e25a419a24784774c3675f88a7
-  data.tar.gz: 2abf287f96ca75b75a41da86d74bf9269acb76ac380f7c55f9668093a4d4ccad
+  metadata.gz: 63b6c2964eb5bd59b6601706fdb9085d50353be9df04ba6b83995e1c9b617707
+  data.tar.gz: 3c366bd4cddb2287a82ad9f184a465c9953323699108eab8849ecadb10f8f11f
 SHA512:
-  metadata.gz: 23faf1f7084d060cf94778f3fcaeb4a3f2fd5f55d40607dd3133a032549140b30f02a50c65a2319a696c5324c4752dfa48e35041e90e3e4be3250c6d1d4ba37e
-  data.tar.gz: 662f292981fb7e3749c90d11f5ef29122491bff8b37b83dc0b03f66cf73f81db178179d3c41a1a24c82066181f6c2e772cdb4101aae8fb7ef79167f00696de3a
+  metadata.gz: b9c7c00307a6063f7254478e8879a0f883b4bb369533cb738dadbb964723cc24f7460e1684e9ae61b201567f3a13f48c8cb0e357999c7cdc99224cb9d6d9acb8
+  data.tar.gz: 0f2c860830b7568161cede9212427412d1e9babe3426429541e425f5e032695976c2e8e91657c81f90e1ff47583f4920efadb37cb2c978da09c302d92b04aaa5

data/.rubocop_todo.yml

@@ -1,319 +1,64 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-09-15 09:40:53 UTC using RuboCop version 1.36.0.
+# on 2022-09-23 07:28:29 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    #- 'arxutils_sqlite3.gemspec'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    #- 'arxutils_sqlite3.gemspec'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_element, with_fixed_indentation
-Layout/ArrayAlignment:
-  Exclude:
-    #- 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    #- 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
-# SupportedStyles: case, end
-Layout/CaseIndentation:
-  Exclude:
-    #- 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    #- 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment.
-Layout/CommentIndentation:
-  Exclude:
-    #- 'Gemfile'
-    #- 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowBorderComment, AllowMarginComment.
-Layout/EmptyComment:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/dbutil.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    # - 'lib/arxutils_sqlite3.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLines:
-  Exclude:
-    # - 'lib/arxutils_sqlite3_rake_task.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowAliasSyntax, AllowedMethods.
-# AllowedMethods: alias_method, public, protected, private
-Layout/EmptyLinesAroundAttributeAccessor:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    # - 'Gemfile'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
 Layout/EmptyLinesAroundModuleBody:
   Exclude:
-    # - 'lib/dbacrecord.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
+    - 'lib/dbacrecord.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Layout/HeredocIndentation:
   Exclude:
-    # - 'db/migrate/050_create_currentennblist.rb'
+    - 'db/migrate/050_create_currentxenoplist.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth, EnforcedStyle.
-# SupportedStyles: spaces, tabs
-Layout/IndentationStyle:
-  Exclude:
-    # - 'Gemfile'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
 Layout/IndentationWidth:
   Exclude:
-    # - 'Gemfile'
-    # - 'lib/dbacrecord.rb'
-
-# Offense count: 29
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
-Layout/LeadingCommentSpace:
-  Exclude:
-    # - 'Gemfile'
-    # - 'Rakefile'
-    # - 'arxutils_sqlite3.gemspec'
-    # - 'exe/arxutils_sqlite3'
-    # - 'lib/arxutils_sqlite3/arx.rb'
-    # - 'lib/arxutils_sqlite3/cli.rb'
-    # - 'lib/arxutils_sqlite3/config.rb'
-    # - 'lib/arxutils_sqlite3/dbutil/dbconnect.rb'
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/LeadingEmptyLines:
-  Exclude:
-    # - 'lib/arxutils_sqlite3_rake_task.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineArrayBraceLayout:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/MultilineBlockLayout:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineMethodCallBraceLayout:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-    # - 'lib/arxutils_sqlite3/util.rb'
+    - 'lib/dbacrecord.rb'
 
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 9
-# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceBeforeComma:
   Exclude:
-    # - 'Gemfile'
-    # - 'arxutils_sqlite3.gemspec'
-    # - 'lib/arxutils_sqlite3/arx.rb'
-    # - 'lib/arxutils_sqlite3/config.rb'
     # - 'lib/dbacrecord.rb'
-    # - 'spec/arxutils__sqlite3_spec.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 12
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, compact, no_space
 Layout/SpaceInsideParens:
   Exclude:
     # - 'config/dbsetup.rb'
-    # - 'lib/arxutils_sqlite3/cli.rb'
-    # - 'lib/arxutils_sqlite3/config.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingEmptyLines:
-  Exclude:
-    # - 'Gemfile'
-    # - 'Rakefile'
-    # - 'lib/arxutils_sqlite3.rb'
-    # - 'lib/arxutils_sqlite3/config.rb'
-    # - 'lib/arxutils_sqlite3_rake_task.rb'
-
-# Offense count: 3
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
-    # - 'db/migrate/050_create_currentennblist.rb'
-    # - 'lib/arxutils_sqlite3/config.rb'
-    # - 'spec/arxutils__sqlite3_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    # - 'Gemfile'
-
-# Offense count: 1
-Lint/NestedPercentLiteral:
-  Exclude:
-    # - 'lib/template/acrecord/db_scheme/opts.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/ScriptPermission:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/dbutil/dbconnect.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, consistent
-Lint/SymbolConversion:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/cli.rb'
-
-# Offense count: 13
-Lint/UselessAssignment:
-  Exclude:
-    # - 'exe/arxutils_sqlite3'
-    # - 'lib/arxutils_sqlite3/cli.rb'
-    # - 'lib/arxutils_sqlite3/config.rb'
-    # - 'lib/arxutils_sqlite3/hier.rb'
-    # - 'spec/arxutils__sqlite3_spec.rb'
+    - 'db/migrate/050_create_currentxenoplist.rb'
 
 # Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 27
+  Max: 23
 
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 173
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 192
 
-# Offense count: 12
+# Offense count: 11
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 49
@@ -328,11 +73,6 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 10
 
-# Offense count: 10
-Naming/AccessorMethodName:
-  Exclude:
-    - 'lib/arxutils_sqlite3/config.rb'
-
 # Offense count: 11
 # Configuration parameters: AllowedNames.
 # AllowedNames: module_parent
@@ -350,27 +90,10 @@ Naming/ClassAndModuleCamelCase:
     - 'lib/arxutils_sqlite3/util.rb'
     - 'lib/arxutils_sqlite3/version.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
-  Exclude:
-    - 'exe/arxutils_sqlite3'
-    - 'lib/arxutils_sqlite3/config.rb'
-    - 'lib/arxutils_sqlite3/dbutil/dbconnect.rb'
-
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
-# SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
-Naming/VariableNumber:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 2
-# Configuration parameters: CountAsOne.
-RSpec/ExampleLength:
-  Max: 7
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 11
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -378,18 +101,6 @@ Style/BlockComments:
   Exclude:
     # - 'config/dbsetup.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-    # - 'lib/arxutils_sqlite3/migrate.rb'
-
 # Offense count: 7
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
@@ -398,17 +109,17 @@ Style/Documentation:
     - 'test/**/*'
     - 'config/dbsetup.rb'
     - 'db/migrate/010_create_countdatetime.rb'
-    - 'db/migrate/020_create_evnb.rb'
-    - 'db/migrate/030_create_ennblist.rb'
-    - 'db/migrate/040_create_invalidennblist.rb'
-    - 'db/migrate/050_create_currentennblist.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: 3
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-Style/FileWrite:
+Style/EmptyLiteral:
   Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
+    # - 'config/dbsetup.rb'
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
@@ -424,12 +135,6 @@ Style/FormatStringToken:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 5
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
 # Offense count: 10
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
@@ -438,50 +143,15 @@ Style/GuardClause:
 Style/HashSyntax:
   Exclude:
     # - 'db/migrate/010_create_countdatetime.rb'
-    # - 'db/migrate/020_create_evnb.rb'
-    # - 'db/migrate/030_create_ennblist.rb'
-    # - 'db/migrate/040_create_invalidennblist.rb'
+    # - 'db/migrate/020_create_xenop.rb'
+    # - 'db/migrate/030_create_xenoplist.rb'
+    # - 'db/migrate/040_create_invalidxenoplist.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: both, prefix, postfix
-Style/NegatedIf:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/config.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantCondition:
-  Exclude:
-    # - 'exe/arxutils_sqlite3'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/RedundantInterpolation:
-  Exclude:
-    # - 'exe/arxutils_sqlite3'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    # - 'lib/arxutils_sqlite3/dbutil/dbconnect.rb'
-
-# Offense count: 5
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
-    # - 'Rakefile'
+    # - 'config/dbsetup.rb'
     # - 'lib/dbacrecord.rb'
-    # - 'spec/arxutils__sqlite3_spec.rb'

data/Gemfile

@@ -12,7 +12,7 @@ gem "simpleoptparse"
 # gem "ykutils" , :github => "ykominami/ykutils"
 gem "ykutils", "> 0.1.3"
 gem "ykxutils", "> 0.1.0"
-# gem "ykxutils", :path => "../ykxutils"
+# gem "ykxutils", path: "../ykxutils"
 
 gem "activesupport"
 # spec.add_runtime_dependency "erb"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.53)
+    arxutils_sqlite3 (0.1.54)
       activerecord (~> 6.1)
       activesupport
       simpleoptparse
@@ -70,7 +70,7 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.1)
+    rubocop-rspec (2.13.2)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simpleoptparse (0.1.2)
@@ -86,7 +86,7 @@ GEM
       erubi
       filex
       tilt
-    ykxutils (0.1.5)
+    ykxutils (0.1.7)
     zeitwerk (2.6.0)
 
 PLATFORMS

data/config/setting.yml

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

data/exe/arxutils_sqlite3

@@ -8,38 +8,18 @@ require "ykxutils"
 
 config = Arxutils_Sqlite3::Config.new
 
-config.require_opts_file
+opts, klass = config.setupx(self)
+# p opts
+# p klass
+# exit
 
-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
-
-setting = config.load_setting_yaml_file
-klass = setting[:klass]
-
-# DBセットアップクラス
-config.require_dbsetup_file
-
-banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b) -y yaml_file --klass=class"
+banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b|y) -y yaml_file --klass=class"
 
 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]) { |x| opts["cmd"] = x }
+  parser.on("--cmd X", %w[s cds co c f m a d b y]) { |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)
@@ -93,6 +73,9 @@ when "b"
   db_scheme_ary = nil
   acrecord = opts["acrecord"]
   cli.delete_db(db_scheme_ary, acrecord)
+
+when "y"
+  cli.delete_setting_yaml
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end

data/lib/arxutils_sqlite3/cli.rb

@@ -11,7 +11,7 @@ module Arxutils_Sqlite3
       # 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})"
@@ -41,7 +41,7 @@ module Arxutils_Sqlite3
       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のクラス定義ファイルの生成
@@ -49,10 +49,12 @@ module Arxutils_Sqlite3
       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)
 
       # マイグレーション実行
@@ -60,25 +62,38 @@ module Arxutils_Sqlite3
     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

data/lib/arxutils_sqlite3/config.rb

@@ -58,25 +58,68 @@ module Arxutils_Sqlite3
     # migrateディレクトリへのパス
     MIGRATE_DIR = DB_PN.join(MIGRATE_BASE_DIR)
 
+    # 削除しないファイル群
     EXCLUDE_FILES = %w[SETTING_YAML_FILE_NAME].freeze
-    DEFAULT_KLASS = "Enop"
+    # 作成対象のActiveRecordの子クラスのデフォルトクラス名
+    DEFAULT_KLASS = "Xenop".freeze
 
     def default_klass
       DEFAULT_KLASS
     end
 
+    def setting_yaml_file
+      SETTING_YAML_FILE
+    end
+
+    def dest_dbsetup_file_b
+      DEST_DBSETUP_FILE_B
+    end
+
+    def setupx(toplevel)
+      require_opts_file
+
+      opts = toplevel.instance_variable_get(:@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
+
+      setting = load_setting_yaml_file
+      # p "setting=#{setting}"
+      klass = setting[:klass]
+      klass ||= DEFAULT_KLASS
+
+      # DBセットアップクラス
+      require_dbsetup_file
+
+      [opts, klass]
+    end
+
     # DB構成ファイル格納ディレクトリの作成
     def make_config_directory
       # p "config make_config_directory"
       FileUtils.mkdir_p(CONFIG_DIR)
     end
 
-    # DBスキームファイルのサンプルファイルコピー
-    def setup_db_scheme_file
+    # DBスキームファイルのサンプルファイコピー
+    def setup_db_scheme_file(klass)
       # p "config setup_db_scheme_file"
       # p "DB_SCHEME_FILE=#{DB_SCHEME_FILE}"
       # p "SAMPLE_DB_SCHEME_FILE=#{SAMPLE_DB_SCHEME_FILE}"
-      FileUtils.cp(DB_SCHEME_FILE, SAMPLE_DB_SCHEME_FILE)
+      scope = {}
+      value_hash = { klass: klass }
+      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)
     end
 
     # DBスキームファイルが存在しなければ、サンプルファイルをDBスキームファイルとしてコピー
@@ -107,7 +150,13 @@ module Arxutils_Sqlite3
     def setup_setting_yaml_file(klass)
       hash = { klass: klass }
       content = YAML.dump(hash)
-      File.write(SETTING_YAML_FILE, content)
+      ret = :SUCCESS
+      begin
+        File.write(SETTING_YAML_FILE, content)
+      rescue StandardError
+        ret = :StandardError
+      end
+      ret
     end
 
     # DB構成ファイルの作成
@@ -139,7 +188,7 @@ module Arxutils_Sqlite3
 
     # Dbsetupファイル(Rubyスクリプトファイル)のrequire
     def require_dbsetup_file
-      dbsetup_file = File.join(".", get_dest_dbsetup_file_b.to_s)
+      dbsetup_file = File.join(".", dest_dbsetup_file_b.to_s)
       begin
         require dbsetup_file
       rescue LoadError
@@ -165,66 +214,49 @@ module Arxutils_Sqlite3
       exit exit_code
     end
 
-    # 変換先optsファイル(Rubyスクリプトファイル)へのパス
-    def get_dest_opts_file
-      DEST_OPTS_FILE
-    end
-
     # DB格納ディレクトリ名
-    def get_db_dir
+    def db_dir
       DB_DIR
     end
 
     # migrateディレクトリへのパス
-    def get_migrate_dir
+    def migrate_dir
       MIGRATE_DIR
     end
 
     # コンフィグディレクトリへのパス
-    def get_config_dir
+    def config_dir
       CONFIG_DIR
     end
 
     # リレーションテンプレートディレクトリへのパス
-    def get_template_acrecord_dir
+    def template_acrecord_dir
       TEMPLATE_ACRECORD_DIR
     end
 
     # テンプレートディレクトリへのパス
-    def get_template_config_dir
+    def template_config_dir
       TEMPLATE_CONFIG_DIR
     end
 
     # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
-    def get_src_dbsetup_file
+    def src_dbsetup_file
       DBSETUP_FILE
     end
 
     # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
-    def get_dest_dbsetup_file
+    def dest_dbsetup_file
       DEST_DBSETUP_FILE
     end
 
-    # 変換先Dbsetupクラス定義のRubyスクリプトファイル(拡張子無し)へのパス
-    def get_dest_dbsetup_file_b
-      DEST_DBSETUP_FILE_B
-    end
-
-    # 変換後DBスキームファイル名(拡張子無し)
-    def get_dest_db_scheme_file
-      DEST_DB_SCHEME_FILE_B
-    end
-
     # DBログファイルの作成
     def setup_for_db_log_path(dbconfig)
-      db_dir = get_db_dir
       # DBログファイルへのパス
       Arxutils_Sqlite3::Util.make_log_path(db_dir, dbconfig)
     end
 
     # DB構成ファイルの作成
     def setup_for_dbconfig_path(dbconfig)
-      config_dir = get_config_dir
       # DB構成ファイル名
       Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
     end
@@ -241,7 +273,7 @@ module Arxutils_Sqlite3
       # DB構成ファイルの出力先ディレクトリ
       dbconfig_src_fname = "#{dbconfig}.tmpl"
       # migrate用スクリプトの出力先ディレクトリ名
-      migrate_dir = get_migrate_dir
+      # migrate_dir = get_migrate_dir
 
       Migrate.new(
         self,
@@ -254,8 +286,6 @@ module Arxutils_Sqlite3
     end
 
     def make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
-      src_dbsetup_file = get_src_dbsetup_file
-
       scope = Object.new
       hash0 = { module_name: acrecord[:module].join("::") }
       hash = db_scheme_ary[0].merge(hash0)

data/lib/arxutils_sqlite3/dbutil/dbconnect.rb

@@ -49,8 +49,8 @@ module Arxutils_Sqlite3
             ActiveRecord::Base.establish_connection(dbconfig[@env])
             ActiveRecord::Base.logger = Logger.new(@log_path)
             @connect_time = DateTime.now.new_offset
-          rescue StandardError => ex
-            p ex.message
+          rescue StandardError => e
+            p e.message
           end
         end
         @connect_time

data/lib/arxutils_sqlite3/migrate.rb

@@ -30,18 +30,18 @@ module Arxutils_Sqlite3
       # アプリ構成情報
       @config = config
       # DB格納ディレクトリ名
-      @db_dir = config.get_db_dir
+      @db_dir = config.db_dir
       # DB構成ファイルの出力先ディレクトリ
-      @dest_config_dir = config.get_config_dir
+      @dest_config_dir = config.config_dir
       # 生成するDB構成情報ファイルパス
       @dbconfig_dest_path = dbconfig_dest_path
       # 参照用DB構成情報ファイル名
       @dbconfig_src_fname = dbconfig_src_fname
 
       # テンプレートファイル格納ディレクトリ名
-      @src_path = config.get_template_acrecord_dir
+      @src_path = config.template_acrecord_dir
       # 構成ファイル格納ディレクトリ
-      @src_config_path = config.get_template_config_dir
+      @src_config_path = config.template_config_dir
       #      @src_config_path = Arxutils_Sqlite3::TEMPLATE_CONFIG_DIR
       # データベーススキーマ定義配列
       @db_scheme_ary = db_scheme_ary
@@ -215,14 +215,21 @@ module Arxutils_Sqlite3
       dir = acrecord_config[:dir]
       fname = acrecord_config[:filename]
       fpath = File.join(dir, fname)
-      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 ""
+      ret = :SUCCESS
+      begin
+        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 ""
+          end
+          acrecord_config[:module].map { |_mod| file.puts("end") }
         end
-        acrecord_config[:module].map { |_mod| file.puts("end") }
+      rescue StandardError
+        ret = :StandardError
       end
+
+      ret
     end
   end
 end

data/lib/arxutils_sqlite3/rake_task.rb

@@ -7,9 +7,14 @@ setting = config.load_setting_yaml_file
 klass = setting[:klass]
 klass = config.default_klass if klass.nil?
 
-desc "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]
+
 desc "delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
 task "arx:bootstrap": %w[arx:delete arxutils_sqlite3]
 
@@ -19,6 +24,9 @@ task "arx:ma": %w[arx:migrate arx:acr]
 desc "delete_db"
 task "arx:b": %w[arx:delete_db]
 
+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 #{klass}"
@@ -68,4 +76,7 @@ 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"
+end

data/lib/arxutils_sqlite3/version.rb

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

data/lib/dbacrecord.rb

@@ -1,25 +1,25 @@
-module Enop
+module Xenop
 module Dbutil
   class Count < ActiveRecord::Base
-    has_many :invalidxennblists
+    has_many :invalidxenoplists
   end
 
   class Countdatetime < ActiveRecord::Base
   end
 
-  class Xevnb < ActiveRecord::Base
+  class Xenop < ActiveRecord::Base
   end
 
-  class Xennblist < ActiveRecord::Base
+  class Xenoplist < ActiveRecord::Base
   end
 
-  class Invalidxennblist < ActiveRecord::Base
-    belongs_to :xennblist , foreign_key: 'org_id'
-    belongs_to :count , foreign_key: ''
+  class Invalidxenoplist < ActiveRecord::Base
+    belongs_to :xenoplist, foreign_key: 'org_id'
+    belongs_to :count, foreign_key: ''
   end
 
-  class Currentxennblist < ActiveRecord::Base
-    belongs_to :xennblist , foreign_key: 'org_id'
+  class Currentxenoplist < ActiveRecord::Base
+    belongs_to :xenoplist , foreign_key: 'org_id'
   end
 
 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/db_scheme.yml

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

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

@@ -4,8 +4,8 @@ class Dbsetup
   def initialize(connect_time)
     @connect_time = connect_time
     @ct = <%= klass %>::Dbutil::Countdatetime.create( countdatetime: @connect_time )
-    @hs_by_notebook = Hash.new
-    @hs_by_id = Hash.new
+    @hs_by_notebook = {}
+    @hs_by_id = {}
   end
 =begin
   # 指定stack(文字列)にノートブック(文字列)、ノートブック数、タグ数を追加

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

@@ -1,6 +1,6 @@
 @opts = {
   acrecord: {
-    module: %w[Enop Dbutil],
+    module: %w[<%= klass %> Dbutil],
     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.53
+  version: 0.1.54
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,7 +236,6 @@ files:
 - lib/template/acrecord/base.tmpl
 - lib/template/acrecord/current.tmpl
 - lib/template/acrecord/db_scheme/db_scheme.yml
-- lib/template/acrecord/db_scheme/db_scheme.yml.sample
 - lib/template/acrecord/db_scheme/dbsetup.tmpl
 - lib/template/acrecord/db_scheme/opts.rb.sample
 - lib/template/acrecord/db_scheme/opts.tmpl

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

@@ -1,48 +0,0 @@
----
-- :flist:
-    - noitem
-  :classname: Countdatetime
-  :classname_downcase: countdatetime
-  :items:
-    - - countdatetime
-      - datetime
-      - 'false'
-  :plural: countdatetimes
-  :ar_version: 6.0
-- :flist:
-    - noitem
-  :classname: Evnb
-  :classname_downcase: evnb
-  :items:
-    - - time_id
-      - integer
-      - 'false'
-    - - ennb_id
-      - integer
-      - 'false'
-  :plural: evnbs
-  :ar_version: 6.0
-- :flist:
-    - noitem
-    - invalid
-    - current
-  :classname: Ennblist
-  :classname_downcase: ennblist
-  :items:
-    - - stack
-      - string
-      - 'false'
-    - - notebook
-      - string
-      - 'false'
-    - - count
-      - integer
-      - 'false'
-    - - tag_count
-      - integer
-      - 'false'
-    - - start_datetime
-      - datetime
-      - 'false'
-  :plural: ennblists
-  :ar_version: 6.0