overview 0.0.2.1.40 → 0.0.2.43
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/README.rdoc +1 -1
- data/lib/appversion/appversion.rb +2 -2
- data/lib/appversion/git.rb +2 -3
- data/lib/overview/version.rb +1 -1
- data/spec/appversion_spec.rb +38 -8
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MWY3ZDhmZDQ3OTkwNmFjOTg4YjIzMmI0ZWU2M2UwODY2ZjM1MzVkNw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
NzU4NzJiM2YzMjdkODlkNzgzYTQ5MjBmYTJkMDQ3OWNmNTBiMTFjOA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YmQxYWI3ODJiYzc3ZGVkZmQzMjkwMWFjZGYzYmY2YzI4OGI4MDY4ZjM1MzFh
|
10
|
+
MmY1MjQ1YTQyYmE2Zjk3YjAxNmNhMDZiMmUwZjIzYTlhMDM2MWEwMWI3YThh
|
11
|
+
YzdmMzY4OWViNWNhYjlhYzc3YTEwNjc2MDRkMWU5ODc1ZjUxMTY=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MzRjZWIzN2E4YmNiOGRkOGQ2MGVhYzAxYWI2OTg2MGE4YzRiOTEzZDVjMDAx
|
14
|
+
YmNkNGVlYzYyYjMwZjRmMmRkZmVmY2Q4M2VkYzM0NGZlZWNhNDgzODQ5ZDll
|
15
|
+
MzZmNTNiODQ0YmJlNzg5ZGMwNTVhZmUzMTM3MzRhYzYxNGE5OGY=
|
data/README.rdoc
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
= overview {<img src="https://codeclimate.com/github/overllc/overview/badges/gpa.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://codeclimate.com/github/overllc/overview/badges/coverage.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://travis-ci.org/overllc/overview.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/overllc/overview]
|
1
|
+
= overview {<img src="https://badge.fury.io/rb/overview.svg" alt="Gem Version" />}[http://badge.fury.io/rb/overview] {<img src="https://codeclimate.com/github/overllc/overview/badges/gpa.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://codeclimate.com/github/overllc/overview/badges/coverage.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://travis-ci.org/overllc/overview.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/overllc/overview]
|
2
2
|
|
3
3
|
Describe your project here
|
4
4
|
|
@@ -49,11 +49,11 @@ module Overview
|
|
49
49
|
commit_count = 0
|
50
50
|
clean_tag = '0.0.1'
|
51
51
|
else
|
52
|
-
|
52
|
+
commit_count = Git.commit_count_since_tag(latest_tag)
|
53
53
|
clean_tag = Git.clean_tag
|
54
54
|
end
|
55
55
|
#Only increment version after production release, so that we retain a single version during beta and RCs
|
56
|
-
if
|
56
|
+
if commit_count == 0 || Release.is_pre_release?(latest_tag)
|
57
57
|
short_version = clean_tag
|
58
58
|
else
|
59
59
|
short_version = clean_tag.increment_version
|
data/lib/appversion/git.rb
CHANGED
@@ -21,8 +21,8 @@ module Overview
|
|
21
21
|
def self.tag
|
22
22
|
(`git describe --tags --match 'v*' --abbrev=0 2>/dev/null` || 'HEAD').strip
|
23
23
|
end
|
24
|
-
def self.clean_tag
|
25
|
-
tag.strip.sub('v','').split(
|
24
|
+
def self.clean_tag(tag=self.tag)
|
25
|
+
tag.strip.sub('v','').split(/[\.,-]/).select { |e| e.is_number?}.first(3).join('.')
|
26
26
|
end
|
27
27
|
def self.commit_count
|
28
28
|
`git rev-list --count HEAD`
|
@@ -39,4 +39,3 @@ module Overview
|
|
39
39
|
end
|
40
40
|
end
|
41
41
|
|
42
|
-
#puts Overview::Git.clean_tag
|
data/lib/overview/version.rb
CHANGED
data/spec/appversion_spec.rb
CHANGED
@@ -1,17 +1,47 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
require 'appversion/ci'
|
3
|
+
require 'appversion/git'
|
4
|
+
|
3
5
|
|
4
6
|
|
5
7
|
RSpec.describe '#build_no' do
|
6
8
|
|
7
|
-
|
9
|
+
include Overview
|
10
|
+
|
11
|
+
it 'returns build number' do
|
12
|
+
build_no = ENV['TRAVIS_BUILD_NUMBER'] || ENV['CIRCLE_BUILD_NUM'] || '1'
|
13
|
+
expect(Overview::CI.build_no).to eq(build_no)
|
14
|
+
end
|
15
|
+
end
|
8
16
|
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
17
|
+
RSpec.describe '#clean_tag' do
|
18
|
+
it '1.2.3-rc4 returns semantic version' do
|
19
|
+
expect(Overview::Git.clean_tag('1.2.3-rc4')).to eq('1.2.3')
|
20
|
+
end
|
21
|
+
it '1.2-rc4 returns semantic version' do
|
22
|
+
expect(Overview::Git.clean_tag('1.2-rc4')).to eq('1.2')
|
23
|
+
end
|
24
|
+
it '1.2-rc4 returns semantic version' do
|
25
|
+
expect(Overview::Git.clean_tag('1.2-rc4')).to eq('1.2')
|
26
|
+
end
|
27
|
+
it '1.2.3 returns semantic version' do
|
28
|
+
expect(Overview::Git.clean_tag('1.2.3')).to eq('1.2.3')
|
29
|
+
end
|
30
|
+
it '1.2.3.4 returns semantic version' do
|
31
|
+
expect(Overview::Git.clean_tag('1.2.3.4')).to eq('1.2.3')
|
32
|
+
end
|
33
|
+
it '1.2.rc4 returns semantic version' do
|
34
|
+
expect(Overview::Git.clean_tag('1.2.rc4')).to eq('1.2')
|
35
|
+
end
|
36
|
+
it '1.2.3.rc4 returns semantic version' do
|
37
|
+
expect(Overview::Git.clean_tag('1.2.3.rc4')).to eq('1.2.3')
|
38
|
+
end
|
39
|
+
it '1.rc4 returns semantic version' do
|
40
|
+
expect(Overview::Git.clean_tag('1.rc4')).to eq('1')
|
41
|
+
end
|
42
|
+
it '1 returns semantic version' do
|
43
|
+
expect(Overview::Git.clean_tag('1')).to eq('1')
|
44
|
+
end
|
45
|
+
end
|
14
46
|
|
15
|
-
end
|
16
47
|
|
17
|
-
end
|