arxutils_sqlite3 0.1.61 → 0.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17be2bd82bd6e648b09f7e49c16ef003b4c61404796620641a1f7f1a6a63e704
-  data.tar.gz: 2407844b80f1b15b74781a71a88f134c1538dc0900cc2a8cd71d8c621e4f4217
+  metadata.gz: ae34a8ad67914930d49020013dd63ba6b2a4a414e4ce2dc094fd0dc2047d9485
+  data.tar.gz: edd24cdd28322e757723cce583b72c3f78a6e565b95205a191d68027fb61608b
 SHA512:
-  metadata.gz: 8de44db00668e653da29e044f0b4b3bd25256aa7ae466b6747a3417da40ae081954dd6bf45250ce6ea5978393a55620d6e0c75289c0607f8de690a2aca154024
-  data.tar.gz: b5c8de59e6bb28ac0c41ad1e0320ab98982107434141c57a25e030a5261aed9ed0ed940efc6d8a0074a426c76709b167568b342e4332a664d57e53aace842cc6
+  metadata.gz: 81573eba04b6ccc77ccf196a82db90139b544d3867d781019349ca7692219815f1deb85d9556bd066bf80bc5bea681cefb61e12871ef18037e9e9ff9f3790ae6
+  data.tar.gz: 67100b137e1c8d795c66974092797cfda909be2ca40b3c227ffb847d7a947058a2203d6fb87d512708cb2e006298c2f0bb245a20c09f4453172ab11b611cd2e5

data/.rubocop_todo.yml

@@ -1,11 +1,34 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-10-01 01:21:06 UTC using RuboCop version 1.36.0.
+# on 2024-02-06 17:26:13 UTC using RuboCop version 1.60.2.
 # 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: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# 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: 2
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ElseAlignment:
+  Exclude:
+    - 'lib/arxutils_sqlite3/arx.rb'
+    - 'lib/arxutils_sqlite3/hier.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -14,23 +37,49 @@ Layout/EmptyLinesAroundModuleBody:
   Exclude:
     - 'lib/dbacrecord.rb'
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
+  Exclude:
+    - 'lib/arxutils_sqlite3/arx.rb'
+    - 'lib/arxutils_sqlite3/hier.rb'
+    - 'lib/arxutils_sqlite3/migrate.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Layout/HeredocIndentation:
   Exclude:
     - 'db/migrate/050_create_currentxenoplist.rb'
 
-# Offense count: 1
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
+# Configuration parameters: Width, AllowedPatterns.
 Layout/IndentationWidth:
   Exclude:
+    - 'lib/arxutils_sqlite3/arx.rb'
+    - 'lib/arxutils_sqlite3/hier.rb'
     - 'lib/dbacrecord.rb'
 
-# Offense count: 4
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/arxutils_sqlite3/dbutil/dbconnect.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Lint/RedundantRequireStatement:
+  Exclude:
+    - 'exe/arxutils_sqlite3'
+    - 'lib/arxutils_sqlite3/migrate.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 23
+  Max: 22
 
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
@@ -38,7 +87,7 @@ Metrics/ClassLength:
   Max: 190
 
 # Offense count: 12
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 49
 
@@ -48,7 +97,7 @@ Metrics/ParameterLists:
   Max: 7
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 10
 
@@ -74,7 +123,7 @@ Naming/ClassAndModuleCamelCase:
 RSpec/MultipleMemoizedHelpers:
   Max: 11
 
-# Offense count: 5
+# Offense count: 8
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
@@ -85,21 +134,23 @@ Style/Documentation:
     - 'db/migrate/030_create_xenoplist.rb'
     - 'db/migrate/040_create_invalidxenoplist.rb'
     - 'db/migrate/050_create_currentxenoplist.rb'
+    - 'lib/dbacrecord.rb'
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
-# Offense count: 7
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Exclude:
     - 'config/dbsetup.rb'
+    - 'config/opts.rb'
     - 'db/migrate/010_create_countdatetime.rb'
     - 'db/migrate/020_create_xenop.rb'
     - 'db/migrate/030_create_xenoplist.rb'
@@ -119,11 +170,41 @@ Style/HashSyntax:
     - 'db/migrate/030_create_xenoplist.rb'
     - 'db/migrate/040_create_invalidxenoplist.rb'
 
-# Offense count: 4
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantDoubleSplatHashBraces:
+  Exclude:
+    - 'lib/arxutils_sqlite3/migrate.rb'
+
+# Offense count: 126
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
-    - 'config/dbsetup.rb'
-    - 'lib/dbacrecord.rb'
+    - 'arxutils_sqlite3.gemspec'
+    - 'lib/arxutils_sqlite3.rb'
+    - 'lib/arxutils_sqlite3/arx.rb'
+    - 'lib/arxutils_sqlite3/cli.rb'
+    - 'lib/arxutils_sqlite3/config.rb'
+    - 'lib/arxutils_sqlite3/dbutil.rb'
+    - 'lib/arxutils_sqlite3/dbutil/dbconnect.rb'
+    - 'lib/arxutils_sqlite3/hier.rb'
+    - 'lib/arxutils_sqlite3/migrate.rb'
+    - 'lib/arxutils_sqlite3/rake_task.rb'
+    - 'lib/arxutils_sqlite3/util.rb'
+    - 'lib/arxutils_sqlite3/version.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInHashLiteral:
+  Exclude:
+    - 'lib/arxutils_sqlite3/migrate.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'lib/arxutils_sqlite3/hier.rb'

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.1

data/Gemfile

@@ -5,27 +5,39 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in arxutils_sqlite3.gemspec
 gemspec
 
-gem 'activerecord', '~> 6.1'
+# gem 'activerecord', '~> 6.1.7.5'
+gem 'activerecord', '~> 7.1.3.4'
 gem 'activesupport'
+gem 'base64'
+gem 'nkf'
+gem 'csv'
+gem 'mutex_m'
+gem 'bigdecimal'
 gem 'bundler'
-gem 'rake', '~> 13.0'
+gem 'rake', '~> 13.1'
 gem 'simpleoptparse'
-gem 'sqlite3'
+gem 'sqlite3' , '2.0.2'
 gem 'ykutils'
-gem 'ykxutils'
+gem 'ykxutils' , path: '../ykxutils'
+
+group :development, :test do
+  gem 'power_assert', '~> 2.0.3'
+end
 
 group :development do
-  gem 'yard'
+  gem 'yard', '~> 0.9.36'
+  gem 'rufo'
 end
 
 group :test, optional: true do
+  gem 'debug'
+  # gem 'rspec-core'
   gem 'rspec', '~> 3.0'
-  # gem "rspec"
-  gem 'power_assert', '~> 1.1.5'
-  gem 'rubocop', '~> 1.7'
+  # gem 'rubocop', '~> 1.50'
+  gem 'rubocop'
   gem 'rubocop-performance'
-  gem 'rubocop-rake'
-  gem 'rubocop-rspec'
+  gem 'rubocop-rake', require: false
+  gem 'rubocop-rspec', require: false
 end
 
 # group :test do

data/Gemfile.lock

@@ -1,120 +1,175 @@
+PATH
+  remote: ../ykxutils
+  specs:
+    ykxutils (0.1.13)
+      erubi
+      tilt
+
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.61)
-      activerecord (~> 6.1)
-      activesupport
+    arxutils_sqlite3 (0.1.63)
       bundler
-      rake (~> 13.0)
-      simpleoptparse
-      sqlite3
-      ykutils
+      sqlite3 (= 2.0.2)
       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)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
-    erubi (1.11.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    csv (3.2.8)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.12.0)
     erubis (2.7.0)
-    filex (0.1.7)
+    filex (0.1.8)
+      bundler
       erubis
       messagex
-    i18n (1.12.0)
+      rake (~> 13.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    io-console (0.7.2)
+    irb (1.12.0)
+      rdoc
+      reline (>= 0.4.2)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
     messagex (0.1.5)
-    minitest (5.16.3)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
+    nkf (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
-    power_assert (1.1.7)
+      racc
+    power_assert (2.0.3)
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.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)
+    rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.0)
+    reline (0.4.3)
+      io-console (~> 0.5)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.62.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       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)
+      rubocop-ast (>= 1.31.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-performance (1.15.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.2)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
+    rubocop-rspec (2.27.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    rufo (0.17.1)
     simpleoptparse (0.1.2)
-    sqlite3 (1.5.2-x86_64-linux)
-    tilt (2.0.11)
-    tzinfo (2.0.5)
+    sqlite3 (2.0.2-aarch64-linux-gnu)
+    sqlite3 (2.0.2-arm-linux-gnu)
+    sqlite3 (2.0.2-arm64-darwin)
+    sqlite3 (2.0.2-x86-linux-gnu)
+    sqlite3 (2.0.2-x86_64-darwin)
+    sqlite3 (2.0.2-x86_64-linux-gnu)
+    stringio (3.1.0)
+    tilt (2.3.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    unicode-display_width (2.5.0)
+    yard (0.9.36)
     ykutils (0.1.7)
       erubi
       filex
       tilt
-    ykxutils (0.1.7)
-    zeitwerk (2.6.1)
 
 PLATFORMS
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (~> 6.1)
+  activerecord (~> 7.1.3.4)
   activesupport
   arxutils_sqlite3!
+  base64
+  bigdecimal
   bundler
-  power_assert (~> 1.1.5)
-  rake (~> 13.0)
+  csv
+  debug
+  mutex_m
+  nkf
+  power_assert (~> 2.0.3)
+  rake (~> 13.1)
   rspec (~> 3.0)
-  rubocop (~> 1.7)
+  rubocop
   rubocop-performance
   rubocop-rake
   rubocop-rspec
+  rufo
   simpleoptparse
-  sqlite3
-  yard
+  sqlite3 (= 2.0.2)
+  yard (~> 0.9.36)
   ykutils
-  ykxutils
+  ykxutils!
 
 BUNDLED WITH
-   2.3.22
+   2.5.3

data/SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

data/arxutils_sqlite3.gemspec

@@ -36,24 +36,25 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'bundler'
 
-  spec.add_runtime_dependency 'activerecord', '~> 6.1'
-  spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'rake', '~> 13.0'
-  spec.add_runtime_dependency 'simpleoptparse'
-  spec.add_runtime_dependency 'sqlite3'
-  spec.add_runtime_dependency 'ykutils'
+  # spec.add_runtime_dependency 'activerecord', '~> 6.1'
+  # spec.add_runtime_dependency 'activesupport'
+  # spec.add_runtime_dependency 'rake', '~> 13.0'
+  # spec.add_runtime_dependency 'simpleoptparse'
+  spec.add_runtime_dependency 'sqlite3', '2.0.2'
+  # spec.add_runtime_dependency 'ykutils'
   spec.add_runtime_dependency 'ykxutils'
 
-  spec.add_development_dependency 'power_assert', '~> 1.1.5'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.7'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'yard'
+  # spec.add_development_dependency 'power_assert', '~> 2.0.3'
+  # spec.add_development_dependency 'rspec', '~> 3.0'
+  # spec.add_development_dependency 'rubocop', '~> 1.7'
+  # spec.add_development_dependency 'rubocop-performance'
+  # 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"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/bin/setup

@@ -3,7 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle config path --local vendor/bundle
+# bundle config path --local vendor/bundle
 bundle install
 bundle exec rake arx:arxutils_sqlite3
 

data/lib/arxutils_sqlite3/arx.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'erb'
-require 'ykutils'
+require "erb"
+require "ykutils"
 
 module Arxutils_Sqlite3
   # スキーマ設定に基づき、テンプレートから変換する
@@ -28,10 +28,10 @@ module Arxutils_Sqlite3
       @field ||= Struct.new(:name, :type, :null)
 
       @data[:ary] = if @data[:items]
-                      @data[:items].map { |x| @field.new(*x) }
-                    else
-                      []
-                    end
+          @data[:items].map { |x| @field.new(*x) }
+        else
+          []
+        end
     end
 
     # テンプレートファイルを元にした変換結果を返す

data/lib/arxutils_sqlite3/cli.rb

@@ -11,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
@@ -69,7 +69,8 @@ module Arxutils_Sqlite3
       Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
 
       # マイグレーション実行
-      ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
+      # ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
+      ActiveRecord::MigrationContext.new(migrate_dir).up
     end
 
     def acr