master_data_tool 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e948beea211d4b3fba1d194412cbafd3b6d7d8c768215bf038b5ea89bbaf1b17
-  data.tar.gz: d72dc44dce6c653c75713440bba5691b062bef9ca766a6159ed233d640f00724
+  metadata.gz: a92262ac7a93ea8237ec6740589c865ca6bce067f1fba4a48403a6f3cd42a379
+  data.tar.gz: d738dce7d637aa27ae2b9b27e9ed1a7d4ae119e41cf240b24f874e86cf6cde4f
 SHA512:
-  metadata.gz: 355a59050f15b91c854e3c79602d89f4c41fd7d7abf49ae0a9cc9be2bc6fbdb212aa4af8d714619e1c0231ad7fd6f321a66e65b6b43cbf0751c4eaf7aa25d7ea
-  data.tar.gz: 48daa315d4805233c1f357ffc80de821c1cd55cba71401723cbb1e33524d4fa483a24e8a6acef42065be58bd0ba4cda208d1b3229679b73c3423098eb38f71c1
+  metadata.gz: b9ebcb430a6d91175cff4e36a512958b30ac5318639f855d4f82e8ab2a74c147a0eeec25f90c5dc97b11a5c3ab7c81b7e1666bee5fee5ad046a8d4cbfcb9a5bc
+  data.tar.gz: 76587a7eb98d0b2b0ac28f2cbf9c59e649c05a1d456ea4011cd9f83daa89c9193509b7a25c89780b5e5ec7a6e25cc4f79b31745f3a6c70a619eb5c271915c2b2

data/Appraisals

@@ -0,0 +1,13 @@
+appraise 'activerecord52' do
+  gem 'activerecord', '~> 5.2'
+end
+
+appraise 'activerecord61' do
+  gem 'activerecord', '~> 6.1'
+end
+
+if RUBY_VERSION >= '2.7.0'
+  appraise 'activerecord70' do
+    gem 'activerecord', '~> 7.0'
+  end
+end

data/README.md

@@ -35,13 +35,14 @@ Or install it yourself as:
 
 ### マスタデータの投入
 
-| option               | default | 内容                                   |
-|----------------------| --- |--------------------------------------|
-| --dry-run            | true | dry-runモードで実行する（データ変更は行わない）          |
-| --verify             | true | データ投入後に全テーブル・全レコードのバリデーションチェックを行う    |
-| --only-import-tables | [] | 指定したテーブルのみデータ投入を行う                   |
-| --only-verify-tables | [] | 指定したテーブルのみ投入後のバリデーションチェックを行う |
-| --skip-no-change     | true | CSVファイルに更新がないテーブルをスキップする             |
+| option               | default | 内容                                |
+|----------------------| --- |-----------------------------------|
+| --dry-run            | true | dry-runモードで実行する（データ変更は行わない）       |
+| --verify             | true | データ投入後に全テーブル・全レコードのバリデーションチェックを行う |
+| --only-import-tables | [] | 指定したテーブルのみデータ投入を行う                |
+| --only-verify-tables | [] | 指定したテーブルのみ投入後のバリデーションチェックを行う      |
+| --skip-no-change     | true | CSVファイルに更新がないテーブルをスキップする          |
+| --silent | false | 結果の出力をやめる                         |
 
 ```bash
 bundle exec master_data_tool import
@@ -55,7 +56,8 @@ bundle exec thor master_data_tool import \
   --verify=true \
   --only-import-tables="" \
   --only-verify-tables="" \
-  --skip-no-change=true
+  --skip-no-change=true \
+  --silent=false
 ```
 
 ### ダンプ
@@ -141,6 +143,40 @@ grep 'operation:import' /tmp/dry-run.txt | grep 'label:detail' | grep 'status:ne
 
 - upsert_allに移行する
 
+## Test
+
+docker-composeでMySQLを立ち上げてテストを実行する。
+
+```
+docker-compose up -d
+```
+
+以下のENVを設定すること。
+
+```
+export DB_HOST=127.0.0.1
+export DB_PORT=`docker port master_data_tool_mysql57 3306 | cut -f 2 -d ':'`
+export DB_USERNAME=root
+export DB_PASSWORD=f3WpxNreVT2NgQry
+export DB_NAME=master_data_tool_test
+```
+
+- dockerでMySQLを立ち上げるたびにポートは変わるのでDB_PORTは都度設定する
+  - direnvを使っているならば `direnv reload` すればいい
+
+```
+./scripts/setup.sh
+```
+
+## rspec
+
+```
+bundle exec appraisal activerecord52 rspec
+bundle exec appraisal activerecord61 rspec
+bundle exec appraisal activerecord70 rspec
+```
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/taka0125/master_data_tool.

data/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3.9'
+
+x-mysql: &mysql
+  image: mysql:5.7
+  container_name: master_data_tool_mysql57
+  environment:
+    MYSQL_ROOT_PASSWORD: 'f3WpxNreVT2NgQry'
+  platform: linux/x86_64
+  ports:
+    - 127.0.0.1::3306
+  volumes:
+    - mysql:/var/lib/mysql
+
+services:
+  mysql:
+    <<: *mysql
+
+volumes:
+  mysql:

data/exe/master_data_tool

@@ -14,6 +14,7 @@ module MasterDataTool
     option :only_import_tables, default: [], type: :array
     option :only_verify_tables, default: [], type: :array
     option :skip_no_change, default: true, type: :boolean
+    option :silent, default: false, type: :boolean
     desc 'import', 'import'
     def import
       dry_run = options[:dry_run]
@@ -21,13 +22,15 @@ module MasterDataTool
       only_import_tables = options[:only_import_tables]
       only_verify_tables = options[:only_verify_tables]
       skip_no_change = options[:skip_no_change]
+      silent = options[:silent]
 
       executor = MasterDataTool::Import::Executor.new(
         dry_run: dry_run,
         verify: verify,
         only_import_tables: only_import_tables,
         only_verify_tables: only_verify_tables,
-        skip_no_change: skip_no_change
+        skip_no_change: skip_no_change,
+        silent: silent
       )
       executor.execute
     end
@@ -49,7 +52,12 @@ module MasterDataTool
         ignore_column_names: ignore_column_names,
         verbose: verbose
       )
-      executor.execute
+      errors = executor.execute
+
+      return if errors.empty?
+
+      message = errors.map { |error| "table:#{error.table}\tmessage:#{error.exception.message}" }.join("\n")
+      raise message
     end
   end
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activerecord52.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "activerecord", "~> 5.2"
+
+gemspec path: "../"

data/gemfiles/activerecord61.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "activerecord", "~> 6.1"
+
+gemspec path: "../"

data/gemfiles/activerecord70.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "activerecord", "~> 7.0"
+
+gemspec path: "../"

data/lib/master_data_tool/config.rb

@@ -11,10 +11,10 @@ module MasterDataTool
 
     def self.default_config
       new.tap do |config|
-        config.master_data_dir = Rails.root.join('db/fixtures')
+        config.master_data_dir = nil # Rails.root.join('db/fixtures')
         config.dump_ignore_tables = %w[]
         config.dump_ignore_columns = %w[]
-        config.logger = Rails.logger
+        config.logger = Logger.new(nil)
       end
     end
   end

data/lib/master_data_tool/dump/executor.rb

@@ -39,7 +39,7 @@ module MasterDataTool
       end
 
       def dump_to_csv(table)
-        model_klass = Rails.const_get(table.classify)
+        model_klass = Object.const_get(table.classify)
         if ignore?(model_klass)
           print_message "[ignore] #{table}"
 

data/lib/master_data_tool/import/executor.rb

@@ -3,13 +3,15 @@
 module MasterDataTool
   module Import
     class Executor
-      def initialize(dry_run: true, verify: true, only_import_tables: [], only_verify_tables: [], skip_no_change: true, report_printer: MasterDataTool::Report::DefaultPrinter.new)
+      def initialize(dry_run: true, verify: true, only_import_tables: [], only_verify_tables: [], skip_no_change: true, silent: false, report_printer: MasterDataTool::Report::DefaultPrinter.new)
         @dry_run = dry_run
         @verify = verify
         @only_import_tables = Array(only_import_tables)
         @only_verify_tables = Array(only_verify_tables)
         @skip_no_change = skip_no_change
+        @silent = silent
         @report_printer = report_printer
+        @report_printer.silent = silent
       end
 
       def execute
@@ -38,7 +40,7 @@ module MasterDataTool
             table_name = MasterDataTool.resolve_table_name(path)
             load_skip = load_skip_table?(table_name, path)
 
-            model_klass = Rails.const_get(table_name.classify)
+            model_klass = Object.const_get(table_name.classify)
             master_data = MasterData.new(path, model_klass)
             master_data.load unless load_skip
 

data/lib/master_data_tool/master_data_status.rb

@@ -2,6 +2,7 @@
 
 require 'active_record'
 require 'activerecord-import'
+require 'openssl'
 
 module MasterDataTool
   class MasterDataStatus < ::ActiveRecord::Base

data/lib/master_data_tool/report/printer.rb

@@ -3,7 +3,15 @@
 module MasterDataTool
   module Report
     module Printer
+      attr_accessor :silent
+
+      def initialize(silent: false)
+        @silent = silent
+      end
+
       def print(message)
+        return if @silent
+
         raise NotImplementedError
       end
     end

data/lib/master_data_tool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MasterDataTool
-  VERSION = "0.3.0"
+  VERSION = "0.7.0"
 end

data/master_data_tool.gemspec

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative "lib/master_data_tool/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "master_data_tool"
+  spec.version = MasterDataTool::VERSION
+  spec.authors = ["Takahiro Ooishi"]
+  spec.email = ["taka0125@gmail.com"]
+
+  spec.summary = "マスタデータの管理ツール"
+  spec.description = "システムが稼働する上で最初から必要なデータ（マスタデータ）を管理するツールです。"
+  spec.homepage = "https://github.com/taka0125/master_data_tool"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # 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.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (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_development_dependency 'rspec'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'psych', '~> 3.1'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'ridgepole'
+  spec.add_development_dependency 'database_cleaner-active_record'
+
+  spec.add_dependency 'activerecord', '>= 5.1.7'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'thor'
+  spec.add_dependency 'activerecord-import'
+end

data/scripts/setup.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -ex
+
+CURRENT=$(cd $(dirname $0);pwd)
+
+mysql \
+  -u ${DB_USERNAME} \
+  -h ${DB_HOST} \
+  -p${DB_PASSWORD} \
+  --port ${DB_PORT} \
+  -e "CREATE DATABASE IF NOT EXISTS ${DB_NAME}"
+
+bundle exec ridgepole \
+  -c ${CURRENT}/../spec/dummy-common/config/database.yml \
+  --apply \
+  -f ${CURRENT}/../spec/dummy-common/db/Schemafile \
+  -E test

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: master_data_tool
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,21 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,21 +67,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: ridgepole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.7
+- !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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -117,12 +159,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- Appraisals
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - exe/master_data_tool
+- gemfiles/.bundle/config
+- gemfiles/activerecord52.gemfile
+- gemfiles/activerecord61.gemfile
+- gemfiles/activerecord70.gemfile
 - lib/generators/master_data_tool/install/install_generator.rb
 - lib/generators/master_data_tool/install/templates/create_master_data_statuses.rb.erb
 - lib/master_data_tool.rb
@@ -141,6 +189,9 @@ files:
 - lib/master_data_tool/report/printer.rb
 - lib/master_data_tool/report/verify_report.rb
 - lib/master_data_tool/version.rb
+- log/test.log
+- master_data_tool.gemspec
+- scripts/setup.sh
 - sig/master_data_tool.rbs
 homepage: https://github.com/taka0125/master_data_tool
 licenses: []
@@ -162,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: マスタデータの管理ツール