Skip to content

Commit

Permalink
Avoid require in Gemfile & Rakefile to avoid redefined constant warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
eregon committed Aug 10, 2024
1 parent f131214 commit 09bfcd0
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
source 'https://rubygems.org'

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

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

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

group :development do
gem 'rake', '~> 13.0'
Expand Down
30 changes: 15 additions & 15 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require_relative 'lib/concurrent-ruby/concurrent/version'
require_relative 'lib/concurrent-ruby-edge/concurrent/edge/version'
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
edge_version = File.read("#{__dir__}/lib/concurrent-ruby-edge/concurrent/edge/version.rb")[/'(.+)'/, 1] or raise
require_relative 'lib/concurrent-ruby/concurrent/utility/engine'

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

current_yard_version_name = Concurrent::VERSION
current_yard_version_name = version

begin
require 'yard'
Expand Down Expand Up @@ -314,21 +314,21 @@ namespace :release do
desc '** tag HEAD with current version and push to github'
task :tag => :ask do
Dir.chdir(__dir__) do
sh "git tag v#{Concurrent::VERSION}" if publish_base
sh "git push origin v#{Concurrent::VERSION}" if publish_base
sh "git tag edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
sh "git push origin edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
sh "git tag v#{version}" if publish_base
sh "git push origin v#{version}" if publish_base
sh "git tag edge-v#{edge_version}" if publish_edge
sh "git push origin edge-v#{edge_version}" if publish_edge
end
end

desc '** push all *.gem files to rubygems'
task :rubygems => :ask do
Dir.chdir(__dir__) do
sh "gem push pkg/concurrent-ruby-#{Concurrent::VERSION}.gem" if publish_base
sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" if publish_edge
sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem" if publish_base
sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x64-mingw32.gem" if publish_base
sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x86-mingw32.gem" if publish_base
sh "gem push pkg/concurrent-ruby-#{version}.gem" if publish_base
sh "gem push pkg/concurrent-ruby-edge-#{edge_version}.gem" if publish_edge
sh "gem push pkg/concurrent-ruby-ext-#{version}.gem" if publish_base
sh "gem push pkg/concurrent-ruby-ext-#{version}-x64-mingw32.gem" if publish_base
sh "gem push pkg/concurrent-ruby-ext-#{version}-x86-mingw32.gem" if publish_base
end
end

Expand Down

0 comments on commit 09bfcd0

Please sign in to comment.