braid 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b07263a1d13718243281be9924f86bf3400e792
-  data.tar.gz: 1a7ea97cf3b02b08013b19daefb97ebe29466b37
+  metadata.gz: e697a371543e509b5d87a65d9d115a926ea473bf
+  data.tar.gz: 6d3c3bcf1b6e0d8ffc03e9aa96895c31a759f52d
 SHA512:
-  metadata.gz: 136b4a010e5774c520d55b94e9fb3a6452132ba27d0f7c4dec37574d0824232be0b31b4e23a55ca330f7a816880cd84f60f3789f91bf8d3d695d82fb0b776ca8
-  data.tar.gz: ed0f139ec17aff47b990dd6d26187b1e3b0bda166a311a20d68f6f329f0ee7340194fcfbc57472b564ff4a94f9e82229779cfd084681413a3cdc3adf7fab3d56
+  metadata.gz: cb691eb77d96fe8944a0723ec7f083ca6d8188b228d1ce1da97c92e6b7c0e41211237eef194785feebcc6ab5c8e27f5f34996ca22210e2d495ac15abcc1ca0f4
+  data.tar.gz: b0b2a74a470aa04a145b75833bcb889d1b4e1130b050168a185c665e454f01a524f9da282c61320f8969f2830a40a0c3beefcaa37ca841d6648a4d4d1835bb62

data/lib/braid/command.rb

@@ -114,13 +114,18 @@ module Braid
       if mirror.tag
         if use_local_cache?
           Dir.chdir git_cache.path(mirror.url) do
-            git.rev_parse(mirror.local_ref)
+            # Dereference the tag to a commit since we want the `revision`
+            # attribute of a mirror to always be a commit object.  This is also
+            # currently needed because we don't fetch annotated tags into the
+            # downstream repository, although we might change that in the
+            # future.
+            git.rev_parse(mirror.local_ref + "^{commit}")
           end
         else
           raise BraidError, 'unable to retrieve tag version when cache disabled.'
         end
       else
-        git.rev_parse(mirror.local_ref)
+        git.rev_parse(mirror.local_ref + "^{commit}")
       end
     end
 
@@ -128,7 +133,7 @@ module Braid
       if revision.nil?
         determine_repository_revision(mirror)
       else
-        new_revision = git.rev_parse(revision)
+        new_revision = git.rev_parse(revision + "^{commit}")
 
         if new_revision == mirror.revision
           raise InvalidRevision, 'mirror is already at requested revision'

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

data/spec/integration/adding_spec.rb

@@ -138,6 +138,41 @@ describe 'Adding a mirror in a clean repository' do
     end
   end
 
+  describe 'from an annotated 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 -a -m "v1" 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")
+
+      in_dir(@repository_dir) do
+        assert_commit_subject(/Braid: Add mirror 'skit1' at '[0-9a-f]{7}'/)
+        assert_commit_author('Some body')
+        assert_commit_email('somebody@example.com')
+      end
+    end
+
+    it 'should create .braids.json and add the mirror to it' do
+      braids = YAML::load_file("#{@repository_dir}/.braids.json")
+      expect(braids['config_version']).to be_kind_of(Numeric)
+      mirror_obj = braids['mirrors']['skit1']
+      expect(mirror_obj['url']).to eq(@vendor_repository_dir)
+      expect(mirror_obj['revision']).not_to be_nil
+      expect(mirror_obj['branch']).to be_nil
+      expect(mirror_obj['tag']).to eq('v1')
+      expect(mirror_obj['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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Cristi Balan