arxutils_sqlite3 0.1.43 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b67a7e8b8c74b99735830d7a77ed35c489a2f94334ed2e9d648e28a1dd7e619
-  data.tar.gz: daa960e9e9ed7f7a4e4457e8c1d8cc986abfea6a2ea0bff25c6da7ad3db9dd0c
+  metadata.gz: 3b5f6ede0a6841ea546179192fe18757e9f35669baae096b5c7f0ed9ec79c687
+  data.tar.gz: 592da7e2edf26c4e4a41e7d9d1ed74ebf67ffdb7dddc6e2a2732f3643a545570
 SHA512:
-  metadata.gz: e213121d613bfb5445a2b701dabfb7718eec7a3a34b034c6bfe6a979d7302dbe64c2b8ed921f09f5ad49039e9ea782bdd1f115065dd5214267f549bb61354eae
-  data.tar.gz: f3ce79fb5d0162c515705f5132c143dc37dd17f438b3599871567e96a717b19f951cd2f82bfc6e320d70bd5fbb8932d0359d3c9466ba2743a5f128fd0c89a979
+  metadata.gz: 3ade5c9990a6c5553a71b62adda473541415bdba26b1c6c7162d2d588e66750d9ebe80367c8efa7bbccff064aa4410a18138fc254a571f14ea27ca2e07b03096
+  data.tar.gz: aedfc8af290c382f5cd2eb4c67dde8b94ef533de95ee5607236a480c0cf0443a1f5a249258efaefdc35193f681f44ab6ce9502232ba388967c85a0eb6e8bd615

data/arxutils_sqlite3.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  p spec.executables
+  #p spec.executables
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "activesupport"
   # spec.add_runtime_dependency "erb"

data/exe/arxutils_sqlite3

@@ -31,41 +31,6 @@ if File.exist?(Arxutils_Sqlite3::DEST_DBSETUP_FILE)
   end
 end
 
-
-def prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_dest_path, opts)
-  migrate_base_dir = Arxutils_Sqlite3::Dbutil::MIGRATE_DIR
-  # migrate用スクリプト格納ディレクトリへのパス
-  migrate_dir = File.join(db_dir, migrate_base_dir)
-  # DB構成ファイルの出力先ディレクトリ
-  dest_config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
-  dbconfig_src_fname = "#{opts["dbconfig"]}.tmpl"
-  p "dbconfig_dest_path=#{dbconfig_dest_path}"
-  relation = opts[:relation]
-  mig = Arxutils_Sqlite3::Migrate.new(
-    dbconfig_dest_path,
-    dbconfig_src_fname,
-    migrate_dir,
-    db_dir,
-    db_scheme_ary,
-    relation,
-    opts)
-end
-
-def make_log_path(db_dir, dbconfig)
-  log_path = ""
-  log_fname = Arxutils_Sqlite3::Dbutil::Dbconnect.make_log_file_name(
-    dbconfig, Arxutils_Sqlite3::Dbutil::DATABASELOG)
-  if db_dir && log_fname
-    # DB用ログファイルへのパス
-    log_path = File.join(db_dir, log_fname)
-  end
-  log_path
-end
-
-def make_dbconfig_path(config_dir, dbconfig)
-  File.join( config_dir, "#{dbconfig}.yml")
-end
-
 banner = "Usage: bundle exec ruby exe/makemigrate --cmd=(s|c|m|i|d) -y yaml_file --klass=class"
 
 opts = @opts ? @opts : {}
@@ -103,9 +68,9 @@ when "c"
   db_dir = Arxutils_Sqlite3::Dbutil::DB_DIR
   config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
   # DB構成ファイル名
-  dbconfig_path = make_dbconfig_path(config_dir, opts["dbconfig"])
+  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, opts["dbconfig"])
 
-  mig = prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_path, opts)
+  mig = Arxutils_Sqlite3::Util.prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_path, opts)
   mig.make_dbconfig(opts)
 
 when "m"
@@ -130,10 +95,10 @@ when "m"
 
   config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
   # DB構成ファイル名
-  dbconfig_path = make_dbconfig_path(config_dir, opts["dbconfig"])
+  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, opts["dbconfig"])
   # DBログファイルへのパス
-  log_path = make_log_path(db_dir, opts["dbconfig"])
-  mig = prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_path, opts)
+  log_path = Arxutils_Sqlite3::Util.make_log_path(db_dir, opts["dbconfig"])
+  mig = Arxutils_Sqlite3::Util.prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_path, opts)
   mig.process
   dbconnect = Arxutils_Sqlite3::Dbutil::Dbconnect.new(
     dbconfig_path,
@@ -141,7 +106,7 @@ when "m"
     log_path
   )
   connect_time = dbconnect.connect
-  p "connect_time=#{connect_time}"
+  #p "connect_time=#{connect_time}"
   ActiveRecord::MigrationContext.new(mig.migrate_dir, ActiveRecord::SchemaMigration).up
 
 when "i"
@@ -151,9 +116,9 @@ when "i"
 
   config_dir = Arxutils_Sqlite3::Dbutil::CONFIG_DIR
   # DB構成ファイルへのパス
-  dbconfig_dest_path = make_dbconfig_path(config_dir, opts["dbconfig"])
+  dbconfig_dest_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, opts["dbconfig"])
   # DBログファイルへのパス
-  log_path = make_log_path(db_dir, opts["dbconfig"])
+  log_path = Arxutils_Sqlite3::Util.make_log_path(db_dir, opts["dbconfig"])
   dbconnect = Arxutils_Sqlite3::Dbutil::Dbconnect.new(
     dbconfig_dest_path,
     env,
@@ -165,12 +130,11 @@ when "i"
 
 when "d"
   db_scheme_ary = nil
-  mig = repare_for_migrate(env, db_scheme_ary, opts)
+  mig = Arxutils_Sqlite3::Util.repare_for_migrate(env, db_scheme_ary, opts)
   mig.delete_migrate_config_and_db
 
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end
-
 #
 

data/lib/arxutils_sqlite3/dbutil/dbconnect.rb

@@ -50,10 +50,10 @@ 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

data/lib/arxutils_sqlite3/util.rb

@@ -0,0 +1,39 @@
+module Arxutils_Sqlite3
+  class Util
+    # migrateの準備
+    def self.prepare_for_migrate(env, db_scheme_ary, db_dir, dbconfig_dest_path, opts)
+      migrate_base_dir = Dbutil::MIGRATE_DIR
+      # migrate用スクリプト格納ディレクトリへのパス
+      migrate_dir = File.join(db_dir, migrate_base_dir)
+      # DB構成ファイルの出力先ディレクトリ
+      dest_config_dir = Dbutil::CONFIG_DIR
+      dbconfig_src_fname = "#{opts["dbconfig"]}.tmpl"
+      relation = opts[:relation]
+      mig = Migrate.new(
+        dbconfig_dest_path,
+        dbconfig_src_fname,
+        migrate_dir,
+        db_dir,
+        db_scheme_ary,
+        relation,
+        opts)
+    end
+
+    # DBログファイルへのパスの作成
+    def self.make_log_path(db_dir, dbconfig)
+      log_path = ""
+      log_fname = Dbutil::Dbconnect.make_log_file_name(
+        dbconfig, Dbutil::DATABASELOG)
+      if db_dir && log_fname
+        # DB用ログファイルへのパス
+        log_path = File.join(db_dir, log_fname)
+      end
+      log_path
+    end
+
+    # DB構成ファイルへのパスの作成
+    def self.make_dbconfig_path(config_dir, dbconfig)
+      File.join( config_dir, "#{dbconfig}.yml")
+    end
+  end
+end

data/lib/arxutils_sqlite3/version.rb

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

data/lib/arxutils_sqlite3.rb

@@ -15,6 +15,7 @@ require_relative "arxutils_sqlite3/hier"
 require_relative "arxutils_sqlite3/migrate"
 require_relative "arxutils_sqlite3/dbutil"
 require_relative "arxutils_sqlite3/migrate"
+require_relative "arxutils_sqlite3/util"
 
 module Arxutils_Sqlite3
   TOP_DIR = Pathname(__FILE__).parent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.44
 platform: ruby
 authors:
 - yasuo kominami
@@ -222,6 +222,7 @@ files:
 - lib/arxutils_sqlite3/hier.rb
 - lib/arxutils_sqlite3/migrate.rb
 - lib/arxutils_sqlite3/transactstate.rb
+- lib/arxutils_sqlite3/util.rb
 - lib/arxutils_sqlite3/version.rb
 - lib/template/config/mysql.tmpl
 - lib/template/config/sqlite3.tmpl