arxutils_sqlite3 0.1.50 → 0.1.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48882ff671e3e3a1b2f79122ec37c8c3ba805cb85f8acbf06c58dbba0f27bf00
-  data.tar.gz: 96acf17a98b0537c6847ede32081306f3a73ad783d38b2e7b52b1ffbf0b64f73
+  metadata.gz: 6651609533fa181147b0b4c538aa3c45bd85934fde386311095d3994514964cb
+  data.tar.gz: 670aa9b9e25355c36b9108a31b378dd8cae74cae60d20ef64ca290980b4b3a6f
 SHA512:
-  metadata.gz: '094045bcdb07d355014b294da9c182d469534ec77f8040902540f2c3205495367149a249675997cb4f7ca396fca04776a8475ede705241ad3b74af9b44e23704'
-  data.tar.gz: 361a7a847edbb2e9d4e8e0f338b81ced67badea6c427b9feaa178250b7e1fca350a6679a6abce9ab833f3f2438e2b58d44e8fda1c514ff73dc46a657df7dc240
+  metadata.gz: 8513dfaafef1f79c1ec93871dddf4f85dfb3845d6ff1fc3b14dc0568dfa7346faff62f500176fdce2dfdb87806110fdffd84efda453ef8b8e3369f22b5b5b647
+  data.tar.gz: cacf3262387b35efcafc367e3f1bc5ec61221be180cc49eb8b5e6f7b0e7ddabcb1de1b417ef12aac5465d480425b17768a6b926e80d6e89fb25d6107fa815261

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.50)
+    arxutils_sqlite3 (0.1.51)
       activerecord (~> 6.1)
       activesupport
       simpleoptparse

data/Rakefile

@@ -18,4 +18,4 @@ RuboCop::RakeTask.new
 
 # task default: %i[spec rubocop]
 
-require "arxutils_sqlite3_rake_task"
+require "arxutils_sqlite3/rake_task"

data/lib/arxutils_sqlite3/config.rb

@@ -4,7 +4,6 @@ module Arxutils_Sqlite3
   ##
   # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
   class Config
-    EXCLUDE_FILES = %W!setting.yml!
     # DB格納ディレクトリ名
     DB_DIR = "db".freeze
     # migrate用スクリプト格納ディレクトリ名
@@ -59,6 +58,8 @@ module Arxutils_Sqlite3
     # migrateディレクトリへのパス
     MIGRATE_DIR = DB_PN.join(MIGRATE_BASE_DIR)
 
+    EXCLUDE_FILES = %w[SETTING_YAML_FILE_NAME].freeze
+
     # DB構成ファイル格納ディレクトリの作成
     def make_config_directory
       # p "config make_config_directory"
@@ -259,8 +260,8 @@ module Arxutils_Sqlite3
       File.write(dest_dbsetup_file, result_content)
     end
 
-    def exclude_file?( fname )
-      EXCLUDE_FILES.index( fname ) != nil
+    def exclude_file?(fname)
+      EXCLUDE_FILES.index(fname) != nil
     end
   end
 end

data/lib/arxutils_sqlite3/migrate.rb

@@ -56,33 +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|
         basename = File.basename(x)
-        ret = !@config.exclude_file?( basename )
+        ret = !@config.exclude_file?(basename)
         ret_file = File.file?(x)
-        ret2 = (ret_file && ret)
-        FileUtils.rm(x) if ret2
-      end
-      Dir.glob(File.join(@db_dir, "*")).each do |x|
-        # puts x
-        FileUtils.rm(x) if 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

data/lib/{arxutils_sqlite3_rake_task.rb → arxutils_sqlite3/rake_task.rb}

@@ -7,10 +7,10 @@ setting = config.load_setting_yaml_file
 klass = setting[:klass]
 
 desc "setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
-task default: %w[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 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]

data/lib/arxutils_sqlite3/version.rb

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

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

@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.50
+  version: 0.1.51
 platform: ruby
 authors:
 - yasuo kominami
@@ -224,10 +224,10 @@ 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
-- lib/arxutils_sqlite3_rake_task.rb
 - lib/dbacrecord.rb
 - lib/template/acrecord/acrecord.tmpl
 - lib/template/acrecord/acrecord_count.tmpl