braid 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d55b46eb72620ccc9092841609eda270aee04f6
-  data.tar.gz: 684c604750e8774035de42d48c071a9796719be2
+  metadata.gz: a27f551df379a0352a7631473cb4fd0846972c36
+  data.tar.gz: e06e3fda1d7876be1062b2a4a37a3455bfadeb06
 SHA512:
-  metadata.gz: 12781c901dc784fffa89b9d16ff941cafb3d9edc9f32435826a0654529962ea736731bab75959c94d4059357772d69211e2d670f1e848fd7733b92613f359c55
-  data.tar.gz: 5cee8e7cbd85eb2fdc40b8a86dafdb89b2808aa5453a0a832158d1f88b2692a71e892a982d3e5752120497220834e193113cdcadb8ff913191776fb6df7c7586
+  metadata.gz: e3b359b14dd78c3eb9c74ba40e00715f1028633b9463b734d157a2907d587c1846087924afb15dfcbb0e7bb633ebdb95a8d829ce0dd47950bf0c350944c09ec1
+  data.tar.gz: a6cd4f1949074ab61fee5919f80458194c22063bdbce1a307d2cc7add311a7dd1e63ba94486d2d98cb310cd49f6b1c73edc65521f7c549a51a0ce0f7eb01ecd0

data/bin/braid

@@ -20,6 +20,19 @@ 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
+      die 'Extra argument(s) passed to command.'
+    end
+  end
+
   mode(:add) {
     description <<-TXT
       Add a new mirror to be tracked.
@@ -43,6 +56,7 @@ Main {
     mixin :argument_url, :optional_local_path, :option_branch, :option_tag, :option_revision, :option_verbose, :option_path
 
     run {
+      check_no_extra_args!
       Braid.verbose = verbose
       Braid::Command.run(:add, url, {'path' => local_path, 'branch' => branch, 'tag' => tag, 'revision' => revision, 'remote_path' => path})
     }
@@ -68,6 +82,7 @@ Main {
     mixin :optional_local_path, :option_head, :option_revision, :option_tag, :option_branch, :option_verbose, :option_keep_remote
 
     run {
+      check_no_extra_args!
       options = {
         'branch' => branch,
         'tag' => tag,
@@ -96,6 +111,7 @@ Main {
     mixin :argument_local_path, :option_verbose, :option_keep_remote
 
     run {
+      check_no_extra_args!
       options = {
         :keep => keep
       }
@@ -107,13 +123,24 @@ Main {
   mode(:diff) {
     description <<-TXT
       Show diff of local changes to mirror.
+
+      Additional arguments for "git diff" may be passed.  "--" should be used to
+      ensure they are not parsed as Braid options.  File paths to limit the diff are
+      relative to the downstream repository (for more convenient completion), even
+      though file paths in the diff are relative to the mirror.
     TXT
 
     mixin :optional_local_path, :option_verbose, :option_keep_remote
 
+    synopsis (Main::Usage.default_synopsis(self) + ' [-- git_diff_arg*]')
+
     run {
+      if @argv.length > 0 && @argv[0] == '--'
+        @argv.shift
+      end
       options = {
-        'keep' => keep
+        'keep' => keep,
+        'git_diff_args' => @argv
       }
       Braid.verbose = verbose
       Braid::Command.run(:diff, local_path, options)
@@ -128,6 +155,7 @@ Main {
     mixin :argument_local_path, :option_branch, :option_verbose, :option_keep_remote
 
     run {
+      check_no_extra_args!
       options = {
         'keep' => keep,
         'branch' => branch
@@ -145,6 +173,7 @@ Main {
     mixin :optional_local_path, :option_verbose, :option_force
 
     run {
+      check_no_extra_args!
       Braid.verbose = verbose
       Braid.force = force
       Braid::Command.run(:setup, local_path)
@@ -155,6 +184,7 @@ Main {
     description 'Show braid version.'
 
     run {
+      check_no_extra_args!
       puts "braid #{Braid::VERSION}"
     }
   }
@@ -165,6 +195,7 @@ Main {
     mixin :optional_local_path, :option_verbose
 
     run {
+      check_no_extra_args!
       Braid.verbose = verbose
       Braid::Command.run(:status, local_path)
     }

data/lib/braid/command.rb

@@ -8,6 +8,7 @@ module Braid
 
     def self.run(command, *args)
       verify_git_version!
+      check_working_dir!
 
       klass = Commands.const_get(command.to_s.capitalize)
       klass.new.run(*args)
@@ -66,6 +67,17 @@ module Braid
       git.require_version!(REQUIRED_GIT_VERSION)
     end
 
+    def self.check_working_dir!
+      # If we aren't in a git repository at all, git.is_inside_worktree will
+      # propagate a "fatal: Not a git repository" ShellException.
+      unless git.is_inside_worktree
+        raise BraidError, 'Braid must run inside a git working tree.'
+      end
+      if git.relative_working_dir != ''
+        raise BraidError, 'Braid does not yet support running in a subdirectory of the working tree.'
+      end
+    end
+
     def bail_on_local_changes!
       git.ensure_clean!
     end

data/lib/braid/commands/diff.rb

@@ -8,33 +8,46 @@ module Braid
       protected
 
       def diff_all(options = {})
-        config.mirrors.each do |path|
-          separator
-          msg "Diffing #{path}\n"
-          separator
-          diff = perform_diff(path, options)
-          puts diff unless diff.empty?
+        # We don't want "git diff" to invoke the pager once for each mirror.
+        # TODO: Invoke the default pager once for the entire output.
+        Operations::with_modified_environment({"GIT_PAGER" => ''}) do
+          config.mirrors.each do |path|
+            separator
+            msg "Diffing #{path}\n"
+            separator
+            show_diff(path, options)
+          end
         end
       end
 
       def diff_one(path, options = {})
-        diff = perform_diff(path, options)
-        puts diff unless diff.empty?
+        show_diff(path, options)
       end
 
       def separator
         puts "=======================================================\n"
       end
 
-      def perform_diff(path, options = {})
+      def show_diff(path, options = {})
         mirror = config.get!(path)
         setup_remote(mirror)
 
-        diff = mirror.diff
+        # We do not need to spend the time to copy the content outside the
+        # mirror from HEAD because --relative will exclude it anyway.  Rename
+        # detection seems to apply only to the files included in the diff, so we
+        # shouldn't have another bug like
+        # https://github.com/cristibalan/braid/issues/41.
+        base_tree = git.make_tree_with_subtree(nil, mirror.path,
+          mirror.versioned_path(mirror.base_revision))
+        # Git 1.7.2.2 release notes mention a bug when --relative is used
+        # without a trailing slash, and our minimum git version is 1.6.0, so
+        # attempt to work around the bug here.
+        #
+        # XXX: Warn if the user specifies file paths that are outside the
+        # mirror?  Currently, they just won't match anything.
+        git.diff_to_stdout("--relative=#{mirror.path}/", base_tree, options['git_diff_args'])
 
         clear_remote(mirror, options)
-
-        diff
       end
     end
   end

data/lib/braid/commands/update.rb

@@ -93,8 +93,8 @@ module Braid
         in_error = false
         begin
           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)
+          base_hash = git.make_tree_with_subtree('HEAD', mirror.path, mirror.versioned_path(base_revision))
+          remote_hash = git.make_tree_with_subtree('HEAD', mirror.path, target_revision)
           Operations::with_modified_environment({
             "GITHEAD_#{local_hash}" => 'HEAD',
             "GITHEAD_#{remote_hash}" => target_revision

data/lib/braid/operations.rb

@@ -144,6 +144,18 @@ module Braid
         [status, out, err]
       end
 
+      def system(cmd)
+        cmd.strip!
+
+        # Without this, "braid diff" output came out in the wrong order on Windows.
+        $stdout.flush
+        $stderr.flush
+        Operations::with_modified_environment({'LANG' => 'C'}) do
+          Kernel.system(cmd)
+          return $?
+        end
+      end
+
       def msg(str)
         puts "Braid: #{str}"
       end
@@ -170,6 +182,24 @@ module Braid
         end
       end
 
+      # If the current directory is not inside a git repository at all, this
+      # command will fail with "fatal: Not a git repository" and that will be
+      # propagated as a ShellExecutionError.  is_inside_worktree can return
+      # false when inside a bare repository and in certain other rare cases such
+      # as when the GIT_WORK_TREE environment variable is set.
+      def is_inside_worktree
+        invoke(:rev_parse, '--is-inside-work-tree') == 'true'
+      end
+
+      # Get the prefix of the current directory relative to the worktree.  Empty
+      # string if it's the root of the worktree, otherwise ends with a slash.
+      # In some cases in which the current directory is not inside a worktree at
+      # all, this will successfully return an empty string, so it may be
+      # desirable to check is_inside_worktree first.
+      def relative_working_dir
+        invoke(:rev_parse, '--show-prefix')
+      end
+
       def commit(message, *args)
         cmd = 'git commit --no-verify'
         if message # allow nil
@@ -309,6 +339,18 @@ module Braid
         end
       end
 
+      def make_tree_with_subtree(main_content, subtree_path, subtree_content)
+        with_temporary_index do
+          if main_content
+            read_tree_im(main_content)
+            rm_r_cached(subtree_path)
+          end
+          # Yes, if subtree_path == '', "git read-tree --prefix=/" works. :/
+          read_tree_prefix_i(subtree_content, subtree_path)
+          write_tree
+        end
+      end
+
       def config(args)
         invoke(:config, args) rescue nil
       end
@@ -336,6 +378,12 @@ module Braid
         out
       end
 
+      def diff_to_stdout(*args)
+        # For now, ignore the exit code.  It can be 141 (SIGPIPE) if the user
+        # quits the pager before reading all the output.
+        system("git diff #{args.join(' ')}")
+      end
+
       def status_clean?
         status, out, err = exec('git status')
         !out.split("\n").grep(/nothing to commit/).empty?

data/lib/braid/version.rb

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

data/spec/fixtures/skit1.3/layouts/README.md

@@ -0,0 +1 @@
+I would write something here if I knew what this was...

data/spec/fixtures/skit1.3/layouts/layout.liquid

@@ -0,0 +1,221 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+{{ '/feed/atom.xml' | assign_to: 'global_feed' }}
+{{ '/feed/all_comments.xml' | assign_to: 'global_comments_feed' }}
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>
+  {{ site.title }}
+  {% if site.current_section %}
+    - {{ site.current_section.name }}
+  {% endif %}
+  {% if article %}
+    - {{ article.title }}
+  {% endif %}
+</title>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="{{ global_feed }}"/>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} comments feed" href="{{ global_comments_feed }}"/>
+{{ 'base' | stylesheet }}
+{{ 'app' | javascript }}
+<!--[if IE]>
+{{ 'base_ie' | stylesheet }}
+<![endif]-->
+</head>
+
+<body class="fixed green">
+<script type="text/javascript">loadPreferences()</script>
+
+<div id="wrapper">
+
+<div id="header" class="clearfix">
+<div id="title" class="clearfix">
+  <h1><a href="/">{{ site.title }}</a></h1>
+</div>
+<h2>Sections</h2>
+<ul id="menu">
+{% for section in site.sections %}
+  {% if section.articles_count > 0 %}
+  {% if section.is_home  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+  {% else %}
+    {% if section.is_paged  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+    {% endif %}
+  {% endif %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+<div id="contentwrapper" class="clearfix">
+
+<div id="content">
+
+  <div id="innerwrapper">
+
+<div class="article">
+  <div class="body">
+  <h2>Skittlish Tips'n'Tricks</h2>
+  <ul>
+    <li>Change the classes for the body tag to set your default site style. also change these in the app.js file (line 66).</li>
+    <li>Remove the scripts and the #options div if you don't want the option switcher.</li>
+    <li>The top menu shows the home section and the sections that are not blogs.</li>
+    <li>Email me at <a href="mailto:evil@che.lu">evil@che.lu</a> if you have any questions.</li>
+    <li>Happy hacking!</li>
+  </ul>
+  </div>
+</div>
+
+{{ content_for_layout }}
+
+  </div>
+
+</div>
+
+<div id="sidebar">
+
+<div class="boxy short">
+<h3>boxy short</h3>
+
+<p>You can have, boxes with a short, tall or no background shade, just change the class of the containing div.</p>
+
+<p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
+
+<p>Happy boxying!</p>
+
+</div>
+
+<div id="search" class="boxy short">
+  <h3>Search</h3>
+  <form method="get" action="/search">
+    <fieldset>
+      <input class="text" type="text" id="q" value="" name="q"/>
+    </fieldset>
+  </form>
+</div>
+
+<div class="boxy tall minor">
+  <h3>Recent</h3>
+
+<dl>
+<dt>Articles <a class="feed" href="{{ global_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for article in site.latest_articles %}
+    <li>{{ article | link_to_article }} <em>({{ article.published_at | format_date: 'stub', true }})</em></li>
+  {% endfor %}
+  </ul>
+</dd>
+
+<dt>Comments <a class="feed" href="{{ global_comments_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for comment in site.latest_comments %}
+    <li>{{ comment.author_link }} on <a href="{{ comment.url }}#comment-{{ comment.id }}">{{ comment.title }}</a></li>
+  {% endfor %}
+  </ul>
+</dd>
+</dl>
+</div>
+
+<div class="boxy short">
+  <h3>Archives</h3>
+  <p>This would be much nicer with jamis' month_drop thingy.</p>
+  {{ '' | section | months | assign_to: 'home_section' }}
+  <ul>
+  {% for month in home_section.months %}
+    {{ home_section | monthly_articles: month | size | assign_to: 'articles_count' }}
+    {% if articles_count > 0 %}
+    <li>{{ home_section | link_to_month: month }} ({{ articles_count }})</li>
+    {% endif %}
+  {% endfor %}
+  </ul>
+</div>
+
+{% if site.blog_sections.size > 1 %}
+<div class="boxy short">
+<h3>Categories</h3>
+<p>Lists only blog type categories with at least one article.</p>
+<p>This list uses an ul. You could use a dl with only dd's in it for the same effect. Wouldn't be semantic tho.</p>
+<ul class="sections">
+{% for section in site.blog_sections %}
+  {% if section.articles_count > 0 %}
+  {% unless section.is_home %}
+  <li>{{ section | link_to_section }} ({{ section.articles_count }})</li>
+  {% endunless %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+{% endif %}
+{% unless site.tags == empty %}
+<div class="boxy short">
+  <p>This would be nicer if we could get the number of articles for each tag.</p>
+  <h3>tags: </h3>
+  <ul>
+  {% for tag in site.tags %}
+    <li>{{ tag | link_to_tag }}</li>
+  {% endfor %}
+  </ul>
+</div>
+
+{% endunless %}
+<div class="boxy tall">
+<h3>boxy tall</h3>
+<p>When using a tall box, make sure it's got plenty of content or that it's immediately followed by a short boxy. It might look a bit chopped off otherwise.</p>
+<dl>
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd><a href="#">value 4</a></dd>
+  <dd><a href="#">value 5</a></dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd>value 4</dd>
+  <dd>value 5</dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+</dl>
+</div>
+
+</div>
+
+</div>
+
+<div id="options">
+  <h2>Options:</h2>
+  <h3>Size</h3>
+  <ul id="option_size">
+    <li id="option_size_fixed"   class="fixed" ><a><span>fixed </span></a></li>
+    <li id="option_size_fluid"   class="fluid" ><a><span>fluid </span></a></li>
+  </ul>
+  <h3>Colors</h3>
+  <ul id="option_color">
+    <li id="option_color_orange" class="orange"><a><span>orange</span></a></li>
+    <li id="option_color_blue"   class="blue"  ><a><span>blue  </span></a></li>
+    <li id="option_color_green"  class="green" ><a><span>green </span></a></li>
+    <li id="option_color_pink"   class="pink"  ><a><span>pink  </span></a></li>
+    <li id="option_color_cyan"   class="cyan"  ><a><span>cyan  </span></a></li>
+    <li id="option_color_red"    class="red"   ><a><span>red   </span></a></li>
+    <li id="option_color_violet" class="violet"><a><span>violet</span></a></li>
+  </ul>
+</div>
+
+<div id="footer">
+<p>Copyright &copy; 2006, Your Name. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.</p>
+<p>Using <a href="http://evil.che.lu/projects/skittlish">skittlish</a> on <a href="http://publishwithimpunity.com/">mephisto</a>.</p>
+</div>
+
+</div>
+
+</body>
+
+</html>

data/spec/integration/diff_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/integration_helper'
 
-describe 'Running braid diff on a mirror' do
+describe 'Running braid diff with a mirror' do
   before do
     FileUtils.rm_rf(TMP_PATH)
     FileUtils.mkdir_p(TMP_PATH)
@@ -19,7 +19,7 @@ describe 'Running braid diff on a mirror' do
     end
 
     describe 'with no changes' do
-      it 'should emit no output when named in braid diff' do
+      it 'with the mirror specified should emit no output' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff skit1")
@@ -28,7 +28,7 @@ describe 'Running braid diff on a mirror' do
         expect(diff).to eq('')
       end
 
-      it 'should emit only banners when braid diff all' do
+      it 'without specifying a mirror should emit only banners' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff")
@@ -47,7 +47,7 @@ describe 'Running braid diff on a mirror' do
         end
       end
 
-      it 'should emit diff when named in braid diff' do
+      it 'with the mirror specified should emit diff' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff skit1")
@@ -70,7 +70,7 @@ index 9f75009..25a4b32 100644
 PATCH
       end
 
-      it 'should emit only banners when braid diff all' do
+      it 'without specifying a mirror should emit diff and banners' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff")
@@ -93,6 +93,162 @@ index 9f75009..25a4b32 100644
  <script type="text/javascript">loadPreferences()</script>
  
  <div id="wrapper">
+PATCH
+      end
+    end
+
+    describe 'with uncommitted changes (some staged)' do
+      before do
+        FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1') + '/.', "#{@repository_dir}/skit1")
+        in_dir(@repository_dir) do
+          run_command('git add *')
+        end
+        FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.2') + '/.', "#{@repository_dir}/skit1")
+        # Now "orange" -> "green" is staged, "Happy boxying!" is unstaged.
+      end
+
+      it 'with the mirror specified should show all uncommitted changes' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff skit1")
+        end
+
+        expect(diff).to eq(<<PATCH)
+diff --git a/layouts/layout.liquid b/layouts/layout.liquid
+index 9f75009..7037e21 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">
+@@ -81,6 +81,8 @@
+ 
+ <p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
+ 
++<p>Happy boxying!</p>
++
+ </div>
+ 
+ <div id="search" class="boxy short">
+PATCH
+      end
+
+      it 'without specifying a mirror should show all uncommitted changes with a banner' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff")
+        end
+
+        expect(diff).to eq(<<PATCH)
+=======================================================
+Braid: Diffing skit1
+=======================================================
+diff --git a/layouts/layout.liquid b/layouts/layout.liquid
+index 9f75009..7037e21 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">
+@@ -81,6 +81,8 @@
+ 
+ <p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
+ 
++<p>Happy boxying!</p>
++
+ </div>
+ 
+ <div id="search" class="boxy short">
+PATCH
+      end
+
+      it 'with the mirror specified and --cached should show only the staged uncommitted changes' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff skit1 -- --cached")
+        end
+
+        expect(diff).to eq(<<PATCH)
+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
+      end
+
+      it 'without specifying a mirror and with --cached should show only the staged uncommitted changes with a banner' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff -- --cached")
+        end
+
+        expect(diff).to eq(<<PATCH)
+=======================================================
+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
+      end
+    end
+
+    describe 'with changes to multiple files and a file path argument' do
+      before do
+        FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.3') + '/.', "#{@repository_dir}/skit1")
+        in_dir(@repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "Some local changes"')
+        end
+      end
+
+      it 'should show only the diff in the specified file' do
+        diff = nil
+        in_dir(@repository_dir) do
+          # Test that file paths are taken relative to the downstream repository
+          # root, as documented, rather than the mirror.
+          diff = run_command("#{BRAID_BIN} diff skit1 -- skit1/layouts/README.md")
+        end
+
+        expect(diff).to eq(<<PATCH)
+diff --git a/layouts/README.md b/layouts/README.md
+new file mode 100644
+index 0000000..69dc7e6
+--- /dev/null
++++ b/layouts/README.md
+@@ -0,0 +1 @@
++I would write something here if I knew what this was...
 PATCH
       end
     end
@@ -106,7 +262,7 @@ PATCH
     end
 
     describe 'with no changes' do
-      it 'should emit no output when named in braid diff' do
+      it 'with the mirror specified should emit no output' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff skit1")
@@ -115,7 +271,7 @@ PATCH
         expect(diff).to eq('')
       end
 
-      it 'should emit only banners when braid diff all' do
+      it 'without specifying a mirror should emit only banners' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff")
@@ -135,7 +291,7 @@ PATCH
         end
       end
 
-      it 'should emit diff when named in braid diff' do
+      it 'with the mirror specified should emit diff' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff skit1")
@@ -158,7 +314,7 @@ index 9f75009..25a4b32 100644
 PATCH
       end
 
-      it 'should emit only banners when braid diff all' do
+      it 'without specifying a mirror should emit diff and banners' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff")
@@ -194,7 +350,7 @@ PATCH
     end
 
     describe 'with no changes' do
-      it 'should emit no output when named in braid diff' do
+      it 'with the mirror specified should emit no output' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff skit1")
@@ -203,7 +359,7 @@ PATCH
         expect(diff).to eq('')
       end
 
-      it 'should emit only banners when braid diff all' do
+      it 'without specifying a mirror should emit only banners' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff")
@@ -222,7 +378,7 @@ PATCH
         end
       end
 
-      it 'should emit diff when named in braid diff' do
+      it 'with the mirror specified should emit diff' do
         diff = nil
         in_dir(@repository_dir) do
           diff = run_command("#{BRAID_BIN} diff skit1")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -110,6 +110,8 @@ files:
 - spec/fixtures/shiny_skit1_mergeable/preview.png
 - spec/fixtures/skit1.1/layouts/layout.liquid
 - spec/fixtures/skit1.2/layouts/layout.liquid
+- spec/fixtures/skit1.3/layouts/README.md
+- spec/fixtures/skit1.3/layouts/layout.liquid
 - spec/fixtures/skit1/layouts/layout.liquid
 - spec/fixtures/skit1/preview.png
 - spec/integration/adding_spec.rb