capistrano-gitflow 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223f9eb5e5673d428371970d29385b92baa58544
-  data.tar.gz: 3ebb90f3c7bdf82d08f19c9ec656dae0e6d8f806
+  metadata.gz: e4efd39dbc0cd6f84c60395a3f4aadd68e0e12fc
+  data.tar.gz: 780070274eda305cd847d7ff2c477910ad55955f
 SHA512:
-  metadata.gz: d77acedbcbf5b15861a91ae936b0d8117a3c9b1109abba96e9041be7be5660c2468842bcc3820e242cff49b451c4c9514bd87fd147ea67035cf5b75b055d4995
-  data.tar.gz: 6d4b964afde31dd00ac7b157ae1e18181640e446aef9c31281e9b9bfbc8f119b5c65fb8fa58c8e70dc5b0996a50e59f32a1e4ccb4c212b39c031c77ab1f39887
+  metadata.gz: 8bb3b196c77f41f94c655c982d1fea1da8c55971496f635486fb57fbec4db91872b64a48f30506985b42acb3d09305b011ff4c86ec69152fa1f4b0b03ec7cd18
+  data.tar.gz: f70dfa30100aa35a6b692dac8de52038d7ff06d5f0321552c288eb5fbf317d6bf239d7eac9bf589ada4589985bdff6d2f8ececc4ae6458e427f25401edd85806

data/README.rdoc

@@ -8,7 +8,7 @@ Gitflow simply adds some tagging/logging/workflow magic.
     $ cap production deploy   # 'master' goes to production
 
     # AFTER
-    $ cap deploy                                                          
+    $ cap deploy
     # 'master' goes to staging; tag staging-YYYY-MM-DD.X created
 
     $ cap production deploy
@@ -18,10 +18,10 @@ Gitflow simply adds some tagging/logging/workflow magic.
     # tag 'production-YYYY-MM-DD-X' created; points to staging-YYYY-MM-DD-X
 
     # BONUS
-    $ cap gitflow:commit_log              
+    $ cap gitflow:commit_log
     # displays a commit log pushed to staging
-    
-    $ cap production gitflow:commit_log   
+
+    $ cap production gitflow:commit_log
     # displays a commit log of what will be pushed to production
 
 == INSTALLATION
@@ -73,6 +73,15 @@ gitflow will automatically:
 * push the code and tags to the remote "origin"
 * and run the normal deploy task for the production stage.
 
+=== CLEANING OLD TAGS:
+Whenever you want to clean the old tags generated by this gem you can simply run this command.
+
+    cap <stage_name> gitflow:cleanup_tags
+
+This will delete all tags that have this pattern  [staging|production]{1}-[0-9]{4}-[0-9]{2}-[0-9]{2}\-([0-9]*)
+The task will delete first the local tasks and then the remote tasks from your git repository.
+For more details you can check here: https://github.com/technicalpickles/capistrano-gitflow/blob/master/lib/capistrano/gitflow/helpers/helper.rb#L219
+
 === NOTES:
 
 * you may need to wipe out the cached-copy on the remote server that cap uses when switching to this workflow; I have seen situations where the cached copy cannot cleanly checkout to the new branch/tag. it's safe to try without wiping it out first, it will fail gracefully.

data/lib/capistrano/gitflow/helpers/helper.rb

@@ -31,7 +31,7 @@ module CapistranoGitFlow
     end
 
     def gitflow_capistrano_tag
-     defined?(capistrano_configuration) ?  capistrano_configuration[:tag] : ENV['TAG']
+      defined?(capistrano_configuration) ?  capistrano_configuration[:tag] : ENV['TAG']
     end
 
     def gitflow_last_tag_matching(pattern)
@@ -86,12 +86,12 @@ module CapistranoGitFlow
         set :origin_sha, `git log --pretty=format:%H #{fetch(:local_branch)} -1`
         unless fetch(:local_sha) == fetch(:origin_sha)
           abort """
-Your #{fetch(:local_branch)} branch is not up to date with origin/#{fetch(:local_branch)}.
-Please make sure you have pulled and pushed all code before deploying:
+          Your #{fetch(:local_branch)} branch is not up to date with origin/#{fetch(:local_branch)}.
+          Please make sure you have pulled and pushed all code before deploying:
 
-git pull origin #{fetch(:local_branch)}
-# run tests, etc
-git push origin #{fetch(:local_branch)}
+          git pull origin #{fetch(:local_branch)}
+          # run tests, etc
+          git push origin #{fetch(:local_branch)}
 
           """
         end
@@ -108,7 +108,7 @@ git push origin #{fetch(:local_branch)}
         task_exists = gitflow_find_task(rake_task_name)
         if !task_exists.nil? && task_exists!= false
 
-            gitflow_execute_task(rake_task_name)
+          gitflow_execute_task(rake_task_name)
 
           system "git push --tags origin #{fetch(:local_branch)}"
           if $? != 0
@@ -216,5 +216,26 @@ git push origin #{fetch(:local_branch)}
       set :branch, new_production_tag
     end
 
+    def gitflow_cleanup_tags
+      return if fetch(:gitflow_keep_tags).nil?
+      tags = `git log --tags  --pretty="format:%at %D" | grep 'tag:' |sort -n | awk '{$1=""; print $0}' | tr "," "\n"| sed 's/tag:*//' | sed -e 's/^[ \t]*//'`
+      tags = tags.split.reject{|tag| tag.blank?  }
+      tags = tags.select { |tag| tag =~ /^(staging|production){1}-[0-9]{4}-[0-9]{2}-[0-9]{2}\-([0-9]*)/ }
+      if tags.count >= fetch(:gitflow_keep_tags)
+        puts "Keeping #{fetch(:gitflow_keep_tags)} Tags from total #{tags.count}"
+        tags_to_delete = (tags - tags.last(fetch(:gitflow_keep_tags)))
+        if tags_to_delete.any?
+          system "git tag -d #{tags_to_delete.join(' ')}"
+          tags_with_dots = tags_to_delete.map{ |tag| tag.prepend(':refs/tags/') }.join(' ')
+          system "git push origin #{tags_with_dots}"
+        else
+          puts "No tags to delete"
+        end
+      else
+        puts "No tags to delete"
+      end
+
+    end
+
   end
 end

data/lib/capistrano/gitflow/version.rb

@@ -6,7 +6,7 @@ module  CapistranoGitFlow # Returns the version of the currently loaded Rails as
   module VERSION
     MAJOR = 1
     MINOR = 5
-    TINY = 5
+    TINY = 6
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/capistrano/tasks/gitflow.rb

@@ -1,6 +1,6 @@
 
 namespace :gitflow do
-  
+
   task :verify_up_to_date do
     gitflow_verify_up_to_date
   end
@@ -25,7 +25,11 @@ namespace :gitflow do
     gitflow_tag_production
   end
 
-  gitflow_callbacks 
+  task :cleanup_tags do
+    gitflow_cleanup_tags
+  end
+
+  gitflow_callbacks
 end
 
 namespace :deploy do
@@ -35,4 +39,3 @@ namespace :deploy do
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-gitflow
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Joshua Nichols
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 3
 summary: Capistrano recipe for a deployment workflow based on git tags