capistrano-gity 0.5.1 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +5 -13
  2. data/capistrano-gity.gemspec +1 -1
  3. data/lib/capistrano-gity.rb +6 -4
  4. metadata +4 -6
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- N2I2ZTA0OTg3NWRiYzMxYjNhYmE2ZTRhNDhmODhiMzY5YTFlYjg1Zg==
5
- data.tar.gz: !binary |-
6
- ZmJmN2I0YjVkYTcyNGYyNjY5NTEzN2RlZGI2MDlhNmZlMzBlYzk5Yg==
2
+ SHA256:
3
+ metadata.gz: 3ce3ce5cf90ffe153fc387d45c34d90eef26b0adc0442ba3722c1137f52023b8
4
+ data.tar.gz: 2e846cccc39deb0369fca8b8bfbdfbdd5799180f717c74a0f0a87b29442fd1e3
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ZDczNDYxY2UzNGUwNzhmZTRmMGIxYjJhZDUzYTY5OTI1NjhkZmIxMWQxMTU0
10
- NGEwM2UzYjBiZTA3Zjc5NGUyZDkyOTcyMDMxNGI4MGY3MTNmMTVhMWQxMzRh
11
- MWU5YmE4OWQxNmExNzQ0MjMzZjA5OGYxY2Q0MzQwNDBmZTQzNjQ=
12
- data.tar.gz: !binary |-
13
- MmExZTA1NWY1ZTgwOTZkY2Q2NThhNGNiNWZiN2I2OGZhZGZiYTQwZDBmOWRi
14
- YmQ2Y2UwYWE2M2Q1MjIzNDM5N2VlZDUxYTU4MzZmYWY3YmI1Nzg2NmY5YTE0
15
- Y2I3ZDZmZmQ2MjZmY2I3N2U3MDgzYWFlZGE3ZjViZmU2MThkOWM=
6
+ metadata.gz: a007f565d9bfb1f714f7fb27397a04763328bbd438fe1fecb2c91a346724766f1b32cb326ebd2850004b9f00e8cedf370e3be0f14b11a19ce1eff2c9ed799d05
7
+ data.tar.gz: bac8db57f85c994aec2d346862b7d4070fbe9ea5268772aaea418ab0d3d8070b4cbfef113bb52e1b4c3a8fd45f323f9905961346177c6279f26112b12b9269f3
data/capistrano-gity.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "capistrano-gity"
5
- s.version = "0.5.1"
5
+ s.version = "0.6.0"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Skroutz.gr Team"]
data/lib/capistrano-gity.rb CHANGED
@@ -78,14 +78,16 @@ Capistrano::Configuration.instance.load do
78
78
  def quit?
79
79
  return false if !check_master
80
80
 
81
- upstream_master = `git rev-parse #{remote}/master`
82
- here = `git rev-parse HEAD`
83
- if here != upstream_master
81
+ current_branch = `git symbolic-ref --short HEAD`.strip
82
+ branch_diff_cmd = "git log #{current_branch} ^#{remote}/master --pretty=format:%h%x09%an%x09%ad%x09%s"
83
+ unpushed_commits = `#{branch_diff_cmd}`
84
+ if !unpushed_commits.empty?
84
85
  puts <<-MSG
85
- The commit you are pushing is different from #{remote} master.
86
+ The following commits are not included in #{remote} master.
86
87
  This means that a subsequent deploy might not include your work.
87
88
  Consider pushing to master now or later.
88
89
  MSG
90
+ puts unpushed_commits
89
91
  answer = Capistrano::CLI.ui.ask("Do you want to continue? (y/n)")
90
92
  return !answer.downcase.start_with?('y')
91
93
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-gity
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Skroutz.gr Team
@@ -31,19 +31,17 @@ require_paths:
31
31
  - lib
32
32
  required_ruby_version: !ruby/object:Gem::Requirement
33
33
  requirements:
34
- - - ! '>='
34
+ - - ">="
35
35
  - !ruby/object:Gem::Version
36
36
  version: '0'
37
37
  required_rubygems_version: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ! '>='
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
41
  version: '0'
42
42
  requirements: []
43
- rubyforge_project:
44
- rubygems_version: 2.1.11
43
+ rubygems_version: 3.2.5
45
44
  signing_key:
46
45
  specification_version: 3
47
46
  summary: Git helpers for capistrano deployments
48
47
  test_files: []
49
- has_rdoc: