merge_db_schema 0.1.1 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +31 -0
- data/lib/merge_db_schema/main.rb +1 -1
- data/lib/merge_db_schema/version.rb +1 -1
- data/merge_db_schema.gemspec +2 -2
- metadata +12 -12
- data/.travis.yml +0 -15
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5a0290b7d255e675a59901e0e5ace8201fcf46a049fb0684396f4aedd52a1458
|
4
|
+
data.tar.gz: b5b4c4a61876601d2e66600d19285c09bc5dcf8b233ec164cd67e4e8bfc2abec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 53341416e81bc3e8f02c7fa7e6b535aab72db53947df941fefdf587084b179d020bbeefaa9d5688c0704f0604c22abacc58fdb96f344b4b854fb6e2dad60e44c
|
7
|
+
data.tar.gz: 3846e824080509041859b63b6b5a5461561a599c4607314df444c323f8c15e021a2c51eb4a0d1641ed64f26b666ccf4c45a7aca095a3c949bf39171bd1a77d27
|
@@ -0,0 +1,31 @@
|
|
1
|
+
name: CI
|
2
|
+
|
3
|
+
on:
|
4
|
+
push:
|
5
|
+
branches:
|
6
|
+
- master
|
7
|
+
pull_request:
|
8
|
+
types:
|
9
|
+
- opened
|
10
|
+
- synchronize
|
11
|
+
- reopened
|
12
|
+
|
13
|
+
jobs:
|
14
|
+
test:
|
15
|
+
strategy:
|
16
|
+
fail-fast: false
|
17
|
+
matrix:
|
18
|
+
ruby: [2.6, 2.7, '3.0', head]
|
19
|
+
runs-on: ubuntu-latest
|
20
|
+
steps:
|
21
|
+
- uses: actions/checkout@v2
|
22
|
+
- uses: ruby/setup-ruby@v1
|
23
|
+
with:
|
24
|
+
ruby-version: ${{ matrix.ruby }}
|
25
|
+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
26
|
+
- run: bin/setup
|
27
|
+
- name: setup git commit
|
28
|
+
run: |
|
29
|
+
git config --global user.email 'test@example.com'
|
30
|
+
git config --global user.name 'Ayano Sugiura'
|
31
|
+
- run: bundle exec rake
|
data/lib/merge_db_schema/main.rb
CHANGED
data/merge_db_schema.gemspec
CHANGED
@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
|
|
21
21
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
22
22
|
spec.require_paths = ["lib"]
|
23
23
|
|
24
|
-
spec.required_ruby_version = '>= 2.
|
24
|
+
spec.required_ruby_version = '>= 2.6.0'
|
25
25
|
|
26
26
|
spec.add_dependency "rainbow"
|
27
27
|
|
28
28
|
spec.add_development_dependency "pry"
|
29
29
|
spec.add_development_dependency "bundler", "< 3"
|
30
|
-
spec.add_development_dependency "rake"
|
30
|
+
spec.add_development_dependency "rake"
|
31
31
|
spec.add_development_dependency "minitest", "~> 5.10"
|
32
32
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: merge_db_schema
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Masataka Kuwabara
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-09-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rainbow
|
@@ -56,16 +56,16 @@ dependencies:
|
|
56
56
|
name: rake
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- - "
|
59
|
+
- - ">="
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
61
|
+
version: '0'
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- - "
|
66
|
+
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
68
|
+
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: minitest
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -90,8 +90,8 @@ executables:
|
|
90
90
|
extensions: []
|
91
91
|
extra_rdoc_files: []
|
92
92
|
files:
|
93
|
+
- ".github/workflows/ci.yml"
|
93
94
|
- ".gitignore"
|
94
|
-
- ".travis.yml"
|
95
95
|
- Gemfile
|
96
96
|
- LICENSE
|
97
97
|
- README.md
|
@@ -109,7 +109,7 @@ homepage: https://github.com/pocke/merge_db_schema
|
|
109
109
|
licenses:
|
110
110
|
- Apache-2.0
|
111
111
|
metadata: {}
|
112
|
-
post_install_message:
|
112
|
+
post_install_message:
|
113
113
|
rdoc_options: []
|
114
114
|
require_paths:
|
115
115
|
- lib
|
@@ -117,15 +117,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
117
117
|
requirements:
|
118
118
|
- - ">="
|
119
119
|
- !ruby/object:Gem::Version
|
120
|
-
version: 2.
|
120
|
+
version: 2.6.0
|
121
121
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
122
122
|
requirements:
|
123
123
|
- - ">="
|
124
124
|
- !ruby/object:Gem::Version
|
125
125
|
version: '0'
|
126
126
|
requirements: []
|
127
|
-
rubygems_version: 3.
|
128
|
-
signing_key:
|
127
|
+
rubygems_version: 3.3.0.dev
|
128
|
+
signing_key:
|
129
129
|
specification_version: 4
|
130
130
|
summary: It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves some
|
131
131
|
of the conflict automatically.
|
data/.travis.yml
DELETED
@@ -1,15 +0,0 @@
|
|
1
|
-
cache: bundler
|
2
|
-
rvm:
|
3
|
-
- 2.4.9
|
4
|
-
- 2.5.7
|
5
|
-
- 2.6.5
|
6
|
-
- 2.7.0
|
7
|
-
- ruby-head
|
8
|
-
branches:
|
9
|
-
only:
|
10
|
-
- master
|
11
|
-
before_script:
|
12
|
-
- git config --global user.email "test@example.com"
|
13
|
-
- git config --global user.name "test user"
|
14
|
-
script:
|
15
|
-
- bundle exec rake
|