capistrano-gity 0.5.1 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2I2ZTA0OTg3NWRiYzMxYjNhYmE2ZTRhNDhmODhiMzY5YTFlYjg1Zg==
-  data.tar.gz: !binary |-
-    ZmJmN2I0YjVkYTcyNGYyNjY5NTEzN2RlZGI2MDlhNmZlMzBlYzk5Yg==
+SHA256:
+  metadata.gz: 3ce3ce5cf90ffe153fc387d45c34d90eef26b0adc0442ba3722c1137f52023b8
+  data.tar.gz: 2e846cccc39deb0369fca8b8bfbdfbdd5799180f717c74a0f0a87b29442fd1e3
 SHA512:
-  metadata.gz: !binary |-
-    ZDczNDYxY2UzNGUwNzhmZTRmMGIxYjJhZDUzYTY5OTI1NjhkZmIxMWQxMTU0
-    NGEwM2UzYjBiZTA3Zjc5NGUyZDkyOTcyMDMxNGI4MGY3MTNmMTVhMWQxMzRh
-    MWU5YmE4OWQxNmExNzQ0MjMzZjA5OGYxY2Q0MzQwNDBmZTQzNjQ=
-  data.tar.gz: !binary |-
-    MmExZTA1NWY1ZTgwOTZkY2Q2NThhNGNiNWZiN2I2OGZhZGZiYTQwZDBmOWRi
-    YmQ2Y2UwYWE2M2Q1MjIzNDM5N2VlZDUxYTU4MzZmYWY3YmI1Nzg2NmY5YTE0
-    Y2I3ZDZmZmQ2MjZmY2I3N2U3MDgzYWFlZGE3ZjViZmU2MThkOWM=
+  metadata.gz: a007f565d9bfb1f714f7fb27397a04763328bbd438fe1fecb2c91a346724766f1b32cb326ebd2850004b9f00e8cedf370e3be0f14b11a19ce1eff2c9ed799d05
+  data.tar.gz: bac8db57f85c994aec2d346862b7d4070fbe9ea5268772aaea418ab0d3d8070b4cbfef113bb52e1b4c3a8fd45f323f9905961346177c6279f26112b12b9269f3

data/capistrano-gity.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-gity"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Skroutz.gr Team"]

data/lib/capistrano-gity.rb

@@ -78,14 +78,16 @@ Capistrano::Configuration.instance.load do
     def quit?
       return false if !check_master
 
-      upstream_master = `git rev-parse #{remote}/master` 
-      here = `git rev-parse HEAD`
-      if here != upstream_master
+      current_branch = `git symbolic-ref --short HEAD`.strip
+      branch_diff_cmd = "git log #{current_branch} ^#{remote}/master --pretty=format:%h%x09%an%x09%ad%x09%s"
+      unpushed_commits = `#{branch_diff_cmd}`
+      if !unpushed_commits.empty?
         puts <<-MSG
-        The commit you are pushing is different from #{remote} master.
+        The following commits are not included in #{remote} master.
         This means that a subsequent deploy might not include your work.
         Consider pushing to master now or later.
         MSG
+        puts unpushed_commits
         answer = Capistrano::CLI.ui.ask("Do you want to continue? (y/n)")
         return !answer.downcase.start_with?('y')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-gity
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Skroutz.gr Team
@@ -31,19 +31,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 3
 summary: Git helpers for capistrano deployments
 test_files: []
-has_rdoc: