cap-git-tags 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a2fccb8c27cf0e3ce1dc5ab499ca6af3f4294f
-  data.tar.gz: cd65f94fd899a9ddc1b6c7c0819b23c8f6ececd6
+  metadata.gz: 5d7d76ebe01d406cd1fbe759d1ffa1ccccf090de
+  data.tar.gz: 072f87a32fb08c248e48cfd1171d8b85df153ce2
 SHA512:
-  metadata.gz: 4cc90cc3e5b908b9159f76885a6a8170aae062c6b6a3b57b0ac326d7b965cc40fe26644f45c7c306f51744f2c5072ef046df5c3b8be5a02f0d005999b8c01a24
-  data.tar.gz: 02903ea26865b2ac9ab0bafc3044933348a8831b091fa9cc70981e79841e8aee2511d4ab567a995ab32c5ca37f1d128eb0faf98a11d7037863fba8e8a707ff33
+  metadata.gz: 6d1b3b7c573f659e64ee4fb5da826f91dfc4b4ae505674524652ffa4a5064f6e1d951578769c0c9f69f4023e4066c5179b3e4e6aa125176045508bb523866329
+  data.tar.gz: 5e43823eb2422f36b350e81661568e004232ead9f4fbc48caa7864f7eada9d9cb6ec4c1ed654e06af04d3aa5655d1cf49fe85a74c9919a43a365786d52ccfbc7

data/changelog.md

@@ -0,0 +1,13 @@
+# Changelog
+
+# v 0.1.2
+
+* Propper fix for rollback issue
+
+# v 0.1.1
+
+* Fixed rollback issue, changed hook to `before :updating`
+
+# v 0.1.0
+
+* Initial release

data/lib/cap-git-tags/tasks/git_tags.rake

@@ -1,52 +1,55 @@
-namespace :deploy do
-
-  task :create_tag do
-    run_locally do
-      current_stage = fetch(:stage)
-
-      if current_stage == :production
-        # Production deploys use the latest staging tag or passed in ENV['TAG']
-        if ENV['TAG']
-          latest_staging_tag = production_tag = ENV['TAG']
+namespace :gittags do
+
+  task :create_tag do |t, args|
+    # Don't run any of this for rollbacks etc
+    if fetch(:deploying)
+      run_locally do
+        current_stage = fetch(:stage)
+
+        if current_stage == :production
+          # Production deploys use the latest staging tag or passed in ENV['TAG']
+          if ENV['TAG']
+            latest_staging_tag = production_tag = ENV['TAG']
+          else
+            latest_staging_tag = `git describe --match "staging*" --abbrev=4 HEAD`.chomp
+            production_tag = latest_staging_tag.sub(/^staging/, "production")
+          end
+
+          info "You are about to deploy: #{latest_staging_tag} to production"
+          ask :yes_to_confirm_deploy, "n"
+
+          if fetch(:yes_to_confirm_deploy)[0].downcase != "y"
+            abort "You didn't confirm the deployment"
+          end
+
+          unless ENV['TAG']
+            info "Publishing tag: #{production_tag}"
+            CapGitTags::Helper.publish_tag production_tag
+          end
+
+          set :branch, production_tag
+        elsif current_stage == :staging
+          # Staging deploys create a new tag based on user input
+          time = Time.new
+
+          ask :a_description_of_what_you_are_deploying, "latest changes"
+
+          safe_tag = fetch(:a_description_of_what_you_are_deploying).downcase.gsub(/[^a-z0-9]/, "-")
+          staging_tag = "staging-#{time.year}-#{time.month}-#{time.day}-#{time.hour}-#{time.min}-#{safe_tag}"
+
+          info "Publishing tag: #{staging_tag}"
+          CapGitTags::Helper.publish_tag staging_tag
+
+          info "Deploying: #{staging_tag} to staging"
+          set :branch, staging_tag
         else
-          latest_staging_tag = `git describe --match "staging*" --abbrev=4 HEAD`.chomp
-          production_tag = latest_staging_tag.sub(/^staging/, "production")
-        end
-
-        info "You are about to deploy: #{latest_staging_tag} to production"
-        ask :yes_to_confirm_deploy, "n"
-
-        if fetch(:yes_to_confirm_deploy)[0].downcase != "y"
-          abort "You didn't confirm the deployment"
-        end
-
-        unless ENV['TAG']
-          info "Publishing tag: #{production_tag}"
-          CapGitTags::Helper.publish_tag production_tag
+          # dev environments allow any branch to be pushed and don't create a tag
+          info "About to deploy your current branch, enter a different branch name to override"
+          ask :branch, proc { CapGitTags::Helper.current_branch }
         end
-
-        set :branch, production_tag
-      elsif current_stage == :staging
-        # Staging deploys create a new tag based on user input
-        time = Time.new
-
-        ask :a_description_of_what_you_are_deploying, "latest changes"
-
-        safe_tag = fetch(:a_description_of_what_you_are_deploying).downcase.gsub(/[^a-z0-9]/, "-")
-        staging_tag = "staging-#{time.year}-#{time.month}-#{time.day}-#{time.hour}-#{time.min}-#{safe_tag}"
-
-        info "Publishing tag: #{staging_tag}"
-        CapGitTags::Helper.publish_tag staging_tag
-
-        info "Deploying: #{staging_tag} to staging"
-        set :branch, staging_tag
-      else
-        # dev environments allow any branch to be pushed and don't create a tag
-        info "About to deploy your current branch, enter a different branch name to override"
-        ask :branch, proc { CapGitTags::Helper.current_branch }
       end
     end
   end
 
-  before :updating, :create_tag
+  before 'deploy:starting', 'gittags:create_tag'
 end

data/lib/cap-git-tags/version.rb

@@ -1,3 +1,3 @@
 module CapGitTags
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-git-tags
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Pete Hawkins
@@ -15,28 +15,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a capistrano 3 plugin for auto tagging your git deploys.
@@ -47,12 +47,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - cap-git-tags.gemspec
+- changelog.md
 - lib/cap-git-tags.rb
 - lib/cap-git-tags/tasks/git_tags.rake
 - lib/cap-git-tags/version.rb
@@ -66,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Auto tags staging and production deploys for git projects