Make rails-autoscale-* gems wrappers around judoscale-*, simplify requires & gemspecs #209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Stop messing with the load path, use the same approach `bundle gem` generated gems are using now with `require_relative`, and add the `frozen_string_literal` pragma as well.
Instead of directly requiring judoscale/* files, make it require the base judoscale-* lib file, and leave the work of requiring judoscale/* files to judoscale-* itself. This is more flexible as it allows judoscale-* to have extra code/setup if necessary (as it happens with judoscale-ruby for instance, which rails-autoscale-core is currently requiring), and might allow us to make rails-autoscale-* gems to be more like shims that depend on judoscale-* in the future.
The rails-autoscale-* gems will be shims on top of judoscale-* gems, simply depending on / requiring them going forward. We only include the rails-autoscale-* files on the gem via gemspec now, and the specific `version.rb` file for each, since that's necessary for the dependency / gemspec setup. This means the judoscale-* gems can now dictate the dependencies without us having to update both judoscale-* and rails-autoscale-* versions.
Use Ruby's `Dir` to list all files under `lib/`, and partition them based on whether they match `rails-autoscale` for each lib. In other words, the judoscale-* libs will get all files that don't match `rails-autoscale`, while the rails-autoscale-* libs will get all files that match `rails-autoscale`, which should really only be the main entry point that delegates back to the respective `judoscale-*` version. Now for rails-autoscale-* libs, the gemspec lists the matching judoscale-* library, it will only include the main lib/rails-autoscale* entrypoint file, which should simply require the respective judoscale-* file, making the rails-autoscale-* libs simpler shims that wrap the judoscale-* ones. This also simplifies the judoscale-* gemspecs to list only the lib/* files, rather than a few others that were previously included but weren't necessary. (like Gemfile, Rakefile, gemspecs.)
Let judoscale-* gemspecs define that, since the rails-autoscale-* depends on them, they'll follow/honor the same required Ruby version.
carlosantoniodasilva
changed the title
Merged
| @@ -1,3 +1,3 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| require "judoscale/delayed_job" | |||
| require "judoscale-delayed_job" | |||
There was a problem hiding this comment.
Require the base lib file, instead of directly requiring the inner file. This allows the judoscale lib to determine what needs to be required, and rails-autoscale will simply delegate to that.
adamlogic
approved these changes
May 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This simplifies our gem setup to avoid getting judoscale-* and rails-autoscale-* out of sync. This happened recently with good job: #198.
Changes:
rails-autoscale-*depend on their respectivejudoscale-*library, leavingjudoscale-*handle any additional dependencies.rails-autoscale-*, since it should honorjudoscale-*.rails-autoscale-*do not require therails-autoscale-corelibrary anymore, since it should have access to the core viajudoscale-*->judoscale-ruby, and the constant aliasing is there in judoscale-ruby.lib/*files, no longer include Gemfile(s)/Rakefile/gemspec(s).rails-autoscale-*will simply includelib/rails-autoscale-*, and that will require the respectivejudoscale-*lib nowjudoscale-*will include everything underlib/*, except files matchingrails-autoscalelib/*files between the two libs.