merge_db_schema 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc1b87e38ba99765cc82ff44811b77e8e9287ba68b059d416dd9d87cebfa352a
-  data.tar.gz: 3b350f0be9ce8f4bf610b12e924616ce698ad5d4d6062f699fbf9ebe87d8839d
+  metadata.gz: 5a0290b7d255e675a59901e0e5ace8201fcf46a049fb0684396f4aedd52a1458
+  data.tar.gz: b5b4c4a61876601d2e66600d19285c09bc5dcf8b233ec164cd67e4e8bfc2abec
 SHA512:
-  metadata.gz: 144cbcf84cb24965e6bd3ccf4d04d6a0dfe51b1a044a24dd5711e757673ad0a9fc3a4f71d9871aa32824a31dfbf2aae8a29620cb7d8f6c0f72c7ca8474a343d6
-  data.tar.gz: 3fd22578f56a71cfcc69026c4706e9e7f305ad6543aeaffe506e683099f17f9ab445fd7e529fdd3709a520232bf5a84bd069c2dc790df401dabf7aaf2902d888
+  metadata.gz: 53341416e81bc3e8f02c7fa7e6b535aab72db53947df941fefdf587084b179d020bbeefaa9d5688c0704f0604c22abacc58fdb96f344b4b854fb6e2dad60e44c
+  data.tar.gz: 3846e824080509041859b63b6b5a5461561a599c4607314df444c323f8c15e021a2c51eb4a0d1641ed64f26b666ccf4c45a7aca095a3c949bf39171bd1a77d27

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, '3.0', head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bin/setup
+    - name: setup git commit
+      run: |
+        git config --global user.email 'test@example.com'
+        git config --global user.name 'Ayano Sugiura'
+    - run: bundle exec rake

data/lib/merge_db_schema/main.rb

@@ -1,6 +1,6 @@
 module MergeDBSchema
   module Main
-    RE_DEFINE = /^ActiveRecord::Schema.define\(version:\s(\d+)\)\sdo$/
+    RE_DEFINE = /^ActiveRecord::Schema.define\(version:\s([\d,_]+)\)\sdo$/
 
     class << self
       # Usage: merge_db_schema %O %A %B

data/lib/merge_db_schema/version.rb

@@ -1,3 +1,3 @@
 module MergeDBSchema
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/merge_db_schema.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency "rainbow"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "< 3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_db_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Masataka Kuwabara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +90,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -109,7 +109,7 @@ homepage: https://github.com/pocke/merge_db_schema
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,15 +117,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves some
   of the conflict automatically.

data/.travis.yml

@@ -1,15 +0,0 @@
-cache: bundler
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-  - ruby-head
-branches:
-  only:
-    - master
-before_script:
-  - git config --global user.email "test@example.com"
-  - git config --global user.name "test user"
-script:
-  - bundle exec rake