capistrano-gitflow 1.4.0 → 1.4.1

data/README.rdoc

@@ -10,7 +10,9 @@ 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 -s tag=staging-YYYY-MM-DD-X-user-description
+    $ 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`
     # tag 'staging-YYYY-MM-DD-X' goes to production
     # tag 'production-YYYY-MM-DD-X' created; points to staging-YYYY-MM-DD-X
 

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/capistrano-gitflow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-gitflow}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-10-26}
   s.description = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [
@@ -17,32 +17,31 @@ Gem::Specification.new do |s|
   ]
   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"
+    "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.homepage = %q{http://github.com/technicalpickles/capistrano-gitflow}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  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"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/capistrano/gitflow.rb

@@ -46,12 +46,17 @@ module Capistrano
             last_tag_matching('production-*')
           end
 
+          def using_git?
+            fetch(:scm, :git).to_sym == :git
+          end
+
           task :verify_up_to_date do
-            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 """
+            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:
 
@@ -60,19 +65,22 @@ Please make sure you have pulled and pushed all code before deploying:
     git push origin #{local_branch}
 
     """
+              end
             end
           end
 
           desc "Calculate the tag to deploy"
           task :calculate_tag do
-            # 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 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`
 
-            send "tag_#{stage}"
+              send "tag_#{stage}"
 
-            system "git push --tags origin #{local_branch}"
-            if $? != 0
-              abort "git push failed"
+              system "git push --tags origin #{local_branch}"
+              if $? != 0
+                abort "git push failed"
+              end
             end
           end
 
@@ -121,11 +129,11 @@ Please make sure you have pulled and pushed all code before deploying:
                                      `git log --pretty=format:%H #{last_staging_tag} -1`
                                    end
 
-            new_staging_tag = next_staging_tag
             if last_staging_tag_sha == current_sha
               puts "Not re-tagging staging because the most recent tag (#{last_staging_tag}) already points to current 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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-gitflow
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: stringex
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -80,28 +87,32 @@ homepage: http://github.com/technicalpickles/capistrano-gitflow
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Capistrano recipe for a deployment workflow based on git tags