next_rails 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e72b90b419e084f28bdd704b0130169cc2e6c6bb0d72e0ab953cede28c2cd11d
-  data.tar.gz: 7a14d79ce4a037e8a1ff04070021ade0323e245836e1016b7463b106331e96ba
+  metadata.gz: 7c7f594ed23846772d59319982c2e1b866b2ba2aeea221e9f276b876d1bfa6a5
+  data.tar.gz: 9f197cf8c84806932c34b5efe31467dab0b58d53408252ce7db193e6547486b2
 SHA512:
-  metadata.gz: b71eab63bf0f85e0d76ef308704a1247765ab5a404140591f902e3fc5fec13dd6c6c18e8328f2d8d6654cc3fc88fceba714adb1c86e7d9ea4ab0fbf151dc5468
-  data.tar.gz: a9c71c3d81c477d198b7be8408791ac5f0882da5042afc46a3f4144f76a80b8f93d6283ac3cacdaa93a91d892757e9c8028121f7776ea7399f0a4bcca22e35a4
+  metadata.gz: 9608a14f3d6ec0dd9b939d52b6b94c3670d4ad8a9a4d4ffc70b2b4f459b5545fa762da0a74f0782efd58ec25f293671cc5039e90f2425e7e7d8570e68f4ad7ba
+  data.tar.gz: 5f3de5c08c617fd74c78d517480cd04747cbf2ac22a6e4348005dae32ba387596f5a74b4ac2b31a6489fedd3d267213432ec94a000ad5cd0162c99b22e4d90c0

data/.github/workflows/main.yml

@@ -13,7 +13,23 @@ 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.2, 3.1, 3.0, 2.7, 2.6, 2.5, 2.4, 2.3]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run rake task
+        run: bundle exec rake
+
+  test_older:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby-version: [2.2, 2.1, 2.0.0]
 
     steps:
       - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,6 +1,12 @@
-# main [(unreleased)](https://github.com/fastruby/next_rails/compare/v1.2.4...main)
+# main [(unreleased)](https://github.com/fastruby/next_rails/compare/v1.3.0...main)
+
 * Your changes/patches go here.
 
+# 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

@@ -45,6 +45,26 @@ bundle_report --help
 bundle_report ruby_check --rails-version=7.0.0
 ```
 
+### 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/lib/next_rails/bundle_report.rb

@@ -17,6 +17,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 +53,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)

data/lib/next_rails/version.rb

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

data/lib/next_rails.rb

@@ -1,8 +1,27 @@
+# frozen_string_literal: true
+
 require "next_rails/gem_info"
 require "next_rails/version"
 require "next_rails/bundle_report"
 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"
@@ -29,6 +28,7 @@ Gem::Specification.new do |spec|
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: next_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Ernesto Tagwerker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -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
@@ -194,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A toolkit to upgrade your next Rails application