braid 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27f551df379a0352a7631473cb4fd0846972c36
-  data.tar.gz: e06e3fda1d7876be1062b2a4a37a3455bfadeb06
+  metadata.gz: ab9eeee697a55d6b0126b0b7fc83f1ef5bcd72ce
+  data.tar.gz: 592d7f2a02f89a1afa3accb32c3e8ab910982ba8
 SHA512:
-  metadata.gz: e3b359b14dd78c3eb9c74ba40e00715f1028633b9463b734d157a2907d587c1846087924afb15dfcbb0e7bb633ebdb95a8d829ce0dd47950bf0c350944c09ec1
-  data.tar.gz: a6cd4f1949074ab61fee5919f80458194c22063bdbce1a307d2cc7add311a7dd1e63ba94486d2d98cb310cd49f6b1c73edc65521f7c549a51a0ce0f7eb01ecd0
+  metadata.gz: e0e1aab9e20c6be6b449c14e9c8c9b768e71b58bc81634e737b83358172a39b62044f92cc0dc8e7fb2eb48045ea4b3dfed67b19ac22faae335619040265a2869
+  data.tar.gz: 644e0aced9a33f47309f1bf6df77c31e7098b9292e3133a1e44e7f5852b7f2d749f02147425b73f949f9e39d444cc1aa156897613450953906f073ff062d3231

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 sudo: false
 rvm:
   - 2.3.1
-  - 1.9.3
   - jruby-19mode
 addons:
   apt:

data/bin/braid

@@ -1,6 +1,18 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+# Duplicated from Braid::Command.run. :(
+def die(msg)
+  puts "Braid: Error: #{msg}"
+  exit(1)
+end
+
+# If we assume Ruby >= 2.0, we can use __dir__.
+libdir = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
+unless File.exists?(libdir)
+  # Don't silently fall back to a different globally installed copy of Braid!
+  die "Cannot find Braid's 'lib' directory."
+end
+$LOAD_PATH.unshift(libdir)
 require 'braid'
 
 require 'rubygems'
@@ -20,12 +32,6 @@ Main {
     You can then merge back or cherry-pick changes.
   TXT
 
-  # Duplicated from Braid::Command.run. :(
-  def die(msg)
-    puts "Braid: Error: #{msg}"
-    exit(1)
-  end
-
   # The "main" library doesn't provide a way to do this??
   def check_no_extra_args!
     if @argv.length > 0

data/braid.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.has_rdoc           = false
   s.rdoc_options       = %w(--line-numbers --inline-source --title braid --main)
 
+  s.required_ruby_version = '>= 2.2.0'
   s.add_dependency(%q<main>, ['>= 4.7.3'])
-  s.add_dependency(%q<open4>, ['>= 1.0.1']) unless defined?(JRUBY_VERSION)
 
   s.add_development_dependency(%q<rspec>, ['>= 3.4.4'])
   s.add_development_dependency(%q<mocha>, ['>= 0.9.11'])

data/lib/braid/commands/diff.rb

@@ -31,6 +31,7 @@ module Braid
       def show_diff(path, options = {})
         mirror = config.get!(path)
         setup_remote(mirror)
+        mirror.fetch_base_revision_if_missing
 
         # We do not need to spend the time to copy the content outside the
         # mirror from HEAD because --relative will exclude it anyway.  Rename

data/lib/braid/mirror.rb

@@ -64,12 +64,27 @@ module Braid
     end
 
     def diff
-      fetch
+      fetch_base_revision_if_missing
       remote_hash = git.rev_parse(versioned_path(base_revision))
       local_hash  = git.tree_hash(path)
       remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : ''
     end
 
+    # Re-fetching the remote after deleting and re-adding it may be slow even if
+    # all objects are still present in the repository
+    # (https://github.com/cristibalan/braid/issues/71).  Mitigate this for
+    # `braid diff` and other commands that need the diff by skipping the fetch
+    # if the base revision is already present in the repository.
+    def fetch_base_revision_if_missing
+      begin
+        # Without ^{commit}, this will happily pass back an object hash even if
+        # the object isn't present.  See the git-rev-parse(1) man page.
+        git.rev_parse(base_revision + "^{commit}")
+      rescue Operations::UnknownRevision
+        fetch
+      end
+    end
+
     def fetch
       git_cache.fetch(url) if cached?
       git.fetch(remote)

data/lib/braid/operations.rb

@@ -3,8 +3,7 @@ require 'rubygems'
 require 'tempfile'
 
 module Braid
-  USE_OPEN3 = defined?(JRUBY_VERSION) || Gem.win_platform?
-  require USE_OPEN3 ? 'open3' : 'open4'
+  require 'open3'
 
   module Operations
     class ShellExecutionError < BraidError
@@ -111,29 +110,8 @@ module Braid
         cmd.strip!
 
         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
-
+          out, err, status = Open3.capture3(cmd)
           [status, out, err]
         end
       end
@@ -402,33 +380,6 @@ module Braid
         out[2..-1]
       end
 
-      def apply(diff, *args)
-        status, err = nil, nil
-
-        command = "git apply --index --whitespace=nowarn #{args.join(' ')} -"
-
-        if USE_OPEN3
-          Open3.popen3(command) do |stdin, stdout, stderr, wait_thread|
-            stdin.puts(diff)
-            stdin.close
-            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(command) do |pid, stdin, stdout, stderr|
-            stdin.puts(diff)
-            stdin.close
-            err = stderr.read
-          end.exitstatus
-        end
-
-        raise ShellExecutionError, err unless status == 0
-        true
-      end
-
       def clone(*args)
         # overrides builtin
         invoke(:clone, *args)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.21'.freeze
+  VERSION = '1.0.22'.freeze
 end

data/spec/integration/diff_spec.rb

@@ -47,13 +47,7 @@ describe 'Running braid diff with a mirror' do
         end
       end
 
-      it 'with the mirror specified should emit diff' do
-        diff = nil
-        in_dir(@repository_dir) do
-          diff = run_command("#{BRAID_BIN} diff skit1")
-        end
-
-        expect(diff).to eq(<<PATCH)
+      EXPECTED_DIFF=<<PATCH
 diff --git a/layouts/layout.liquid b/layouts/layout.liquid
 index 9f75009..25a4b32 100644
 --- a/layouts/layout.liquid
@@ -68,6 +62,14 @@ index 9f75009..25a4b32 100644
  
  <div id="wrapper">
 PATCH
+
+      it 'with the mirror specified should emit diff' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff skit1")
+        end
+
+        expect(diff).to eq(EXPECTED_DIFF)
       end
 
       it 'without specifying a mirror should emit diff and banners' do
@@ -76,24 +78,50 @@ PATCH
           diff = run_command("#{BRAID_BIN} diff")
         end
 
-        expect(diff).to eq(<<PATCH)
+        expect(diff).to eq(<<BANNER + EXPECTED_DIFF)
 =======================================================
 Braid: Diffing skit1
 =======================================================
-diff --git a/layouts/layout.liquid b/layouts/layout.liquid
-index 9f75009..25a4b32 100644
---- a/layouts/layout.liquid
-+++ b/layouts/layout.liquid
-@@ -22,7 +22,7 @@
- <![endif]-->
- </head>
- 
--<body class="fixed orange">
-+<body class="fixed green">
- <script type="text/javascript">loadPreferences()</script>
- 
- <div id="wrapper">
-PATCH
+BANNER
+      end
+
+      it 'in a new clone of the downstream repository should fetch the base revision and emit diff' do
+        diff = nil
+        CLONE_NAME = 'shiny-clone'
+        in_dir(TMP_PATH) do
+          run_command("git clone --quiet #{@repository_dir} #{CLONE_NAME}")
+        end
+        clone_dir = File.join(TMP_PATH, CLONE_NAME)
+        in_dir(clone_dir) do
+          diff = run_command("#{BRAID_BIN} diff skit1")
+        end
+
+        expect(diff).to eq(EXPECTED_DIFF)
+      end
+
+      it 'after pruning the base revision from the repository should fetch it again and emit diff' do
+        # Note: It is not the intent of this test case to require that Braid
+        # leave objects from the mirror in the main repository after it exits.
+        # A design change to stop doing that would legitimately require this
+        # test case to be modified or dropped.
+        diff = nil
+        in_dir(@repository_dir) do
+          status_out = run_command("#{BRAID_BIN} status skit1")
+          base_revision = /^skit1 \(([0-9a-f]{40})\)/.match(status_out)[1]
+          # Make sure the base revision is in the repository as a sanity check.
+          run_command("git rev-parse --verify --quiet #{base_revision}^{commit}")
+          run_command("git gc --quiet --prune=all")
+          # Make sure it's gone now so we know we're actually testing Braid's fetch behavior.
+          `git rev-parse --verify --quiet #{base_revision}^{commit}`
+          raise "'git gc' did not delete the base revision from the repository." if $?.success?
+
+          diff = run_command("#{BRAID_BIN} diff skit1")
+
+          # The base revision should be present again.
+          run_command("git rev-parse --verify --quiet #{base_revision}^{commit}")
+        end
+
+        expect(diff).to eq(EXPECTED_DIFF)
       end
     end
 

data/spec/mirror_spec.rb

@@ -69,33 +69,6 @@ describe 'Braid::Mirror.new_from_options' do
 
 end
 
-describe 'Braid::Mirror#diff' do
-  before(:each) do
-    @mirror = build_mirror('revision' => 'a' * 40, 'url' => 'git://path')
-    @mirror.stubs(:base_revision).returns(@mirror.revision) # bypass rev_parse
-  end
-
-  def set_hashes(remote_hash, local_hash)
-    git.expects(:rev_parse).with("#{@mirror.revision}:").returns(remote_hash)
-    git.expects(:tree_hash).with(@mirror.path).returns(local_hash)
-  end
-
-  it 'should return an empty string when the hashes match' do
-    set_hashes('b' * 40, 'b' * 40)
-    git.expects(:fetch)
-    git.expects(:diff_tree).never
-    expect(@mirror.diff).to eq('')
-  end
-
-  it 'should generate a diff when the hashes do not match' do
-    set_hashes('b' * 40, 'c' * 40)
-    diff = "diff --git a/path b/path\n"
-    git.expects(:fetch)
-    git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
-    expect(@mirror.diff).to eq(diff)
-  end
-end
-
 describe 'Braid::Mirror#base_revision' do
   it 'should be inferred when no revision is set' do
     @mirror = build_mirror

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -26,20 +26,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.3
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="