capistrano-gitflow 1.3.3 → 1.3.4

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/capistrano-gitflow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-gitflow}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-06-18}
+  s.date = %q{2010-06-23}
   s.description = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "capistrano-gitflow.gemspec",
-     "gitflow.gemspec",
      "lib/capistrano/gitflow.rb",
      "lib/capistrano/gitflow/natcmp.rb",
      "recipes/gitflow_recipes.rb",
@@ -32,7 +31,7 @@ Gem::Specification.new do |s|
   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.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.test_files = [
     "spec/gitflow_spec.rb",
@@ -43,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= 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

@@ -27,6 +27,22 @@ module Capistrano
             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
+
+            require 'ruby-debug';breakpoint
+            "#{stage}-#{hwhen}-#{new_tag_serial}-#{who}-#{what}"
+          end
+
           def last_production_tag()
             last_tag_matching('production-*')
           end
@@ -101,27 +117,12 @@ Please make sure you have pulled and pushed all code before deploying:
 
           desc "Mark the current code as a staging/qa release"
           task :tag_staging do
-            # find latest staging tag for today
-            new_tag_date   = Date.today.to_s
-            new_tag_serial = 1
-
-            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-#{new_tag_date}.*")
-            if last_staging_tag
-              # calculate largest serial and increment
-              last_staging_tag =~ /staging-[0-9]{4}-[0-9]{2}-[0-9]{2}\-([0-9]*)/
-                new_tag_serial = $1.to_i + 1
-            end
-
-            new_staging_tag = "#{stage}-#{new_tag_date}-#{new_tag_serial}-#{who}-#{what}"
-
             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
 
+            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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-gitflow
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-06-23 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"
@@ -36,11 +33,9 @@ dependencies:
   name: stringex
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,11 +45,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -76,7 +69,6 @@ files:
 - Rakefile
 - VERSION
 - capistrano-gitflow.gemspec
-- gitflow.gemspec
 - lib/capistrano/gitflow.rb
 - lib/capistrano/gitflow/natcmp.rb
 - recipes/gitflow_recipes.rb
@@ -93,27 +85,23 @@ 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.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Capistrano recipe for a deployment workflow based on git tags

data/gitflow.gemspec

@@ -1,60 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{gitflow}
-  s.version = "1.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-06-15}
-  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",
-     "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/gitflow}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Capistrano recipe for a deployment workflow based on git tags}
-  s.test_files = [
-    "spec/gitflow_spec.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
-      s.add_runtime_dependency(%q<capistrano>, [">= 0"])
-      s.add_runtime_dependency(%q<stringex>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<capistrano>, [">= 0"])
-      s.add_dependency(%q<stringex>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<capistrano>, [">= 0"])
-    s.add_dependency(%q<stringex>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
-end
-