braid 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f27ef2c42cd4181967aa09dfb553f0830e15185c
-  data.tar.gz: f138de7633616c00ee483c9b58902cdb8e313b3c
+  metadata.gz: 2d55b46eb72620ccc9092841609eda270aee04f6
+  data.tar.gz: 684c604750e8774035de42d48c071a9796719be2
 SHA512:
-  metadata.gz: 4305c95e52816fe64157d24e263d1d1309cd490ae8caf203c74d3fbfbb32951072a4fa387ab27e3e8cc20b227142204d1fade6f2fdab08ea93219e9479071a14
-  data.tar.gz: 1896dce83a4f455cd189ef87cb1fe09aeff7b81cc4ba327cc5f36c2c0310027b0ea061c45f1f426ac4fddb2466c0a511a37cd1d4e0da283fea1e4a85cfd3e7d4
+  metadata.gz: 12781c901dc784fffa89b9d16ff941cafb3d9edc9f32435826a0654529962ea736731bab75959c94d4059357772d69211e2d670f1e848fd7733b92613f359c55
+  data.tar.gz: 5cee8e7cbd85eb2fdc40b8a86dafdb89b2808aa5453a0a832158d1f88b2692a71e892a982d3e5752120497220834e193113cdcadb8ff913191776fb6df7c7586

data/lib/braid.rb

@@ -37,6 +37,7 @@ module Braid
   end
 end
 
+require 'braid/operations_lite'
 require 'braid/operations'
 require 'braid/mirror'
 require 'braid/config'

data/lib/braid/commands/push.rb

@@ -60,8 +60,9 @@ module Braid
           # worry about them being moved or deleted during the lifetime of this
           # temporary repository) and faster than fetching from them.  We don't
           # need git.repo_file_path because the temporary repository isn't using
-          # a linked worktree.
-          File.open('.git/objects/info/alternates', 'w') { |f|
+          # a linked worktree.  Git for Windows seems to want LF and not CRLF in
+          # the alternates file; hope that works for Cygwin Git, etc. too.
+          File.open('.git/objects/info/alternates', 'wb') { |f|
             f.puts(odb_paths)
           }
           git.fetch(remote_url, mirror.remote_ref)

data/lib/braid/commands/update.rb

@@ -95,9 +95,12 @@ module Braid
           local_hash = git.rev_parse('HEAD')
           base_hash = generate_tree_hash(mirror, mirror.versioned_path(base_revision))
           remote_hash = generate_tree_hash(mirror, target_revision)
-          ENV["GITHEAD_#{local_hash}"] = 'HEAD'
-          ENV["GITHEAD_#{remote_hash}"] = target_revision
-          git.merge_trees(base_hash, local_hash, remote_hash)
+          Operations::with_modified_environment({
+            "GITHEAD_#{local_hash}" => 'HEAD',
+            "GITHEAD_#{remote_hash}" => target_revision
+          }) do
+            git.merge_trees(base_hash, local_hash, remote_hash)
+          end
         rescue Operations::MergeError => error
           in_error = true
           print error.conflicts_text

data/lib/braid/operations.rb

@@ -110,35 +110,32 @@ module Braid
       def exec(cmd)
         cmd.strip!
 
-        previous_lang = ENV['LANG']
-        ENV['LANG']   = 'C'
-
-        out, err = nil
-        status, pid = 0
-        log(cmd)
-
-        if USE_OPEN3
-          status = nil
-          Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
-            # Under old jrubies this may sometimes throw an exception
-            stdin.close rescue nil
-            out = stdout.read
-            err = stderr.read
-            # Under earlier jrubies this is not correctly passed so add in check
-            status = wait_thread.value if wait_thread # Process::Status object returned.
+        Operations::with_modified_environment({'LANG' => 'C'}) do
+          out, err = nil
+          status, pid = 0
+          log(cmd)
+
+          if USE_OPEN3
+            status = nil
+            Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
+              # Under old jrubies this may sometimes throw an exception
+              stdin.close rescue nil
+              out = stdout.read
+              err = stderr.read
+              # Under earlier jrubies this is not correctly passed so add in check
+              status = wait_thread.value if wait_thread # Process::Status object returned.
+            end
+            # Handle earlier jrubies such as 1.6.7.2
+            status = $?.exitstatus if status.nil?
+          else
+            status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
+              out = stdout.read
+              err = stderr.read
+            end.exitstatus
           end
-          # Handle earlier jrubies such as 1.6.7.2
-          status = $?.exitstatus if status.nil?
-        else
-          status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
-            out = stdout.read
-            err = stderr.read
-          end.exitstatus
-        end
 
-        [status, out, err]
-      ensure
-        ENV['LANG'] = previous_lang
+          [status, out, err]
+        end
       end
 
       def exec!(cmd)
@@ -305,12 +302,9 @@ module Braid
       # Execute a block using a temporary git index file, initially empty.
       def with_temporary_index
         Dir.mktmpdir('braid_index') do |dir|
-          orig_index_file = ENV['GIT_INDEX_FILE']
-          ENV['GIT_INDEX_FILE'] = File.join(dir, 'index')
-          begin
+          Operations::with_modified_environment(
+            {'GIT_INDEX_FILE' => File.join(dir, 'index')}) do
             yield
-          ensure
-            ENV['GIT_INDEX_FILE'] = orig_index_file
           end
         end
       end

data/lib/braid/operations_lite.rb

@@ -0,0 +1,21 @@
+# One helper that is shared with the integration test harness and has no
+# dependencies on the rest of Braid.
+module Braid
+  module Operations
+    # Want to use https://github.com/thoughtbot/climate_control ?
+    def self.with_modified_environment(dict)
+      orig_dict = {}
+      dict.each { |name, value|
+        orig_dict[name] = ENV[name]
+        ENV[name] = value
+      }
+      begin
+        yield
+      ensure
+        orig_dict.each { |name, orig_value|
+          ENV[name] = orig_value
+        }
+      end
+    end
+  end
+end

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.19'
+  VERSION = '1.0.20'
 end

data/spec/integration/integration_helper.rb

@@ -6,12 +6,13 @@ require 'tempfile'
 require 'fileutils'
 require 'pathname'
 
+require File.dirname(__FILE__) + '/../../lib/braid/operations_lite'
+
 DEFAULT_NAME = 'Your Name'
 DEFAULT_EMAIL = 'you@example.com'
 
 TMP_PATH = File.join(Dir.tmpdir, 'braid_integration')
 EDITOR_CMD = "#{TMP_PATH}/editor"
-EDITOR_CMD_PREFIX = "export GIT_EDITOR=#{EDITOR_CMD};"
 BRAID_PATH = Pathname.new(File.dirname(__FILE__)).parent.parent.realpath
 FIXTURE_PATH = File.join(BRAID_PATH, 'spec', 'fixtures')
 FileUtils.rm_rf(TMP_PATH)
@@ -19,12 +20,15 @@ FileUtils.mkdir_p(TMP_PATH)
 
 BRAID_BIN = ((defined?(JRUBY_VERSION) || Gem.win_platform?) ? 'ruby ' : '') + File.join(BRAID_PATH, 'bin', 'braid')
 
-def set_editor_message(message = 'Make some changes')
+def with_editor_message(message = 'Make some changes')
   File.write(EDITOR_CMD, <<CMD)
 #!/usr/bin/env ruby
 File.open(ARGV[0], 'w') { |file| file.write(#{message.inspect}) }
 CMD
   FileUtils.chmod 0755, EDITOR_CMD
+  Braid::Operations::with_modified_environment({'GIT_EDITOR' => EDITOR_CMD}) do
+    yield
+  end
 end
 
 def assert_no_diff(file1, file2)
@@ -54,6 +58,8 @@ def in_dir(dir = TMP_PATH)
   yield
 end
 
+# Note: Do not use single quotes to quote spaces in arguments.  They do not work
+# on Windows.
 def run_command(command)
   output = `#{command}`
   raise "Error executing command: #{command}\nOutput: #{output}" unless $?.success?

data/spec/integration/push_spec.rb

@@ -33,8 +33,9 @@ describe 'Pushing to a mirror' do
         braid_output = nil
         commit_message = 'Make some changes'
         in_dir(@repository_dir) do
-          set_editor_message(commit_message)
-          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
+          with_editor_message(commit_message) do
+            braid_output = run_command("#{BRAID_BIN} push skit1")
+          end
         end
         expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
         expect(braid_output).to match(/Make some changes/)
@@ -56,8 +57,9 @@ describe 'Pushing to a mirror' do
         commit_message = 'Make some changes'
         braid_output = nil
         in_dir(@repository_dir) do
-          set_editor_message(commit_message)
-          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1 --branch MyBranch")
+          with_editor_message(commit_message) do
+            braid_output = run_command("#{BRAID_BIN} push skit1 --branch MyBranch")
+          end
         end
         expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
         expect(braid_output).to match(/Make some changes/)
@@ -90,8 +92,9 @@ describe 'Pushing to a mirror' do
       it 'should halt before attempting to push changes' do
         braid_output = nil
         in_dir(@repository_dir) do
-          set_editor_message('Make some changes')
-          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
+          with_editor_message('Make some changes') do
+            braid_output = run_command("#{BRAID_BIN} push skit1")
+          end
         end
         expect(braid_output).to match(/Braid: Mirror is not up to date. Stopping./)
 
@@ -126,8 +129,9 @@ describe 'Pushing to a mirror' do
         braid_output = nil
         commit_message = 'Make some changes'
         in_dir(@repository_dir) do
-          set_editor_message(commit_message)
-          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
+          with_editor_message(commit_message) do
+            braid_output = run_command("#{BRAID_BIN} push skit1")
+          end
         end
         expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
         expect(braid_output).to match(/Make some changes/)
@@ -176,8 +180,9 @@ describe 'Pushing to a mirror' do
         braid_output = nil
         commit_message = 'Make some changes'
         in_dir(@repository_dir) do
-          set_editor_message(commit_message)
-          braid_output = `#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1`
+          with_editor_message(commit_message) do
+            braid_output = `#{BRAID_BIN} push skit1`
+          end
         end
         expect(braid_output).to match(/Braid: Error: mirror is based off a tag. Can not push to a tag: skit1/)
 
@@ -189,8 +194,9 @@ describe 'Pushing to a mirror' do
         commit_message = 'Make some changes'
         braid_output = nil
         in_dir(@repository_dir) do
-          set_editor_message(commit_message)
-          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1 --branch MyBranch")
+          with_editor_message(commit_message) do
+            braid_output = run_command("#{BRAID_BIN} push skit1 --branch MyBranch")
+          end
         end
         expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
         expect(braid_output).to match(/Make some changes/)
@@ -225,8 +231,9 @@ describe 'Pushing to a mirror' do
       it 'should halt before attempting to push changes' do
         braid_output = nil
         in_dir(@repository_dir) do
-          set_editor_message('Make some changes')
-          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1 --branch MyBranch")
+          with_editor_message('Make some changes') do
+            braid_output = run_command("#{BRAID_BIN} push skit1 --branch MyBranch")
+          end
         end
         expect(braid_output).to match(/Braid: Mirror is not up to date. Stopping./)
 

data/spec/integration/updating_spec.rb

@@ -95,7 +95,7 @@ describe 'Updating a mirror' do
         run_command("cp #{File.join(FIXTURE_PATH, 'shiny_skit1_mergeable', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
         in_dir(@repository_dir) do
-          run_command("git commit -a -m 'mergeable change'")
+          run_command('git commit -a -m "mergeable change"')
           run_command("#{BRAID_BIN} update skit1")
         end
 
@@ -118,12 +118,12 @@ describe 'Updating a mirror' do
 
         braid_output = nil
         in_dir(@repository_dir) do
-          run_command("git commit -a -m 'conflicting change'")
+          run_command('git commit -a -m "conflicting change"')
           braid_output = run_command("#{BRAID_BIN} update skit1")
         end
         expect(braid_output).to match(/Caught merge error\. Breaking\./)
 
-        run_command("grep -q '>>>>>>> #{target_revision}' #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
+        run_command("grep -q \">>>>>>> #{target_revision}\" #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
       end
     end
 
@@ -243,7 +243,7 @@ describe 'Updating a mirror' do
         run_command("cp #{File.join(FIXTURE_PATH, 'shiny_skit1_mergeable', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
         in_dir(@repository_dir) do
-          run_command("git commit -a -m 'mergeable change'")
+          run_command('git commit -a -m "mergeable change"')
           run_command("#{BRAID_BIN} update skit1")
         end
 
@@ -266,7 +266,7 @@ describe 'Updating a mirror' do
 
         braid_output = nil
         in_dir(@repository_dir) do
-          run_command("git commit -a -m 'conflicting change'")
+          run_command('git commit -a -m "conflicting change"')
           braid_output = run_command("#{BRAID_BIN} update skit1")
         end
         expect(braid_output).to match(/Caught merge error\. Breaking\./)
@@ -338,7 +338,7 @@ describe 'Updating a mirror' do
               run_command("cp #{File.join(FIXTURE_PATH, 'shiny_skit1_mergeable', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
               in_dir(@repository_dir) do
-                run_command("git commit -a -m 'mergeable change'")
+                run_command('git commit -a -m "mergeable change"')
                 run_command("#{BRAID_BIN} update skit1")
               end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-21 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -97,6 +97,7 @@ files:
 - lib/braid/config.rb
 - lib/braid/mirror.rb
 - lib/braid/operations.rb
+- lib/braid/operations_lite.rb
 - lib/braid/version.rb
 - spec/config_spec.rb
 - spec/fixtures/shiny/README