gitscape 1.3.2 → 1.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/gitscape.gemspec +1 -1
- data/lib/gitscape/base.rb +5 -3
- data/lib/gitscape/version.rb +1 -1
- metadata +10 -23
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA512:
|
3
|
+
data.tar.gz: 17284fed4972659c5d7fed7eafb9744933e60428cb86c40689c331e202c5b390f434289999b61cbb2fef79a59ba94f7beb01c60a70e7ef547a7239382c460847
|
4
|
+
metadata.gz: 9bbe2341a929fb3bcbd537edabdac4ae0d802b700dea829cf019cba30cd2d291d21366ba8e5d23240de1f9c769de7b0e640e9f31e43effcd5b07e41203df7aba
|
5
|
+
SHA1:
|
6
|
+
data.tar.gz: 73a4a0ed709e139f80d631ff1b753007504aa503
|
7
|
+
metadata.gz: f25b55976fe44530ce59d5a2b76a139cf321ce46
|
data/gitscape.gemspec
CHANGED
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
|
|
7
7
|
s.name = "gitscape"
|
8
8
|
s.version = Gitscape::VERSION
|
9
9
|
s.platform = Gem::Platform::RUBY
|
10
|
-
s.authors = ["Jon Botelho"]
|
10
|
+
s.authors = ["Jon Botelho", "Xavier Matos"]
|
11
11
|
s.email = ["gitscape@eachscape.com"]
|
12
12
|
s.homepage = "https://github.com/eachscape/gitscape"
|
13
13
|
s.summary = "Various Git utilities for cherry-pick/rebase workflows."
|
data/lib/gitscape/base.rb
CHANGED
@@ -109,7 +109,8 @@ class Gitscape::Base
|
|
109
109
|
end
|
110
110
|
|
111
111
|
hotfix_branch = @repo.branch hotfix_branch_name
|
112
|
-
|
112
|
+
# TODO The next line breaks at iteration 100
|
113
|
+
development_branch = @repo.branches.select {|branch| branch.full.start_with? "release/"}.sort{|a, b| a.name <=> b.name}.last
|
113
114
|
development_branch = master_branch if development_branch == nil
|
114
115
|
live_branch = @repo.branch "live"
|
115
116
|
|
@@ -305,9 +306,10 @@ class Gitscape::Base
|
|
305
306
|
raise "Git version string must have 4 parts" if min_version.size != 4
|
306
307
|
|
307
308
|
4.times do |i|
|
308
|
-
|
309
|
+
next if local_version[i] == min_version[i]
|
310
|
+
return local_version[i] > min_version[i]
|
309
311
|
end
|
310
|
-
true
|
312
|
+
true # If you get all the way here, all 4 positions match precisely
|
311
313
|
end
|
312
314
|
|
313
315
|
def self.result_ok?(result)
|
data/lib/gitscape/version.rb
CHANGED
metadata
CHANGED
@@ -1,21 +1,16 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gitscape
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
5
|
-
segments:
|
6
|
-
- 1
|
7
|
-
- 3
|
8
|
-
- 2
|
9
|
-
version: 1.3.2
|
4
|
+
version: 1.3.3
|
10
5
|
platform: ruby
|
11
6
|
authors:
|
12
7
|
- Jon Botelho
|
8
|
+
- Xavier Matos
|
13
9
|
autorequire:
|
14
10
|
bindir: bin
|
15
11
|
cert_chain: []
|
16
12
|
|
17
|
-
date: 2013-
|
18
|
-
default_executable:
|
13
|
+
date: 2013-03-06 00:00:00 Z
|
19
14
|
dependencies:
|
20
15
|
- !ruby/object:Gem::Dependency
|
21
16
|
name: git
|
@@ -24,10 +19,6 @@ dependencies:
|
|
24
19
|
requirements:
|
25
20
|
- - ~>
|
26
21
|
- !ruby/object:Gem::Version
|
27
|
-
segments:
|
28
|
-
- 1
|
29
|
-
- 2
|
30
|
-
- 5
|
31
22
|
version: 1.2.5
|
32
23
|
type: :runtime
|
33
24
|
version_requirements: *id001
|
@@ -50,10 +41,11 @@ files:
|
|
50
41
|
- lib/gitscape.rb
|
51
42
|
- lib/gitscape/base.rb
|
52
43
|
- lib/gitscape/version.rb
|
53
|
-
has_rdoc: true
|
54
44
|
homepage: https://github.com/eachscape/gitscape
|
55
45
|
licenses: []
|
56
46
|
|
47
|
+
metadata: {}
|
48
|
+
|
57
49
|
post_install_message:
|
58
50
|
rdoc_options: []
|
59
51
|
|
@@ -61,24 +53,19 @@ require_paths:
|
|
61
53
|
- lib
|
62
54
|
required_ruby_version: !ruby/object:Gem::Requirement
|
63
55
|
requirements:
|
64
|
-
-
|
56
|
+
- &id002
|
57
|
+
- ">="
|
65
58
|
- !ruby/object:Gem::Version
|
66
|
-
segments:
|
67
|
-
- 0
|
68
59
|
version: "0"
|
69
60
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
70
61
|
requirements:
|
71
|
-
-
|
72
|
-
- !ruby/object:Gem::Version
|
73
|
-
segments:
|
74
|
-
- 0
|
75
|
-
version: "0"
|
62
|
+
- *id002
|
76
63
|
requirements: []
|
77
64
|
|
78
65
|
rubyforge_project:
|
79
|
-
rubygems_version:
|
66
|
+
rubygems_version: 2.0.2
|
80
67
|
signing_key:
|
81
|
-
specification_version:
|
68
|
+
specification_version: 4
|
82
69
|
summary: Various Git utilities for cherry-pick/rebase workflows.
|
83
70
|
test_files: []
|
84
71
|
|