conjur-debify 1.5.3 → 1.5.4

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -1
  3. data/lib/conjur/debify.rb +2 -2
  4. data/lib/conjur/debify/version.rb +1 -1
  5. metadata +23 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f144ac5f47a96820c0c42b1941adee5e51720335
4
- data.tar.gz: 4316233ba88c597982eae537cfd9fee00c1d5542
3
+ metadata.gz: 862455ae84807ccc3cf1335557e2df5649a84382
4
+ data.tar.gz: 39a34fec2c9bef304fa33f28f5ed7a04c0102345
5
5
  SHA512:
6
- metadata.gz: d13e2010bf0aea5cf5e1285e6444ad7fb8225da92056e18533e3546897f78d91c39f64a8f7123e82a9877f1d744ac675b22dc29f3f58c77ba080bbca1ef21bb3
7
- data.tar.gz: 05dcfd9104f647cfc5a0cd6ea9b8e111d975dd01b01c98af0d9f19b80f6cd09b82e85e14e3c198e03fb9218eb0bc6aa890517c35da10006957364a9db00cd3d9
6
+ metadata.gz: 6323cb3635571b8426cbdac72e4a2a8d2b6da988b8ac7572b3760f1ce372d0df0d02d4c234d8221d3b58b2f98221701aff309fe6562c3365c9de979bca53f696
7
+ data.tar.gz: 004efe037fb96a93eb2670ecac8085fca8cc84f1e4ff6f5852447992aff1162dee8ab5d1ed1cd921bee070732f412afddde80c605b95e951e758d9f6bc9e38b0
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ # 1.5.4
2
+
3
+ * `debify publish` now checks env var `BRANCH_NAME` as well as `GIT_BRANCH`.
4
+ Jenkins pipelines use `BRANCH_NAME`, Jenkins jobs use `GIT_BRANCH`.
5
+
1
6
  # 1.5.3
2
7
 
3
8
  * debify now uses `~/.docker/config` auth if pulling an image fails due to auth
@@ -42,7 +47,7 @@
42
47
 
43
48
  # 1.0.0
44
49
 
45
- * Base image used for packaging on Ubuntu 14.04
50
+ * Base image used for packaging on Ubuntu 14.04
46
51
  * Install ruby2.2 and related packages
47
52
 
48
53
  # 0.11.1
data/lib/conjur/debify.rb CHANGED
@@ -625,7 +625,7 @@ be auto-detected from Git.
625
625
 
626
626
  --component should be 'stable' if run after package tests pass or 'testing' if the package is not yet ready for release.
627
627
  If you don't specify the component, it will be set to 'testing' unless the current git branch is 'master' or 'origin/master'.
628
- The git branch is first detected from the env var GIT_BRANCH, and then by checking `git rev-parse --abbrev-ref HEAD`
628
+ The git branch is first detected from the env var GIT_BRANCH or BRANCH_NAME, and then by checking `git rev-parse --abbrev-ref HEAD`
629
629
  (which won't give you the answer you want when detached).
630
630
 
631
631
  DESC
@@ -646,7 +646,7 @@ command "publish" do |c|
646
646
  raise "Received extra command-line arguments" if args.shift
647
647
 
648
648
  def detect_component
649
- branch = ENV['GIT_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip
649
+ branch = ENV['GIT_BRANCH'] || ENV['BRANCH_NAME'] || `git rev-parse --abbrev-ref HEAD`.strip
650
650
  if %w(master origin/master).include?(branch)
651
651
  'stable'
652
652
  else
data/lib/conjur/debify/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Conjur
2
2
  module Debify
3
- VERSION = "1.5.3"
3
+ VERSION = "1.5.4"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,111 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-debify
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.3
4
+ version: 1.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Gilpin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-30 00:00:00.000000000 Z
11
+ date: 2017-06-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: gli
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: docker-api
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '1.33'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '1.33'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: conjur-cli
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.7'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.7'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '10.0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '10.0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: cucumber
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: aruba
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  description:
@@ -116,10 +116,10 @@ executables:
116
116
  extensions: []
117
117
  extra_rdoc_files: []
118
118
  files:
119
- - .dockerignore
120
- - .gitignore
121
- - .project
122
- - .rvmrc
119
+ - ".dockerignore"
120
+ - ".gitignore"
121
+ - ".project"
122
+ - ".rvmrc"
123
123
  - CHANGELOG.md
124
124
  - Dockerfile
125
125
  - Gemfile
@@ -156,17 +156,17 @@ require_paths:
156
156
  - lib
157
157
  required_ruby_version: !ruby/object:Gem::Requirement
158
158
  requirements:
159
- - - '>='
159
+ - - ">="
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
162
  required_rubygems_version: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - '>='
164
+ - - ">="
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  requirements: []
168
168
  rubyforge_project:
169
- rubygems_version: 2.0.14.1
169
+ rubygems_version: 2.4.5.2
170
170
  signing_key:
171
171
  specification_version: 4
172
172
  summary: Utility commands to build and package Conjur services as Debian packages