braid 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8ca4b2ca46100c1204aa7e8303d29f0ca2f827
-  data.tar.gz: 2762804b4104a9102b215ae04c697607d279667a
+  metadata.gz: 91ffaf5ed3caf78d594252885a0a420faa985530
+  data.tar.gz: 34467d809339f7035e29ea3f53c88e322f391ee2
 SHA512:
-  metadata.gz: d482a938bccaec81fdaf42c058a6d90fc88915335cf46b6a6896e00542850040a3de103026013cb974010389667397393efe1371108afc386f90ed02500b796a
-  data.tar.gz: 7a8eae42c2d2f5d41b6c1f8f18c34d3ee670c5acef87e79c24965a61b71808a16a81d676f00de2dc84ad5725292b046b4b9fe9a0d778d0372e1fa8e3fc52150a
+  metadata.gz: 2e481ed9197ec3a0d48a2b76a1697cd7407fa36cc7ef4f5a8f045a1a2aac101d1f67f3f16412fdd79620cb6cd7b31e166320c574e97a9b57cea5716011b29ba9
+  data.tar.gz: f7222bc8ac1b732b44eaa038310ec5f7fd50c2a7b63164d1dec0aba6157305122940167f8775804b1962b85889251ffc67aa1bfafbe3a843e5fb5f580eb8862d

data/README.md

@@ -39,6 +39,7 @@ references to external libraries or mirrors. The configuration allows you to con
 aspects of the mirroring process such as;
 
 * whether the mirror is locked to a particular version of the external library.
+* whether the mirror is tracking a tag or a branch.
 * whether the mirror includes the entire external library or just a subdirectory.
 
 ## Installation
@@ -99,7 +100,15 @@ This is useful if you want to add a subdirectory from a mirror into your own pro
 
     braid add --path dist https://github.com/twbs/bootstrap.git vendor/assets/bootstrap
 
-#### Adding mirrors with revisions
+#### Adding a mirror based on a branch
+
+    braid add --branch 5-0-stable https://github.com/rails/rails.git vendor/rails
+
+#### Adding a mirror based on a tag
+
+    braid add --tag v1.0 https://github.com/realityforge/backpack.git vendor/tools/backpack
+
+#### Adding mirror locked to a revision
 
     braid add --revision bf1b1e0 git://github.com/rails/rails.git vendor/rails
 
@@ -123,8 +132,13 @@ index with `git reset --hard`.
 
 #### Locking and unlocking mirrors
 
+Lock to a particular version in the mirror.
+
     braid update --revision 6c1c16b vendor/rails
-    braid update --head vendor/rails
+
+Go back to tracking a particular branch.
+
+    braid update --branch master vendor/rails
 
 #### Showing local changes made to mirrors
 

data/bin/braid

@@ -40,11 +40,11 @@ Main {
       . braid add http://remote/path local/dir
     TXT
 
-    mixin :argument_url, :optional_local_path, :option_branch, :option_revision, :option_verbose, :option_path
+    mixin :argument_url, :optional_local_path, :option_branch, :option_tag, :option_revision, :option_verbose, :option_path
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, {'path' => local_path, 'branch' => branch, 'revision' => revision, 'remote_path' => path})
+      Braid::Command.run(:add, url, {'path' => local_path, 'branch' => branch, 'tag' => tag, 'revision' => revision, 'remote_path' => path})
     }
   }
 
@@ -65,10 +65,12 @@ Main {
       . braid update local/dir
     TXT
 
-    mixin :optional_local_path, :option_revision, :option_head, :option_verbose, :option_keep_remote
+    mixin :optional_local_path, :option_head, :option_revision, :option_tag, :option_branch, :option_verbose, :option_keep_remote
 
     run {
       options = {
+        'branch' => branch,
+        'tag' => tag,
         'revision' => revision,
         'head' => head,
         'keep' => keep
@@ -191,7 +193,16 @@ Main {
     option(:branch, :b) {
       optional
       argument :required
-      desc 'remote branch name'
+      desc 'remote branch name to track'
+      attr
+    }
+  }
+
+  mixin(:option_tag) {
+    option(:tag, :t) {
+      optional
+      argument :required
+      desc 'remote tag name to track'
       attr
     }
   }
@@ -217,7 +228,7 @@ Main {
   mixin(:option_head) {
     option(:head) {
       optional
-      desc 'mirror head'
+      desc 'unused option'
       attr
     }
   }

data/lib/braid/command.rb

@@ -45,7 +45,13 @@ module Braid
     private
 
     def setup_remote(mirror)
-      Command.run(:setup, mirror.path)
+      existing_force = Braid.force
+      begin
+        Braid.force = true
+        Command.run(:setup, mirror.path)
+      ensure
+        Braid.force = existing_force
+      end
     end
 
     def clear_remote(mirror, options)
@@ -88,17 +94,32 @@ module Braid
       "'#{revision[0, 7]}'"
     end
 
-    def validate_new_revision(mirror, new_revision)
-      return git.rev_parse("#{mirror.remote}/#{mirror.branch}") unless new_revision
+    def determine_repository_revision(mirror)
+      if mirror.tag
+        if use_local_cache?
+          Dir.chdir git_cache.path(mirror.url) do
+            git.rev_parse(mirror.local_ref)
+          end
+        else
+          raise BraidError, 'unable to retrieve tag version when cache disabled.'
+        end
+      else
+        git.rev_parse(mirror.local_ref)
+      end
+    end
 
-      new_revision = git.rev_parse(new_revision)
-      old_revision = mirror.revision
+    def validate_new_revision(mirror, revision)
+      if revision.nil?
+        determine_repository_revision(mirror)
+      else
+        new_revision = git.rev_parse(revision)
 
-      if new_revision == old_revision
-        raise InvalidRevision, 'mirror is already at requested revision'
-      end
+        if new_revision == mirror.revision
+          raise InvalidRevision, 'mirror is already at requested revision'
+        end
 
-      new_revision
+        new_revision
+      end
     end
 
     def determine_target_revision(mirror, new_revision)

data/lib/braid/commands/add.rb

@@ -6,13 +6,18 @@ module Braid
           mirror           = config.add_from_options(url, options)
           add_config_file
 
-          branch_message   = (mirror.branch == 'master') ? '' : " branch '#{mirror.branch}'"
+          mirror.branch = nil if options['revision']
+          raise BraidError, 'Can not add mirror specifying both a revision and a tag' if options['revision'] && mirror.tag
+
+          branch_message   = (mirror.branch.nil? || mirror.branch == 'master') ? '' : " branch '#{mirror.branch}'"
+          tag_message      = mirror.tag.nil? ? '' : " tag '#{mirror.tag}'"
           revision_message = options['revision'] ? " at #{display_revision(mirror, options['revision'])}" : ''
-          msg "Adding mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
+          msg "Adding mirror of '#{mirror.url}'#{branch_message}#{tag_message}#{revision_message}."
 
           # these commands are explained in the subtree merge guide
           # http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
 
+          config.update(mirror)
           setup_remote(mirror)
           mirror.fetch
 
@@ -22,7 +27,6 @@ module Braid
           git.read_tree_prefix_u(target_revision, mirror.path)
 
           mirror.revision = new_revision
-          mirror.lock = new_revision if options['revision']
           config.update(mirror)
           add_config_file
 

data/lib/braid/commands/push.rb

@@ -2,6 +2,12 @@ require 'fileutils'
 require 'tmpdir'
 
 module Braid
+    class NoPushToTag < BraidError
+      def message
+        "mirror is based off a tag. Can not push to a tag: #{super}"
+      end
+    end
+
   module Commands
     class Push < Command
       def run(path, options = {})
@@ -9,10 +15,12 @@ module Braid
 
         branch = options['branch'] || mirror.branch
 
+        raise NoPushToTag, path unless branch
+
         setup_remote(mirror)
         mirror.fetch
 
-        base_revision = git.rev_parse("#{mirror.remote}/#{mirror.branch}")
+        base_revision = determine_repository_revision(mirror)
         unless mirror.merged?(base_revision)
           msg 'Mirror is not up to date. Stopping.'
           clear_remote(mirror, options)
@@ -42,7 +50,7 @@ module Braid
           git.config(['--local', 'user.name', "\"#{user_name}\""]) if user_name
           git.config(['--local', 'user.email', "\"#{user_email}\""]) if user_email
           git.fetch(mirror.cached_url) if File.exist?(mirror.cached_url)
-          git.fetch(remote_url, "+refs/heads/#{mirror.branch}")
+          git.fetch(remote_url, mirror.remote_ref)
           git.checkout(base_revision)
           args =[]
           args << "--directory=#{mirror.remote_path}" if mirror.remote_path

data/lib/braid/commands/status.rb

@@ -22,7 +22,13 @@ module Braid
         mirror.fetch
         print path.to_s
         print ' (' + mirror.base_revision + ')'
-        print ' [LOCKED]' if mirror.locked?
+        if mirror.locked?
+          print ' [REVISION LOCKED]'
+        elsif mirror.tag
+          print " [TAG=#{mirror.tag}]"
+        else # mirror.branch
+          print " [BRANCH=#{mirror.branch}]"
+        end
         msg "Fetching new commits for '#{mirror.path}'." if verbose?
         new_revision = validate_new_revision(mirror, options['revision'])
         print ' (Remote Modified)' if new_revision.to_s != mirror.base_revision.to_s

data/lib/braid/commands/update.rb

@@ -17,24 +17,35 @@ module Braid
       end
 
       def update_one(path, options = {})
+        bail_on_local_changes!
+
+        raise BraidError, "Do not specify --head option anymore. Please use '--branch MyBranch' to track a branch or '--tag MyTag' to track a branch" if options['head']
+
         mirror           = config.get!(path)
 
-        revision_message = options['revision'] ? " to #{display_revision(mirror, options['revision'])}" : ''
-        msg "Updating mirror '#{mirror.path}'#{revision_message}."
+        msg "Updating mirror '#{mirror.path}'."
 
         was_locked = mirror.locked?
-
-        # check options for lock modification
-        if mirror.locked?
-          if options['head']
-            msg "Unlocking mirror '#{mirror.path}'." if verbose?
-            mirror.lock = nil
-          elsif !options['revision']
-            msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force."
-            return
-          end
+        original_revision = mirror.revision
+        original_branch = mirror.branch
+        original_tag = mirror.tag
+
+        raise BraidError, 'Can not update mirror specifying both a revision and a tag' if options['revision'] && options['tag']
+        raise BraidError, 'Can not update mirror specifying both a branch and a tag' if options['branch'] && options['tag']
+
+        if options['tag']
+          mirror.tag = options['tag']
+          mirror.branch = nil
+        elsif options['branch']
+          mirror.tag = nil
+          mirror.branch = options['branch']
+        elsif options['revision']
+          mirror.tag = nil
+          mirror.branch = nil
         end
 
+        config.update(mirror)
+
         setup_remote(mirror)
         msg "Fetching new commits for '#{mirror.path}'." if verbose?
         mirror.fetch
@@ -48,8 +59,27 @@ module Braid
         target_revision = determine_target_revision(mirror, new_revision)
         current_revision = determine_target_revision(mirror, mirror.base_revision)
 
-        if (options['revision'] && was_locked && target_revision == current_revision) ||
-          (options['revision'].nil? && !was_locked && mirror.merged?(git.rev_parse(new_revision)))
+        from_desc =
+          original_tag ? "tag '#{original_tag}'" :
+            !was_locked ? "branch '#{original_branch}'" :
+              "revision '#{original_revision}'"
+
+        switching = true
+        if mirror.branch && (original_branch != mirror.branch || (was_locked && !mirror.locked?))
+          msg "Switching mirror '#{mirror.path}' to branch '#{mirror.branch}' from #{from_desc}."
+        elsif mirror.tag && original_tag != mirror.tag
+          msg "Switching mirror '#{mirror.path}' to tag '#{mirror.tag}' from #{from_desc}."
+        elsif options['revision'] && original_revision != options['revision']
+          msg "Switching mirror '#{mirror.path}' to revision '#{options['revision']}' from #{from_desc}."
+        else
+          switching = false
+        end
+
+        if !switching &&
+          (
+            (options['revision'] && was_locked && target_revision == current_revision) ||
+            (options['revision'].nil? && !was_locked && mirror.merged?(git.rev_parse(new_revision)))
+          )
           msg "Mirror '#{mirror.path}' is already up to date."
           clear_remote(mirror, options)
           return
@@ -58,7 +88,6 @@ module Braid
         base_revision = mirror.base_revision
 
         mirror.revision = new_revision
-        mirror.lock = new_revision if options['revision']
 
         msg "Merging in mirror '#{mirror.path}'." if verbose?
         in_error = false

data/lib/braid/mirror.rb

@@ -1,6 +1,6 @@
 module Braid
   class Mirror
-    ATTRIBUTES = %w(url branch revision lock path)
+    ATTRIBUTES = %w(url branch revision tag path)
 
     class UnknownType < BraidError
       def message
@@ -12,6 +12,11 @@ module Braid
         'path is required'
       end
     end
+    class NoTagAndBranch < BraidError
+      def message
+        'can not specify both tag and branch configuration'
+      end
+    end
 
     include Operations::VersionControl
 
@@ -25,14 +30,17 @@ module Braid
     def self.new_from_options(url, options = {})
       url    = url.sub(/\/$/, '')
 
-      branch = options['branch'] || 'master'
+      raise NoTagAndBranch if options['tag'] && options['branch']
+
+      tag = options['tag']
+      branch = options['branch'] || (tag.nil? ? 'master' : nil)
 
       path = (options['path'] || extract_path_from_url(url)).sub(/\/$/, '')
       raise PathRequired unless path
 
       remote_path = options['remote_path']
 
-      attributes = {'url' => url, 'branch' => branch, 'path' => remote_path}
+      attributes = {'url' => url, 'branch' => branch, 'path' => remote_path, 'tag' => tag}
       self.new(path, attributes)
     end
 
@@ -41,7 +49,7 @@ module Braid
     end
 
     def locked?
-      !!lock
+      branch.nil? && tag.nil?
     end
 
     def merged?(commit)
@@ -79,6 +87,16 @@ module Braid
       end
     end
 
+    def local_ref
+      return "#{self.remote}/#{self.branch}" unless self.branch.nil?
+      return "tags/#{self.tag}" unless self.tag.nil?
+      self.revision
+    end
+
+    def remote_ref
+      self.branch.nil? ? "+refs/tags/#{self.tag}" : "+refs/heads/#{self.branch}"
+    end
+
     def remote_path
       self.attributes['path']
     end
@@ -92,7 +110,7 @@ module Braid
     end
 
     def remote
-      "#{branch}/braid/#{path}"
+      "#{branch || tag || 'revision'}/braid/#{path}"
     end
 
     private

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.17'
+  VERSION = '1.0.18'
 end

data/spec/integration/adding_spec.rb

@@ -30,6 +30,7 @@ describe 'Adding a mirror in a clean repository' do
       expect(braids['skit1']['url']).to eq(@vendor_repository_dir)
       expect(braids['skit1']['revision']).not_to be_nil
       expect(braids['skit1']['branch']).to eq('master')
+      expect(braids['skit1']['tag']).to be_nil
       expect(braids['skit1']['path']).to be_nil
     end
   end
@@ -57,7 +58,90 @@ describe 'Adding a mirror in a clean repository' do
       expect(braids['skit1']['url']).to eq(@vendor_repository_dir)
       expect(braids['skit1']['revision']).not_to be_nil
       expect(braids['skit1']['branch']).to eq('master')
+      expect(braids['skit1']['tag']).to be_nil
       expect(braids['skit1']['path']).to eq('layouts')
     end
   end
+
+  describe 'from a tag in a git repository' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => 'somebody@example.com')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+      end
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --tag v1")
+      end
+    end
+
+    it 'should add the files and commit' do
+      assert_no_diff("#{FIXTURE_PATH}/skit1/layouts/layout.liquid", "#{@repository_dir}/skit1/layouts/layout.liquid")
+
+      assert_commit_subject(/Braid: Add mirror 'skit1' at '[0-9a-f]{7}'/)
+      assert_commit_author('Some body')
+      assert_commit_email('somebody@example.com')
+    end
+
+    it 'should create .braids.json and add the mirror to it' do
+      braids = YAML::load_file("#{@repository_dir}/.braids.json")
+      expect(braids['skit1']['url']).to eq(@vendor_repository_dir)
+      expect(braids['skit1']['revision']).not_to be_nil
+      expect(braids['skit1']['branch']).to be_nil
+      expect(braids['skit1']['tag']).to eq('v1')
+      expect(braids['skit1']['path']).to be_nil
+    end
+  end
+
+  describe 'from a revision in a git repository' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => 'somebody@example.com')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+        @revision = run_command('git rev-parse HEAD').strip
+      end
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --revision #{@revision}")
+      end
+    end
+
+    it 'should add the files and commit' do
+      assert_no_diff("#{FIXTURE_PATH}/skit1/layouts/layout.liquid", "#{@repository_dir}/skit1/layouts/layout.liquid")
+
+      assert_commit_subject(/Braid: Add mirror 'skit1' at '[0-9a-f]{7}'/)
+      assert_commit_author('Some body')
+      assert_commit_email('somebody@example.com')
+    end
+
+    it 'should create .braids.json and add the mirror to it' do
+      braids = YAML::load_file("#{@repository_dir}/.braids.json")
+      expect(braids['skit1']['url']).to eq(@vendor_repository_dir)
+      expect(braids['skit1']['revision']).not_to be_nil
+      expect(braids['skit1']['branch']).to be_nil
+      expect(braids['skit1']['tag']).to be_nil
+      expect(braids['skit1']['path']).to be_nil
+    end
+  end
+
+  describe 'with a git repository' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => 'somebody@example.com')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+      end
+    end
+
+    it 'should generate an error if both tag and revision specified' do
+      output = nil
+      in_dir(@repository_dir) do
+        output = `#{BRAID_BIN} add #{@vendor_repository_dir} --revision X --tag v1`
+      end
+
+      expect(output).to match(/^Braid: Error: Can not add mirror specifying both a revision and a tag$/)
+    end
+  end
 end

data/spec/integration/diff_spec.rb

@@ -6,6 +6,9 @@ describe 'Running braid diff on a mirror' do
     FileUtils.mkdir_p(TMP_PATH)
     @repository_dir = create_git_repo_from_fixture('shiny')
     @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+    in_dir(@vendor_repository_dir) do
+      run_command('git tag v1')
+    end
   end
 
   describe 'braided directly in' do
@@ -173,6 +176,67 @@ index 9f75009..25a4b32 100644
  <![endif]-->
  </head>
  
+-<body class="fixed orange">
++<body class="fixed green">
+ <script type="text/javascript">loadPreferences()</script>
+ 
+ <div id="wrapper">
+PATCH
+      end
+    end
+  end
+
+  describe 'braided as a tag directly in' do
+    before do
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --tag v1")
+      end
+    end
+
+    describe 'with no changes' do
+      it 'should emit no output when named in braid diff' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff skit1")
+        end
+
+        expect(diff).to eq('')
+      end
+
+      it 'should emit only banners when braid diff all' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} diff")
+        end
+
+        expect(diff).to eq("=======================================================\nBraid: Diffing skit1\n=======================================================\n")
+      end
+    end
+
+    describe 'with changes' do
+      before do
+        FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1') + '/.', "#{@repository_dir}/skit1")
+        in_dir(@repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "Some local changes"')
+        end
+      end
+
+      it 'should emit diff when named in braid diff' 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..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>

data/spec/integration/push_spec.rb

@@ -146,4 +146,92 @@ describe 'Pushing to a mirror' do
       end
     end
   end
+
+  describe 'from a git repository braided in as a tag' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => 'somebody@example.com')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+      end
+      @file_name = 'layouts/layout.liquid'
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --tag v1")
+      end
+
+      in_dir(@vendor_repository_dir) do
+        run_command('git config receive.denyCurrentBranch updateInstead')
+      end
+
+      update_dir_from_fixture('shiny/skit1', 'skit1.1')
+      in_dir(@repository_dir) do
+        run_command('git add *')
+        run_command('git commit -m "Make some changes to vendored files"')
+      end
+    end
+
+    context 'with remote updtodate' do
+      it 'should fail tring to push without specifying branch' 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`
+        end
+        expect(braid_output).to match(/Braid: Error: mirror is based off a tag. Can not push to a tag: skit1/)
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+        assert_no_diff("#{FIXTURE_PATH}/skit1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+      end
+
+      it 'should push changes to specified branch successfully' 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")
+        end
+        expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
+        expect(braid_output).to match(/Make some changes/)
+        expect(braid_output).to match(/Braid: Pushing changes to remote branch MyBranch./)
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+
+        in_dir(@vendor_repository_dir) do
+          run_command('git checkout MyBranch 2>&1')
+
+          assert_commit_subject(commit_message)
+          assert_commit_author('Some body')
+          assert_commit_email('somebody@example.com')
+        end
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+      end
+    end
+
+    context 'with remote having changes' do
+      before do
+        update_dir_from_fixture('skit1', 'skit1.1')
+        update_dir_from_fixture('skit1', 'skit1.2')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "Update vendored directory"')
+          run_command('git tag -f v1')
+        end
+      end
+
+      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")
+        end
+        expect(braid_output).to match(/Braid: Mirror is not up to date. Stopping./)
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.2/#{@file_name}", "#{TMP_PATH}/skit1/#{@file_name}")
+      end
+    end
+  end
 end

data/spec/integration/status_spec.rb

@@ -21,7 +21,7 @@ describe 'Running braid status on a mirror' do
           diff = run_command("#{BRAID_BIN} status skit1")
         end
 
-        expect(diff).to match(/^skit1 \([0-9a-f]{40}\)$/)
+        expect(diff).to match(/^skit1 \([0-9a-f]{40}\) \[BRANCH=master\]$/)
       end
     end
 
@@ -35,24 +35,130 @@ describe 'Running braid status on a mirror' do
           output = run_command("#{BRAID_BIN} status skit1")
         end
 
-        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \(Locally Modified\)$/)
+        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \[BRANCH=master\] \(Locally Modified\)$/)
       end
     end
 
     describe 'with remote changes' do
       it 'should emit remote modified indicator' do
-      update_dir_from_fixture('skit1', 'skit1.1')
+        update_dir_from_fixture('skit1', 'skit1.1')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "change default color"')
+        end
+
+        output = nil
+        in_dir(@repository_dir) do
+          output = run_command("#{BRAID_BIN} status skit1")
+        end
+
+        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \[BRANCH=master\] \(Remote Modified\)$/)
+      end
+    end
+  end
+
+  describe 'braided into branch in' do
+    before do
       in_dir(@vendor_repository_dir) do
-        run_command('git add *')
-        run_command('git commit -m "change default color"')
+        run_command('git checkout -bbranch1 2>&1')
+      end
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --branch branch1")
+      end
+    end
+    describe 'with no changes' do
+      it 'should only emit version when neither modified' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} status skit1")
+        end
+
+        expect(diff).to match(/^skit1 \([0-9a-f]{40}\) \[BRANCH=branch1\]$/)
+      end
+    end
+
+    describe 'with local changes' do
+      it 'should emit local modified indicator' do
+        output = nil
+        in_dir(@repository_dir) do
+          File.open("#{@repository_dir}/skit1/foo.txt", 'wb') { |f| f.write('Hi') }
+          run_command('git add *')
+          run_command('git commit -m "modify mirror"')
+          output = run_command("#{BRAID_BIN} status skit1")
+        end
+
+        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \[BRANCH=branch1\] \(Locally Modified\)$/)
       end
+    end
+
+    describe 'with remote changes' do
+      it 'should emit remote modified indicator' do
+        update_dir_from_fixture('skit1', 'skit1.1')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "change default color"')
+        end
+
+        output = nil
+        in_dir(@repository_dir) do
+          output = run_command("#{BRAID_BIN} status skit1")
+        end
+
+        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \[BRANCH=branch1\] \(Remote Modified\)$/)
+      end
+    end
+  end
+
+  describe 'braided directly in as tag' do
+    before do
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+      end
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --tag v1")
+      end
+    end
+    describe 'with no changes' do
+      it 'should only emit version when neither modified' do
+        diff = nil
+        in_dir(@repository_dir) do
+          diff = run_command("#{BRAID_BIN} status skit1")
+        end
+
+        expect(diff).to match(/^skit1 \([0-9a-f]{40}\) \[TAG=v1\]$/)
+      end
+    end
+
+    describe 'with local changes' do
+      it 'should emit local modified indicator' do
+        output = nil
+        in_dir(@repository_dir) do
+          File.open("#{@repository_dir}/skit1/foo.txt", 'wb') { |f| f.write('Hi') }
+          run_command('git add *')
+          run_command('git commit -m "modify mirror"')
+          output = run_command("#{BRAID_BIN} status skit1")
+        end
+
+        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \[TAG=v1\] \(Locally Modified\)$/)
+      end
+    end
+
+    describe 'with remote changes' do
+      it 'should emit remote modified indicator' do
+        update_dir_from_fixture('skit1', 'skit1.1')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "change default color"')
+          run_command('git tag -f v1')
+        end
 
         output = nil
         in_dir(@repository_dir) do
           output = run_command("#{BRAID_BIN} status skit1")
         end
 
-        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \(Remote Modified\)$/)
+        expect(output).to match(/^skit1 \([0-9a-f]{40}\) \[TAG=v1\] \(Remote Modified\)$/)
       end
     end
   end

data/spec/integration/updating_spec.rb

@@ -7,6 +7,48 @@ describe 'Updating a mirror' do
     FileUtils.mkdir_p(TMP_PATH)
   end
 
+  describe 'with a git repository' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => 'somebody@example.com')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      @head_version = nil
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+        @head_version = run_command('git rev-parse HEAD')
+      end
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir}")
+      end
+    end
+
+    it 'should generate an error if --head parameter passed' do
+      output = nil
+      in_dir(@repository_dir) do
+        output = `#{BRAID_BIN} update skit1 --head 2>&1`
+      end
+
+      expect(output).to match(/^Braid: Error: Do not specify --head option anymore. Please use '--branch MyBranch' to track a branch or '--tag MyTag' to track a branch$/)
+    end
+
+    it 'should generate an error if both tag and revision specified' do
+      output = nil
+      in_dir(@repository_dir) do
+        output = `#{BRAID_BIN} update skit1 --tag v1 --revision #{@head_version} 2>&1`
+      end
+
+      expect(output).to match(/^Braid: Error: Can not update mirror specifying both a revision and a tag$/)
+    end
+
+    it 'should generate an error if both branch and revision specified' do
+      output = nil
+      in_dir(@repository_dir) do
+        output = `#{BRAID_BIN} update skit1 --branch master --tag v1`
+      end
+
+      expect(output).to match(/^Braid: Error: Can not update mirror specifying both a branch and a tag$/)
+    end
+  end
+
   describe 'from a git repository' do
     before do
       @repository_dir = create_git_repo_from_fixture('shiny')
@@ -150,4 +192,211 @@ describe 'Updating a mirror' do
       end
     end
   end
+
+  describe 'from a git repository braided in as a tag' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      in_dir(@vendor_repository_dir) do
+        run_command('git tag v1')
+      end
+      @file_name = 'layouts/layout.liquid'
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --tag v1")
+      end
+
+      update_dir_from_fixture('skit1', 'skit1.1')
+      in_dir(@vendor_repository_dir) do
+        run_command('git add *')
+        run_command('git commit -m "change default color"')
+      end
+
+      update_dir_from_fixture('skit1', 'skit1.2')
+      in_dir(@vendor_repository_dir) do
+        run_command('git add *')
+        run_command('git commit -m "add a happy note"')
+        run_command('git tag -f v1')
+      end
+    end
+
+    context 'with no project-specific changes' do
+      it 'should add the files and commit' do
+        in_dir(@repository_dir) do
+          run_command("#{BRAID_BIN} update skit1")
+        end
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.2/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+
+        output = run_command('git log --pretty=oneline').split("\n")
+        expect(output.length).to eq(3)
+        expect(output[0]).to match(/^[0-9a-f]{40} Braid: Update mirror 'skit1' to '[0-9a-f]{7}'$/)
+
+        # No temporary commits should be added to the reflog.
+        output = `git log -g --pretty=oneline`.split("\n")
+        expect(output.length).to eq(3)
+      end
+    end
+
+    context 'with mergeable changes to the same file' do
+      it 'should auto-merge and commit' 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("#{BRAID_BIN} update skit1")
+        end
+
+        assert_no_diff("#{FIXTURE_PATH}/shiny_skit1.2_merged/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+
+        output = run_command('git log --pretty=oneline').split("\n")
+        expect(output.length).to eq(4) # plus 'mergeable change'
+        expect(output[0]).to match(/Braid: Update mirror 'skit1' to '[0-9a-f]{7}'/)
+      end
+    end
+
+    context 'with conflicting changes' do
+      it 'should leave conflict markup with the target revision' do
+        run_command("cp #{File.join(FIXTURE_PATH, 'shiny_skit1_conflicting', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
+
+        target_revision = nil
+        in_dir(@vendor_repository_dir) do
+          target_revision = run_command('git rev-parse HEAD')
+        end
+
+        braid_output = nil
+        in_dir(@repository_dir) do
+          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)}")
+      end
+    end
+  end
+
+  tracking_strategy =
+    {
+      'branch' => 'master',
+      'tag' => 'v1',
+      'revision' => nil,
+    }
+
+  tracking_strategy.each_pair do |initial_strategy, initial_value|
+    describe "from a git repository from tracking strategy #{initial_strategy} '#{initial_value}'" do
+      before do
+        @repository_dir = create_git_repo_from_fixture('shiny')
+        @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+        @file_name = 'layouts/layout.liquid'
+
+        @initial_revision = nil
+        in_dir(@vendor_repository_dir) do
+          run_command('git tag v1')
+          @initial_revision = run_command('git rev-parse HEAD').strip
+        end
+        in_dir(@repository_dir) do
+          run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --#{initial_strategy} #{initial_value || @initial_revision}")
+        end
+
+        update_dir_from_fixture('skit1', 'skit1.1')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "change default color"')
+        end
+
+        @target_revision = nil
+        update_dir_from_fixture('skit1', 'skit1.2')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "add a happy note"')
+          @target_revision = run_command('git rev-parse HEAD').strip
+          run_command('git tag -f v1')
+        end
+      end
+
+      context 'with no project-specific changes' do
+        if initial_strategy != 'revision'
+          it 'should add the files and commit' do
+            in_dir(@repository_dir) do
+              run_command("#{BRAID_BIN} update skit1")
+            end
+
+            assert_no_diff("#{FIXTURE_PATH}/skit1.2/#{@file_name}", "#{@repository_dir}/skit1/layouts/layout.liquid")
+
+            output = run_command('git log --pretty=oneline').split("\n")
+            expect(output.length).to eq(3)
+            expect(output[0]).to match(/^[0-9a-f]{40} Braid: Update mirror 'skit1' to '[0-9a-f]{7}'$/)
+
+            # No temporary commits should be added to the reflog.
+            output = `git log -g --pretty=oneline`.split("\n")
+            expect(output.length).to eq(3)
+          end
+
+          context 'with mergeable changes to the same file' do
+            it 'should auto-merge and commit' 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("#{BRAID_BIN} update skit1")
+              end
+
+              assert_no_diff("#{FIXTURE_PATH}/shiny_skit1.2_merged/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+
+              output = run_command('git log --pretty=oneline').split("\n")
+              expect(output.length).to eq(4) # plus 'mergeable change'
+              expect(output[0]).to match(/Braid: Update mirror 'skit1' to '[0-9a-f]{7}'/)
+            end
+          end
+        else
+          it 'should not change files as revision not changed' do
+            in_dir(@repository_dir) do
+              run_command("#{BRAID_BIN} update skit1 --verbose")
+            end
+
+            assert_no_diff("#{FIXTURE_PATH}/skit1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+
+            output = run_command('git log --pretty=oneline').split("\n")
+            expect(output.length).to eq(2)
+
+            # No temporary commits should be added to the reflog.
+            output = `git log -g --pretty=oneline`.split("\n")
+            expect(output.length).to eq(2)
+          end
+        end
+      end
+
+      tracking_strategy.each_pair do |target_strategy, target_value|
+        describe "to a tracking strategy #{target_strategy} '#{target_value}'" do
+          it 'should add the files and commit' do
+            output = nil
+            in_dir(@repository_dir) do
+              output = run_command("#{BRAID_BIN} update skit1 --#{target_strategy} #{target_value || @target_revision}").split("\n")
+            end
+
+            index = 0
+            expect(output[index]).to match(/^Braid: Updating mirror 'skit1'.$/)
+
+            if initial_strategy != target_strategy || target_strategy == 'revision'
+              index = index + 1
+              expect(output[index]).to match(/^Braid: Switching mirror 'skit1' to #{target_strategy} '#{target_value || @target_revision}' from #{initial_strategy} '#{initial_value || @initial_revision}'.$/)
+            end
+            index = index + 1
+            expect(output[index]).to match(/^Braid: Updated mirror to '[0-9a-f]{7}'.$/)
+
+            assert_no_diff("#{FIXTURE_PATH}/skit1.2/#{@file_name}", "#{@repository_dir}/skit1/layouts/layout.liquid")
+
+            output = run_command('git log --pretty=oneline').split("\n")
+            expect(output.length).to eq(3)
+            expect(output[0]).to match(/^[0-9a-f]{40} Braid: Update mirror 'skit1' to '[0-9a-f]{7}'$/)
+
+            # No temporary commits should be added to the reflog.
+            output = `git log -g --pretty=oneline`.split("\n")
+            expect(output.length).to eq(3)
+          end
+        end
+      end
+    end
+  end
 end

data/spec/mirror_spec.rb

@@ -15,6 +15,58 @@ describe 'Braid::Mirror.new_from_options' do
     new_from_options('http://path.git', 'path' => 'vendor/tools/mytool/')
     expect(@mirror.path).to eq('vendor/tools/mytool')
   end
+
+  it 'should define local_ref correctly when default branch specified' do
+    new_from_options('http://mytool.git')
+    expect(@mirror.local_ref).to eq('master/braid/mytool/master')
+  end
+
+  it 'should define local_ref correctly when explicit branch specified' do
+    new_from_options('http://mytool.git', 'branch' => 'mybranch')
+    expect(@mirror.local_ref).to eq('mybranch/braid/mytool/mybranch')
+  end
+
+  it 'should define local_ref correctly when explicit tag specified' do
+    new_from_options('http://mytool.git', 'tag' => 'v1')
+    expect(@mirror.local_ref).to eq('tags/v1')
+  end
+
+  it 'should raise an exception if both tag and branch specified' do
+    expect {
+      new_from_options('http://mytool.git', 'tag' => 'v1', 'branch' => 'mybranch')
+    }.to raise_error(Braid::Mirror::NoTagAndBranch)
+  end
+
+  it 'should define remote_ref correctly when default branch specified' do
+    new_from_options('http://mytool.git')
+    expect(@mirror.remote_ref).to eq('+refs/heads/master')
+  end
+
+  it 'should define remote_ref correctly when explicit branch specified' do
+    new_from_options('http://mytool.git', 'branch' => 'mybranch')
+    expect(@mirror.remote_ref).to eq('+refs/heads/mybranch')
+  end
+
+  it 'should define remote_ref correctly when explicit tag specified' do
+    new_from_options('http://mytool.git', 'tag' => 'v1')
+    expect(@mirror.remote_ref).to eq('+refs/tags/v1')
+  end
+
+  it 'should define remote correctly when default branch specified' do
+    new_from_options('http://mytool.git')
+    expect(@mirror.remote).to eq('master/braid/mytool')
+  end
+
+  it 'should define remote correctly when explicit branch specified' do
+    new_from_options('http://mytool.git', 'branch' => 'mybranch')
+    expect(@mirror.remote).to eq('mybranch/braid/mytool')
+  end
+
+  it 'should define remote correctly when explicit tag specified' do
+    new_from_options('http://mytool.git', 'tag' => 'v1')
+    expect(@mirror.remote).to eq('v1/braid/mytool')
+  end
+
 end
 
 describe 'Braid::Mirror#diff' do
@@ -63,8 +115,8 @@ describe 'Braid::Mirror#inferred_revision' do
   it 'should return the last commit before the most recent update' do
     @mirror = new_from_options('git://path')
     git.expects(:rev_list).times(2).returns(
-        "#{'a' * 40}\n",
-        "commit #{'b' * 40}\n#{'t' * 40}\n"
+      "#{'a' * 40}\n",
+      "commit #{'b' * 40}\n#{'t' * 40}\n"
     )
     git.expects(:tree_hash).with(@mirror.path, 'a' * 40).returns('t' * 40)
     expect(@mirror.send(:inferred_revision)).to eq('b' * 40)

metadata

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