manifestly 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e16c5ca04e57fbe559ae1320d7be6ff4698657
-  data.tar.gz: 79b8b5a9fc98b0e7cd6e9aeb7f62c08e4a725f02
+  metadata.gz: 9a122c2c2aad6e6043dfb5e16f1d51362eceaf94
+  data.tar.gz: 06b7b5cbb590eedf3c5229edf2c16a0b66b3d775
 SHA512:
-  metadata.gz: fb5405e348c4476facc9462f6e03cedfeb994899c87c761363e49b38b93e5ea3d2eb73248fef0caf03370d11e5b1268cc5a7a95fed181d73fc8350795e9236f7
-  data.tar.gz: 04bcb082f5a1b47d55da807ccd10a8fe9d606c1c1e7820c2f7677a1301b38732d947f73069728631f81cacbe4bfd5fbbb9fdd65bf8cfb9eebacaefced5b31e12
+  metadata.gz: eadfeb8b0b646242ac93ef0ec955db3326f4546edef87f56669f6e9303bfbbd109a8e8db73a0cb087056e290ea0e9e31f6d29e3492100537db64ab4fc17bc3b1
+  data.tar.gz: 02cc0ec9bf7d0c29fbcd21155330cb4e2dabf543ba7559f66300d158337e47558814f7d41dc7735db867edd72302d12246391e632cd7c63df54d42d1f25ba495

data/README.md

@@ -20,13 +20,15 @@ To update to the latest version:
 A manifest is simple: just a file listing off repositories at specified commits, e.g.:
 
 ```
-my_github_org/application_1 @ fb186400247779f90aacf23fa2cde044cbac387c
-my_github_org/application_2 @ c4eb68d6b16f61af04dd0e02df2249382d411104
+[directory_1] my_github_org/application_1@fb18640024
+[directory_2] my_github_org/application_2@c4eb68d6b1 # v1.2.3
 ```
 
 When you have deploys that span multiple applications, a manifest lets you identify exactly what is deployed for each app.
 This tool, Manifestly, helps you create, find, and use these manifests in your deploy infrastructure.
 
+_Note: By including repository source directories, manifestly helps support cases where one repository holds the source for multiple deployments.  Manifestly will also include tag names for the indicated commit at the end of each line in a comment._
+
 ## Usage
 
 Manifestly has built in help:

data/lib/manifestly/manifest_item.rb

@@ -30,20 +30,42 @@ module Manifestly
       @repository.checkout_commit(@commit.sha, fetch_if_unfound)
     end
 
+    def commit_tags
+      @repository.git.tags.select do |tag|
+        # Gotta do some digging to get tagged sha out of annotated tags
+        tagged_sha = tag.annotated? ?
+                     tag.contents_array[0].split(" ").last == commit :
+                     tag.sha
+
+        tagged_sha == commit.sha
+      end.map(&:name)
+    end
+
     def to_file_string
-      "#{repository_name} @ #{commit.sha}"
+      dir = @repository.deepest_working_dir
+      repo = @repository.github_name_or_path
+      tags = commit_tags
+
+      "[#{dir}]#{repo.nil? ? '' : ' ' + repo}@#{commit.sha[0..9]}#{' # ' + tags.join(",") if tags.any?}"
     end
 
     def self.from_file_string(string, repositories)
-      repo_name, sha = string.split('@').collect(&:strip)
-      raise(InvalidManifestItem, string) if repo_name.blank? || sha.blank?
+      repo_name, dir, sha = parse_file_string(string)
 
       matching_repositories = repositories.select do |repo|
-        repo.display_name == repo_name
+        # directory name will be the most unique way to match and should always be available
+        # wheres repo_name won't always be
+        repo.deepest_working_dir == dir
+      end
+
+      # TODO test these two exceptions!
+      if matching_repositories.size > 1
+        raise(MultipleSameNameRepositories, "Dir: [#{dir}], Repo: [#{repo_name}]")
       end
 
-      raise(MultipleSameNameRepositories, repo_name) if matching_repositories.size > 1
-      raise(RepositoryNotFound, repo_name) if matching_repositories.empty?
+      if matching_repositories.empty?
+        raise(RepositoryNotFound, "Dir: [#{dir}], Repo: [#{repo_name}]")
+      end
 
       repository = matching_repositories.first
 
@@ -52,6 +74,43 @@ module Manifestly
       item
     end
 
+    def self.parse_file_string(string)
+      sha_re = "([a-fA-F0-9]+)"
+      repo_re = '([\w-]+\/[\w-]+)'
+      old_dir_re_1 = '\((.*)\)'
+      old_dir_re_2 = '(.*)'
+      new_dir_re = '\[(.*)\]'
+
+      # New style: `[dir] org/repo@sha`
+      if string =~ /#{new_dir_re}\W*#{repo_re}\W*@\W*#{sha_re}/
+        dir = $1.strip
+        repo_name = $2.strip
+        sha = $3.strip
+      # New style where there is no GH repo: `[dir]@sha`
+      elsif string =~ /#{new_dir_re}\W*@\W*#{sha_re}/
+        dir = $1.strip
+        sha = $2.strip
+      # Old style with dir shown: `org/repo (dir) @ sha`
+      elsif string =~ /#{repo_re}\W*#{old_dir_re_1}\W*@\W*#{sha_re}/
+        repo_name = $1.strip
+        dir = $2.strip
+        sha = $3.strip
+      # Old style with implicit dir: `org/repo @ sha`
+      elsif string =~ /#{repo_re}\W*@\W*#{sha_re}/
+        repo_name = $1.strip
+        sha = $2.strip
+        dir = repo_name.split('/').last
+      # Old style with no repo: `dir @ sha`
+      elsif string =~ /#{old_dir_re_2}\W*@\W*#{sha_re}/
+        dir = $1.strip
+        sha = $2.strip
+      else
+        raise(InvalidManifestItem, string)
+      end
+
+      [repo_name, dir, sha]
+    end
+
     attr_accessor :commit
     attr_reader :repository
 

data/lib/manifestly/repository.rb

@@ -239,18 +239,12 @@ module Manifestly
       git.dir
     end
 
+    def deepest_working_dir
+      working_dir.to_s.split(File::SEPARATOR).last
+    end
+
     def display_name
-      if github_name_or_path
-        repo_name = github_name_or_path.split('/').last
-        dir_name = working_dir.to_s.split(File::SEPARATOR).last
-        if repo_name == dir_name
-          github_name_or_path
-        else
-          github_name_or_path + " (#{dir_name})"
-        end
-      else
-        working_dir.to_s.split('/').last
-      end
+      "[#{deepest_working_dir}]#{' ' + github_name_or_path if !github_name_or_path.nil?}"
     end
 
     protected

data/lib/manifestly/version.rb

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

metadata

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