git-merge-structure-sql 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8c35db8645408746b82cf6f317a2a6c6c5c70ba693ca198f84325c508d4f49
-  data.tar.gz: ad2f45570587be9299b378adcb601a481c3f953c2b7eed39a348003e696ff946
+  metadata.gz: 45fa3f60e8db64b7a23134411c828fe3a2282c0460de038c4a4797053c3e0fd0
+  data.tar.gz: 3b2fed60a95223f78e75054594e368ef672aa57a44726ef8f34f142add0aa677
 SHA512:
-  metadata.gz: ce85fd23fe236cb10da132ae9e06577c196a0b754425de855087614486de10492b06650a4ebde6f5cf05719e0b7aef5a5eb9c342eb24bc1c235658e85b436d78
-  data.tar.gz: 6558f1ed947236bf03762e0d22d47653e7d8957209ea912a16f757f02859599103eab39245c4dded0c49d6a2502f5085d05c98eaca115cc92181846461ab9c23
+  metadata.gz: 77f0237b83a0d37ab7c699d4d88f68288cfc658e13778ab2995aedb30e2e0c17c53f95b1ca3992d8bc5af006eb6e46b0086261a5539e00f604cd7f372d4ffdd4
+  data.tar.gz: b18704eb043e4cbe1039a0dfd9adfa8c1853f58f5deec99e917cc9c1728cc55bd1b23b2f56770b5386047ceb18d160266493dcc2023375c23ada3986e966a7a5

data/CHANGELOG.md

@@ -12,3 +12,7 @@
 ## 1.1.1 (2021-04-28)
 
 - Fix installation when the attribute file does not exist yet
+
+## 1.1.2 (2021-04-30)
+
+- Implemnt local installation with --install=local

data/README.md

@@ -30,6 +30,11 @@ 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.
 
+If you want to enable this driver only in the current git directory,
+run this:
+
+    $ git-merge-structure-sql --install=local
+
 ## Usage
 
 Once enabled, Git should call this driver as necessary when it needs

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

@@ -33,7 +33,7 @@
 #
 
 class StructureSqlMergeDriver
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
   VARIANTS = []
 
   module Default # This covers PostgreSQL, SQLite and newer MySQL formats.
@@ -154,49 +154,73 @@ class StructureSqlMergeDriver
       opts.summary_indent = ''
       opts.summary_width = 24
 
-      opts.on('--install',
-        "Enable this merge driver in Git") { |val|
-        install = val
+      opts.on('--install[={global|local}]',
+        "Enable this merge driver in Git (default: global)") { |val|
+        case install = val&.to_sym || :global
+        when :global, :local
+          # ok
+        else
+          raise OptionParser::InvalidArgument, "--install=#{val}: unknown argument"
+        end
       }
     }
 
     files = opts.order(argv)
 
     if install
-      puts "Registering the \"#{driver_name}\" driver in your git configuration"
-
-      system!(*%W[
-        git config --global merge.#{driver_name}.name
-        #{'Rails structure.sql merge driver'}
-      ])
-      system!(*%W[
-        git config --global merge.#{driver_name}.driver
-        #{"#{myname.shellescape} %A %O %B"}
-      ])
-
-      attributes_file = `git config --global core.attributesfile`.chomp
+      global = install == :global
+
+      git_config = ["git", "config", *("--global" if global)]
+
+      config_file = `GIT_EDITOR=echo #{git_config.shelljoin} -e 2>/dev/null`.chomp
+
+      puts "#{config_file}: Adding the \"#{driver_name}\" driver definition"
+
+      system!(
+        *git_config,
+        "merge.#{driver_name}.name",
+        "Rails structure.sql merge driver"
+      )
+      system!(
+        *git_config,
+        "merge.#{driver_name}.driver",
+        "#{myname.shellescape} %A %O %B"
+      )
+
       attributes_file =
-        if $?.success?
-          File.expand_path(attributes_file)
+        if global
+          filename = `git config --global core.attributesfile`.chomp
+
+          if $?.success?
+            File.expand_path(filename)
+          else
+            [
+              [File.join(ENV['XDG_CONFIG_HOME'] || '~/.config', 'git'), 'attributes'],
+              ['~', '.gitattributes']
+            ].find { |dir, file|
+              if File.directory?(File.expand_path(dir))
+                system!(*%W[
+                  git config --global core.attributesfile #{File.join(dir, file)}
+                ])
+                break File.expand_path(file, dir)
+              end
+            } or raise "don't you have home?"
+          end
         else
-          [
-            [File.join(ENV['XDG_CONFIG_HOME'] || '~/.config', 'git'), 'attributes'],
-            ['~', '.gitattributes']
-          ].find { |dir, file|
-            if File.directory?(File.expand_path(dir))
-              system!(*%W[
-                git config --global core.attributesfile #{File.join(dir, file)}
-              ])
-              break File.expand_path(file, dir)
-            end
-          } or raise "don't you have home?"
+          git_dir = `git rev-parse --git-dir`.chomp
+
+          if $?.success?
+            File.expand_path(File.join('info', 'attributes'), git_dir)
+          else
+            raise "not in a git directory"
+          end
         end
 
       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"
+        puts "#{attributes_file}: Registering the \"#{driver_name}\" driver for structure.sql"
         f.puts if f.pos > 0
         f.puts "structure.sql merge=#{driver_name}"
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-merge-structure-sql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler