conjur-api 4.9.0 → 4.9.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 05d952363d80aa2180905c6b41fc2c7eb603538d
4
+ data.tar.gz: 8ed90479978bec0f925c366ec7e5a5b6709ec834
5
+ SHA512:
6
+ metadata.gz: 6767b1f5ed0d478520ac98553a7d1fb8ddf111cd4de12d24f70489d48addb403520e960501a7ea61b3463f045d296cd507f6ef3c87087860a00b805ee49e95f9
7
+ data.tar.gz: a7dae6329da4acd092fa408feb71b79b3b169ac7c2da189173bc837e5133ae7dd8adad71dabf288ebb063f7628a9607a5afaf1b30c0abba4bd5f2a58b917b65a
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
19
19
  gem.required_ruby_version = '>= 1.9'
20
20
 
21
21
 
22
- gem.add_dependency 'rest-client'
22
+ gem.add_dependency 'rest-client', '= 1.6.7' # with newer versions adding certificates to OpenSSL does not work
23
23
  gem.add_dependency 'activesupport'
24
24
 
25
25
  gem.add_development_dependency 'rake'
@@ -20,6 +20,6 @@
20
20
  #
21
21
  module Conjur
22
22
  class API
23
- VERSION = "4.9.0"
23
+ VERSION = "4.9.1"
24
24
  end
25
25
  end
@@ -54,7 +54,7 @@ module Conjur
54
54
  # @api private
55
55
  def add_option name, options = {}, &def_proc
56
56
  accepted_options << name
57
- allow_env = options[:env].nil? or options[:env]
57
+ allow_env = options[:env].nil? || options[:env]
58
58
  sticky = options.member?(:sticky) ? options[:sticky] : true
59
59
  env_var = options[:env] || "CONJUR_#{name.to_s.upcase}"
60
60
  def_val = options[:default]
@@ -30,6 +30,12 @@ module Conjur
30
30
  match_path(3..-1)
31
31
  end
32
32
 
33
+ def ownerid
34
+ attributes['owner']
35
+ end
36
+
37
+ alias owner ownerid
38
+
33
39
  # Name convention according to Role#roleid.
34
40
  def resourceid
35
41
  [account, kind, identifier].join ':'
@@ -128,8 +128,6 @@ describe Conjur::API do
128
128
  }
129
129
  context "in stage" do
130
130
  before(:each) do
131
- # Looks at "ENV['CONJUR_STACK']" first, stub this out
132
- ENV.stub(:[]).with('CONJUR_STACK').and_return nil
133
131
  Conjur::Configuration.any_instance.stub(:env).and_return "stage"
134
132
  end
135
133
  its "host" do
@@ -6,12 +6,9 @@ describe Conjur::Configuration do
6
6
  }
7
7
  subject { Conjur.configuration }
8
8
  context "CONJUR_ENV unspecified" do
9
- before(:all) {
9
+ before {
10
10
  ENV.delete('CONJUR_ENV')
11
11
  }
12
- after(:all) {
13
- ENV['CONJUR_ENV'] = 'test'
14
- }
15
12
  context "default env" do
16
13
  its(:env) { should == "production" }
17
14
  end
@@ -96,4 +93,4 @@ describe Conjur::Configuration do
96
93
  end
97
94
  end
98
95
  end
99
- end
96
+ end
@@ -22,6 +22,13 @@ Spork.prefork do
22
22
  #require 'webrat/integrations/rspec-rails'
23
23
 
24
24
  RSpec.configure do |config|
25
+ config.treat_symbols_as_metadata_keys_with_true_values = true
26
+ config.before do
27
+ # test with a clean environment
28
+ stub_const 'ENV', 'CONJUR_ENV' => 'test'
29
+ end
30
+
31
+
25
32
  # If you're not using ActiveRecord you should remove these
26
33
  # lines, delete config/database.yml and disable :active_record
27
34
  # in your config/boot.rb
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.9.0
5
- prerelease:
4
+ version: 4.9.1
6
5
  platform: ruby
7
6
  authors:
8
7
  - Rafał Rzepecki
@@ -10,78 +9,69 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2014-06-06 00:00:00.000000000 Z
12
+ date: 2014-07-17 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: rest-client
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
- - - ! '>='
18
+ - - '='
21
19
  - !ruby/object:Gem::Version
22
- version: '0'
20
+ version: 1.6.7
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
- - - ! '>='
25
+ - - '='
29
26
  - !ruby/object:Gem::Version
30
- version: '0'
27
+ version: 1.6.7
31
28
  - !ruby/object:Gem::Dependency
32
29
  name: activesupport
33
30
  requirement: !ruby/object:Gem::Requirement
34
- none: false
35
31
  requirements:
36
- - - ! '>='
32
+ - - '>='
37
33
  - !ruby/object:Gem::Version
38
34
  version: '0'
39
35
  type: :runtime
40
36
  prerelease: false
41
37
  version_requirements: !ruby/object:Gem::Requirement
42
- none: false
43
38
  requirements:
44
- - - ! '>='
39
+ - - '>='
45
40
  - !ruby/object:Gem::Version
46
41
  version: '0'
47
42
  - !ruby/object:Gem::Dependency
48
43
  name: rake
49
44
  requirement: !ruby/object:Gem::Requirement
50
- none: false
51
45
  requirements:
52
- - - ! '>='
46
+ - - '>='
53
47
  - !ruby/object:Gem::Version
54
48
  version: '0'
55
49
  type: :development
56
50
  prerelease: false
57
51
  version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
52
  requirements:
60
- - - ! '>='
53
+ - - '>='
61
54
  - !ruby/object:Gem::Version
62
55
  version: '0'
63
56
  - !ruby/object:Gem::Dependency
64
57
  name: spork
65
58
  requirement: !ruby/object:Gem::Requirement
66
- none: false
67
59
  requirements:
68
- - - ! '>='
60
+ - - '>='
69
61
  - !ruby/object:Gem::Version
70
62
  version: '0'
71
63
  type: :development
72
64
  prerelease: false
73
65
  version_requirements: !ruby/object:Gem::Requirement
74
- none: false
75
66
  requirements:
76
- - - ! '>='
67
+ - - '>='
77
68
  - !ruby/object:Gem::Version
78
69
  version: '0'
79
70
  - !ruby/object:Gem::Dependency
80
71
  name: rspec
81
72
  requirement: !ruby/object:Gem::Requirement
82
- none: false
83
73
  requirements:
84
- - - ! '>='
74
+ - - '>='
85
75
  - !ruby/object:Gem::Version
86
76
  version: '2.14'
87
77
  - - <
@@ -90,9 +80,8 @@ dependencies:
90
80
  type: :development
91
81
  prerelease: false
92
82
  version_requirements: !ruby/object:Gem::Requirement
93
- none: false
94
83
  requirements:
95
- - - ! '>='
84
+ - - '>='
96
85
  - !ruby/object:Gem::Version
97
86
  version: '2.14'
98
87
  - - <
@@ -101,97 +90,85 @@ dependencies:
101
90
  - !ruby/object:Gem::Dependency
102
91
  name: webmock
103
92
  requirement: !ruby/object:Gem::Requirement
104
- none: false
105
93
  requirements:
106
- - - ! '>='
94
+ - - '>='
107
95
  - !ruby/object:Gem::Version
108
96
  version: '0'
109
97
  type: :development
110
98
  prerelease: false
111
99
  version_requirements: !ruby/object:Gem::Requirement
112
- none: false
113
100
  requirements:
114
- - - ! '>='
101
+ - - '>='
115
102
  - !ruby/object:Gem::Version
116
103
  version: '0'
117
104
  - !ruby/object:Gem::Dependency
118
105
  name: ci_reporter
119
106
  requirement: !ruby/object:Gem::Requirement
120
- none: false
121
107
  requirements:
122
- - - ! '>='
108
+ - - '>='
123
109
  - !ruby/object:Gem::Version
124
110
  version: '0'
125
111
  type: :development
126
112
  prerelease: false
127
113
  version_requirements: !ruby/object:Gem::Requirement
128
- none: false
129
114
  requirements:
130
- - - ! '>='
115
+ - - '>='
131
116
  - !ruby/object:Gem::Version
132
117
  version: '0'
133
118
  - !ruby/object:Gem::Dependency
134
119
  name: simplecov
135
120
  requirement: !ruby/object:Gem::Requirement
136
- none: false
137
121
  requirements:
138
- - - ! '>='
122
+ - - '>='
139
123
  - !ruby/object:Gem::Version
140
124
  version: '0'
141
125
  type: :development
142
126
  prerelease: false
143
127
  version_requirements: !ruby/object:Gem::Requirement
144
- none: false
145
128
  requirements:
146
- - - ! '>='
129
+ - - '>='
147
130
  - !ruby/object:Gem::Version
148
131
  version: '0'
149
132
  - !ruby/object:Gem::Dependency
150
133
  name: io-grab
151
134
  requirement: !ruby/object:Gem::Requirement
152
- none: false
153
135
  requirements:
154
- - - ! '>='
136
+ - - '>='
155
137
  - !ruby/object:Gem::Version
156
138
  version: '0'
157
139
  type: :development
158
140
  prerelease: false
159
141
  version_requirements: !ruby/object:Gem::Requirement
160
- none: false
161
142
  requirements:
162
- - - ! '>='
143
+ - - '>='
163
144
  - !ruby/object:Gem::Version
164
145
  version: '0'
165
146
  - !ruby/object:Gem::Dependency
166
147
  name: yard
167
148
  requirement: !ruby/object:Gem::Requirement
168
- none: false
169
149
  requirements:
170
- - - ! '>='
150
+ - - '>='
171
151
  - !ruby/object:Gem::Version
172
152
  version: '0'
173
153
  type: :development
174
154
  prerelease: false
175
155
  version_requirements: !ruby/object:Gem::Requirement
176
- none: false
177
156
  requirements:
178
- - - ! '>='
157
+ - - '>='
179
158
  - !ruby/object:Gem::Version
180
159
  version: '0'
181
160
  - !ruby/object:Gem::Dependency
182
161
  name: redcarpet
183
162
  requirement: !ruby/object:Gem::Requirement
184
- none: false
185
163
  requirements:
186
- - - ! '>='
164
+ - - '>='
187
165
  - !ruby/object:Gem::Version
188
166
  version: '0'
189
167
  type: :development
190
168
  prerelease: false
191
169
  version_requirements: !ruby/object:Gem::Requirement
192
- none: false
193
170
  requirements:
194
- - - ! '>='
171
+ - - '>='
195
172
  - !ruby/object:Gem::Version
196
173
  version: '0'
197
174
  description: Conjur API
@@ -302,30 +279,26 @@ files:
302
279
  homepage: https://github.com/conjurinc/api-ruby/
303
280
  licenses:
304
281
  - MIT
282
+ metadata: {}
305
283
  post_install_message:
306
284
  rdoc_options: []
307
285
  require_paths:
308
286
  - lib
309
287
  required_ruby_version: !ruby/object:Gem::Requirement
310
- none: false
311
288
  requirements:
312
- - - ! '>='
289
+ - - '>='
313
290
  - !ruby/object:Gem::Version
314
291
  version: '1.9'
315
292
  required_rubygems_version: !ruby/object:Gem::Requirement
316
- none: false
317
293
  requirements:
318
- - - ! '>='
294
+ - - '>='
319
295
  - !ruby/object:Gem::Version
320
296
  version: '0'
321
- segments:
322
- - 0
323
- hash: 1491369076526143326
324
297
  requirements: []
325
298
  rubyforge_project:
326
- rubygems_version: 1.8.25
299
+ rubygems_version: 2.2.2
327
300
  signing_key:
328
- specification_version: 3
301
+ specification_version: 4
329
302
  summary: Conjur API
330
303
  test_files:
331
304
  - features/enroll_server.feature