capistrano-deploytags 0.8.0 → 0.9.0

data/README.md

@@ -126,6 +126,14 @@ commit doesn't work as you might expect. The simple solution is to
 create a new branch from the previous commit you wish to deploy and
 supplying `-S branch=<new branch>` as arguments to Capistrano.
 
+Running from Jenkins
+--------------------
+Because Jenkins will check out the code with the current revision 
+number you will be in a detached state. This causes the plugin to be 
+unhappy about the git tree. The solution is to add `-S branch=$GIT_COMMIT` 
+to the cap deploy line called from your Jenkins build. This will cause
+the diffs and comparisons done by the deploytags gem to be correct.
+
 Credits
 -------
 This software was written by [Karl Matthias](https://github.com/relistan)

data/lib/capistrano/deploy_tags.rb

@@ -2,17 +2,24 @@ module Capistrano
   module DeployTags
     def pending_git_changes?
       # Do we have any changes vs HEAD on deployment branch?
-      !(`git fetch && git diff #{branch} --shortstat`.strip.empty?)
+      `git fetch #{remote}`.tap do |output|
+        return !(`git diff #{branch} --shortstat`.strip.empty?) if exec_success?
+        raise "'git fetch #{remote}' failed:\n #{output}"
+      end
     end
 
     def git_tag_for(stage)
-      "#{stage}-#{Time.now.strftime("%Y.%m.%d-%H%M%S")}"
+      "#{stage}-#{Time.new.utc.strftime('%Y.%m.%d-%H%M%S-utc')}"
     end
 
     def safe_run(*args)
       raise "#{args.join(" ")} failed!" unless system(*args)
     end
 
+    def exec_success?
+      $?.success?
+    end
+
     def validate_git_vars
       unless exists?(:branch) && exists?(:stage)
         logger.log Capistrano::Logger::IMPORTANT, 'Capistrano Deploytags requires that :branch and :stage be defined.'

data/lib/capistrano/deploy_tags.rb.orig

@@ -0,0 +1,89 @@
+module Capistrano
+  module DeployTags
+    def pending_git_changes?
+      # Do we have any changes vs HEAD on deployment branch?
+      !(`git fetch && git diff #{branch} --shortstat`.strip.empty?)
+    end
+
+    def git_tag_for(stage)
+<<<<<<< HEAD
+      "#{stage}-#{Time.new.utc.strftime('%Y.%m.%d-%H%M%S')}"
+=======
+      "#{stage}-#{Time.new.utc.strftime('%Y.%m.%d-%H%M%S-utc')}"
+>>>>>>> Added utc to the tag to make the change obvious.
+    end
+
+    def safe_run(*args)
+      raise "#{args.join(" ")} failed!" unless system(*args)
+    end
+
+    def validate_git_vars
+      unless exists?(:branch) && exists?(:stage)
+        logger.log Capistrano::Logger::IMPORTANT, 'Capistrano Deploytags requires that :branch and :stage be defined.'
+        raise 'define :branch and :stage'
+      end
+    end
+
+    def git_tag?(tag)
+      !`git tag -l #{tag}`.strip.empty?
+    end
+
+    def has_remote?
+      !`git remote`.strip.empty?
+    end
+
+    def remote
+      exists?(:git_remote) ? git_remote : `git remote`.strip.split(/\n/).first
+    end
+
+    def self.load_into(configuration)
+      configuration.load do
+        before 'deploy', 'git:prepare_tree'
+        before 'deploy:migrations', 'git:prepare_tree'
+        after  'deploy', 'git:tagdeploy'
+        after  'deploy:migrations', 'git:tagdeploy'
+
+        desc 'prepare git tree so we can tag on successful deployment'
+        namespace :git do
+          task :prepare_tree, :except => { :no_release => true } do
+            next if fetch(:no_deploytags, false)
+
+            cdt.validate_git_vars
+
+            logger.log Capistrano::Logger::IMPORTANT, "Preparing to deploy HEAD from branch '#{branch}' to '#{stage}'"
+
+            if cdt.pending_git_changes?
+              logger.log Capistrano::Logger::IMPORTANT, "Whoa there, partner. Dirty trees can't deploy. Git yerself clean first."
+              raise 'Dirty git tree'
+            end
+
+            cdt.safe_run 'git', 'checkout', branch
+            logger.log Capistrano::Logger::IMPORTANT, "Pulling from #{branch}"
+            cdt.safe_run 'git', 'pull', cdt.remote, branch if cdt.has_remote?
+          end
+
+          desc 'add git tags for each successful deployment'
+          task :tagdeploy, :except => { :no_release => true } do
+            next if fetch(:no_deploytags, false)
+
+            cdt.validate_git_vars
+
+            current_sha = `git rev-parse #{branch} HEAD`.strip[0..8]
+            logger.log Capistrano::Logger::INFO, "Tagging #{current_sha} for deployment"
+
+            tag_user = (ENV['USER'] || ENV['USERNAME']).strip
+            cdt.safe_run 'git', 'tag', '-a', cdt.git_tag_for(stage), '-m', "#{tag_user} deployed #{current_sha} to #{stage}"
+            cdt.safe_run 'git', 'push', '--tags' if cdt.has_remote?
+          end
+        end
+
+      end
+    end
+  end
+end
+
+Capistrano.plugin :cdt, Capistrano::DeployTags
+
+if Capistrano::Configuration.instance
+  Capistrano::DeployTags.load_into(Capistrano::Configuration.instance(:must_exist))
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-deploytags
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Karl Matthias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,30 +57,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/capistrano/deploy_tags.rb
+- lib/capistrano/deploy_tags.rb.orig
 - lib/capistrano-deploytags.rb
 - README.md
 - LICENSE
 homepage: http://github.com/mydrive/capistrano-deploytags
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Add dated, environment-specific tags to your git repo at each deployment.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTkwOGQ4YjJjOWZkMDg4ODEwMjM3NTJlZjEzZDhhYTI3YTFjYzczYw==
-  data.tar.gz: !binary |-
-    YzZkMDkxZWM1ZDgzZTJiZmE5NmYzNGM1MDkwYzA2OTAwMGQ0MGFhZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTA2OTY3NDU3MjI0MTZlMDJhMjY0M2M3MWMzNjhhN2Q2ZDA2MzJmMGY4N2Nj
-    ZGNjYzY3ODYzZmQ1MjAyZjMyN2QxOWUyNzVlY2ViODU2YWMyY2Q4NjM0MDE5
-    M2IwNjBhNmZjYzcxN2E0OWVhNzA0OGY5MDc3YmFjNTkyZTliOTg=
-  data.tar.gz: !binary |-
-    MTRiNGMxOTdhYzUzYzE1ZDBlZGFjMTEyNmE0NGM2NzdjZDlhYzMzYTAzNTFk
-    YzZlYjBiNTg0YTkyNjMzOTAyYWQyN2QxZDMxY2RmODQzMGVmZGRhMTU0YmY2
-    MDAzNWQ5NTkyMDMwZjRjYmNiNzg0Y2IyZmQwZTI4NjM1ZWNkOTE=