merge_db_schema 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: acca68090701a9cd73419ca59497be7497f43c86
+  data.tar.gz: 9c27f64e6243bb3dd5e6c9265835a9b565ef727c
+SHA512:
+  metadata.gz: fc605e12c1e6d9fafe8f60e9ad7b3f6c6d6d4711060710b112e83f5df4397f91cef9cf1256d8de4e05ae5b7cb4b41bdedd54f0e6a042922e4f874b515dfddae5
+  data.tar.gz: 43a2f8716044a558a252af109ac83d04d88c70742670ba9f140d2999d676cc47e21d6ff77d48ddd48c175d9e743f69acd86ab9df4e575e13739baeafe763c9f2

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -0,0 +1,14 @@
+sudo: false
+cache: bundler
+rvm:
+  - 2.3.4
+  - 2.4.1
+  - 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

data/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in merge_db_schema.gemspec
+gemspec

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -0,0 +1,104 @@
+# MergeDBSchema
+
+[![Build Status](https://travis-ci.org/pocke/merge_db_schema.svg?branch=master)](https://travis-ci.org/pocke/merge_db_schema)
+
+It is a git merge driver for `db/schema.rb` of Ruby on Rails.
+It resolves some of the conflict automatically.
+
+![out](https://user-images.githubusercontent.com/4361134/27761416-665a6ee8-5e96-11e7-852d-5eddc9c2a6b8.gif)
+
+```bash
+# Can't merge a branch because schema version is conflicted.
+$ git merge change1
+Auto-merging db/schema.rb
+CONFLICT (content): Merge conflict in db/schema.rb
+Automatic merge failed; fix conflicts and then commit the result.
+
+$ git diff
+diff --cc db/schema.rb
+index bdb07db,da150fc..0000000
+--- a/db/schema.rb
++++ b/db/schema.rb
+@@@ -10,7 -10,7 +10,11 @@@
+  #
+  # It's strongly recommended that you check this file into your version control system.
+  
+++<<<<<<< HEAD
+ +ActiveRecord::Schema.define(version: 20170701103541) do
+++=======
++ ActiveRecord::Schema.define(version: 20170701103437) do
+++>>>>>>> change1
+  
+    create_table "articles", force: :cascade do |t|
+      t.string   "title"
+
+$ git merge --abort
+
+# Install merge_db_schema
+$ merge_db_schema-init --force
+Initializing .gitattributes ... done!
+Initializing .git/config ... done!
+Successfully initialized!
+
+# The conflict is resolved automatically!
+$ git merge change1
+Auto-merging db/schema.rb
+Merge made by the 'recursive' strategy.
+ db/migrate/20170701103437_add_address_to_user.rb | 5 +++++
+ db/schema.rb                                     | 1 +
+ 2 files changed, 6 insertions(+)
+ create mode 100644 db/migrate/20170701103437_add_address_to_user.rb
+```
+
+
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'merge_db_schema'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install merge_db_schema
+
+### Initializing this gem
+
+Run `merge_db_schema-init` and edit `.git/config`.
+
+```bash
+$ merge_db_schema-init
+Initializing .gitattributes ... done!
+Add the following code into .git/config, initializing is completed!
+
+[merge "merge_db_schema"]
+	name = Merge db/schema.rb
+	driver = merge_db_schema %O %A %B
+	recursive = text
+```
+
+If you add `--force` option to the command, it edits `.git/config` automatically.
+
+```bash
+$ merge_db_schema-init --force
+Initializing .gitattributes ... done!
+Initializing .git/config ... done!
+Successfully initialized!
+```
+
+
+Note: `.git/config` **is not tracked by Git**. So, other team members should edit `.git/config` to use this gem.
+
+
+
+License
+-------
+
+Apache License 2.0
+See [LICENSE](https://github.com/pocke/merge_db_schema/blob/master/LICENSE)

data/Rakefile

@@ -0,0 +1,10 @@
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task :default => :test
+
+Rake::TestTask.new do |test|
+  test.libs << 'test'
+  test.test_files = Dir['test/**/test_*.rb']
+  test.verbose = true
+end

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "merge_db_schema"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/exe/merge_db_schema

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'merge_db_schema'
+
+exit MergeDBSchema::Main.main(ARGV)

data/exe/merge_db_schema-init

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'merge_db_schema'
+
+MergeDBSchema::Init.init(ARGV)

data/lib/merge_db_schema.rb

@@ -0,0 +1,9 @@
+require 'pathname'
+require 'rainbow'
+
+require "merge_db_schema/version"
+require 'merge_db_schema/main'
+require 'merge_db_schema/init'
+
+module MergeDBSchema
+end

data/lib/merge_db_schema/init.rb

@@ -0,0 +1,63 @@
+module MergeDBSchema
+  module Init
+    class NotGitDirectoryError < StandardError; end
+
+    class << self
+      def init(argv)
+        force = argv[0] == '--force'
+        check_git_dir!
+        init_gitattribute
+        init_gitconfig(force)
+      end
+
+      private
+
+      def check_git_dir!
+        raise NotGitDirectoryError, 'Current directory is not managed by git!' unless Pathname('.git').exist?
+      end
+
+      def init_gitattribute
+        print 'Initializing .gitattributes ... '
+        gitattributes_content = "db/schema.rb merge=merge_db_schema\n"
+        gitattr = Pathname('.gitattributes')
+        if gitattr.exist? && gitattr.read.include?(gitattributes_content)
+          puts Rainbow('skip').orange
+        else
+          gitattr.open('a') do |f|
+            f.write(gitattributes_content)
+          end
+          puts Rainbow('done!').green
+        end
+      end
+
+      def init_gitconfig(force)
+        gitconfig_content = <<~END
+          [merge "merge_db_schema"]
+          \tname = Merge db/schema.rb
+          \tdriver = merge_db_schema %O %A %B
+          \trecursive = text
+        END
+
+        unless force
+          puts 'Add the following code into .git/config, initializing is completed!'
+          puts
+          puts gitconfig_content
+          return
+        end
+
+        gitconfig = Pathname('.git/config')
+        print 'Initializing .git/config ... '
+        if gitconfig.exist? && gitconfig.read.include?(gitconfig_content)
+          puts Rainbow('skip').orange
+        else
+          gitconfig.open('a') do |f|
+            f.write(gitconfig_content)
+          end
+          puts Rainbow('done!').green
+        end
+
+        puts Rainbow('Successfully initialized!')
+      end
+    end
+  end
+end

data/lib/merge_db_schema/main.rb

@@ -0,0 +1,38 @@
+module MergeDBSchema
+  module Main
+    RE_DEFINE = /^ActiveRecord::Schema.define\(version:\s(\d+)\)\sdo$/
+
+    class << self
+      # Usage: merge_db_schema %O %A %B
+      # @param argv [Array<String>]
+      # @return [Integer] status code
+      def main(argv)
+        original = Pathname(argv[0])
+        current = Pathname(argv[1])
+        other = Pathname(argv[2])
+
+        current_text = current.read
+        other_text   = other.read
+
+        version1 = current_text[RE_DEFINE, 1].to_i
+        version2 = other_text[RE_DEFINE, 1].to_i
+        version = [version1, version2].max
+
+        update_version(current, version)
+        update_version(other, version)
+        update_version(original, version)
+
+        `git merge-file -q #{current} #{original} #{other}`
+        return $?.exitstatus
+      end
+
+      private
+
+      def update_version(path, version)
+        text = path.read
+        text[RE_DEFINE, 1] = version.to_s
+        path.write(text)
+      end
+    end
+  end
+end

data/lib/merge_db_schema/version.rb

@@ -0,0 +1,3 @@
+module MergeDBSchema
+  VERSION = "0.1.0"
+end

data/merge_db_schema.gemspec

@@ -0,0 +1,31 @@
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "merge_db_schema/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "merge_db_schema"
+  spec.version       = MergeDBSchema::VERSION
+  spec.authors       = ["Masataka Kuwabara"]
+  spec.email         = ["kuwabara@pocke.me"]
+
+  spec.summary       = %q{It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves some of the conflict automatically.}
+  spec.description   = %q{It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves some of the conflict automatically.}
+  spec.homepage      = "https://github.com/pocke/merge_db_schema"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = '>= 2.3.0'
+
+  spec.add_dependency "rainbow"
+
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.10"
+end

metadata

@@ -0,0 +1,132 @@
+--- !ruby/object:Gem::Specification
+name: merge_db_schema
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Masataka Kuwabara
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2017-07-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  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: pry
+  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: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+description: It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves
+  some of the conflict automatically.
+email:
+- kuwabara@pocke.me
+executables:
+- merge_db_schema
+- merge_db_schema-init
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/console
+- bin/setup
+- exe/merge_db_schema
+- exe/merge_db_schema-init
+- lib/merge_db_schema.rb
+- lib/merge_db_schema/init.rb
+- lib/merge_db_schema/main.rb
+- lib/merge_db_schema/version.rb
+- merge_db_schema.gemspec
+homepage: https://github.com/pocke/merge_db_schema
+licenses: []
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.3.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.6.10
+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.
+test_files: []