manifestly 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47dda06e6e700b317780d75c6c00a33530d965cc
-  data.tar.gz: 6609152fec2cacd952a22f56512cb0da18da349c
+  metadata.gz: 50e16c5ca04e57fbe559ae1320d7be6ff4698657
+  data.tar.gz: 79b8b5a9fc98b0e7cd6e9aeb7f62c08e4a725f02
 SHA512:
-  metadata.gz: ab10f14fa3e9867b39eff764bebcac01e35ce62abe2b7056055dd20dd0a36c08393d5926285be3acb072c5933cb907b137b35c3af8275371d8a03f22a582538e
-  data.tar.gz: 43c6081ac7133ef7bef7f500c11dcfec53a39ac6cbc3eb9e68426abaadb595a8121c27c2d54e0b8d27f716c0efcc87c853e6e7a68dbdb3a781fe8b8cff267a12
+  metadata.gz: fb5405e348c4476facc9462f6e03cedfeb994899c87c761363e49b38b93e5ea3d2eb73248fef0caf03370d11e5b1268cc5a7a95fed181d73fc8350795e9236f7
+  data.tar.gz: 04bcb082f5a1b47d55da807ccd10a8fe9d606c1c1e7820c2f7677a1301b38732d947f73069728631f81cacbe4bfd5fbbb9fdd65bf8cfb9eebacaefced5b31e12

data/lib/manifestly/cli.rb

@@ -326,6 +326,17 @@ module Manifestly
       When you run this command, the tag is immediately pushed to the upstream
       manifest repository.
 
+      Implementation note: if you look at the underlying git repository, you'll
+      see that tags are stored as the value you provided prepended with a
+      timestamp, some random characters (for uniqueness), and the filename
+      being tagged.  These unique tags are never removed and are what are used
+      by Manifestly, e.g. in the `find` command.  However, to make direct use
+      of the manifest repository easier, we also use moving tags that just
+      consist of the tag value you provide prepended by the filename being
+      tagged.  Each time you put tag `blah` on a sha for a file `my.manifest`,
+      a `my.manifest/blah` tag will move to that sha in the underlying manifest
+      git repo.
+
       #{Rainbow("Examples:").bright}
 
       $> manifestly tag --repo=org/repo --sha=fe10b5fdb9 --tag=release-to-qa --message="howdy"
@@ -371,6 +382,10 @@ module Manifestly
       You can limit the number of returned SHAs with the `--limit` flag.
       Otherwise, all matching SHAs are returned.
 
+      Implementation note: only pays attention to the unique versions of tags
+      created through manifestly, not to the "plain" tags that exist to support
+      direct use of the manifest git repo.
+
       #{Rainbow("Examples:").bright}
 
       $> manifestly find --tag=release-to-qa --repo=org/some_repo --repo-file=foo\x5

data/lib/manifestly/repository.rb

@@ -192,15 +192,21 @@ module Manifestly
       raise(ShaAlreadyTagged) if existing_shas.any?{|existing| existing.match(/#{options[:sha]}/)}
 
       filename = get_commit_filename(options[:sha])
-      tag = "#{Time.now.utc.strftime("%Y%m%d-%H%M%S.%6N")}/#{::SecureRandom.hex(2)}/#{filename}/#{options[:tag]}"
-      git.add_tag(tag, options[:sha], {annotate: true, message: options[:message], f: true})
-      git.push('origin', "refs/tags/#{tag}", f: true) if options[:push]
+
+      plain_tag = "#{filename}/#{options[:tag]}"
+      git.add_tag(plain_tag, options[:sha], {annotate: true, message: options[:message], f: true})
+      git.push('origin', "refs/tags/#{plain_tag}", f: true) if options[:push]
+
+      unique_tag = "#{Time.now.utc.strftime("%Y%m%d-%H%M%S.%6N")}/#{::SecureRandom.hex(2)}/#{filename}/#{options[:tag]}"
+      git.add_tag(unique_tag, options[:sha], {annotate: true, message: options[:message], f: true})
+      git.push('origin', "refs/tags/#{unique_tag}", f: true) if options[:push]
     end
 
     def get_shas_with_tag(options={})
       options[:file] ||= ".*"
       options[:order] ||= :descending
 
+      # only look for the unique tags, not the plain ones
       pattern = /.*\/#{options[:file]}\/#{options[:tag]}/
 
       tag_objects = git.tags.select{|tag| tag.name.match(pattern)}

data/lib/manifestly/version.rb

@@ -1,3 +1,3 @@
 module Manifestly
-  VERSION = "2.3.5"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifestly
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor