diff --git a/README.md b/README.md index ea17e883..f6f7747a 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,6 @@ To install each gem onto your local machine, run `bundle exec rake install`. To release a new version: 1. Use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary), and release branches will be created automatically via [Release Please](https://github.com/google-github-actions/release-please-action). This updates the changelog and the version of judoscale-ruby. -1. On the release branch, run `bin/sync-versions` to update the `VERSION` constants for each gem. Commit and push this change to the release branch. 1. Merge the release branch, and GitHub Actions will run `bin/release` to publish all gems to [Rubygems](https://rubygems.org). _Note: We keep all gem versions in sync to provide a better developer experience for our users._ diff --git a/bin/sync-versions b/bin/sync-versions deleted file mode 100755 index 0a1bc8d5..00000000 --- a/bin/sync-versions +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -require "fileutils" -require "./judoscale-ruby/lib/judoscale/version" - -# Syncs the VERSION of all judoscale-* gems based on judoscale-ruby. -# -# Usage: -# - Manually update judoscale-ruby/lib/judoscale/version.rb -# - Run bin/sync-versions - -Dir["judoscale-*/**/version.rb"].each do |filepath| - next if filepath.include?("judoscale-ruby") - - updated_file_content = File.read(filepath).gsub( - /VERSION = ".*"/, - %(VERSION = "#{Judoscale::VERSION}") - ) - File.open(filepath, "w") { |file| file << updated_file_content } - - puts "Updated #{filepath} to version #{Judoscale::VERSION}" -end diff --git a/judoscale-delayed_job/judoscale-delayed_job.gemspec b/judoscale-delayed_job/judoscale-delayed_job.gemspec index fce9377f..6939b2c2 100644 --- a/judoscale-delayed_job/judoscale-delayed_job.gemspec +++ b/judoscale-delayed_job/judoscale-delayed_job.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/delayed_job/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-delayed_job" - spec.version = Judoscale::DelayedJob::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::DelayedJob::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "delayed_job_active_record", ">= 4.0" end diff --git a/judoscale-delayed_job/lib/judoscale/delayed_job.rb b/judoscale-delayed_job/lib/judoscale/delayed_job.rb index aa3d2caf..ae403636 100644 --- a/judoscale-delayed_job/lib/judoscale/delayed_job.rb +++ b/judoscale-delayed_job/lib/judoscale/delayed_job.rb @@ -2,13 +2,13 @@ require "judoscale-ruby" require "judoscale/config" -require "judoscale/delayed_job/version" +require "judoscale/version" require "judoscale/delayed_job/metrics_collector" require "delayed_job_active_record" Judoscale.add_adapter :"judoscale-delayed_job", { - adapter_version: Judoscale::DelayedJob::VERSION, + adapter_version: Judoscale::VERSION, framework_version: Gem.loaded_specs["delayed_job_active_record"].version.to_s # DJ doesn't have a `VERSION` constant }, metrics_collector: Judoscale::DelayedJob::MetricsCollector, diff --git a/judoscale-delayed_job/lib/judoscale/delayed_job/version.rb b/judoscale-delayed_job/lib/judoscale/delayed_job/version.rb deleted file mode 100644 index 2767c50e..00000000 --- a/judoscale-delayed_job/lib/judoscale/delayed_job/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module DelayedJob - VERSION = "1.7.0" - end -end diff --git a/judoscale-delayed_job/rails-autoscale-delayed_job.gemspec b/judoscale-delayed_job/rails-autoscale-delayed_job.gemspec index cc5cdec7..41c2c24a 100644 --- a/judoscale-delayed_job/rails-autoscale-delayed_job.gemspec +++ b/judoscale-delayed_job/rails-autoscale-delayed_job.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/delayed_job/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-delayed_job" - spec.version = Judoscale::DelayedJob::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-delayed_job", Judoscale::DelayedJob::VERSION + spec.add_dependency "judoscale-delayed_job", Judoscale::VERSION end diff --git a/judoscale-good_job/judoscale-good_job.gemspec b/judoscale-good_job/judoscale-good_job.gemspec index 0b783c50..b10ad4c1 100644 --- a/judoscale-good_job/judoscale-good_job.gemspec +++ b/judoscale-good_job/judoscale-good_job.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/good_job/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-good_job" - spec.version = Judoscale::GoodJob::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::GoodJob::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "good_job", ">= 3.0" end diff --git a/judoscale-good_job/lib/judoscale/good_job.rb b/judoscale-good_job/lib/judoscale/good_job.rb index 1dfe7b20..cdfdc6ef 100644 --- a/judoscale-good_job/lib/judoscale/good_job.rb +++ b/judoscale-good_job/lib/judoscale/good_job.rb @@ -7,12 +7,12 @@ require "good_job" require "judoscale-ruby" require "judoscale/config" -require "judoscale/good_job/version" +require "judoscale/version" require "judoscale/good_job/metrics_collector" Judoscale.add_adapter :"judoscale-good_job", { - adapter_version: Judoscale::GoodJob::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::GoodJob::VERSION }, metrics_collector: Judoscale::GoodJob::MetricsCollector, diff --git a/judoscale-good_job/lib/judoscale/good_job/version.rb b/judoscale-good_job/lib/judoscale/good_job/version.rb deleted file mode 100644 index 3c7c6e5d..00000000 --- a/judoscale-good_job/lib/judoscale/good_job/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module GoodJob - VERSION = "1.7.0" - end -end diff --git a/judoscale-good_job/rails-autoscale-good_job.gemspec b/judoscale-good_job/rails-autoscale-good_job.gemspec index 3ef14b9b..0912da60 100644 --- a/judoscale-good_job/rails-autoscale-good_job.gemspec +++ b/judoscale-good_job/rails-autoscale-good_job.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/good_job/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-good_job" - spec.version = Judoscale::GoodJob::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-good_job", Judoscale::GoodJob::VERSION + spec.add_dependency "judoscale-good_job", Judoscale::VERSION end diff --git a/judoscale-que/judoscale-que.gemspec b/judoscale-que/judoscale-que.gemspec index c3e8c2b6..6483a125 100644 --- a/judoscale-que/judoscale-que.gemspec +++ b/judoscale-que/judoscale-que.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/que/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-que" - spec.version = Judoscale::Que::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::Que::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "que", ">= 1.0" end diff --git a/judoscale-que/lib/judoscale/que.rb b/judoscale-que/lib/judoscale/que.rb index 92fc3d0b..c8359355 100644 --- a/judoscale-que/lib/judoscale/que.rb +++ b/judoscale-que/lib/judoscale/que.rb @@ -2,13 +2,13 @@ require "judoscale-ruby" require "judoscale/config" -require "judoscale/que/version" +require "judoscale/version" require "judoscale/que/metrics_collector" require "que" Judoscale.add_adapter :"judoscale-que", { - adapter_version: Judoscale::Que::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::Que::VERSION }, metrics_collector: Judoscale::Que::MetricsCollector, diff --git a/judoscale-que/lib/judoscale/que/version.rb b/judoscale-que/lib/judoscale/que/version.rb deleted file mode 100644 index 9e36eac6..00000000 --- a/judoscale-que/lib/judoscale/que/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module Que - VERSION = "1.7.0" - end -end diff --git a/judoscale-que/rails-autoscale-que.gemspec b/judoscale-que/rails-autoscale-que.gemspec index 2a107c5e..25985aa7 100644 --- a/judoscale-que/rails-autoscale-que.gemspec +++ b/judoscale-que/rails-autoscale-que.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/que/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-que" - spec.version = Judoscale::Que::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-que", Judoscale::Que::VERSION + spec.add_dependency "judoscale-que", Judoscale::VERSION end diff --git a/judoscale-rack/judoscale-rack.gemspec b/judoscale-rack/judoscale-rack.gemspec index 309a374f..ef895395 100644 --- a/judoscale-rack/judoscale-rack.gemspec +++ b/judoscale-rack/judoscale-rack.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/rack/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-rack" - spec.version = Judoscale::Rack::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::Rack::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "rack" end diff --git a/judoscale-rack/lib/judoscale/rack.rb b/judoscale-rack/lib/judoscale/rack.rb index ff7faa9a..f583355a 100644 --- a/judoscale-rack/lib/judoscale/rack.rb +++ b/judoscale-rack/lib/judoscale/rack.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "judoscale-ruby" -require "judoscale/rack/version" +require "judoscale/version" require "judoscale/web_metrics_collector" require "judoscale/request_middleware" require "rack" @@ -10,6 +10,6 @@ # the app's middleware chain. Judoscale.add_adapter :"judoscale-rack", { - adapter_version: Judoscale::Rack::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::Rack.version }, metrics_collector: Judoscale::WebMetricsCollector diff --git a/judoscale-rack/lib/judoscale/rack/version.rb b/judoscale-rack/lib/judoscale/rack/version.rb deleted file mode 100644 index e73d25f2..00000000 --- a/judoscale-rack/lib/judoscale/rack/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module Rack - VERSION = "1.7.0" - end -end diff --git a/judoscale-rack/rails-autoscale-rack.gemspec b/judoscale-rack/rails-autoscale-rack.gemspec index 3ac6ccec..0f381d64 100644 --- a/judoscale-rack/rails-autoscale-rack.gemspec +++ b/judoscale-rack/rails-autoscale-rack.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/rack/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-rack" - spec.version = Judoscale::Rack::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-rack", Judoscale::Rack::VERSION + spec.add_dependency "judoscale-rack", Judoscale::VERSION end diff --git a/judoscale-rails/judoscale-rails.gemspec b/judoscale-rails/judoscale-rails.gemspec index 845a10d2..c93d62cc 100644 --- a/judoscale-rails/judoscale-rails.gemspec +++ b/judoscale-rails/judoscale-rails.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/rails/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-rails" - spec.version = Judoscale::Rails::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::Rails::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "railties" end diff --git a/judoscale-rails/lib/judoscale/rails.rb b/judoscale-rails/lib/judoscale/rails.rb index c4d6a67b..ba86b08a 100644 --- a/judoscale-rails/lib/judoscale/rails.rb +++ b/judoscale-rails/lib/judoscale/rails.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true require "judoscale-ruby" -require "judoscale/rails/version" +require "judoscale/version" require "judoscale/rails/railtie" require "judoscale/web_metrics_collector" require "rails/version" Judoscale.add_adapter :"judoscale-rails", { - adapter_version: Judoscale::Rails::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::Rails.version }, metrics_collector: Judoscale::WebMetricsCollector diff --git a/judoscale-rails/lib/judoscale/rails/version.rb b/judoscale-rails/lib/judoscale/rails/version.rb deleted file mode 100644 index 72c86151..00000000 --- a/judoscale-rails/lib/judoscale/rails/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module Rails - VERSION = "1.7.0" - end -end diff --git a/judoscale-rails/rails-autoscale-web.gemspec b/judoscale-rails/rails-autoscale-web.gemspec index 738838f9..25e50700 100644 --- a/judoscale-rails/rails-autoscale-web.gemspec +++ b/judoscale-rails/rails-autoscale-web.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/rails/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-web" - spec.version = Judoscale::Rails::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-rails", Judoscale::Rails::VERSION + spec.add_dependency "judoscale-rails", Judoscale::VERSION end diff --git a/judoscale-resque/judoscale-resque.gemspec b/judoscale-resque/judoscale-resque.gemspec index 87f9e1fd..1f5a80e2 100644 --- a/judoscale-resque/judoscale-resque.gemspec +++ b/judoscale-resque/judoscale-resque.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/resque/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-resque" - spec.version = Judoscale::Resque::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::Resque::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "resque", ">= 2.0" end diff --git a/judoscale-resque/lib/judoscale/resque.rb b/judoscale-resque/lib/judoscale/resque.rb index 19a74f24..efbabc98 100644 --- a/judoscale-resque/lib/judoscale/resque.rb +++ b/judoscale-resque/lib/judoscale/resque.rb @@ -2,14 +2,14 @@ require "judoscale-ruby" require "judoscale/config" -require "judoscale/resque/version" +require "judoscale/version" require "judoscale/resque/metrics_collector" require "resque" require "judoscale/resque/latency_extension" Judoscale.add_adapter :"judoscale-resque", { - adapter_version: Judoscale::Resque::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::Resque::VERSION }, metrics_collector: Judoscale::Resque::MetricsCollector, diff --git a/judoscale-resque/lib/judoscale/resque/version.rb b/judoscale-resque/lib/judoscale/resque/version.rb deleted file mode 100644 index e037bd50..00000000 --- a/judoscale-resque/lib/judoscale/resque/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module Resque - VERSION = "1.7.0" - end -end diff --git a/judoscale-resque/rails-autoscale-resque.gemspec b/judoscale-resque/rails-autoscale-resque.gemspec index e7ec281f..3a9ea922 100644 --- a/judoscale-resque/rails-autoscale-resque.gemspec +++ b/judoscale-resque/rails-autoscale-resque.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/resque/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-resque" - spec.version = Judoscale::Resque::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-resque", Judoscale::Resque::VERSION + spec.add_dependency "judoscale-resque", Judoscale::VERSION end diff --git a/judoscale-shoryuken/judoscale-shoryuken.gemspec b/judoscale-shoryuken/judoscale-shoryuken.gemspec index 8c86cb9f..9a980173 100644 --- a/judoscale-shoryuken/judoscale-shoryuken.gemspec +++ b/judoscale-shoryuken/judoscale-shoryuken.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/shoryuken/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-shoryuken" - spec.version = Judoscale::Shoryuken::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::Shoryuken::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "shoryuken", ">= 6.0" end diff --git a/judoscale-shoryuken/lib/judoscale/shoryuken.rb b/judoscale-shoryuken/lib/judoscale/shoryuken.rb index be058521..40022bab 100644 --- a/judoscale-shoryuken/lib/judoscale/shoryuken.rb +++ b/judoscale-shoryuken/lib/judoscale/shoryuken.rb @@ -2,13 +2,13 @@ require "judoscale-ruby" require "judoscale/config" -require "judoscale/shoryuken/version" +require "judoscale/version" require "judoscale/shoryuken/metrics_collector" require "shoryuken" Judoscale.add_adapter :"judoscale-shoryuken", { - adapter_version: Judoscale::Shoryuken::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::Shoryuken::VERSION }, metrics_collector: Judoscale::Shoryuken::MetricsCollector, diff --git a/judoscale-shoryuken/lib/judoscale/shoryuken/version.rb b/judoscale-shoryuken/lib/judoscale/shoryuken/version.rb deleted file mode 100644 index 08afb317..00000000 --- a/judoscale-shoryuken/lib/judoscale/shoryuken/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module Shoryuken - VERSION = "1.7.0" - end -end diff --git a/judoscale-shoryuken/rails-autoscale-shoryuken.gemspec b/judoscale-shoryuken/rails-autoscale-shoryuken.gemspec index 442f1cf7..2965a9f0 100644 --- a/judoscale-shoryuken/rails-autoscale-shoryuken.gemspec +++ b/judoscale-shoryuken/rails-autoscale-shoryuken.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/shoryuken/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-shoryuken" - spec.version = Judoscale::Shoryuken::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-shoryuken", Judoscale::Shoryuken::VERSION + spec.add_dependency "judoscale-shoryuken", Judoscale::VERSION end diff --git a/judoscale-sidekiq/judoscale-sidekiq.gemspec b/judoscale-sidekiq/judoscale-sidekiq.gemspec index 39dcaa87..2ab5dfbb 100644 --- a/judoscale-sidekiq/judoscale-sidekiq.gemspec +++ b/judoscale-sidekiq/judoscale-sidekiq.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/sidekiq/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-sidekiq" - spec.version = Judoscale::Sidekiq::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" - spec.add_dependency "judoscale-ruby", Judoscale::Sidekiq::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "sidekiq", ">= 5.0" end diff --git a/judoscale-sidekiq/lib/judoscale/sidekiq.rb b/judoscale-sidekiq/lib/judoscale/sidekiq.rb index 3cf1e84a..cfec5d35 100644 --- a/judoscale-sidekiq/lib/judoscale/sidekiq.rb +++ b/judoscale-sidekiq/lib/judoscale/sidekiq.rb @@ -2,13 +2,13 @@ require "judoscale-ruby" require "judoscale/config" -require "judoscale/sidekiq/version" +require "judoscale/version" require "judoscale/sidekiq/metrics_collector" require "sidekiq/api" Judoscale.add_adapter :"judoscale-sidekiq", { - adapter_version: Judoscale::Sidekiq::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::Sidekiq::VERSION }, metrics_collector: Judoscale::Sidekiq::MetricsCollector, diff --git a/judoscale-sidekiq/lib/judoscale/sidekiq/version.rb b/judoscale-sidekiq/lib/judoscale/sidekiq/version.rb deleted file mode 100644 index 3d679414..00000000 --- a/judoscale-sidekiq/lib/judoscale/sidekiq/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module Sidekiq - VERSION = "1.7.0" - end -end diff --git a/judoscale-sidekiq/rails-autoscale-sidekiq.gemspec b/judoscale-sidekiq/rails-autoscale-sidekiq.gemspec index 630f6e51..a8732f0f 100644 --- a/judoscale-sidekiq/rails-autoscale-sidekiq.gemspec +++ b/judoscale-sidekiq/rails-autoscale-sidekiq.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/sidekiq/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-sidekiq" - spec.version = Judoscale::Sidekiq::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-sidekiq", Judoscale::Sidekiq::VERSION + spec.add_dependency "judoscale-sidekiq", Judoscale::VERSION end diff --git a/judoscale-solid_queue/judoscale-solid_queue.gemspec b/judoscale-solid_queue/judoscale-solid_queue.gemspec index 910dabc3..020fd1cc 100644 --- a/judoscale-solid_queue/judoscale-solid_queue.gemspec +++ b/judoscale-solid_queue/judoscale-solid_queue.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/solid_queue/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "judoscale-solid_queue" - spec.version = Judoscale::SolidQueue::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.7.0" - spec.add_dependency "judoscale-ruby", Judoscale::SolidQueue::VERSION + spec.add_dependency "judoscale-ruby", Judoscale::VERSION spec.add_dependency "solid_queue", ">= 0.3" end diff --git a/judoscale-solid_queue/lib/judoscale/solid_queue.rb b/judoscale-solid_queue/lib/judoscale/solid_queue.rb index 2bc50f7c..7c84579d 100644 --- a/judoscale-solid_queue/lib/judoscale/solid_queue.rb +++ b/judoscale-solid_queue/lib/judoscale/solid_queue.rb @@ -3,12 +3,12 @@ require "solid_queue" require "judoscale-ruby" require "judoscale/config" -require "judoscale/solid_queue/version" +require "judoscale/version" require "judoscale/solid_queue/metrics_collector" Judoscale.add_adapter :"judoscale-solid_queue", { - adapter_version: Judoscale::SolidQueue::VERSION, + adapter_version: Judoscale::VERSION, framework_version: ::SolidQueue::VERSION }, metrics_collector: Judoscale::SolidQueue::MetricsCollector, diff --git a/judoscale-solid_queue/lib/judoscale/solid_queue/version.rb b/judoscale-solid_queue/lib/judoscale/solid_queue/version.rb deleted file mode 100644 index 3414acce..00000000 --- a/judoscale-solid_queue/lib/judoscale/solid_queue/version.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module Judoscale - module SolidQueue - VERSION = "1.7.0" - end -end diff --git a/judoscale-solid_queue/rails-autoscale-solid_queue.gemspec b/judoscale-solid_queue/rails-autoscale-solid_queue.gemspec index 452e9a15..ca533fe0 100644 --- a/judoscale-solid_queue/rails-autoscale-solid_queue.gemspec +++ b/judoscale-solid_queue/rails-autoscale-solid_queue.gemspec @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative "lib/judoscale/solid_queue/version" +require_relative "../judoscale-ruby/lib/judoscale/version" Gem::Specification.new do |spec| spec.name = "rails-autoscale-solid_queue" - spec.version = Judoscale::SolidQueue::VERSION + spec.version = Judoscale::VERSION spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"] spec.email = ["hello@judoscale.com"] @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*"].select { |f| f.match?(%r{rails-autoscale}) } spec.require_paths = ["lib"] - spec.add_dependency "judoscale-solid_queue", Judoscale::SolidQueue::VERSION + spec.add_dependency "judoscale-solid_queue", Judoscale::VERSION end