harleytt-capistrano-gitflow 1.4.7 → 1.4.8

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.8

data/capistrano-gitflow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{harleytt-capistrano-gitflow}
-  s.version = "1.4.7"
+  s.version = "1.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors          = ["Joshua Nichols", "Harley Trung"]
-  s.date             = %q{2011-08-07}
+  s.date             = %q{2011-08-18}
   s.description      = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.summary          = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.email            = %q{harley.trung@gmail.com}

data/lib/capistrano/gitflow.rb

@@ -1,5 +1,4 @@
 require 'capistrano'
-require File.join(File.dirname(__FILE__), 'gitflow', 'natcmp')
 require 'stringex'
 
 module Capistrano
@@ -66,7 +65,7 @@ module Capistrano
           def get_from_tag(stage_name)
             case stage_name
             when :production
-               last_production_tag
+               last_production_tag || 'undefined'
             when :staging
                last_staging_tag
             else
@@ -80,6 +79,7 @@ module Capistrano
             when :production
               last_staging_tag
             when :staging
+              # get SHA of master
               `git rev-list master | head -n 1`.chomp
             else
               raise "Unsupported stage #{stage}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: harleytt-capistrano-gitflow
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 4
-  - 7
-  version: 1.4.7
+  - 8
+  version: 1.4.8
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 -04:00
+date: 2011-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,6 @@ files:
 - VERSION
 - capistrano-gitflow.gemspec
 - lib/capistrano/gitflow.rb
-- lib/capistrano/gitflow/natcmp.rb
 - recipes/gitflow_recipes.rb
 - spec/gitflow_spec.rb
 - spec/spec.opts

data/lib/capistrano/gitflow/natcmp.rb

@@ -1,76 +0,0 @@
-# natcmp.rb
-#
-# Natural order comparison of two strings
-# e.g. "my_prog_v1.1.0" < "my_prog_v1.2.0" < "my_prog_v1.10.0"
-# which does not follow alphabetically
-#
-# Based on Martin Pool's "Natural Order String Comparison" originally written in C
-# http://sourcefrog.net/projects/natsort/
-#
-# This implementation is Copyright (C) 2003 by Alan Davies
-# <cs96and_AT_yahoo_DOT_co_DOT_uk>
-#
-# This software is provided 'as-is', without any express or implied
-# warranty.  In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-class String
-
-# 'Natural order' comparison of two strings
-def String.natcmp(str1, str2, caseInsensitive=false)
-	str1, str2 = str1.dup, str2.dup
-	compareExpression = /^(\D*)(\d*)(.*)$/
-
-	if caseInsensitive
-		str1.downcase!
-		str2.downcase!
-	end
-
-	# Remove all whitespace
-	str1.gsub!(/\s*/, '')
-	str2.gsub!(/\s*/, '')
-
-	while (str1.length > 0) or (str2.length > 0) do
-		# Extract non-digits, digits and rest of string
-		str1 =~ compareExpression
-		chars1, num1, str1 = $1.dup, $2.dup, $3.dup
-
-		str2 =~ compareExpression
-		chars2, num2, str2 = $1.dup, $2.dup, $3.dup
-
-		# Compare the non-digits
-		case (chars1 <=> chars2)
-			when 0 # Non-digits are the same, compare the digits...
-				# If either number begins with a zero, then compare alphabetically,
-				# otherwise compare numerically
-				if (num1[0] != 48) and (num2[0] != 48)
-					num1, num2 = num1.to_i, num2.to_i
-				end
-
-				case (num1 <=> num2)
-					when -1 then return -1
-					when 1 then return 1
-				end
-			when -1 then return -1
-			when 1 then return 1
-		end # case
-
-	end # while
-
-	# Strings are naturally equal
-	return 0
-end
-
-end # class String