master_data_tool 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f03f9ca56ad09dd1f511a53248da3ffe917a0e8be0dba68e3bfbb8f61f74bb'
-  data.tar.gz: 56d9f18f92c96ca4cf2f5bac42edc369d861cbf1cb3ba3e39cb6c8b19eccbdc0
+  metadata.gz: 13d917fbfac12aeef06fb5d23478b0b7a72cb7d322307650097cf7b9bbfc2154
+  data.tar.gz: 55e5a9eaf6fb6605e3c81db67e416b9b194ba38dd68f7f52646e2d6aed1f4bb4
 SHA512:
-  metadata.gz: 229dc35b454ca6adafddc65125042649172d203a87554fbe161cade5ad6f17c9e645c40108cb37a937cbf1bfa496b06f0ad6406e904e706a7945b4a9ffe9bb2f
-  data.tar.gz: 285b4f485f23c1215b8029af39bac2808a85050506e02cb92e1662ddaf0ccf634f9a8de4b821663f297d78f6e8a74d61a0920af4e2570ebe19200a0d1ec2f121
+  metadata.gz: c786f48fffb282a462c5daff7dc238c2021113d79590b6bcfc3a5f9d001a153e0db298b958f99548f12d0f4c09f69ed7b254c3b03e7e29655bc67d3b299c2476
+  data.tar.gz: cf6f31dbe36c37e82ac9fbed099b02e93ac721fc31676288cc3f5b2905502a85b2e919517f0bdc60e3a793f5ab525de4bef597c335ac254b53c168eb7f0a12b1

data/lib/master_data_tool/import/executor.rb

@@ -33,17 +33,17 @@ module MasterDataTool
         ApplicationRecord.transaction do
           print_execute_options
 
-          master_data_list = build_master_data_list
+          master_data_collection = build_master_data_collection
 
-          import_all!(master_data_list)
-          verify_all!(master_data_list) if @verify
-          save_master_data_statuses!(master_data_list)
+          import_all!(master_data_collection)
+          verify_all!(master_data_collection) if @verify
+          save_master_data_statuses!(master_data_collection)
 
-          print_affected_tables(master_data_list)
+          print_affected_tables(master_data_collection)
 
           raise DryRunError if @dry_run
 
-          master_data_list
+          master_data_collection
         end
       rescue DryRunError
         puts "[DryRun] end"
@@ -61,22 +61,18 @@ module MasterDataTool
         puts "================="
       end
 
-      def build_master_data_list
-        [].tap do |master_data_list|
-          MasterDataTool::Import::MasterDataFileList.new(override_identifier: @override_identifier).build.each do |master_data_file|
+      def build_master_data_collection
+        MasterDataCollection.new.tap do |collection|
+          MasterDataTool::MasterDataFileCollection.new(override_identifier: @override_identifier).each do |master_data_file|
             load_skip = load_skip_table?(master_data_file)
-
-            model_klass = Object.const_get(master_data_file.table_name.classify)
-            master_data = MasterData.new(master_data_file, model_klass)
-            master_data.load unless load_skip
-
-            master_data_list << master_data
+            master_data = MasterData.build(master_data_file, load: !load_skip)
+            collection.append(master_data)
           end
-        end.sort_by { |m| m.basename } # 外部キー制約などがある場合には先に入れておかないといけないデータなどがある。なので、プレフィックスを付けて順序を指定して貰う
+        end
       end
 
-      def import_all!(master_data_list)
-        master_data_list.each do |master_data|
+      def import_all!(master_data_collection)
+        master_data_collection.each do |master_data|
           next unless master_data.loaded?
           next if import_skip_table?(master_data.table_name)
 
@@ -85,8 +81,8 @@ module MasterDataTool
         end
       end
 
-      def verify_all!(master_data_list)
-        master_data_list.each do |master_data|
+      def verify_all!(master_data_collection)
+        master_data_collection.each do |master_data|
           next if verify_skip_table?(master_data.table_name)
 
           report = master_data.verify!(ignore_fail: @dry_run)
@@ -94,9 +90,9 @@ module MasterDataTool
         end
       end
 
-      def save_master_data_statuses!(master_data_list)
+      def save_master_data_statuses!(master_data_collection)
         records = []
-        master_data_list.each do |master_data|
+        master_data_collection.each do |master_data|
           next unless master_data.loaded?
 
           records << MasterDataTool::MasterDataStatus.build(master_data.master_data_file)
@@ -105,8 +101,8 @@ module MasterDataTool
         MasterDataTool::MasterDataStatus.import_records!(records, dry_run: @dry_run)
       end
 
-      def print_affected_tables(master_data_list)
-        master_data_list.each do |master_data|
+      def print_affected_tables(master_data_collection)
+        master_data_collection.each do |master_data|
           next unless master_data.loaded?
           next unless master_data.affected?
 

data/lib/master_data_tool/import.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require_relative 'import/master_data_file_list'
 require_relative "import/executor"

data/lib/master_data_tool/master_data.rb

@@ -19,6 +19,15 @@ module MasterDataTool
       @deleted_records = []
     end
 
+    class << self
+      def build(master_data_file, load: false)
+        model_klass = Object.const_get(master_data_file.table_name.classify)
+        new(master_data_file, model_klass).tap do |record|
+          record.load if load
+        end
+      end
+    end
+
     def basename
       @master_data_file.basename
     end

data/lib/master_data_tool/master_data_collection.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module MasterDataTool
+  class MasterDataCollection
+    def initialize
+      @collection = []
+    end
+
+    def append(master_data)
+      @collection << master_data
+    end
+
+    def each
+      return enum_for(:each) unless block_given?
+
+      @collection.sort_by(&:basename).each do |master_data|
+        yield master_data
+      end
+    end
+
+    def to_a
+      each.to_a
+    end
+  end
+end

data/lib/master_data_tool/master_data_file.rb

@@ -1,13 +1,35 @@
 # frozen_string_literal: true
 module MasterDataTool
-  class MasterDataFile < Struct.new(:table_name, :path, :override_identifier)
+  class MasterDataFile
+    attr_reader :table_name, :path, :override_identifier
+
     def initialize(table_name, path, override_identifier)
-      super(table_name, path, override_identifier)
+      @table_name = table_name
+      @path = path
+      @override_identifier = override_identifier
       freeze
     end
 
+    class << self
+      def build(path, override_identifier)
+        table_name = MasterDataTool.resolve_table_name(path, override_identifier)
+        new(table_name, path, override_identifier)
+      end
+    end
+
     def basename
-      self.path.basename
+      @path.basename
+    end
+
+    def ==(other)
+      other.class === self &&
+        other.hash == hash
+    end
+
+    alias eql? ==
+
+    def hash
+      [@table_name, @path, @override_identifier].join.hash
     end
   end
 end

data/lib/master_data_tool/master_data_file_collection.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module MasterDataTool
+  class MasterDataFileCollection
+    def initialize(override_identifier: nil)
+      @override_identifier = override_identifier
+      @collection = build
+      freeze
+    end
+
+    def each
+      return enum_for(:each) unless block_given?
+
+      @collection.each do |file|
+        yield file
+      end
+    end
+
+    def to_a
+      each.to_a
+    end
+
+    private
+
+    def build
+      files = extract_master_data_csv_paths.presence&.index_by(&:table_name)
+      overridden_files = overridden_master_data_csv_paths.presence&.index_by(&:table_name) || {}
+
+      table_names = (files.keys + overridden_files.keys).uniq
+      table_names.map do |table_name|
+        overridden_files[table_name] || files[table_name]
+      end
+    end
+
+    def extract_master_data_csv_paths
+      pattern = Pathname.new(MasterDataTool.config.master_data_dir).join('*.csv').to_s
+      Pathname.glob(pattern).select(&:file?).map do |path|
+        MasterDataFile.build(path, nil)
+      end
+    end
+
+    def overridden_master_data_csv_paths
+      return [] if @override_identifier.blank?
+
+      pattern = Pathname.new(MasterDataTool.config.master_data_dir).join(@override_identifier).join('*.csv').to_s
+      Pathname.glob(pattern).select(&:file?).map do |path|
+        MasterDataFile.build(path, @override_identifier)
+      end
+    end
+  end
+end

data/lib/master_data_tool/version.rb

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

data/lib/master_data_tool.rb

@@ -5,7 +5,9 @@ require_relative "master_data_tool/version"
 require_relative "master_data_tool/config"
 require_relative "master_data_tool/master_data_status"
 require_relative "master_data_tool/master_data_file"
+require_relative "master_data_tool/master_data_file_collection"
 require_relative "master_data_tool/master_data"
+require_relative "master_data_tool/master_data_collection"
 require_relative "master_data_tool/report"
 require_relative "master_data_tool/dump/executor"
 require_relative "master_data_tool/import"

data/master_data_tool.gemspec

@@ -0,0 +1,42 @@
+# 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_development_dependency 'standalone_activerecord_boot_loader'
+
+  spec.add_dependency 'activerecord', '>= 5.1.7'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'thor'
+  spec.add_dependency 'activerecord-import'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_data_tool
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Takahiro Ooishi
@@ -194,9 +194,10 @@ files:
 - lib/master_data_tool/dump/executor.rb
 - lib/master_data_tool/import.rb
 - lib/master_data_tool/import/executor.rb
-- lib/master_data_tool/import/master_data_file_list.rb
 - lib/master_data_tool/master_data.rb
+- lib/master_data_tool/master_data_collection.rb
 - lib/master_data_tool/master_data_file.rb
+- lib/master_data_tool/master_data_file_collection.rb
 - lib/master_data_tool/master_data_status.rb
 - lib/master_data_tool/report.rb
 - lib/master_data_tool/report/core.rb
@@ -207,6 +208,7 @@ files:
 - 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
@@ -229,7 +231,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: マスタデータの管理ツール

data/lib/master_data_tool/import/master_data_file_list.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module MasterDataTool
-  module Import
-    class MasterDataFileList
-      Result = Struct.new(:table_name, :path, :override_identifier)
-
-      def initialize(override_identifier: nil)
-        @override_identifier = override_identifier
-      end
-
-      def build
-        files = extract_master_data_csv_paths.presence&.index_by(&:table_name)
-        overridden_files = overridden_master_data_csv_paths.presence&.index_by(&:table_name) || {}
-
-        table_names = (files.keys + overridden_files.keys).uniq
-        table_names.map do |table_name|
-          overridden_files[table_name] || files[table_name]
-        end
-      end
-
-      private
-
-      def extract_master_data_csv_paths
-        pattern = Pathname.new(MasterDataTool.config.master_data_dir).join('*.csv').to_s
-        Pathname.glob(pattern).select(&:file?).map do |path|
-          table_name = MasterDataTool.resolve_table_name(path, nil)
-          MasterDataTool::MasterDataFile.new(table_name, path, nil)
-        end
-      end
-
-      def overridden_master_data_csv_paths
-        return [] if @override_identifier.blank?
-
-        pattern = Pathname.new(MasterDataTool.config.master_data_dir).join(@override_identifier).join('*.csv').to_s
-        Pathname.glob(pattern).select(&:file?).map do |path|
-          table_name = MasterDataTool.resolve_table_name(path, @override_identifier)
-          MasterDataTool::MasterDataFile.new(table_name, path, @override_identifier)
-        end
-      end
-    end
-  end
-end