git-merge-structure-sql 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106ff7bb28c70bd2a3ddab8ada1e1055cd3018acc97bfc7b51163c72033c69bf
-  data.tar.gz: 8b3c3484f05e9419128172bc743457580a7b23f280295a5769c99d61366fdb33
+  metadata.gz: 84da2722a1dae47932ee39b2b8fab2afe1cf3e45f44dc13a47b2827b31a8ead7
+  data.tar.gz: ef4564d98915f1d3793ceed52293dc842c2ea7b360a0ef510e9cbfda1752ed02
 SHA512:
-  metadata.gz: ef8055e769b186b91c73278f4a5f50670999a33615b2b059b6c7e6d7d187d1d1a7ef80605473057837daa33f2e2a3fbb32503eee3828600861ec942315ffc0be
-  data.tar.gz: 80003f7b2921cdc9cd2923a6670cc9a125c27209ec7fc72cb8870cd282dbfa4eb8bcdf62f0782580c2cf320566c3d8eeed70184cfc3cb2f86a0309b7e383a753
+  metadata.gz: 7e6460ea9caf2df665e595714a2d47dce362bb6aadfab4a3a176e0591c88ac5b00695ddbc0bef567c8c1661832e85bbca1d65fa64f797153e65d9e6468cb45d5
+  data.tar.gz: 38663df90de6dff046713ca93b5836a62ad5c0f96f377425ff2d6ff0adc8e18c29dc1d5d93607bb56b9f389a6a6de6fc206cb5644f915ce239112e524d596491

data/.gitignore

@@ -1,3 +1,5 @@
+Gemfile.lock
+
 /.bundle/
 /.yardoc
 /_yardoc/
@@ -6,3 +8,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Change Log
+
+## 1.0.0 (2018-11-29)
+
+- Initial release
+
+## 1.1.0 (2018-11-30)
+
+- Add support for the latest MySQL dump format
+- Mention support for the SQLite3 dump format

data/LICENSE.txt

@@ -0,0 +1,24 @@
+Copyright (c) 2018 Akinori MUSHA
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.	 IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/README.md

@@ -3,7 +3,8 @@
 This is a merge driver for Git that resolves trivial parts of
 merge conflicts in a db/structure.sql file of Rails.
 
-Currently only PostgreSQL and MySQL dump formats are supported.
+Currently only PostgreSQL, MySQL and SQLite3 dump formats are
+supported.
 
 ## Installation
 
@@ -26,6 +27,16 @@ files.
 Once enabled, Git should call this driver as necessary when it needs
 to merge changes made in structure.sql.
 
-## Contributing
+## History
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/knu/git-merge-structure-sql.
+See `CHANGELOG.md` for the version history.
+
+## Author
+
+Copyright (c) 2018 Akinori MUSHA.
+
+Licensed under the 2-clause BSD license.  See `LICENSE.txt` for
+details.
+
+Visit the [GitHub Repository](https://github.com/knu/sidetiq-timezone)
+for the latest information.

data/Rakefile

@@ -1,10 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "git/merge/structure/sql"
+require "git-merge-structure-sql"
 
 # 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.

data/git-merge-structure-sql.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = StructureSqlMergeDriver::VERSION
   spec.authors       = ["Akinori MUSHA"]
   spec.email         = ["knu@idaemons.org"]
+  spec.license       = "BSD-2-Clause"
 
   spec.summary       = %q{git merge driver for db/structure.sql in a Rails project}
   spec.homepage      = "https://github.com/knu/git-merge-structure-sql"
@@ -29,5 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

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

@@ -33,12 +33,12 @@
 #
 
 class StructureSqlMergeDriver
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
   VARIANTS = []
 
-  module PostgreSQL
+  module Default # This covers PostgreSQL, SQLite and newer MySQL formats.
     RE_VERSION = /^\('(\d+)'\)[,;]\n/
-    RE_VERSIONS = /^INSERT INTO "schema_migrations" \(version\) VALUES\n\K#{RE_VERSION}+/
+    RE_VERSIONS = /^INSERT INTO (?<q>["`])schema_migrations\k<q> \(version\) VALUES\n\K#{RE_VERSION}+/
 
     class << self
       def match?(content)
@@ -68,7 +68,7 @@ class StructureSqlMergeDriver
       end
     end
 
-    VARIANTS << self
+    VARIANTS.unshift self
   end
 
   module MySQL
@@ -125,7 +125,7 @@ class StructureSqlMergeDriver
       end
     end
 
-    VARIANTS << self
+    VARIANTS.unshift self
   end
 
   def system!(*args)
@@ -144,6 +144,7 @@ class StructureSqlMergeDriver
 
       usage: #{myname} <current-file> <base-file> <other-file>
              #{myname} --install
+
     EOF
 
     install = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-merge-structure-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.0'
 description: 
 email:
 - knu@idaemons.org
@@ -61,8 +61,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
@@ -71,7 +74,8 @@ files:
 - git-merge-structure-sql.gemspec
 - lib/git-merge-structure-sql.rb
 homepage: https://github.com/knu/git-merge-structure-sql
-licenses: []
+licenses:
+- BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/knu/git-merge-structure-sql
   source_code_uri: https://github.com/knu/git-merge-structure-sql