Skip to content

Commit 5cf6114

Browse files
arielvalentinarielvalentin
authored
chore: Enable Gemfile Dev Deps (#1426)
* chore: Enable Gemfile Dev Deps * squash: move them out! * squash: use a single group * squash: corrected gemspecs * squash: update generator * squash: update rubocop * squash: more fxies * squash: remove require pry * squash: indentation * squash: add do not remove gemspec * squash: Update CONTRIBUTING.md * squash: bump rubocop * squash: bad merge * squash: bad merge
1 parent 79fa587 commit 5cf6114

File tree

121 files changed

+625
-720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+625
-720
lines changed

‎.instrumentation_generator/templates/Gemfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,15 @@ gemspec
1414

1515
group :test do
1616
gem 'opentelemetry-instrumentation-base', path: '../base'
17+
gem 'appraisal', '~> 2.5'
18+
gem 'bundler', '~> 2.4'
19+
gem 'minitest', '~> 5.0'
20+
gem 'opentelemetry-sdk', '~> 1.0'
21+
gem 'opentelemetry-test-helpers', '~> 0.3'
22+
gem 'rake', '~> 13.0'
23+
gem 'rubocop', '~> 1.72.0'
24+
gem 'rubocop-performance', '~> 1.19.1'
25+
gem 'simplecov', '~> 0.17.1'
26+
gem 'webmock', '~> 3.24'
27+
gem 'yard', '~> 0.9'
1728
end

‎.instrumentation_generator/templates/gemspec.tt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ Gem::Specification.new do |spec|
2828
spec.add_dependency 'opentelemetry-api', '~> <%= opentelemetry_version %>'
2929
spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
3030

31-
spec.add_development_dependency 'appraisal', '~> 2.5'
32-
spec.add_development_dependency 'bundler', '~> 2.4'
33-
spec.add_development_dependency 'minitest', '~> 5.0'
34-
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
35-
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
36-
spec.add_development_dependency 'rake', '~> 13.0'
37-
spec.add_development_dependency 'rubocop', '~> 1.70.0'
38-
spec.add_development_dependency 'rubocop-performance', '~> 1.19.1'
39-
spec.add_development_dependency 'simplecov', '~> 0.17.1'
40-
spec.add_development_dependency 'webmock', '~> 3.24'
41-
spec.add_development_dependency 'yard', '~> 0.9'
42-
4331
if spec.respond_to?(:metadata)
4432
spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"
4533
spec.metadata['source_code_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/<%= instrumentation_name %>'

‎.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AllCops:
1212
Bundler/OrderedGems:
1313
Enabled: false
1414
Gemspec/DevelopmentDependencies:
15-
Enabled: false
15+
Enabled: true
1616
Gemspec/RequiredRubyVersion:
1717
Enabled: false
1818
Lint/ConstantDefinitionInBlock:

‎CONTRIBUTING.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -387,34 +387,34 @@ This will then run a bulk update on all of the gems in the repository, and then
387387

388388
```console
389389

390-
diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
390+
diff --git a/propagator/ottrace/Gemfile b/propagator/ottrace/Gemfile
391391
index 42c5ecba..74fcc743 100644
392-
--- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
392+
--- a/propagator/ottrace/Gemfile
393393
+++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
394394
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
395-
spec.add_development_dependency 'bundler', '~> 2.4'
396-
spec.add_development_dependency 'minitest', '~> 5.0'
397-
spec.add_development_dependency 'rake', '~> 13.0'
398-
- spec.add_development_dependency 'rubocop', '~> 1.50.0'
399-
+ spec.add_development_dependency 'rubocop', '~> 1.56.1'
400-
spec.add_development_dependency 'simplecov', '~> 0.22.0'
401-
spec.add_development_dependency 'yard', '~> 0.9'
402-
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
395+
gem 'bundler', '~> 2.4'
396+
gem 'minitest', '~> 5.0'
397+
gem 'rake', '~> 13.0'
398+
- gem 'rubocop', '~> 1.50.0'
399+
+ gem 'rubocop', '~> 1.56.1'
400+
gem 'simplecov', '~> 0.22.0'
401+
gem 'yard', '~> 0.9'
402+
gem 'yard-doctest', '~> 0.1.6'
403403
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y
404404

405-
diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec
405+
diff --git a/propagator/xray/Gemfile b/propagator/xray/Gemfile
406406
index e29acbfc..85622d25 100644
407-
--- a/propagator/xray/opentelemetry-propagator-xray.gemspec
408-
+++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
407+
--- a/propagator/xray/Gemfile
408+
+++ b/propagator/xray/Gemfile
409409
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
410-
spec.add_development_dependency 'bundler', '~> 2.4'
411-
spec.add_development_dependency 'minitest', '~> 5.0'
412-
spec.add_development_dependency 'rake', '~> 13.0'
413-
- spec.add_development_dependency 'rubocop', '~> 1.50.0'
414-
+ spec.add_development_dependency 'rubocop', '~> 1.56.1'
415-
spec.add_development_dependency 'simplecov', '~> 0.22.0'
416-
spec.add_development_dependency 'yard', '~> 0.9'
417-
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
410+
gem 'bundler', '~> 2.4'
411+
gem 'minitest', '~> 5.0'
412+
gem 'rake', '~> 13.0'
413+
- gem 'rubocop', '~> 1.50.0'
414+
+ gem 'rubocop', '~> 1.56.1'
415+
gem 'simplecov', '~> 0.22.0'
416+
gem 'yard', '~> 0.9'
417+
gem 'yard-doctest', '~> 0.1.6'
418418
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y
419419
```
420420

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
source 'https://rubygems.org'
88

99
gem 'rake', '~> 13.0'
10-
gem 'rubocop', '~> 1.72.2'
10+
gem 'rubocop', '~> 1.72.0'
1111
gem 'rubocop-performance', '~> 1.23.0'

‎bin/update-dependencies

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ if [ -z "$2" ] ; then
88
echo "gem version is required!" && exit 2;
99
fi
1010

11-
for gemspec in $(git ls-files \*.gemspec)
11+
for file in $(git ls-files \*Gemfile \*.gemspec)
1212
do
13-
sed -i -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$gemspec"
13+
sed -i -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$file"
1414
done
1515

1616
echo "Review your changes and commit"

‎helpers/mysql/Gemfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ source 'https://rubygems.org'
99
gemspec
1010

1111
group :test do
12+
gem 'bundler', '~> 2.4'
13+
gem 'minitest', '~> 5.0'
14+
gem 'opentelemetry-test-helpers', '~> 0.3'
15+
gem 'rake', '~> 13.0'
16+
gem 'rubocop', '~> 1.72.0'
17+
gem 'rubocop-performance', '~> 1.23.0'
18+
gem 'simplecov', '~> 0.22.0'
19+
gem 'yard', '~> 0.9'
20+
gem 'yard-doctest', '~> 0.1.6'
1221
if RUBY_VERSION >= '3.4'
1322
gem 'base64'
1423
gem 'mutex_m'

‎helpers/mysql/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Add the gem to your instrumentation's Gemfile:
1616
```ruby
1717
# Gemfile
1818

19-
group :test, :development do
19+
group :test do
2020
gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
2121
end
2222
```

‎helpers/mysql/opentelemetry-helpers-mysql.gemspec

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ Gem::Specification.new do |spec|
2828
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2929
spec.add_dependency 'opentelemetry-common', '~> 0.21'
3030

31-
spec.add_development_dependency 'bundler', '~> 2.4'
32-
spec.add_development_dependency 'minitest', '~> 5.0'
33-
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
34-
spec.add_development_dependency 'rake', '~> 13.0'
35-
spec.add_development_dependency 'rubocop', '~> 1.72.2'
36-
spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
37-
spec.add_development_dependency 'simplecov', '~> 0.22.0'
38-
spec.add_development_dependency 'yard', '~> 0.9'
39-
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
40-
4131
if spec.respond_to?(:metadata)
4232
spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"
4333
spec.metadata['source_code_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/helpers/mysql'

‎helpers/sql-obfuscation/Gemfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ source 'https://rubygems.org'
99
gemspec
1010

1111
group :test do
12+
gem 'bundler', '~> 2.4'
13+
gem 'minitest', '~> 5.0'
14+
gem 'opentelemetry-test-helpers', '~> 0.3'
15+
gem 'rake', '~> 13.0'
16+
gem 'rubocop', '~> 1.72.0'
17+
gem 'rubocop-performance', '~> 1.23.0'
18+
gem 'simplecov', '~> 0.22.0'
19+
gem 'yard', '~> 0.9'
20+
gem 'yard-doctest', '~> 0.1.6'
1221
if RUBY_VERSION >= '3.4'
1322
gem 'base64'
1423
gem 'mutex_m'

0 commit comments

Comments
 (0)