zzdeploy 0.1.5 → 0.1.6

data/lib/commands/chef_bake.rb

@@ -49,9 +49,9 @@ module Commands
       end
 
       # verify that the chef deploy tag exists
-      cmd = "git ls-remote --tags git@github.com:zangzing/zz-chef-repo.git refs/tags/#{recipes_deploy_tag} | egrep refs/tags/#{recipes_deploy_tag}"
+      cmd = "git ls-remote --tags git@github.com:zangzing/zz-chef-repo.git refs/tags/#{recipes_deploy_tag}^{} refs/tags/#{recipes_deploy_tag} | egrep refs/tags/#{recipes_deploy_tag}"
       if ZZSharedLib::CL.do_cmd_result(cmd) != 0
-        raise "Could not find the tag: #{recipes_deploy_tag} in the remote zz-chef-repo repository.  Make sure you check in and tag your code, and run chef_upload."
+        raise "Could not find the remote tag: #{recipes_deploy_tag} in the remote zz-chef-repo repository.  Make sure you check in and tag your code, and run chef_upload."
       end
 
       # tag is good, go ahead and deploy to all the machines in the group

data/lib/commands/chef_upload.rb

@@ -40,7 +40,7 @@ module Commands
       deploy_group = amazon.find_deploy_group(group_name)
 
       # verify that the tag given is on the remote repo
-      cmd = "git ls-remote --tags git@github.com:zangzing/zz-chef-repo.git refs/tags/#{recipes_deploy_tag} | egrep refs/tags/#{recipes_deploy_tag}"
+      cmd = "git ls-remote --tags git@github.com:zangzing/zz-chef-repo.git refs/tags/#{recipes_deploy_tag}^{} refs/tags/#{recipes_deploy_tag} | egrep refs/tags/#{recipes_deploy_tag}"
       if ZZSharedLib::CL.do_cmd_result(cmd) != 0
         raise "Could not find the tag specified in the remote zz-chef-repo repository.  Make sure you check in and tag your code."
       end

data/lib/commands/deploy_instances.rb

@@ -72,9 +72,9 @@ module Commands
       full_ref = "refs/heads/#{app_deploy_tag}"
       cmd = "git ls-remote #{gitrepo} #{full_ref} | egrep #{full_ref}"
       if ZZSharedLib::CL.do_cmd_result(cmd) != 0
-        # now try to see if it's a tag
+        # now try to see if it's a tag - use the ^{} to follow tags to find the matching non tag object (i.e. the proper checkin that we tagged)
         full_ref = "refs/tags/#{app_deploy_tag}"
-        cmd = "git ls-remote #{gitrepo} #{full_ref} | egrep #{full_ref}"
+        cmd = "git ls-remote #{gitrepo} #{full_ref}^{} #{full_ref} | egrep #{full_ref}"
         if ZZSharedLib::CL.do_cmd_result(cmd) != 0
           raise "Could not find the tag or ref: #{app_deploy_tag} in the remote #{gitrepo} repository."
         end

data/lib/info.rb

@@ -1,5 +1,5 @@
 class Info
   def self.version
-    "0.1.5"
+    "0.1.6"
   end
 end

data/lib/zz_deploy.rb

@@ -7,11 +7,11 @@ require 'right_aws'
 require 'sdb/active_sdb'
 require 'json'
 require 'zzsharedlib'
+require 'info'
 
 class ZZDeploy
   include Subcommands
 
-  VERSION = "0.0.4"
   CMD = "zz"
 
   RECIPES_DIR = "/var/chef/cookbooks/zz-chef-repo"
@@ -59,7 +59,7 @@ class ZZDeploy
     set_amazon_options
     # global options
     global_options do |opts|
-      opts.banner = "Version: #{VERSION} - Usage: #{CMD} [options] [subcommand [options]]"
+      opts.banner = "Version: #{Info.version} - Usage: #{CMD} [options] [subcommand [options]]"
       opts.description = "ZangZing configuration and deploy tool.  You must specify a valid sub command."
       opts.separator ""
       opts.separator "Global options are:"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Greg Seitz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -07:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency