next_rails 1.2.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e72b90b419e084f28bdd704b0130169cc2e6c6bb0d72e0ab953cede28c2cd11d
-  data.tar.gz: 7a14d79ce4a037e8a1ff04070021ade0323e245836e1016b7463b106331e96ba
+  metadata.gz: 7c82f6a12b6cd481313202fce9894ca2690c222d4397a14398f74c4dd0e6d31f
+  data.tar.gz: 546438cf1893b369c1f4c0d05f507a99c96a3dbd939b78b8e3bacbed560f2150
 SHA512:
-  metadata.gz: b71eab63bf0f85e0d76ef308704a1247765ab5a404140591f902e3fc5fec13dd6c6c18e8328f2d8d6654cc3fc88fceba714adb1c86e7d9ea4ab0fbf151dc5468
-  data.tar.gz: a9c71c3d81c477d198b7be8408791ac5f0882da5042afc46a3f4144f76a80b8f93d6283ac3cacdaa93a91d892757e9c8028121f7776ea7399f0a4bcca22e35a4
+  metadata.gz: a1330ca26c90f32978737bbf780156458bc8254377addbfdb860c63b1ff697f06a554e640d457bc7c7d1433a3baa7f2cd0115d4860bf451b85d468f8d0501eec
+  data.tar.gz: a5b5da58d00c288258931320c395cbccf1341f4eed15f56b680693f2ef3919d96ec97542a9bc2c3c11e5cf82ee5371f44d64162e9630901a4c702ded146e1415

data/.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Run rake task
+name: Continuous Integration
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [3.2, 3.1, 3.0, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0.0]
+        ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
 
     steps:
       - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,6 +1,20 @@
-# main [(unreleased)](https://github.com/fastruby/next_rails/compare/v1.2.4...main)
+# main [(unreleased)](https://github.com/fastruby/next_rails/compare/v1.4.0...main)
+
 * Your changes/patches go here.
 
+# v1.4.0 / 2024-09-24 [(commits)](https://github.com/fastruby/next_rails/compare/v1.3.0...v1.4.0)
+
+- [CHORE: Use next_rails namespace on spec tests.](https://github.com/fastruby/next_rails/pull/117)
+- [CHORE: Remove 2.0.0, 2.1, 2.2 Ruby support](https://github.com/fastruby/next_rails/pull/126)
+- [CHORE: Update compatibility for Ruby versions to use Rainbow](https://github.com/fastruby/next_rails/pull/125)
+- [FEATURE: Support compatibility for Ruby versions](https://github.com/fastruby/next_rails/pull/116)
+- [CHORE: Remove GPL licensed dependency Colorize and replace it with Rainbow]
+
+# v1.3.0 / 2023-06-16 [(commits)](https://github.com/fastruby/next_rails/compare/v1.2.4...v1.3.0)
+
+- [FEATURE: Add NextRails.next? for application usage (e.g. Rails shims)](https://github.com/fastruby/next_rails/pull/97)
+- [BUGFIX: Support ERB versions older than 2.2.0](https://github.com/fastruby/next_rails/pull/100)
+
 # v1.2.4 / 2023-04-21 [(commits)](https://github.com/fastruby/next_rails/compare/v1.2.3...v1.2.4)
 
 - [BUGFIX: Update the warn method signature to support for Ruby 3]

data/README.md

@@ -1,5 +1,7 @@
 # Next Rails
 
+[![Continuous Integration](https://github.com/fastruby/next_rails/actions/workflows/main.yml/badge.svg)](https://github.com/fastruby/next_rails/actions/workflows/main.yml)
+
 This is a toolkit to upgrade your next Rails application. It will help you
 set up dual booting, track deprecation warnings, and get a report on outdated
 dependencies for any Rails application.
@@ -39,12 +41,36 @@ bundle_report outdated --json
 # Show gems that don't work with Rails 5.2.0
 bundle_report compatibility --rails-version=5.2.0
 
-# Show the usual help message
-bundle_report --help
+# Show gems that don't work with Ruby 3.0
+bundle_report compatibility --ruby-version=3.0
+
 # Find minimum compatible ruby version with Rails 7.0.0
 bundle_report ruby_check --rails-version=7.0.0
+
+# Show the usual help message
+bundle_report --help
 ```
 
+### Application usage
+
+Every now and then it will be necessary to add code like this to your
+application:
+
+```ruby
+if NextRails.next?
+  # Do things "the Rails 7 way"
+else
+  # Do things "the Rails 6.1 way"
+end
+```
+
+The `NextRails.next?` method will use your environment
+(e.g. `ENV['BUNDLE_GEMFILE]`) to determine whether your application is
+running with the next set of dependencies or the current set of dependencies.
+
+This might come in handy if you need to inject
+[Ruby or Rails shims](https://www.fastruby.io/blog/rails/upgrades/rails-upgrade-shims.html).
+
 ### Deprecation tracking
 
 If you're using RSpec, add this snippet to `rails_helper.rb` or `spec_helper.rb` (whichever loads Rails).

data/exe/bundle_report

@@ -16,6 +16,7 @@ at_exit do
 
       Examples:
         #{$0} compatibility --rails-version 5.0
+        #{$0} compatibility --ruby-version 3.3
         #{$0} outdated
         #{$0} outdated --json
 
@@ -33,6 +34,10 @@ at_exit do
       options[:rails_version] = rails_version
     end
 
+    opts.on("--ruby-version [STRING]", "Ruby version to check compatibility against (defaults to 2.3)") do |ruby_version|
+      options[:ruby_version] = ruby_version
+    end
+
     opts.on("--include-rails-gems", "Include Rails gems in compatibility report (defaults to false)") do
       options[:include_rails_gems] = true
     end
@@ -61,7 +66,11 @@ at_exit do
   when "ruby_check" then NextRails::BundleReport.compatible_ruby_version(rails_version: options.fetch(:rails_version))
   when "outdated" then NextRails::BundleReport.outdated(options.fetch(:format, nil))
   else
-    NextRails::BundleReport.compatibility(rails_version: options.fetch(:rails_version, "5.0"), include_rails_gems: options.fetch(:include_rails_gems, false))
+    if options[:ruby_version]
+      NextRails::BundleReport.compatibility(ruby_version: options.fetch(:ruby_version, "2.3"))
+    else
+      NextRails::BundleReport.compatibility(rails_version: options.fetch(:rails_version, "5.0"), include_rails_gems: options.fetch(:include_rails_gems, false))
+    end
   end
 end
 

data/exe/deprecations

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 require "json"
-require "colorize"
+require "rainbow/refinement"
 require "optparse"
 require "set"
 
+using Rainbow
+
 def run_tests(deprecation_warnings, opts = {})
   tracker_mode = opts[:tracker_mode]
   next_mode = opts[:next_mode]

data/lib/deprecation_tracker.rb

@@ -1,6 +1,8 @@
-require "colorize"
+require "rainbow/refinement"
 require "json"
 
+using Rainbow
+
 # A shitlist for deprecation warnings during test runs. It has two modes: "save" and "compare"
 #
 # DEPRECATION_TRACKER=save

data/lib/next_rails/bundle_report/ruby_version_compatibility.rb

@@ -0,0 +1,46 @@
+require "rainbow/refinement"
+
+class NextRails::BundleReport::RubyVersionCompatibility
+  using Rainbow
+
+  MINIMAL_VERSION = 1.0
+  attr_reader :gems, :options
+
+  def initialize(gems: NextRails::GemInfo.all, options: {})
+    @gems = gems
+    @options = options
+  end
+
+  def generate
+    return invalid_message unless valid?
+
+    message
+  end
+
+  private
+
+  def message
+    output = "=> Incompatible gems with Ruby #{ruby_version}:".white.bold
+    incompatible.each do |gem|
+      output += "\n#{gem.name} - required Ruby version: #{gem.gem_specification.required_ruby_version}".magenta
+    end
+    output += "\n\n#{incompatible.length} incompatible #{incompatible.one? ? 'gem' : 'gems' } with Ruby #{ruby_version}".red
+    output
+  end
+
+  def incompatible
+    gems.reject { |gem| gem.compatible_with_ruby?(ruby_version) }
+  end
+
+  def ruby_version
+    options[:ruby_version].to_f
+  end
+
+  def invalid_message
+    "=> Invalid Ruby version: #{options[:ruby_version]}.".red.bold
+  end
+
+  def valid?
+    ruby_version > MINIMAL_VERSION
+  end
+end

data/lib/next_rails/bundle_report.rb

@@ -1,14 +1,18 @@
-require "colorize"
+require "rainbow/refinement"
 require "cgi"
 require "erb"
 require "json"
 require "net/http"
 
+using Rainbow
+
 module NextRails
   module BundleReport
     extend self
 
-    def compatibility(rails_version: nil, include_rails_gems: nil)
+    def compatibility(rails_version: nil, ruby_version: nil, include_rails_gems: nil)
+      return puts RubyVersionCompatibility.new(options: { ruby_version: ruby_version }).generate if ruby_version
+
       incompatible_gems = NextRails::GemInfo.all.reject do |gem|
         gem.compatible_with_rails?(rails_version: rails_version) || (!include_rails_gems && gem.from_rails?)
       end.sort_by { |gem| gem.name }
@@ -17,6 +21,10 @@ module NextRails
 
       incompatible_gems_by_state = incompatible_gems.group_by { |gem| gem.state(rails_version) }
 
+      puts erb_output(incompatible_gems_by_state, incompatible_gems, rails_version)
+    end
+
+    def erb_output(incompatible_gems_by_state, incompatible_gems, rails_version)
       template = <<-ERB
 <% if incompatible_gems_by_state[:found_compatible] -%>
 <%= "=> Incompatible with Rails #{rails_version} (with new versions that are compatible):".white.bold %>
@@ -49,7 +57,16 @@ module NextRails
 <%= incompatible_gems.length.to_s.red %> gems incompatible with Rails <%= rails_version %>
       ERB
 
-      puts ERB.new(template, trim_mode: "-").result(binding)
+      erb_version = ERB.version
+      if erb_version =~ /erb.rb \[([\d\.]+) .*\]/
+        erb_version = $1
+      end
+
+      if Gem::Version.new(erb_version) < Gem::Version.new("2.2")
+        ERB.new(template, nil, "-").result(binding)
+      else
+        ERB.new(template, trim_mode: "-").result(binding)
+      end
     end
 
     def gem_header(_gem)
@@ -155,4 +172,4 @@ module NextRails
       puts footer
     end
   end
-end
+end

data/lib/next_rails/gem_info.rb

@@ -147,5 +147,9 @@ module NextRails
         rails_dependency.requirement.satisfied_by?(Gem::Version.new(rails_version))
       end
     end
+
+    def compatible_with_ruby?(ruby_version)
+      gem_specification.required_ruby_version.satisfied_by?(Gem::Version.new(ruby_version))
+    end
   end
 end

data/lib/next_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NextRails
-  VERSION = "1.2.4"
+  VERSION = "1.4.0"
 end

data/lib/next_rails.rb

@@ -1,8 +1,28 @@
+# frozen_string_literal: true
+
 require "next_rails/gem_info"
 require "next_rails/version"
 require "next_rails/bundle_report"
+require "next_rails/bundle_report/ruby_version_compatibility"
 require "deprecation_tracker"
 
 module NextRails
-  # Your code goes here...
+  @@next_bundle_gemfile = nil
+
+  # This method will check your environment
+  # (e.g. `ENV['BUNDLE_GEMFILE]`) to determine whether your application is
+  # running with the next set of dependencies or the current set of dependencies.
+  #
+  # @return [Boolean]
+  def self.next?
+    return @@next_bundle_gemfile unless @@next_bundle_gemfile.nil?
+
+    @@next_bundle_gemfile = File.exist?(ENV["BUNDLE_GEMFILE"]) && File.basename(ENV["BUNDLE_GEMFILE"]) == "Gemfile.next"
+  end
+
+  # This method will reset the @@next_bundle_gemfile variable. Then next time
+  # you call `NextRails.next?` it will check the environment once again.
+  def self.reset_next_bundle_gemfile
+    @@next_bundle_gemfile = nil
+  end
 end

data/next_rails.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "next_rails/version"
@@ -23,12 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "colorize", ">= 0.8.1"
+  spec.add_dependency "rainbow", ">= 3"
   spec.add_development_dependency "bundler", ">= 1.16", "< 3.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.17.1"
   spec.add_development_dependency "timecop", "~> 0.9.1"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rexml", "3.1.7.3" # limited on purpose, new versions don't work with old rubies
   spec.add_development_dependency "webmock", "3.16.2" # limited on purpose, new versions don't work with old rubies
 end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: next_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Ernesto Tagwerker
 - Luis Sagastume
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -150,9 +164,7 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
-- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -171,6 +183,7 @@ files:
 - lib/deprecation_tracker.rb
 - lib/next_rails.rb
 - lib/next_rails/bundle_report.rb
+- lib/next_rails/bundle_report/ruby_version_compatibility.rb
 - lib/next_rails/gem_info.rb
 - lib/next_rails/version.rb
 - next_rails.gemspec
@@ -179,7 +192,7 @@ homepage: https://github.com/fastruby/next_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: A toolkit to upgrade your next Rails application
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.3
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.2
-before_install: gem install bundler -v 1.16.1

data/CODEOWNERS

@@ -1,4 +0,0 @@
-# These code owners will be the default owners to everything in the repository.
-# Unless a posterior rule has precedence, they will be automatically requested
-# for review when a pull request is opened.
-*       @fastruby/black-bunny-brigade