Skip to content

Commit e2f92ce

Browse files
authored
Merge pull request #26 from DataDog/lloeki/frozen-bundle
Support frozen bundle
2 parents 6e369b4 + e0a35fd commit e2f92ce

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

src/mod/guard.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ def call(status)
4848
result << { :name => 'bundler.locked', :reason => 'bundler.unlocked' }
4949
end
5050

51-
if status[:bundler][:frozen]
52-
result << { :name => 'bundler.frozen', :reason => 'bundler.frozen' }
53-
end
54-
5551
if !status[:fs][:writable]
5652
result << { :name => 'fs.writable', :reason => 'fs.readonly' }
5753
end

test/bin/test.rb

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,6 @@
152152
},
153153
[{ fixture: 'frozen' }, { fixture: 'hot', env: 'BUNDLE_FROZEN=true' }] => {
154154
[
155-
{ engine: 'ruby', version: '1.8' },
156-
{ engine: 'ruby', version: '1.9' },
157-
{ engine: 'ruby', version: '2.0' },
158-
{ engine: 'ruby', version: '2.1' },
159-
{ engine: 'ruby', version: '2.2' },
160-
{ engine: 'ruby', version: '2.3' },
161-
{ engine: 'ruby', version: '2.4' },
162-
{ engine: 'ruby', version: '2.5' },
163155
{ engine: 'ruby', version: '2.6' },
164156
{ engine: 'ruby', version: '2.7' },
165157
{ engine: 'ruby', version: '3.0' },
@@ -168,17 +160,15 @@
168160
{ engine: 'ruby', version: '3.3' },
169161
{ engine: 'ruby', version: '3.4' },
170162
{ engine: 'ruby', version: '3.5' },
171-
{ engine: 'jruby', version: '9.2' },
172-
{ engine: 'jruby', version: '9.3' },
173-
{ engine: 'jruby', version: '9.4' },
174-
{ engine: 'jruby', version: '10.0' },
175163
] => [
176164
'telemetry should include start',
177-
'injection should abort',
178-
'abort reason should include bundler.frozen',
165+
'injection should proceed',
166+
'injection should succeed',
167+
'telemetry should include complete',
168+
'abort reason should be empty',
179169
'telemetry start should not include result report',
180170
'telemetry conclusion should include result report',
181-
'reported result type should be abort',
171+
'reported result type should be success',
182172
],
183173
},
184174
{ fixture: 'hot', env: 'BUNDLE_PATH=/bundle' } => {
@@ -313,6 +303,30 @@
313303
'reported result type should be success',
314304
],
315305
},
306+
{ fixture: 'frozen', inject: true, injector: 'datadog', packaged: true } => {
307+
[
308+
{ engine: 'ruby', version: '2.6' },
309+
{ engine: 'ruby', version: '2.7' },
310+
{ engine: 'ruby', version: '3.0' },
311+
{ engine: 'ruby', version: '3.1' },
312+
{ engine: 'ruby', version: '3.2' },
313+
{ engine: 'ruby', version: '3.3' },
314+
{ engine: 'ruby', version: '3.4' },
315+
{ engine: 'ruby', version: '3.5' },
316+
] => [
317+
'telemetry should include complete',
318+
'app gemfile should not include datadog',
319+
'app lockfile should not include datadog',
320+
'new gemfile should exist',
321+
'new lockfile should exist',
322+
'new gemfile should include datadog',
323+
'new lockfile should include datadog',
324+
'gem datadog should have require option',
325+
'telemetry start should not include result report',
326+
'telemetry conclusion should include result report',
327+
'reported result type should be success',
328+
],
329+
},
316330
{ fixture: 'hot', inject: true, injector: 'datadog', packaged: true } => {
317331
[
318332
{ engine: 'ruby', version: '2.6' },
@@ -444,10 +458,6 @@ def example(desc, &block)
444458
context.telemetry.any? { |e| e['points'].any? { |p| p['name'] == 'library_entrypoint.abort' && p['tags'].include?('reason:bundler.deployment') } }
445459
end
446460

447-
example 'abort reason should include bundler.frozen' do |context|
448-
context.telemetry.any? { |e| e['points'].any? { |p| p['name'] == 'library_entrypoint.abort' && p['tags'].include?('reason:bundler.frozen') } }
449-
end
450-
451461
example 'abort reason should include bundler.unbundled' do |context|
452462
context.telemetry.any? { |e| e['points'].any? { |p| p['name'] == 'library_entrypoint.abort' && p['tags'].include?('reason:bundler.unbundled') } }
453463
end

0 commit comments

Comments
 (0)