capistrano_confirm_branch 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483621ae853ee0cfe7c9aef6296437ed65407cf0
-  data.tar.gz: 3db9b3bf22a1f8148d25ebacc665384e8ce2be41
+  metadata.gz: b9e330c8b3781e1e8a677922001c12649837a725
+  data.tar.gz: 68db5b09834f02d611a5680f5323418566004bd8
 SHA512:
-  metadata.gz: c3534b1587c6e3c965f15d5a287dea4f474d3d952b2210b6419b6afe509ac1bdc4825b57f3e413405e45f605b15b89cd1c1086a77a23d8afaa4abdfb8fd61778
-  data.tar.gz: f2e39f079d64a87c754ee927ccd73d8beecf163eed4d572426ce7e2dd016f535246f020a195e665709b599a5dc55ed187f1b965c24374697a981c2c49c3ca661
+  metadata.gz: 3623841547fb4deefb308af4b7f982e3329fccff44f2a86638d5d47ae88d5825d56a6a6a71b82789310d0d93eebdffc41655c91e42b71074a77d4718f743eb9d
+  data.tar.gz: f524cda189d04173e931fa4bfe7855a0b313059fee8a31007a6723d6e3d6d7b544424b5462a8fa5b684703eb481026f28dc040514188a55ba0816d8810204474

data/README.md

@@ -2,7 +2,8 @@
 [![Gem Version](https://badge.fury.io/rb/capistrano_confirm_branch.png)](http://badge.fury.io/rb/capistrano_confirm_branch)
 
 
-Requires confirmation before switching deployed branches using capistrano.
+Requires confirmation before switching deployed branches using capistrano and
+warns when deploying with unpushed changes.
 
 ![Confirm Deploy](http://i.imgur.com/7IdUY.png)
 
@@ -23,6 +24,23 @@ gem 'capistrano_confirm_branch'
 Then in your `Capfile` add `require 'capistrano/confirm_branch'` and you will be
 asked to confirm changing branches before each deploy.
 
+
+### Configuration options
+
+By default `capistrano_confirm_branch` will warn when changing branches AND when
+there are unpushed git commits. You can opt out of either warning by setting the
+following options:
+
+```ruby
+# config/deploy.rb
+
+# Turn off unpushed git commit check
+set :check_unpushed_commits_before_deploy, false
+
+# Turn off branch change warning
+set :confirm_branch_before_deploy, false
+```
+
 ## Bonus
 
 To deploy from the current working branch, use this in your capistrano recipe:
@@ -39,4 +57,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/capistrano/confirm_branch/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module ConfirmBranch
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/capistrano/tasks/confirm_branch.rake

@@ -1,6 +1,8 @@
 namespace :confirm_branch do
   desc 'Confirms deployment when switching deployed branches'
   task :check_deployed_branch do
+    return unless fetch(:confirm_branch_before_deploy, true)
+
     ui                    = HighLine.new
     deployed_branch       = nil
     pending_deploy_branch = fetch(:branch)
@@ -27,12 +29,42 @@ namespace :confirm_branch do
 
       abort unless ui.agree(
         "Do you wish to continue deploying #{pending_deploy_branch}?"
-      )
+      )  {|a| a.default = 'yes' }
+    end
+  end
+
+  desc 'Confirms there are no pending commits to be pushed'
+  task :check_unpushed_commits do
+    if fetch(:scm).to_s == 'git' &&
+      fetch(:check_unpushed_commits_before_deploy, true)
+      pending_commits = `git status`
+
+      unless pending_commits[/Your branch is up-to-date/]
+        pending_commits = /(Your branch is ahead of '\S*' by \d commits?)/.
+          match(pending_commits).captures.first
+
+        ui = HighLine.new
+
+        ui.say %{
+          ============ WARNING: Unpushed Commits Present ============
+
+          #{pending_commits}
+
+          ===========================================================
+
+        }
+
+        abort unless ui.agree(
+          "Do you wish to continue deploying?"
+        ) {|a| a.default = 'yes' }
+      end
     end
   end
 
   desc 'Updates the file which tracks the currently deployed branch'
   task :update_current_branch do
+    return unless fetch(:confirm_branch_before_deploy, true)
+
     on release_roles(:all) do
       within shared_path do
         execute :echo, %{"#{fetch(:branch)}" > current_branch}
@@ -41,5 +73,7 @@ namespace :confirm_branch do
   end
 end
 
+before 'deploy', 'confirm_branch:check_unpushed_commits'
+
 before 'deploy', 'confirm_branch:check_deployed_branch'
 after  'deploy', 'confirm_branch:update_current_branch'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_confirm_branch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jordan Byron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -51,7 +51,7 @@ files:
 - lib/capistrano/confirm_branch.rb
 - lib/capistrano/confirm_branch/version.rb
 - lib/capistrano/tasks/confirm_branch.rake
-homepage: https://github.com/elm-city-craftworks/capistrano_confirm_branch
+homepage: https://github.com/madriska/capistrano_confirm_branch
 licenses: []
 metadata: {}
 post_install_message: