capistrano-tampon 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1d87d2a496095670624e411724478196192d095
-  data.tar.gz: 3d74a0287066568e804414d73fc3af91cee45ce2
+  metadata.gz: b18d5ae0a26082a101bc319ac05552d4fe5658c1
+  data.tar.gz: 82dcf2957825ab49eafb840d0b181f8201c4622b
 SHA512:
-  metadata.gz: 2e29aab5c4b387bc3f7b57a1d9829a5585bc771d2765ad4121462ccae33da895d45ee9d4643b4a74b7f807bb985e77a916d5969098e6e1d492811490a549f79a
-  data.tar.gz: 0263b24182ff277271f49a6966059dd17e659af5830fb68c3df318b02c425e04fc6fbc695978d1593be5c9fe72b80699b658dd4a468492e25c57b83901816a0b
+  metadata.gz: 7b9ea3510ffd9f5a1dfdd0fda127cde9846a27bfc373322713f4c6ccc64fd1c6aa7582a56a7b4cf991f80ec083a64ce95947cad269b62edd81597164b9d45484
+  data.tar.gz: 4625a304551db0c300053ba855b769e7eff2d879b0b686fadce8fc8c6dc0bb2f85968224b631e60029a186163e58e3b3577f526b1abf08f95febb6d64eb84b43

data/capistrano-tampon.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-tampon"
-  s.version = "3.0.2"
+  s.version = "3.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Spencer Markowski"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = "spencer@theablefew.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     "Gemfile",

data/lib/capistrano/tampon/utilities.rb

@@ -43,11 +43,13 @@ module Capistrano
         def available_tags
           puts "Available Tags:".color :green
           puts "#{releases.sort.reverse.take(Capistrano::Tampon::Configuration.previous_releases.to_i).join("\n")}"
+          puts "\n"
         end
 
         def available_releases
           puts "\nAvailable Releases:".color :green
           puts "#{releases.reverse.take(Capistrano::Tampon::Configuration.previous_releases.to_i).join("\n")}"
+          puts "\n"
         end
 
         def banner
@@ -66,22 +68,22 @@ module Capistrano
 
           def deploy_from
             puts banner unless Capistrano::Tampon::Configuration.prude.to_i == 1
-            if stage == :production
+            if fetch(:stage) == :production
               available_releases
-              from_destination = ask("\nRelease to deploy:".color(:yellow).bright, lastest_release)
+              set :from_destination, ask("\nRelease to deploy:".color(:yellow).bright, lastest_release)
             else
-              create_tag = ask("Do you want to tag deployment? [y/N]".color(:yellow), 'N')
-              return next_tag if create_tag
+              set :create_tag, ask("\nDo you want to tag deployment?".color(:yellow).bright, 'N')
+              return next_tag if fetch(:create_tag).downcase =~ /^[Yy]$/
               available_tags
-              from_destination = ask "\nBranch, tag or release to deploy:".color(:yellow).bright, current_branch
+              set :from_destination, ask("\nBranch, tag or release to deploy:".color(:yellow).bright, current_branch)
             end
-            return from_destination
+            return fetch(:from_destination)
           end
 
           def next_tag
             hwhen   = Date.today.to_s
-            what = ask("What does this release introduce? (this will be normalized and used in the tag for this release)".color(:yellow)).to_url
-            new_staging_tag = "#{hwhen}-#{who}-#{what}"
+            set :what, ask("\nWhat does this release introduce?".color(:yellow).bright, nil)
+            new_staging_tag = "#{hwhen}-#{who}-#{fetch(:what)}"
             puts "Tagging current branch for deployment to staging as '#{new_staging_tag}'".color(:green)
             system "git tag -a -m 'tagging current code for deployment to staging' #{new_staging_tag}"
             return new_staging_tag

data/lib/capistrano/tasks/hooks.cap

@@ -1,2 +1,2 @@
-before 'deploy:started', 'tampon:calculate_tag'
+before 'deploy:starting', 'tampon:calculate_tag'
 before 'tampon:calculate_tag', 'tampon:verify_up_to_date'

data/lib/capistrano/tasks/tampon.cap

@@ -48,7 +48,7 @@ namespace :tampon do
   end
 
   task :tag_staging do
-    staging_destination = :deploy_from
+    staging_destination = deploy_from
 
     set :branch, staging_destination
   end
@@ -62,13 +62,13 @@ namespace :tampon do
   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
 
-    production_destination = deploy_from
+     production_destination = deploy_from
 
-     really_deploy = Capistrano::CLI.ui.ask("Do you really want to deploy #{production_destination}? [y/N]").to_url
+     set :really_deploy, ask("Do you really want to deploy #{production_destination}?", "N")
 
-     exit(1) unless really_deploy =~ /^[Yy]$/
+     exit(1) unless fetch(:really_deploy) =~ /^[Yy]$/
 
-    set :branch, production_destination
+     set :branch, production_destination
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-tampon
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Spencer Markowski
@@ -100,12 +100,11 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - Gemfile
 - LICENSE.txt
 - README.md
-- README.rdoc
 - VERSION
 - able.rc
 - capistrano-tampon.gemspec

data/README.rdoc

@@ -1,74 +0,0 @@
-= tampon
-
-  ,-------------.
- (o) _ __ _____  )--.
-  `-------------'    )
-                    (     /
-                     `---'
-
-Tampon provides Gitflow integration with Capistrano, without unessecary restrictions to the deploy process. Our goal with tampon was to improve on capistrano-gitflow by allowing you to tag a staging release (or not tag a staging release),
-deploy from the HEAD of whatever branch you are on (feature, develop, hotfix, etc), and deploy to production from bonafide gitflow release tags. 
-
-== Installation
-
-You can use the most recent tampon gem by adding it to your Gemfile:
-
-  gem 'tampon'
-
-Or install it the old-fashioned way: 
-
-  gem install tampon
-
-
-== Capistrano Setup
-
-Add this to `Capfile`, after `require
-
-  require 'capistrano/ext/multistage'
-  require 'capistrano/tampon'
-
-That's all you need. Tampon will set the :branch variable and allow you deploy from any tag, branch or release whenever you wish. 
-
-== Optional Setup
-
-If you're using the gitflow binary https://github.com/nvie/gitflow , tampon provides a nice helper to initialize your project using our favorite defaults:
-
-  rake gitflow:prepare
-
-This will attempt to create a develop branch if one doesn't exist locally or remotely, track it and add the following defaults:
-
-  gitflow.branch.master = master
-  gitflow.branch.develop = develop
-  gtiflow.prefix.versiontag = v
-
-=== Deploy to staging
-
-To deploy what you're currently working on to staging:
-
-  cap staging deploy
-
-Tampon will ask if you'd like to tag the release. The tag will include the date, who is deploying and a message. You will then be able to specify that tag as what you'd like to deploy. 
-
-=== Deploy to production
-
-After you've finished a release branch, tampon will show you all the available releases to deploy from:
-
-  cap production deploy
-
-
-
-== Contributing to tampon
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Spencer Markowski (The Able Few, LLC). See LICENSE.txt for
-further details.
-