Skip to content

Commit 09bfcd0

Browse files
committed
Avoid require in Gemfile & Rakefile to avoid redefined constant warnings
1 parent f131214 commit 09bfcd0

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

Diff for: Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
source 'https://rubygems.org'
22

3-
require File.join(File.dirname(__FILE__), 'lib/concurrent-ruby/concurrent/version')
4-
require File.join(File.dirname(__FILE__ ), 'lib/concurrent-ruby-edge/concurrent/edge/version')
3+
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
4+
edge_version = File.read("#{__dir__}/lib/concurrent-ruby-edge/concurrent/edge/version.rb")[/'(.+)'/, 1] or raise
55

66
no_path = ENV['NO_PATH']
77
options = no_path ? {} : { path: '.' }
88

9-
gem 'concurrent-ruby', Concurrent::VERSION, options
10-
gem 'concurrent-ruby-edge', Concurrent::EDGE_VERSION, options
11-
gem 'concurrent-ruby-ext', Concurrent::VERSION, options.merge(platform: :mri)
9+
gem 'concurrent-ruby', version, options
10+
gem 'concurrent-ruby-edge', edge_version, options
11+
gem 'concurrent-ruby-ext', version, options.merge(platform: :mri)
1212

1313
group :development do
1414
gem 'rake', '~> 13.0'

Diff for: Rakefile

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
require_relative 'lib/concurrent-ruby/concurrent/version'
2-
require_relative 'lib/concurrent-ruby-edge/concurrent/edge/version'
1+
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
2+
edge_version = File.read("#{__dir__}/lib/concurrent-ruby-edge/concurrent/edge/version.rb")[/'(.+)'/, 1] or raise
33
require_relative 'lib/concurrent-ruby/concurrent/utility/engine'
44

55
core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec')
@@ -96,9 +96,9 @@ begin
9696
task :installed do
9797
Bundler.with_original_env do
9898
Dir.chdir(__dir__) do
99-
sh "gem install pkg/concurrent-ruby-#{Concurrent::VERSION}.gem"
100-
sh "gem install pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem" if Concurrent.on_cruby?
101-
sh "gem install pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem"
99+
sh "gem install pkg/concurrent-ruby-#{version}.gem"
100+
sh "gem install pkg/concurrent-ruby-ext-#{version}.gem" if Concurrent.on_cruby?
101+
sh "gem install pkg/concurrent-ruby-edge-#{edge_version}.gem"
102102
ENV['NO_PATH'] = 'true'
103103
sh 'bundle update'
104104
sh 'bundle exec rake spec:ci'
@@ -128,7 +128,7 @@ rescue LoadError => e
128128
puts 'RSpec is not installed, skipping test task definitions: ' + e.message
129129
end
130130

131-
current_yard_version_name = Concurrent::VERSION
131+
current_yard_version_name = version
132132

133133
begin
134134
require 'yard'
@@ -314,21 +314,21 @@ namespace :release do
314314
desc '** tag HEAD with current version and push to github'
315315
task :tag => :ask do
316316
Dir.chdir(__dir__) do
317-
sh "git tag v#{Concurrent::VERSION}" if publish_base
318-
sh "git push origin v#{Concurrent::VERSION}" if publish_base
319-
sh "git tag edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
320-
sh "git push origin edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
317+
sh "git tag v#{version}" if publish_base
318+
sh "git push origin v#{version}" if publish_base
319+
sh "git tag edge-v#{edge_version}" if publish_edge
320+
sh "git push origin edge-v#{edge_version}" if publish_edge
321321
end
322322
end
323323

324324
desc '** push all *.gem files to rubygems'
325325
task :rubygems => :ask do
326326
Dir.chdir(__dir__) do
327-
sh "gem push pkg/concurrent-ruby-#{Concurrent::VERSION}.gem" if publish_base
328-
sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" if publish_edge
329-
sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem" if publish_base
330-
sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x64-mingw32.gem" if publish_base
331-
sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x86-mingw32.gem" if publish_base
327+
sh "gem push pkg/concurrent-ruby-#{version}.gem" if publish_base
328+
sh "gem push pkg/concurrent-ruby-edge-#{edge_version}.gem" if publish_edge
329+
sh "gem push pkg/concurrent-ruby-ext-#{version}.gem" if publish_base
330+
sh "gem push pkg/concurrent-ruby-ext-#{version}-x64-mingw32.gem" if publish_base
331+
sh "gem push pkg/concurrent-ruby-ext-#{version}-x86-mingw32.gem" if publish_base
332332
end
333333
end
334334

0 commit comments

Comments
 (0)