arxutils_sqlite3 0.1.49 → 0.1.51

data/lib/arxutils_sqlite3/dbutil/dbconnect.rb

@@ -6,28 +6,6 @@ require "active_record"
 require "sqlite3"
 require "ykxutils"
 
-def require_x(path)
-  require path
-rescue StandardError => e
-  p "1 request_x"
-  p e
-rescue LoadError => e
-  p "21 request_x"
-  p e
-rescue NotImplementedError => e
-  p "22 request_x"
-  p e
-rescue SyntaxError => e
-  p "23 request_x"
-  p e
-rescue ScriptError => e
-  p "20 request_x"
-  p e
-rescue Exception => e
-  p "9 request_x"
-  p e
-end
-
 module Arxutils_Sqlite3
   module Dbutil
     # DB操作用ユーティリティクラス
@@ -64,14 +42,14 @@ module Arxutils_Sqlite3
       def connect
         unless @connect_time
           begin
-            #p "@dbconfig_dest_path=#{@dbconfig_dest_path}"
+            # p "@dbconfig_dest_path=#{@dbconfig_dest_path}"
             dbconfig = Ykxutils.yaml_load_file_compati(@dbconfig_dest_path)
-            #p "dbconfig=#{dbconfig}"
-            #p "@env=#{@env}"
+            # p "dbconfig=#{dbconfig}"
+            # p "@env=#{@env}"
             ActiveRecord::Base.establish_connection(dbconfig[@env])
             ActiveRecord::Base.logger = Logger.new(@log_path)
             @connect_time = DateTime.now.new_offset
-          rescue => ex
+          rescue StandardError => ex
             p ex.message
           end
         end

data/lib/arxutils_sqlite3/dbutil.rb

@@ -3,6 +3,5 @@ require_relative "dbutil/dbconnect"
 module Arxutils_Sqlite3
   # DB操作用ユーティリティクラス
   module Dbutil
-    #
   end
 end

data/lib/arxutils_sqlite3/hier.rb

@@ -142,10 +142,10 @@ module Arxutils_Sqlite3
       hier = @hier_klass.find_by(child_id: num)
       level = hier.level
       parent_id = hier.parent_id
-      base = @base_klass.find_by(ord_id: num)
+      # base = @base_klass.find_by(ord_id: num)
 
-      parent_base = @base_klass.find_by(ord_id: parent_id)
-      parent_hier_string = parent_base.__send__ @hier_symbol
+      # parent_base = @base_klass.find_by(ord_id: parent_id)
+      # parent_hier_string = parent_base.__send__ @hier_symbol
 
       # 属する子を探す
       children_hier = @hier_klass.where(parent_id: num)

data/lib/arxutils_sqlite3/migrate.rb

@@ -1,21 +1,22 @@
-#require "arxutils_sqlite3"
+# require "arxutils_sqlite3"
 require "ykutils"
 require "fileutils"
-#require "active_support"
+# require "active_support"
 require "active_record"
 require "active_record/migration"
 require "pp"
 
 # ActiveRecord用ユーティリティモジュール
 module Arxutils_Sqlite3
-##
-# migrateに必要なファイルをテンプレートから作成し、migarteを実行する
+  ##
+  # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
   class Migrate
     attr_reader :migrate_dir
+
     # migrate用スクリプトファイル名の先頭の番号の間隔
     FILENAME_COUNTER_STEP = 10
     # DB接続までの初期化を行うDbinitクラスのインスタンス
-    #attr_reader :dbinit
+    # attr_reader :dbinit
 
     # migrate用のスクリプトの生成、migrateの実行を行うmigratexの生成
     def initialize(
@@ -25,7 +26,9 @@ module Arxutils_Sqlite3
       db_scheme_ary,
       acrecord_config,
       migrate_dir
-      )
+    )
+      # アプリ構成情報
+      @config = config
       # DB格納ディレクトリ名
       @db_dir = config.get_db_dir
       # DB構成ファイルの出力先ディレクトリ
@@ -39,7 +42,7 @@ module Arxutils_Sqlite3
       @src_path = config.get_template_acrecord_dir
       # 構成ファイル格納ディレクトリ
       @src_config_path = config.get_template_config_dir
-#      @src_config_path = Arxutils_Sqlite3::TEMPLATE_CONFIG_DIR
+      #      @src_config_path = Arxutils_Sqlite3::TEMPLATE_CONFIG_DIR
       # データベーススキーマ定義配列
       @db_scheme_ary = db_scheme_ary
       # リレーション指定
@@ -53,29 +56,28 @@ module Arxutils_Sqlite3
 
     # マイグレート用スクリプト、DB構成情報ファイル、DBファイルの削除
     def delete_migrate_and_config_and_db
-      if @migrate_dir
-        Dir.glob(File.join(@migrate_dir, "*")).each do |x|
-          FileUtils.rm(x) if File.file?(x)
-        end
-      end
+      #    def delete_migrate_and_config
+      delete_migrate
       Dir.glob(File.join(@dest_config_dir, "*")).each do |x|
-        FileUtils.rm(x) if File.file?(x)
-      end
-      Dir.glob(File.join(@db_dir, "*")).each do |x|
-        # puts x
-        FileUtils.rm(x) if File.file?(x)
+        basename = File.basename(x)
+        ret = !@config.exclude_file?(basename)
+        ret_file = File.file?(x)
+        FileUtils.rm(x) if ret_file && ret
       end
+      delete_db
     end
 
     # マイグレート用スクリプト、DBファイルの削除
     def delete_migrate_and_db
-      if @migrate_dir
-        Dir.glob(File.join(@migrate_dir, "*")).each do |x|
-          FileUtils.rm(x) if File.file?(x)
-        end
-      end
-      Dir.glob(File.join(@db_dir, "*")).each do |x|
-        # puts x
+      delete_migrate
+      delete_db
+    end
+
+    # マイグレート用スクリプトの削除
+    def delete_migrate
+      return unless @migrate_dir
+
+      Dir.glob(File.join(@migrate_dir, "*")).each do |x|
         FileUtils.rm(x) if File.file?(x)
       end
     end
@@ -152,7 +154,8 @@ module Arxutils_Sqlite3
     def make_dbconfig(data)
       content = convert(data, @src_config_path, @dbconfig_src_fname)
       File.open(
-        @dbconfig_dest_path, "w:utf-8") do |f|
+        @dbconfig_dest_path, "w:utf-8"
+      ) do |f|
         f.puts(content)
       end
     end
@@ -185,23 +188,22 @@ module Arxutils_Sqlite3
 
     # スキーマ設定からmigarte用スクリプトの内容を生成
     def make_script_group(data)
-      #p data
-      data[:flist].map {
-        |kind|
+      # p data
+      data[:flist].map do |kind|
         [kind,
-          convert(data, @src_path, "#{kind}.tmpl"),
-          data[:classname_downcase]
-          ] }
+         convert(data, @src_path, "#{kind}.tmpl"),
+         data[:classname_downcase]]
+      end
     end
 
     # migrationのスクリプトをファイル出力する
     def output_script(idy, kind, content, classname_downcase)
       additional = case kind
-                    when "base", "noitem"
-                      ""
-                    else
-                      kind
-                    end
+                   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|
         f.puts(content)

data/lib/arxutils_sqlite3/rake_task.rb

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

data/lib/arxutils_sqlite3/util.rb

@@ -4,7 +4,8 @@ module Arxutils_Sqlite3
     def self.make_log_path(db_dir, dbconfig)
       log_path = ""
       log_fname = Dbutil::Dbconnect.make_log_file_name(
-        dbconfig, Config::DATABASELOG)
+        dbconfig, Config::DATABASELOG
+      )
       if db_dir && log_fname
         # DB用ログファイルへのパス
         log_path = File.join(db_dir, log_fname)

data/lib/arxutils_sqlite3/version.rb

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

data/lib/arxutils_sqlite3.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "ykutils"
 require "ykxutils"
 
@@ -24,4 +25,4 @@ 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 "dbacrecord"

data/lib/template/acrecord/db_scheme/{dbsetup.rb → dbsetup.tmpl}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.1.51
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simpleoptparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ykutils
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ykxutils
+  name: ykutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simpleoptparse
+  name: ykxutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -206,14 +206,15 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - arxutils_sqlite3.gemspec
 - bin/console
 - bin/setup
 - config/.gitignore
+- config/setting.yml
 - exe/arxutils_sqlite3
 - lib/arxutils_sqlite3.rb
 - lib/arxutils_sqlite3/arx.rb
@@ -223,6 +224,7 @@ files:
 - 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/transactstate.rb
 - lib/arxutils_sqlite3/util.rb
 - lib/arxutils_sqlite3/version.rb
@@ -235,9 +237,9 @@ files:
 - 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.rb
-- lib/template/acrecord/db_scheme/opts.rb
+- lib/template/acrecord/db_scheme/dbsetup.tmpl
 - lib/template/acrecord/db_scheme/opts.rb.sample
+- lib/template/acrecord/db_scheme/opts.tmpl
 - lib/template/acrecord/invalid.tmpl
 - lib/template/acrecord/noitem.tmpl
 - lib/template/config/mysql.tmpl
@@ -256,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2022 yasuo kominami
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.