braid 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea7f832727df1483b0ba45181553cf061f2539a
-  data.tar.gz: dab214bf42041f02f3b6edd29cc8229866689199
+  metadata.gz: afbdb15969e052393b88693a8b6079066d180052
+  data.tar.gz: a5198d79c0cff3d4ba868d3e644d4233d2838e99
 SHA512:
-  metadata.gz: 5aba65dd373480d84c90ea6d4ff7c1e664fcf360d1c344339dccf1a5f92c20f8c2c392793dce5f58cbad7c081d35044a55e64b6871067dbb861080dc796b4d8f
-  data.tar.gz: 190985839fe84ff0157dda1debcd3021c547e1a5d8164f011fab647ba644323957e62158f462dcd6a115da1f40797c418f054da5e9791a016d9f69f5c9dafdd0
+  metadata.gz: 75ffd2beb47c5cb36320e1a326ffb48d6bc6d2e8aaaf83e809b5e22cbbf763cbe63e31261f577fff8d6cad4102247fb98315362d095dbcc3e5da2471e09910a0
+  data.tar.gz: 0c53d7fda15233809526ef8b45318ce9175a8d2ea4030d786e46a9601fc397a822674842a9a9975e67a22716846c8a6a97e77d025de362a4974d6292d1197225

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.3.1
   - 1.9.3
   - jruby-19mode
-  - jruby-18mode
 addons:
   apt:
     sources:

data/lib/braid/commands/update.rb

@@ -86,7 +86,8 @@ module Braid
 
         commit_message = "Update mirror '#{mirror.path}' to #{display_revision(mirror)}"
         if in_error
-          File.open('.git/MERGE_MSG', 'w') { |f| f.puts(commit_message) }
+          merge_msg_path = git.repo_file_path('MERGE_MSG')
+          File.open(merge_msg_path, 'w') { |f| f.puts(commit_message) }
           return
         end
 

data/lib/braid/operations.rb

@@ -161,6 +161,18 @@ module Braid
     end
 
     class Git < Proxy
+      # Get the physical path to a file in the git repository (e.g.,
+      # 'MERGE_MSG'), taking into account worktree configuration.  The returned
+      # path may be absolute or relative to the current working directory.
+      def repo_file_path(path)
+        if require_version('2.5')  # support for --git-path
+          invoke(:rev_parse, '--git-path', path)
+        else
+          # Git < 2.5 doesn't support linked worktrees anyway.
+          File.join(invoke(:rev_parse, '--git-dir'), path)
+        end
+      end
+
       def commit(message, *args)
         cmd = 'git commit --no-verify'
         if message # allow nil

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

data/spec/integration_helper.rb

@@ -8,7 +8,7 @@ require 'pathname'
 
 TMP_PATH     = File.join(Dir.tmpdir, 'braid_integration')
 EDITOR_CMD   = "#{TMP_PATH}/editor"
-EDITOR_CMD_PREFIX = "GIT_EDITOR=#{EDITOR_CMD}"
+EDITOR_CMD_PREFIX = "export GIT_EDITOR=#{EDITOR_CMD};"
 BRAID_PATH   = Pathname.new(File.dirname(__FILE__)).parent.realpath
 FIXTURE_PATH = File.join(BRAID_PATH, 'spec', 'fixtures')
 FileUtils.rm_rf(TMP_PATH)
@@ -19,7 +19,7 @@ BRAID_BIN = ((defined?(JRUBY_VERSION) || Gem.win_platform?) ? 'ruby ' : '') + Fi
 def set_editor_message(message = 'Make some changes')
   File.write(EDITOR_CMD, <<CMD)
 #!/usr/bin/env ruby
-File.write(ARGV[0], #{message.inspect})
+File.open(ARGV[0], 'w') { |file| file.write(#{message.inspect}) }
 CMD
   FileUtils.chmod 0755, EDITOR_CMD
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main