git-merge-structure-sql 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84da2722a1dae47932ee39b2b8fab2afe1cf3e45f44dc13a47b2827b31a8ead7
-  data.tar.gz: ef4564d98915f1d3793ceed52293dc842c2ea7b360a0ef510e9cbfda1752ed02
+  metadata.gz: 0e8c35db8645408746b82cf6f317a2a6c6c5c70ba693ca198f84325c508d4f49
+  data.tar.gz: ad2f45570587be9299b378adcb601a481c3f953c2b7eed39a348003e696ff946
 SHA512:
-  metadata.gz: 7e6460ea9caf2df665e595714a2d47dce362bb6aadfab4a3a176e0591c88ac5b00695ddbc0bef567c8c1661832e85bbca1d65fa64f797153e65d9e6468cb45d5
-  data.tar.gz: 38663df90de6dff046713ca93b5836a62ad5c0f96f377425ff2d6ff0adc8e18c29dc1d5d93607bb56b9f389a6a6de6fc206cb5644f915ce239112e524d596491
+  metadata.gz: ce85fd23fe236cb10da132ae9e06577c196a0b754425de855087614486de10492b06650a4ebde6f5cf05719e0b7aef5a5eb9c342eb24bc1c235658e85b436d78
+  data.tar.gz: 6558f1ed947236bf03762e0d22d47653e7d8957209ea912a16f757f02859599103eab39245c4dded0c49d6a2502f5085d05c98eaca115cc92181846461ab9c23

data/CHANGELOG.md

@@ -8,3 +8,7 @@
 
 - Add support for the latest MySQL dump format
 - Mention support for the SQLite3 dump format
+
+## 1.1.1 (2021-04-28)
+
+- Fix installation when the attribute file does not exist yet

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Akinori MUSHA
+Copyright (c) 2018-2021 Akinori MUSHA
 
 All rights reserved.
 

data/README.md

@@ -1,7 +1,16 @@
 # git-merge-structure-sql
 
-This is a merge driver for Git that resolves trivial parts of
-merge conflicts in a db/structure.sql file of Rails.
+This is a merge driver for Git that resolves typical merge conflicts
+in a `db/structure.sql` file of Rails.
+
+When your project is configured with
+`config.active_record.schema_format = :sql`, the database schema is
+kept in `db/structure.sql` instead of `db/schema.rb` in the native
+dump format of the underlying database engine, which is not suitable
+for the default merge driver of Git to deal with.  As a result, when
+you try to merge two branches you always have to resolve trivial
+conflicts manually if new schema migrations take place in both
+branches.  This custom driver takes away such a pain.
 
 Currently only PostgreSQL, MySQL and SQLite3 dump formats are
 supported.
@@ -17,10 +26,9 @@ for you by this command:
 
     $ git-merge-structure-sql --install
 
-This adds necessary settings to your
-`~/.gitconfig`/`$XDG_CONFIG_HOME/git/config` and the default
-gitattributes(5) file to enable the merge driver for structure.sql
-files.
+This adds necessary settings to your `~/.gitconfig` or
+`$XDG_CONFIG_HOME/git/config` and the default gitattributes(5) file to
+enable the merge driver for structure.sql files.
 
 ## Usage
 
@@ -33,7 +41,7 @@ See `CHANGELOG.md` for the version history.
 
 ## Author
 
-Copyright (c) 2018 Akinori MUSHA.
+Copyright (c) 2018-2021 Akinori MUSHA.
 
 Licensed under the 2-clause BSD license.  See `LICENSE.txt` for
 details.

data/git-merge-structure-sql.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/git-merge-structure-sql.rb

@@ -6,7 +6,7 @@
 # How to use:
 #     $ git-merge-structure-sql --install
 #
-# Copyright (c) 2018 Akinori MUSHA
+# Copyright (c) 2018-2021 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 #
 
 class StructureSqlMergeDriver
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   VARIANTS = []
 
   module Default # This covers PostgreSQL, SQLite and newer MySQL formats.
@@ -192,12 +192,13 @@ class StructureSqlMergeDriver
           } or raise "don't you have home?"
         end
 
-      File.open(attributes_file, 'r+') { |f|
+      File.open(attributes_file, 'a+') { |f|
         pattern = /^\s*structure.sql\s+(?:\S+\s+)*merge=#{Regexp.quote(driver_name)}(?:\s|$)/
         break if f.any? { |line| pattern === line }
 
         puts "Enabling the \"#{driver_name}\" driver for structure.sql"
-        f.puts "\nstructure.sql merge=#{driver_name}"
+        f.puts if f.pos > 0
+        f.puts "structure.sql merge=#{driver_name}"
       }
 
       exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-merge-structure-sql
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Akinori MUSHA
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - knu@idaemons.org
 executables:
@@ -80,7 +80,7 @@ metadata:
   homepage_uri: https://github.com/knu/git-merge-structure-sql
   source_code_uri: https://github.com/knu/git-merge-structure-sql
   changelog_uri: https://github.com/knu/git-merge-structure-sql/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.11
+signing_key:
 specification_version: 4
 summary: git merge driver for db/structure.sql in a Rails project
 test_files: []