Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,13 @@ jobs:

matrix:
ruby:
- '3.1'
- '3.2'
- '3.3'
- '3.4'
activerecord:
- '7.1'
- '7.2'
- '8.0'
exclude:
- ruby: '3.1'
activerecord: '8.0'
- '8.1'

services:
mysql:
Expand Down Expand Up @@ -83,9 +80,8 @@ jobs:
bundle exec rspec
continue-on-error: ${{ matrix.allow_failures == 'true' }}

- name: Test report
if: matrix.ruby == '3.3' && matrix.activerecord == '7.1' && success()
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter after-build
- uses: qltysh/qlty-action/coverage@v2
if: matrix.ruby == '3.4' && matrix.activerecord == '8.1' && success()
with:
token: ${{secrets.QLTY_COVERAGE_TOKEN}}
files: coverage/.resultset.json
8 changes: 4 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
appraise 'activerecord7.1' do
gem 'activerecord', '~> 7.1.0'
end

appraise 'activerecord7.2' do
gem 'activerecord', '~> 7.2.0'
end

appraise 'activerecord8.0' do
gem 'activerecord', '~> 8.0.0'
end

appraise 'activerecord8.1' do
gem 'activerecord', '~> 8.1.0'
end
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

[![Build Status](https://github.com/taka0125/master_data_tool/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/taka0125/master_data_tool/actions/workflows/main.yml)
[![Gem Version](https://badge.fury.io/rb/master_data_tool.svg)](https://badge.fury.io/rb/master_data_tool)
[![Maintainability](https://api.codeclimate.com/v1/badges/5fc8420c4fe83a2e6c92/maintainability)](https://codeclimate.com/github/taka0125/master_data_tool/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/5fc8420c4fe83a2e6c92/test_coverage)](https://codeclimate.com/github/taka0125/master_data_tool/test_coverage)
[![Maintainability](https://qlty.sh/gh/taka0125/projects/master_data_tool/maintainability.svg)](https://qlty.sh/gh/taka0125/projects/master_data_tool)
[![Code Coverage](https://qlty.sh/gh/taka0125/projects/master_data_tool/coverage.svg)](https://qlty.sh/gh/taka0125/projects/master_data_tool)

システムが稼働する上で最初から必要なデータ(マスタデータ)を管理するツール

Expand Down Expand Up @@ -191,10 +191,10 @@ grep 'operation:import' /tmp/dry-run.txt | grep 'label:detail' | grep 'status:ne

## Test

docker-composeでMySQLを立ち上げてテストを実行する。
docker composeでMySQLを立ち上げてテストを実行する。

```
docker-compose up -d
docker compose up -d
```

以下のENVを設定すること。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ source "https://rubygems.org"

gem "rake", "~> 13.0"
gem "rspec", "~> 3.0"
gem "activerecord", "~> 7.1.0"
gem "activerecord", "~> 8.1.0"

gemspec path: "../"
2 changes: 2 additions & 0 deletions lib/master_data_tool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

require 'csv'
require 'socket'
require 'active_support'
require 'active_support/core_ext'
require_relative "master_data_tool/version"
require_relative "master_data_tool/act_as_master_data"
require_relative "master_data_tool/config"
Expand Down
8 changes: 2 additions & 6 deletions lib/master_data_tool/config.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
require 'active_support/configurable'

module MasterDataTool
class Config
include ActiveSupport::Configurable

config_accessor :master_data_dir
config_accessor :spec_configs
class_attribute :master_data_dir
class_attribute :spec_configs

def initialize
self.master_data_dir = nil
Expand Down
2 changes: 1 addition & 1 deletion lib/master_data_tool/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module MasterDataTool
VERSION = "0.23.0"
VERSION = "0.24.0"
end
5 changes: 3 additions & 2 deletions master_data_tool.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ Gem::Specification.new do |spec|
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 'ridgepole', '~> 3.0'
spec.add_development_dependency 'database_cleaner-active_record'
spec.add_development_dependency 'standalone_activerecord_boot_loader', '>= 0.3 '
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'rbs'
spec.add_development_dependency 'typeprof'

spec.add_dependency 'activerecord', '>= 6.0.0'
spec.add_dependency 'activerecord', '>= 7.2'
spec.add_dependency 'activesupport'
spec.add_dependency 'thor'
spec.add_dependency 'csv'
end
2 changes: 0 additions & 2 deletions sig/master_data_tool.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ module MasterDataTool
end

class Config
include ActiveSupport::Configurable

def initialize: () -> void

def spec_config: (String spec_name) -> untyped
Expand Down
2 changes: 2 additions & 0 deletions spec/dummy/db/Schemafile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ create_table 'taggings', id: :bigint, unsigned: true, force: :cascade do |t|
t.bigint "tag_id", unsigned: true
t.datetime "created_at", null: false
t.datetime "updated_at", null: false

t.index %w[tag_id], name: 'key_taggings_1'
end

create_table 'item_taggings', id: :bigint, unsigned: true, force: :cascade do |t|
Expand Down
4 changes: 3 additions & 1 deletion spec/master_data_tool/report/import_report_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,16 @@
end
master_data.load

hash = {'name'=>['tag2', 'tag222']}

expected = <<-EOD
operation:import label:count table_name:tags before:2 after:2
operation:import label:affected table_name:tags affected:true
operation:import label:new_count table_name:tags count:0
operation:import label:updated_count table_name:tags count:1
operation:import label:no_change_count table_name:tags count:1
operation:import label:deleted_count table_name:tags count:0
operation:import label:detail table_name:tags status:updated id:2 detail:{"name"=>["tag2", "tag222"]}
operation:import label:detail table_name:tags status:updated id:2 detail:#{hash}
operation:import label:detail table_name:tags status:no_change id:1
EOD

Expand Down