capistrano-gitflow 1.4.3 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d000bf44f50e77b3dbea01aabc5e3bd14d0cbf2
+  data.tar.gz: 6c4f309adee905011a3334d0884aac076b143bab
+SHA512:
+  metadata.gz: 564c7e7815e3b5e1081aac04648af129f3e86a17cdcc32ac10c7354088d030f702c7ebbe1ec06a107172e9d49062a5951e5dc5ce58b503e04a7550c3768a62a4
+  data.tar.gz: ccc62ab240bbfdd691f053690618d7ede6eef579a7ee84b6ae872fd2847e975bcc15dabd7433d877dfb35769b82668811c97aba1f915898a2651e163d4b52cda

data/.gitignore

@@ -0,0 +1,76 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# For TextMate
+*.tmproj
+tmtags
+
+# For emacs:
+*~
+\#*
+.\#*
+
+# For vim:
+*.swp
+
+# For redcar:
+.redcar
+
+# For rubinius:
+*.rbc
+/nbproject/private/
+
+/tmp/
+
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+*~
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+.rvmrc
+s.rbx/
+.bundle/
+*.gem
+.idea/
+.rvmrc
+*.swp
+log/*.log
+pkg/
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+gemfiles
+coverage
+tags
+/nbproject/
+/.git-rewrite/
+.rbenv-version
+.ruby-version
+Gemfile.lock

data/README.rdoc

@@ -10,17 +10,18 @@ Gitflow simply adds some tagging/logging/workflow magic.
     # AFTER
     $ cap deploy                                                          
     # 'master' goes to staging; tag staging-YYYY-MM-DD.X created
+
     $ cap production deploy
     # deploys latest staging tag, or if last tag is a production tag then that, to production
-    # for specifying the tag by hand add `-s tag=staging-YYYY-MM-DD-X-user-description`
+    # displays a commit log of what will be pushed to production, requests confirmation before deploying
     # tag 'staging-YYYY-MM-DD-X' goes to production
     # 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
-    # ... alternatively, if you're using GitHub, will open a page using branch compare
-    cap production gitflow:log_log   
+    
+    $ cap production gitflow:commit_log   
     # displays a commit log of what will be pushed to production
 
 == INSTALLATION
@@ -34,6 +35,8 @@ Then update config/deploy.rb
     require 'capistrano/ext/multistage'
     require 'capistrano/gitflow' # needs to come after multistage
 
+More info at: http://rubygems.org/gems/capistrano-gitflow
+
 == DETAILS
 
 After experimenting with several workflows for deployment in git, I've finally found one I really like.
@@ -56,12 +59,15 @@ gitflow will automatically:
 
 === PUSH TO PRODUCTION:
 
-Whenever you want to push code to production, you must specify the staging tag you wish to promote to production:
+Whenever you want to push code to production, just do:
 
-    cap production deploy -s tag=staging-2009-09-08.2
+    cap production deploy
 
 gitflow will automatically:
 
+* determine the last staging tag created, show a commit log of last-production-tag..last-staging-tag
+* (alternatively, specify the tag to push to production via `-s tag=staging-YYYY-MM-DD-X-user-description`
+* prompt for confirmation of deploy
 * alias the staging tag to a production tag like: production-2008-09-08.2
 * configure multistage to use that tag for the deploy
 * push the code and tags to the remote "origin"
@@ -74,4 +80,32 @@ gitflow will automatically:
 
 == CREDIT
 
-Originally forked from Alan Pinstein's git_deployment repo. Gemified and hacked by Josh Nichols. There wasn't really a license originally, so...
+Originally created by Alan Pinstein.
+
+Gemified and hacked by Josh Nichols.
+
+== LICENSE
+
+MIT licensed.
+
+Copyright (c) 2009-2011 Alan Pinstein <apinstein@mac.com>
+
+Copyright (c) 2010-2011 Josh Nichols
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/capistrano-gitflow.gemspec

@@ -3,44 +3,32 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+require File.expand_path("../lib/capistrano/gitflow/version", __FILE__)
+
 Gem::Specification.new do |s|
   s.name = %q{capistrano-gitflow}
-  s.version = "1.4.3"
-
+  s.version = CapistranoGitFlow.gem_version
+  
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2011-04-07}
+  s.date =%q{2011-04-07}
   s.description = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "capistrano-gitflow.gemspec",
-    "lib/capistrano/gitflow.rb",
-    "lib/capistrano/gitflow/natcmp.rb",
-    "recipes/gitflow_recipes.rb",
-    "spec/gitflow_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
+  s.files = `git ls-files`.split("\n")
+  
   s.homepage = %q{http://github.com/technicalpickles/capistrano-gitflow}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Capistrano recipe for a deployment workflow based on git tags}
-  s.test_files = [
-    "spec/gitflow_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
+  s.test_files =s.files.grep(/^(spec)/)
+  
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-
+  
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<capistrano>, [">= 0"])
       s.add_runtime_dependency(%q<stringex>, [">= 0"])

data/lib/capistrano/gitflow.rb

@@ -1,196 +1,14 @@
-require 'capistrano'
-require 'capistrano/gitflow/natcmp'
+# require 'capistrano'
 require 'stringex'
+Gem.find_files('capistrano/gitflow/helpers/**/*.rb').each { |path| require path }
+require 'capistrano/version'
 
-module Capistrano
-  class Gitflow
-    def self.load_into(capistrano_configuration)
-      capistrano_configuration.load do
-        before "deploy:update_code", "gitflow:calculate_tag"
-        before "gitflow:calculate_tag", "gitflow:verify_up_to_date"
+self.extend CapistranoGitFlow::Helper
+include CapistranoGitFlow::Helper
 
-        namespace :gitflow do
-          def last_tag_matching(pattern)
-            matching_tags = `git tag -l '#{pattern}'`.split
-            matching_tags.sort! do |a,b|
-              String.natcmp(b, a, true)
-            end
 
-            last_tag = if matching_tags.length > 0
-                         matching_tags[0]
-                       else
-                         nil
-                       end
-          end
-
-          def last_staging_tag()
-            last_tag_matching('staging-*')
-          end
-
-          def next_staging_tag
-            hwhen   = Date.today.to_s
-            who = `whoami`.chomp.to_url
-            what = Capistrano::CLI.ui.ask("What does this release introduce? (this will be normalized and used in the tag for this release) ").to_url
-
-            last_staging_tag = last_tag_matching("staging-#{hwhen}-*")
-            new_tag_serial = if last_staging_tag && last_staging_tag =~ /staging-[0-9]{4}-[0-9]{2}-[0-9]{2}\-([0-9]*)/
-                               $1.to_i + 1
-                             else
-                               1
-                             end
-
-            "#{stage}-#{hwhen}-#{new_tag_serial}-#{who}-#{what}"
-          end
-
-          def last_production_tag()
-            last_tag_matching('production-*')
-          end
-
-          def using_git?
-            fetch(:scm, :git).to_sym == :git
-          end
-
-          task :verify_up_to_date do
-            if using_git?
-              set :local_branch, `git branch --no-color 2> /dev/null | sed -e '/^[^*]/d'`.gsub(/\* /, '').chomp
-              set :local_sha, `git log --pretty=format:%H HEAD -1`.chomp
-              set :origin_sha, `git log --pretty=format:%H #{local_branch} -1`
-              unless local_sha == origin_sha
-                abort """
-Your #{local_branch} branch is not up to date with origin/#{local_branch}.
-Please make sure you have pulled and pushed all code before deploying:
-
-    git pull origin #{local_branch}
-    # run tests, etc
-    git push origin #{local_branch}
-
-    """
-              end
-            end
-          end
-
-          desc "Calculate the tag to deploy"
-          task :calculate_tag do
-            if using_git?
-              # make sure we have any other deployment tags that have been pushed by others so our auto-increment code doesn't create conflicting tags
-              `git fetch`
-
-              if respond_to?("tag_#{stage}")
-                send "tag_#{stage}" 
-
-                system "git push --tags origin #{local_branch}"
-                if $? != 0
-                  abort "git push failed"
-                end
-              end
-            end
-          end
-
-          desc "Show log between most recent staging tag (or given tag=XXX) and last production release."
-          task :commit_log do
-            from_tag = if stage == :production
-                         last_production_tag
-                       elsif stage == :staging
-                         last_staging_tag
-                       else
-                         abort "Unsupported stage #{stage}"
-                       end
-
-            # no idea how to properly test for an optional cap argument a la '-s tag=x'
-            to_tag = capistrano_configuration[:tag]
-            to_tag ||= begin 
-                         puts "Calculating 'end' tag for :commit_log for '#{stage}'"
-                         to_tag = if stage == :production
-                                    last_staging_tag
-                                  elsif stage == :staging
-                                    'master'
-                                  else
-                                    abort "Unsupported stage #{stage}"
-                                  end
-                       end
-
-
-            command = if `git config remote.origin.url` =~ /git@github.com:(.*)\/(.*).git/
-                        "open https://github.com/#{$1}/#{$2}/compare/#{from_tag}...#{to_tag || 'master'}"
-                      else
-                        log_subcommand = if ENV['git_log_command'] && ENV['git_log_command'].strip != ''
-                                           ENV['git_log_command']
-                                         else
-                                           'log'
-                                         end
-                        "git #{log_subcommand} #{fromTag}..#{toTag}"
-                      end
-            puts command
-            system command
-          end
-
-          desc "Mark the current code as a staging/qa release"
-          task :tag_staging do
-            current_sha = `git log --pretty=format:%H HEAD -1`
-            last_staging_tag_sha = if last_staging_tag
-                                     `git log --pretty=format:%H #{last_staging_tag} -1`
-                                   end
-
-            if last_staging_tag_sha == current_sha
-              puts "Not re-tagging staging because latest tag (#{last_staging_tag}) already points to HEAD"
-              new_staging_tag = last_staging_tag
-            else
-              new_staging_tag = next_staging_tag
-              puts "Tagging current branch for deployment to staging as '#{new_staging_tag}'"
-              system "git tag -a -m 'tagging current code for deployment to staging' #{new_staging_tag}"
-            end
-
-            set :branch, new_staging_tag
-          end
-
-          desc "Push the approved tag to production. Pass in tag to deploy with '-s tag=staging-YYYY-MM-DD-X-feature'."
-          task :tag_production do
-            promote_to_production_tag = capistrano_configuration[:tag] || last_staging_tag
-
-            unless promote_to_production_tag && promote_to_production_tag =~ /staging-.*/
-              abort "Couldn't find a staging tag to deploy; use '-s tag=staging-YYYY-MM-DD.X'"
-            end
-            unless last_tag_matching(promote_to_production_tag)
-              abort "Staging tag #{promote_to_production_tag} does not exist."
-            end
-
-            promote_to_production_tag =~ /^staging-(.*)$/
-            new_production_tag = "production-#{$1}"
-
-            if new_production_tag == last_production_tag
-              puts "Not re-tagging #{last_production_tag} because it already exists"
-             really_deploy = Capistrano::CLI.ui.ask("Do you really want to deploy #{last_production_tag}? [y/N]").to_url
-
-             exit(1) unless really_deploy =~ /^[Yy]$/
-            else
-              puts "Preparing to promote staging tag '#{promote_to_production_tag}' to '#{new_production_tag}'"
-              unless capistrano_configuration[:tag]
-                really_deploy = Capistrano::CLI.ui.ask("Do you really want to deploy #{new_production_tag}? [y/N]").to_url
-
-                exit(1) unless really_deploy =~ /^[Yy]$/
-              end
-              puts "Promoting staging tag #{promote_to_production_tag} to production as '#{new_production_tag}'"
-              system "git tag -a -m 'tagging current code for deployment to production' #{new_production_tag} #{promote_to_production_tag}"
-            end
-
-            set :branch, new_production_tag
-          end
-        end
-
-        namespace :deploy do
-          namespace :pending do
-            task :compare do
-              gitflow.commit_log
-            end
-          end
-        end
-
-      end
-
-    end
-  end
-end
-
-if Capistrano::Configuration.instance
-  Capistrano::Gitflow.load_into(Capistrano::Configuration.instance)
+if gitflow_using_cap3?
+  require  File.join(File.dirname(__FILE__), 'tasks', 'gitflow')
+else
+  require File.join(File.dirname(__FILE__), 'gitflow','legacy', 'gitflow')
 end

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

@@ -0,0 +1,218 @@
+module CapistranoGitFlow
+  module Helper
+    
+      
+    def gitflow_stage
+      original_stage = fetch(:stage)
+      original_stage.to_s.include?(":") ? original_stage.split(':').reverse[0] : original_stage
+    end
+    
+    def gitflow_using_cap3?
+      defined?(Capistrano::VERSION) && Capistrano::VERSION.to_s.split('.').first.to_i >= 3
+    end
+      
+    def gitflow_callbacks
+      if gitflow_using_cap3?
+        before "deploy", "gitflow:verify_up_to_date"
+      else
+        before "deploy:update_code", "gitflow:verify_up_to_date"
+      end
+      after "gitflow:verify_up_to_date", "gitflow:calculate_tag"
+    end
+    
+    def gitflow_find_task(name)
+      defined?(::Rake) ? ::Rake::Task[name] :  exists?(name) 
+    rescue 
+      nil
+    end
+    
+    def gitflow_execute_task(name)
+      defined?(::Rake) ?  gitflow_find_task(name).invoke : find_and_execute_task(name)
+    end
+       
+    def gitflow_capistrano_tag
+     defined?(capistrano_configuration) ?  capistrano_configuration[:tag] : ENV['TAG']
+    end
+    
+    def gitflow_last_tag_matching(pattern)
+      # search for most recent (chronologically) tag matching the passed pattern, then get the name of that tag.
+      last_tag = `git describe --exact-match  --tags --match='#{pattern}' $(git log --tags='#{pattern}*' -n1 --pretty='%h')`.chomp
+      last_tag == '' ? nil : last_tag
+    end
+
+    def gitflow_last_staging_tag
+      gitflow_last_tag_matching('staging-*')
+    end
+
+    def gitflow_ask_confirm(message)
+      if gitflow_using_cap3?
+        $stdout.print "#{message}"
+        $stdin.gets.to_s.chomp
+      else
+        Capistrano::CLI.ui.ask("#{message}")
+      end
+    end
+  
+    def gitflow_next_staging_tag
+      hwhen  = Date.today.to_s
+      who = `whoami`.chomp.to_url
+      what = gitflow_ask_confirm("What does this release introduce? (this will be normalized and used in the tag for this release) ")
+  
+      abort "No tag has been provided: #{what.inspect}" if what == ''
+    
+      last_staging_tag = gitflow_last_tag_matching("staging-#{hwhen}-*")
+      new_tag_serial = if last_staging_tag && last_staging_tag =~ /staging-[0-9]{4}-[0-9]{2}-[0-9]{2}\-([0-9]*)/
+        $1.to_i + 1
+      else
+        1
+      end
+
+      "#{gitflow_stage}-#{hwhen}-#{new_tag_serial}-#{who}-#{what.to_url}"
+    end
+
+    def gitflow_last_production_tag()
+      gitflow_last_tag_matching('production-*')
+    end
+
+    def gitflow_using_git?
+      fetch(:scm, :git).to_sym == :git
+    end
+    
+    
+    def gitflow_verify_up_to_date
+      if gitflow_using_git?
+        set :local_branch, `git branch --no-color 2> /dev/null | sed -e '/^[^*]/d'`.gsub(/\* /, '').chomp
+        set :local_sha, `git log --pretty=format:%H HEAD -1`.chomp
+        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:
+
+git pull origin #{fetch(:local_branch)}
+# run tests, etc
+git push origin #{fetch(:local_branch)}
+
+          """
+        end
+      end
+    end
+    
+    
+    
+    def gitflow_calculate_tag
+      if gitflow_using_git?
+        # make sure we have any other deployment tags that have been pushed by others so our auto-increment code doesn't create conflicting tags
+        `git fetch`
+        rake_task_name = "gitflow:tag_#{gitflow_stage}"
+        if !gitflow_find_task(rake_task_name).nil?
+            gitflow_execute_task(rake_task_name)
+        
+          system "git push --tags origin #{fetch(:local_branch)}"
+          if $? != 0
+            abort "git push failed"
+          end
+        else
+          puts "Will deploy tag: #{fetch(:local_branch)}"
+          set :branch, fetch(:local_branch)
+        end
+      end
+    end
+    
+    def gitflow_commit_log
+      from_tag = if gitflow_stage.to_s == 'production'
+        gitflow_last_production_tag
+      elsif gitflow_stage.to_s == 'staging'
+        gitflow_last_staging_tag
+      else
+        abort "Unsupported stage #{gitflow_stage}"
+      end
+
+      # no idea how to properly test for an optional cap argument a la '-s tag=x'
+      to_tag = gitflow_capistrano_tag
+      to_tag ||= begin
+        puts "Calculating 'end' tag for :commit_log for '#{gitflow_stage}'"
+        to_tag = if  gitflow_stage.to_s == 'production'
+          gitflow_last_staging_tag
+        elsif gitflow_stage.to_s == 'staging'
+          'master'
+        else
+          abort "Unsupported stage #{gitflow_stage}"
+        end
+      end
+      
+
+
+      # use custom compare command if set
+      if ENV['git_log_command'] && ENV['git_log_command'].strip != ''
+        command = "git #{ENV['git_log_command']} #{from_tag}..#{to_tag}"
+      else
+        # default compare command
+        # be awesome for github
+        if `git config remote.origin.url` =~ /git@github.com:(.*)\/(.*).git/
+          command = "open https://github.com/#{$1}/#{$2}/compare/#{from_tag}...#{to_tag}"
+        else
+          command = "git log #{from_tag}..#{to_tag}"
+        end
+      end
+      puts "Displaying commits from #{from_tag} to #{to_tag} via:\n#{command}"
+      system command
+
+      puts ""
+    end
+    
+    
+    def gitflow_tag_staging
+      current_sha = `git log --pretty=format:%H HEAD -1`
+      last_staging_tag_sha = if gitflow_last_staging_tag
+        `git log --pretty=format:%H #{gitflow_last_staging_tag} -1`
+      end
+
+      if last_staging_tag_sha == current_sha
+        puts "Not re-tagging staging because latest tag (#{gitflow_last_staging_tag}) already points to HEAD"
+        new_staging_tag = gitflow_last_staging_tag
+      else
+        new_staging_tag = gitflow_next_staging_tag
+        puts "Tagging current branch for deployment to staging as '#{new_staging_tag}'"
+        system "git tag -a -m 'tagging current code for deployment to staging' #{new_staging_tag}"
+      end
+
+      set :branch, new_staging_tag
+    end
+    
+    
+    def gitflow_tag_production
+      promote_to_production_tag = gitflow_capistrano_tag || gitflow_last_staging_tag
+
+      unless promote_to_production_tag && promote_to_production_tag =~ /staging-.*/
+        abort "Couldn't find a staging tag to deploy; use '-s tag=staging-YYYY-MM-DD.X'"
+      end
+      unless gitflow_last_tag_matching(promote_to_production_tag)
+        abort "Staging tag #{promote_to_production_tag} does not exist."
+      end
+
+      promote_to_production_tag =~ /^staging-(.*)$/
+      new_production_tag = "production-#{$1}"
+
+      if new_production_tag == gitflow_last_production_tag
+        puts "Not re-tagging #{last_production_tag} because it already exists"
+        really_deploy = gitflow_ask_confirm("Do you really want to deploy #{last_production_tag}? [y/N]")
+
+        exit(1) unless really_deploy.to_url =~ /^[Yy]$/
+      else
+        puts "Preparing to promote staging tag '#{promote_to_production_tag}' to '#{new_production_tag}'"
+        gitflow_commit_log
+        unless gitflow_capistrano_tag
+          really_deploy = gitflow_ask_confirm("Do you really want to deploy #{new_production_tag}? [y/N]")
+
+          exit(1) unless really_deploy.to_url =~ /^[Yy]$/
+        end
+        puts "Promoting staging tag #{promote_to_production_tag} to production as '#{new_production_tag}'"
+        system "git tag -a -m 'tagging current code for deployment to production' #{new_production_tag} #{promote_to_production_tag}"
+      end
+
+      set :branch, new_production_tag
+    end
+    
+  end
+end

data/lib/capistrano/gitflow/legacy/gitflow.rb

@@ -0,0 +1,13 @@
+require 'capistrano'
+
+module Capistrano
+  class Gitflow
+    def self.load_into(capistrano_configuration)
+      capistrano_configuration.load  File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'tasks', 'gitflow.rb')
+    end
+  end
+end
+
+if Capistrano::Configuration.instance
+  Capistrano::Gitflow.load_into(Capistrano::Configuration.instance)
+end

data/lib/capistrano/gitflow/version.rb

@@ -0,0 +1,14 @@
+module  CapistranoGitFlow # Returns the version of the currently loaded Rails as a <tt>Gem::Version</tt>
+  def self.gem_version
+    Gem::Version.new CapistranoGitFlow::VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 1
+    MINOR = 5
+    TINY = 0
+    PRE = nil
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  end
+end

data/lib/capistrano/tasks/gitflow.rb

@@ -0,0 +1,38 @@
+
+namespace :gitflow do
+  
+  task :verify_up_to_date do
+    gitflow_verify_up_to_date
+  end
+
+  desc "Calculate the tag to deploy"
+  task :calculate_tag do
+    gitflow_calculate_tag
+  end
+
+  desc "Show log between most recent staging tag (or given tag=XXX) and last production release."
+  task :commit_log do
+    gitflow_commit_log
+  end
+
+  desc "Mark the current code as a staging/qa release"
+  task :tag_staging do
+    gitflow_tag_staging
+  end
+
+  desc "Push the approved tag to production. Pass in tag to deploy with '-s tag=staging-YYYY-MM-DD-X-feature'."
+  task :tag_production do
+    gitflow_tag_production
+  end
+
+  gitflow_callbacks unless defined?(Sinatra)
+end
+
+namespace :deploy do
+  namespace :pending do
+    task :compare do
+       gitflow_execute_task("gitflow:commit_log")
+    end
+  end
+end
+

metadata

@@ -1,121 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-gitflow
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 3
-  version: 1.4.3
+version: !ruby/object:Gem::Version
+  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Joshua Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-07 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-04-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: stringex
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 description: Capistrano recipe for a deployment workflow based on git tags
 email: josh@technicalpickles.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
-- .document
+files:
+- ".document"
+- ".gitignore"
 - README.rdoc
 - Rakefile
-- VERSION
 - capistrano-gitflow.gemspec
 - lib/capistrano/gitflow.rb
-- lib/capistrano/gitflow/natcmp.rb
+- lib/capistrano/gitflow/helpers/helper.rb
+- lib/capistrano/gitflow/helpers/natcmp.rb
+- lib/capistrano/gitflow/legacy/gitflow.rb
+- lib/capistrano/gitflow/version.rb
+- lib/capistrano/tasks/gitflow.rb
 - recipes/gitflow_recipes.rb
 - spec/gitflow_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/technicalpickles/capistrano-gitflow
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 3
 summary: Capistrano recipe for a deployment workflow based on git tags
-test_files: 
+test_files:
 - spec/gitflow_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.4.3