recap 1.0.7 → 1.0.8

data/features/templates/project/Capfile

@@ -19,3 +19,4 @@ set :repository, '/recap/share/<%= project.name %>'
 # which they can do when automated like this, we use a finer-grained release tag
 
 set(:release_tag) { Time.now.utc.strftime("%Y%m%d%H%M%S%L") }
+set(:release_matcher) { /\A[0-9]{17}\Z/ }

data/features/templates/project/Capfile.erb

@@ -19,3 +19,4 @@ set :repository, '/recap/share/projects/<%= project.name %>'
 # which they can do when automated like this, we use a finer-grained release tag
 
 set(:release_tag) { Time.now.utc.strftime("%Y%m%d%H%M%S%L") }
+set(:release_matcher) { /\A[0-9]{17}\Z/ }

data/lib/recap/support/capistrano_extensions.rb

@@ -56,7 +56,7 @@ module Recap::Support::CapistranoExtensions
   # tags are timestamps, the latest tag will always be the last in the list.
   def latest_tag_from_repository
     tags = capture_git("tag").strip.split
-    tags.grep(/^[0-9]{17}/).last
+    tags.grep(release_matcher).last
   end
 
   # Does the given file exist within the deployment directory?

data/lib/recap/tasks/deploy.rb

@@ -37,6 +37,10 @@ module Recap::Tasks::Deploy
     # not be changed, as the format is matched in the list of tags to find deploy tags.
     set(:release_tag) { Time.now.utc.strftime("%Y%m%d%H%M%S") }
 
+    # If `release_tag` is changed, then `release_matcher` must be too, to a regular expression
+    # that will match all generated release tags.  In general it's best to leave both unchanged.
+    set(:release_matcher) { /\A[0-9]{14}\Z/ }
+
     # On tagging a release, a message is also recorded alongside the tag.  This message can contain
     # anything useful - its contents are not important for the recipe.
     set(:release_message, "Deployed at #{Time.now}")
@@ -97,6 +101,9 @@ module Recap::Tasks::Deploy
 
     # Tag `HEAD` with the release tag and message
     task :tag, :except => {:no_release => true} do
+      unless release_tag =~ release_matcher
+        abort "The release_tag must be matched by the release_matcher regex, #{release_tag} doesn't match #{release_matcher}"
+      end
       on_rollback { git "tag -d #{release_tag}" }
       git "tag #{release_tag} -m '#{release_message}'"
     end

data/lib/recap/version.rb

@@ -1,3 +1,3 @@
 module Recap
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/spec/tasks/deploy_spec.rb

@@ -77,6 +77,24 @@ describe Recap::Tasks::Deploy do
       end
     end
 
+    describe '#release_matcher' do
+      it 'defaults to a matcher matching timestamps' do
+        ("20130908123422" =~ config.release_matcher).should be_true
+      end
+
+      it 'does not match timestamp-like numbers with too many digits' do
+        ("201309081234221" =~ config.release_matcher).should be_false
+      end
+
+      it 'does not match timestamp-like numbers with too few digits' do
+        ("2013090812342" =~ config.release_matcher).should be_false
+      end
+
+      it 'does not match strings with non-numeric characters' do
+        ("2013090a123421" =~ config.release_matcher).should be_false
+      end
+    end
+
     describe '#latest_tag' do
       it 'memoizes call to latest_tag_from_repository' do
         namespace.stubs(:latest_tag_from_repository).returns('abc123').then.returns('something-else')
@@ -182,12 +200,19 @@ describe Recap::Tasks::Deploy do
 
     describe 'deploy:tag' do
       before do
-        config.set :release_tag, 'abcd1234'
+        config.set :release_tag, '20120101012034'
         config.set :release_message, 'Released into the wild'
       end
 
       it 'tags code with the release tag and release message' do
-        namespace.expects(:git).with('tag abcd1234 -m \'Released into the wild\'')
+        namespace.expects(:git).with('tag 20120101012034 -m \'Released into the wild\'')
+        namespace.find_and_execute_task('deploy:tag')
+      end
+
+      it 'aborts if prospective release_tag does not match release_matcher' do
+        config.set :release_matcher, /abcd/
+        namespace.expects(:abort).with("The release_tag must be matched by the release_matcher regex, 20120101012034 doesn't match (?-mix:abcd)")
+        namespace.stubs(:git)
         namespace.find_and_execute_task('deploy:tag')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recap
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1151781088408316006
+      hash: 2476123254273941007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1151781088408316006
+      hash: 2476123254273941007
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23