arxutils_sqlite3 0.1.58 → 0.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9869bb5f70a1b84e0b029c73369c71624dd56138009b6926dff1132e36c7e6f6
-  data.tar.gz: 2037193703cd10ca47ddee96acad81200a50ff4194d94bf88d69fd92fe11779d
+  metadata.gz: ba5f7070ec93ff0ea6f25e7b66fa8f8fb74860ff477adb367fe653ad4853dd70
+  data.tar.gz: fe71d7c10f6ad03081531fc0f69d532b99a66bc7b2be25a13b5535803dc04ab0
 SHA512:
-  metadata.gz: 508ac749345626f3c1b1bc98ff0a97e011f40a026e88ac12f13e97e107fecd55068c6f25ce737bfbc5ce9ca6600dbcf6dadccc09c68d0e4eaa62d37fe7b712a4
-  data.tar.gz: 68c2597c5e5b09fa9415ee74d0cb7c7146425fdcceade63cfe49e93e5f9c188dcafe113f5491a5df8b44f41c07ec9224eb3f0dec0941711c559231975f0c0ff2
+  metadata.gz: 93fa710fff1d92e873823ac196de7436e66e7b7999d3a4291670c260dd6a338ab11ef30ebc58e769a4a04a86fe895cf0300c6698a71ad2a7486d54ad4ed7285b
+  data.tar.gz: 502b418dc1faaf99a295a53dc24e642464ea9f4c1052e7b85995914bfc9f4b19eec8b1a6d9a69cb2867d33f659449ee13b393fd2923d76bb28fb21191f92e1e9

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,31 @@
 # 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 "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 "ykxutils", path: "../ykxutils"
-
-gem "activesupport"
-# spec.add_runtime_dependency "erb"
-# spec.add_runtime_dependency "activerecord", "~> 4.2"
-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 "rubocop", "~> 1.7"
-gem "rubocop-rake"
-gem "rubocop-rspec"
+gem 'activesupport'
+gem 'activerecord', '~> 6.1'
+gem 'sqlite3'
+gem 'simpleoptparse'
+gem 'ykutils'
+gem 'ykxutils'
+gem 'bundler'
+gem 'rake', '~> 13.0'
 
 group :development do
-  gem "yard"
+  gem 'yard'
+end
+
+group :test, optional: true do
+  gem "rspec", "~> 3.0"
+  # gem "rspec"
+  gem "rubocop", '~> 1.7'
+  gem "rubocop-performance"
+  gem "rubocop-rake"
+  gem "rubocop-rspec"
+  gem 'power_assert', '~> 1.1.5'
 end
 
 # group :test do

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.58)
+    arxutils_sqlite3 (0.1.60)
       activerecord (~> 6.1)
       activesupport
+      bundler
+      rake (~> 13.0)
       simpleoptparse
       sqlite3
       ykutils
@@ -39,9 +41,10 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
+    power_assert (1.1.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -68,13 +71,16 @@ GEM
       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)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     rubocop-rspec (2.13.2)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simpleoptparse (0.1.2)
-    sqlite3 (1.5.0-x86_64-linux)
+    sqlite3 (1.5.2-x86_64-linux)
     tilt (2.0.11)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
@@ -82,12 +88,12 @@ GEM
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    ykutils (0.1.6)
+    ykutils (0.1.7)
       erubi
       filex
       tilt
     ykxutils (0.1.7)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   x86_64-linux
@@ -97,16 +103,18 @@ DEPENDENCIES
   activesupport
   arxutils_sqlite3!
   bundler
+  power_assert (~> 1.1.5)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.7)
+  rubocop-performance
   rubocop-rake
   rubocop-rspec
   simpleoptparse
   sqlite3
   yard
-  ykutils (> 0.1.3)
-  ykxutils (> 0.1.0)
+  ykutils
+  ykxutils
 
 BUNDLED WITH
    2.3.22

data/Rakefile

@@ -1,21 +1,40 @@
-require "bundler/gem_tasks"
-# require "rake/testtask"
-
-# Rake::TestTask.new do |t|
-#  t.libs  << "test"
-# end
-
-# desc "Run test"
-# task default: :test
-
-require "rspec/core/rake_task"
+# frozen_string_literal: true
 
-RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
+require "bundler/gem_tasks"
 
-# task default: %i[spec rubocop]
+begin
+  require "rspec/core/rake_task"
+rescue LoadError => e
+  puts e.message
+end
+
+begin
+  RSpec::Core::RakeTask.new(:spec)
+rescue NameError, LoadError => e
+  puts e.message
+end
+
+begin
+  require "rubocop/rake_task"
+rescue LoadError => e
+  puts e.message
+end
+
+begin
+  RuboCop::RakeTask.new
+rescue NameError, LoadError => e
+  puts e.message
+end
+
+begin
+  require 'arxutils_sqlite3/rake_task'
+rescue LoadError => e
+  puts e.message
+end
+
+begin
+  task default: %i[spec rubocop]
+rescue LoadError => e
+  puts e.message
+end
 
-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,28 @@ 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.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_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.require_paths = ['lib']
+  
+  spec.add_runtime_dependency 'bundler'
+
+  spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'activerecord', '~> 6.1'
+  spec.add_runtime_dependency 'sqlite3'
+  spec.add_runtime_dependency 'simpleoptparse'
+  spec.add_runtime_dependency 'ykutils'
+  spec.add_runtime_dependency 'ykxutils'
+  spec.add_runtime_dependency 'rake', '~> 13.0'
+
+  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'
   # 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