arxutils_sqlite3 0.1.37 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80bd6f38c8e6edbdc35892ccce309a017e856d0fadb5ed0ced56984437c06045
-  data.tar.gz: 670aa08c210fc8f78c46e3526fa2f264527fe018c71c56683215c5c43329ba37
+  metadata.gz: c1a7a61bca55d5435ecaea2fe8ea91531c5cb840ac9fb9a72f926bb0509e5448
+  data.tar.gz: 5ce2a98a472410a3813ad0a34a2e5e5eb3ac81566f10d4040a890f6126047573
 SHA512:
-  metadata.gz: 206ec70ac61a2126005cee1efe4efd6eee37d1f9224b0ac3bccd49744c9f2278b902244ebf5cf692e29062a8cd1d40eba76ca6e3fa822fbe9fbc067ac2809219
-  data.tar.gz: b830d478658ff7e6b754afc98ba6d858d880637393dcce061e03f4d0435ca786ae9842f2efe46f557990da7afc003efc7ba61249e043abb48cd10b03411d4d18
+  metadata.gz: a31eda2a8c4dbbb91537515736c6d0fed7c1aa5c990f179e32c6d12888642aa496c23db4dece16852f5b458f5721804f367a0908d46f38db19b04b2ea29252d4
+  data.tar.gz: e4cf68c44aaeedfe02a72ad09dbd186fc2846a4ebafe92081deddf77fc1ab50c58aa38988fc3b9e859c7d7fa89b6292f0cfa3f9fa416645b354bbeb9aaf2b2ad

data/Rakefile

@@ -1,12 +1,40 @@
-# frozen_string_literal: true
-
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+=begin
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs  << "test"
+end
+
+desc "Run test"
+task default: :test
+=end
+
+#=begin
+task default: %w[setup makeconfig migrate integrate]
+
+task cmi: %w[makeconfig migrate integrate]
 
-RSpec::Core::RakeTask.new(:spec)
+# コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
+# プトファイルの生成
+task :setup do
+  sh "bundle exec ruby exe/arxutils_sqlite3 --cmd=s --klass=Enop"
+end
+# DB構成情報の生成
+task :makeconfig do
+  sh "bundle exec ruby exe/arxutils_sqlite3 --cmd=c"
+end
+# マイグレート用スクリプトファイルの生成とマイグレートの実行
+task :migrate do
+  sh "bundle exec ruby exe/arxutils_sqlite3 --cmd=m --yaml=config/db_scheme.yml"
+end
+task :integrate do
+  sh "bundle exec ruby exe/arxutils_sqlite3 --cmd=i"
+end
 
-require "rubocop/rake_task"
+task :delete do
+  sh "bundle exec ruby exe/arxutils_sqlite3 --cmd=d"
+end
 
-RuboCop::RakeTask.new
+#=end
 
-task default: %i[spec rubocop]

data/arxutils_sqlite3.gemspec

@@ -28,15 +28,18 @@ Gem::Specification.new do |spec|
       (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  #spec.add_runtime_dependency "activesupport"
+  #p "====-"
+  #p "spec.executables=#{spec.executables}"
+  #p "====----"
+  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 "sqlite3"
+  spec.add_runtime_dependency "activerecord", "~> 6.1"
+  spec.add_runtime_dependency "sqlite3"
   # spec.add_runtime_dependency "mysql2" , "~> 0.4.1"
   #spec.add_runtime_dependency "encx"
 

data/{bin/arxutils-cli → exe/arxutils_sqlite3}

@@ -130,5 +130,5 @@ when "d"
   db_scheme_ary = nil
   dbconnect = prepare_for_migrate(env, db_scheme_ary, opts)
 else
-  raise
+  puts "Invalid command(#{opts["cmd"]}) specified!!"
 end

data/lib/arxutils_sqlite3/version.rb

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

metadata

@@ -1,19 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.40
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
-dependencies: []
+date: 2022-09-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: utility functions for ActiveRecord.
 email:
 - ykominami@gmail.com
-executables: []
+executables:
+- arxutils_sqlite3
 extensions: []
 extra_rdoc_files: []
 files:
@@ -28,13 +71,10 @@ files:
 - README.md
 - Rakefile
 - arxutils_sqlite3.gemspec
-- bin/arxutils-cli
 - bin/console
-- bin/makemigrate
 - bin/setup
-- bin/setupx.bat
-- bin/setupx.rb
 - config/.gitignore
+- exe/arxutils_sqlite3
 - lib/arxutils_sqlite3.rb
 - lib/arxutils_sqlite3/arx.rb
 - lib/arxutils_sqlite3/dbutil.rb

data/bin/makemigrate

@@ -1,55 +0,0 @@
-#!/usr/bin/env ruby
-require "arxutils_sqlite3"
-require "simpleoptparse"
-
-require "yaml"
-
-AR_VERSION = 6.0
-
-opts = {
-  db_dir: Arxutils_Sqlite3::Dbutil::DB_DIR,
-  relation: {
-    module: %w[Enop Dbutil],
-    filename: "dbrelation.rb",
-    dir: "lib/arxutils_sqlite3/dbutil"
-  }
-}
-banner = "Usage: bundle exec ruby exe/makemigrate (-c|-r) (--mysql|--sqlite3) -s yaml_file"
-
-Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSION, nil) do |parser|
-  parser.on("-c", "--makeconfig") { |_x| opts["makeconfig"] = true }
-  parser.on("-r", "--remigrate") { |_x| opts["remigrate"] = true }
-  parser.on("-s yaml_file", "--setting yaml_file") { |file| opts["setting"] = file }
-  parser.on("--mysql") { |_x| opts["dbconfig"] = Arxutils_Sqlite3::Dbutil::DBCONFIG_MYSQL }
-  parser.on("--sqlite3") { |_x| opts["dbconfig"] = Arxutils_Sqlite3::Dbutil::DBCONFIG_SQLITE3 }
-end
-
-db_scheme_yaml_file = opts["setting"]
-
-if db_scheme_yaml_file.nil?
-  puts banner
-  exit 10
-end
-
-opts["makeconfig"] = !opts["makeconfig"].nil?
-opts["remigrate"] = !opts["remigrate"].nil?
-
-db_scheme_ary = YAML.load_file(db_scheme_yaml_file)
-#pp db_scheme_ary
-
-opts["dbconfig"] = Arxutils_Sqlite3::Dbutil::DBCONFIG_SQLITE3 unless opts["dbconfig"]
-
-env = ENV.fetch("ENV", nil)
-# env ||= "development"
-env ||= "production"
-
-Arxutils_Sqlite3::Migrate.migrate(
-  Arxutils_Sqlite3::Dbutil::DB_DIR,
-  Arxutils_Sqlite3::Dbutil::CONFIG_DIR,
-  Arxutils_Sqlite3::Dbutil::DATABASELOG,
-  Arxutils_Sqlite3::Dbutil::MIGRATE_DIR,
-  env,
-  db_scheme_ary,
-  opts["dbconfig"],
-  opts
-)

data/bin/setupx.bat

@@ -1,7 +0,0 @@
-REM set -euo pipefail
-REM IFS=$'\n\t'
-REM set -vx
-
-REM bundle install
-bundle exec ruby bin/setupx.rb
-# Do any other automated setup that you need to do here

data/bin/setupx.rb

@@ -1,4 +0,0 @@
-require "arxutils_sqlite3"
-require "pathname"
-
-puts $PROGRAM_NAME