amazing_print 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95f05f3413c3497f346ec0bb7de2ed94a065aa6224a0a6bc8b36c699728ea4b2
-  data.tar.gz: 112760cadb1e3b76240163a64a462323975e5885ea0e002845790d75fb0c6858
+  metadata.gz: 5d771d603c88c997bca4379eba3dc4cd794994e5810edb0859ad5c47c3b2590c
+  data.tar.gz: 87ea8f90780f57731ad4cff0bfbce9eb2d837681829979bd23e839f62415a1b0
 SHA512:
-  metadata.gz: 2f2e2fddf5cbf25953721ab0bc8f0ff0648fbe93710508137af6022ef5b8c5153be9292cbea2910fe4ef8b434c2a3510585f2ef5e98097296f78e0c74f292140
-  data.tar.gz: 0b2e88771d4c2835e586a5ccf5c3c6e8822267475a65ddd80faf5908e526b099ea888953395fb77047df776ba7f6e7e63cf8bf50cb7676b253b2c67987b1437c
+  metadata.gz: d1d1d0eb8ca306adbf3af3eec93d9cbb3fa6a47f1ad0e3b836d473bc4a0595be02dcd27af60de86a3f524bb373e5e0d2b9053f6b40dfac437add803dc075a315
+  data.tar.gz: 3c74f2a0333fad6e5c34b5209124767b931d56c88423960f55945b694e27dadd41636259f7a1a395e64d4971887c2d1f095b64714acd525748dae5423d670872

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## v1.5.0
+  - Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1
+  - Add File/Dir formatters for mswin platform #48
+  - Don't monkey patch String class #91
+  - Fix ruby19 hash syntax so it can be copy-pasted #94
+
 ## v1.4.0
   - Support loading config from `$XDG_CONFIG_HOME/aprc` - #63
   - Remove support for Rails 5.1 #75

data/Gemfile

@@ -4,3 +4,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in amazing_print.gemspec
 gemspec
+
+# Development dependencies
+gem 'appraisal', '~> 2.3'
+gem 'fakefs', '~> 1.2'
+gem 'nokogiri', '~> 1.10'
+gem 'pry'
+gem 'rspec', '~> 3.9'
+gem 'rubocop', '~> 1.20'
+gem 'rubocop-rspec', '~> 2.4'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazing_print (1.3.1.pre)
+    amazing_print (1.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -12,56 +12,62 @@ GEM
       thor (>= 0.14.0)
     ast (2.4.2)
     coderay (1.1.3)
-    diff-lcs (1.4.4)
-    fakefs (1.3.2)
+    diff-lcs (1.5.0)
+    fakefs (1.9.0)
+    json (2.6.3)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.5.2)
-    rainbow (3.0.0)
+    racc (1.6.2)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.51.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.5.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    thor (1.1.0)
-    unicode-display_width (2.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    thor (1.2.2)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   amazing_print!
@@ -74,4 +80,4 @@ DEPENDENCIES
   rubocop-rspec (~> 2.4)
 
 BUNDLED WITH
-   2.2.27
+   2.3.12

data/README.md

@@ -3,9 +3,8 @@
 [![RubyGems][gem_version_badge]][ruby_gems]
 [![RubyGems][gem_downloads_badge]][ruby_gems]
 |
-[![Travis CI][travis_ci_badge]][travis_ci]
 ![Specs](https://github.com/amazing-print/amazing_print/workflows/Specs/badge.svg)
-![Lint](https://github.com/amazing-print/amazing_print/workflows/Lint/badge.svg)
+![Lint](https://github.com/amazing-print/amazing_print/workflows/Lints/badge.svg)
 |
 [![Gitter](https://badges.gitter.im/amazing-print/community.svg)](https://gitter.im/amazing-print/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

data/lib/amazing_print/colorize.rb

@@ -2,24 +2,17 @@
 
 autoload :CGI, 'cgi'
 
+require_relative 'colors'
+
 module AmazingPrint
   module Colorize
     # Pick the color and apply it to the given string as necessary.
     #------------------------------------------------------------------------------
     def colorize(str, type)
       str = CGI.escapeHTML(str) if options[:html]
-      if options[:plain] || !options[:color][type] || !inspector.colorize?
-        str
-      #
-      # Check if the string color method is defined by amazing_print and accepts
-      # html parameter or it has been overriden by some gem such as colorize.
-      #
-      elsif str.method(options[:color][type]).arity == -1 # Accepts html parameter.
-        str.send(options[:color][type], options[:html])
-      else
-        str = %(<kbd style="color:#{options[:color][type]}">#{str}</kbd>) if options[:html]
-        str.send(options[:color][type])
-      end
+      return str if options[:plain] || !options[:color][type] || !inspector.colorize?
+
+      AmazingPrint::Colors.public_send(options[:color][type], str, options[:html])
     end
   end
 end

data/lib/amazing_print/colors.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module AmazingPrint
+  module Colors
+    module_function
+
+    #
+    # ANSI color codes:
+    #   \e => escape
+    #   30 => color base
+    #    1 => bright
+    #    0 => normal
+    #
+    # For HTML coloring we use <kbd> tag instead of <span> to require monospace
+    # font. Note that beloved <tt> has been removed from HTML5.
+    #
+    %w[gray red green yellow blue purple cyan white].zip(
+      %w[black darkred darkgreen brown navy darkmagenta darkcyan slategray]
+    ).each_with_index do |(color, shade), i|
+      # NOTE: Format strings are created once only, for performance, and remembered by closures.
+
+      term_bright_seq = "\e[1;#{i + 30}m%s\e[0m"
+      html_bright_seq = %(<kbd style="color:#{color}">%s</kbd>)
+
+      define_method color do |str, html = false|
+        (html ? html_bright_seq : term_bright_seq) % str
+      end
+
+      term_normal_seq = "\e[0;#{i + 30}m%s\e[0m"
+      html_normal_seq = %(<kbd style="color:#{shade}">%s</kbd>)
+
+      define_method "#{color}ish" do |str, html = false|
+        (html ? html_normal_seq : term_normal_seq) % str
+      end
+    end
+  end
+end

data/lib/amazing_print/formatters/array_formatter.rb

@@ -15,7 +15,7 @@ module AmazingPrint
       end
 
       def format
-        if array.length.zero?
+        if array.empty?
           '[]'
         elsif methods_array?
           methods_array

data/lib/amazing_print/formatters/dir_formatter.rb

@@ -3,6 +3,7 @@
 require 'shellwords'
 
 require_relative 'base_formatter'
+require_relative 'mswin_helper' if RUBY_PLATFORM.include?('mswin')
 
 module AmazingPrint
   module Formatters
@@ -17,9 +18,17 @@ module AmazingPrint
       end
 
       def format
-        ls = `ls -alF #{dir.path.shellescape}`
+        ls = info
         colorize(ls.empty? ? dir.inspect : "#{dir.inspect}\n#{ls.chop}", :dir)
       end
+
+      def info
+        if RUBY_PLATFORM.include?('mswin')
+          "#{GetChildItem.new(@dir.path)}\n"
+        else
+          `ls -alF #{dir.path.shellescape}`
+        end
+      end
     end
   end
 end

data/lib/amazing_print/formatters/file_formatter.rb

@@ -3,6 +3,7 @@
 require 'shellwords'
 
 require_relative 'base_formatter'
+require_relative 'mswin_helper' if RUBY_PLATFORM.include?('mswin')
 
 module AmazingPrint
   module Formatters
@@ -17,9 +18,17 @@ module AmazingPrint
       end
 
       def format
-        ls = File.directory?(file) ? `ls -adlF #{file.path.shellescape}` : `ls -alF #{file.path.shellescape}`
+        ls = info
         colorize(ls.empty? ? file.inspect : "#{file.inspect}\n#{ls.chop}", :file)
       end
+
+      def info
+        if RUBY_PLATFORM.include?('mswin')
+          "#{GetChildItem.new(@file.path)}\n"
+        else
+          File.directory?(file) ? `ls -adlF #{file.path.shellescape}` : `ls -alF #{file.path.shellescape}`
+        end
+      end
     end
   end
 end

data/lib/amazing_print/formatters/hash_formatter.rb

@@ -87,7 +87,8 @@ module AmazingPrint
 
       def ruby19_syntax(key, value, width)
         key[0] = ''
-        "#{align(key, width - 1)}#{colorize(': ', :hash)}#{inspector.awesome(value)}"
+        key << ':'
+        "#{align(key, width)} #{inspector.awesome(value)}"
       end
 
       def pre_ruby19_syntax(key, value, width)

data/lib/amazing_print/formatters/mswin_helper.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'fiddle'
+require 'fiddle/import'
+
+module AmazingPrint
+  module Formatters
+    module Kernel32
+      extend Fiddle::Importer
+      dlload 'kernel32'
+      extern 'unsigned long GetFileAttributesA(const char*)'
+    end
+
+    class GetChildItem
+      def initialize(fname)
+        @fname = fname
+        @stat = File.send(File.symlink?(@fname) ? :lstat : :stat, @fname)
+        @attrs = Kernel32::GetFileAttributesA @fname
+      end
+
+      # docs.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants
+      FILE_ATTRIBUTE_ARCHIVE  = 0x20
+      FILE_ATTRIBUTE_READONLY = 0x1
+      FILE_ATTRIBUTE_HIDDEN   = 0x2
+      FILE_ATTRIBUTE_SYSTEM   = 0x4
+
+      def mode
+        r = ['-'] * 6
+        r[0] = 'd' if @stat.directory?
+        r[1] = 'a' unless (@attrs & FILE_ATTRIBUTE_ARCHIVE).zero?
+        r[2] = 'r' unless (@attrs & FILE_ATTRIBUTE_READONLY).zero?
+        r[3] = 'h' unless (@attrs & FILE_ATTRIBUTE_HIDDEN).zero?
+        r[4] = 's' unless (@attrs & FILE_ATTRIBUTE_SYSTEM).zero?
+        r[5] = 'l' if File.symlink? @fname
+        r.join
+      end
+
+      def last_write_time
+        @stat.mtime.strftime '%Y-%m-%d     %H:%M'
+      end
+
+      def length
+        @stat.file? ? @stat.size.to_s : ''
+      end
+
+      def name
+        @fname
+      end
+
+      def to_s
+        format '%-12<Mode>s %<LastWriteTime>s %14<Length>s %<Name>s',
+               {
+                 Mode: mode,
+                 LastWriteTime: last_write_time,
+                 Length: length,
+                 Name: name
+               }
+      end
+    end
+  end
+end
+
+puts AmazingPrint::Formatters::GetChildItem.new ARGV[0] if __FILE__ == $PROGRAM_NAME

data/lib/amazing_print/inspector.rb

@@ -166,7 +166,7 @@ module AmazingPrint
       return xdg_config_path if File.exist?(xdg_config_path)
 
       # default to ~/.aprc
-      File.join(ENV['HOME'], '.aprc')
+      File.join(Dir.home, '.aprc')
     end
 
     # This method needs to be mocked during testing so that it always loads

data/lib/amazing_print/version.rb

@@ -7,6 +7,6 @@
 #------------------------------------------------------------------------------
 module AmazingPrint
   def self.version
-    '1.4.0'
+    '1.5.0'
   end
 end

data/lib/amazing_print.rb

@@ -10,7 +10,7 @@
 # so do nothing for subsequent requires.
 #
 unless defined?(AmazingPrint::Inspector)
-  %w[awesome_method_array string object class kernel].each do |file|
+  %w[awesome_method_array object class kernel].each do |file|
     require_relative "amazing_print/core_ext/#{file}"
   end
 

data/spec/colors_spec.rb

@@ -102,11 +102,16 @@ RSpec.describe 'AmazingPrint' do
         stub_tty!
       end
     end
+  end
+
+  describe 'AmazingPrint::Colors' do
+    %i[gray red green yellow blue purple cyan white].each_with_index do |color, i|
+      it "has #{color} color" do
+        expect(AmazingPrint::Colors.public_send(color, color.to_s)).to eq("\e[1;#{i + 30}m#{color}\e[0m")
+      end
 
-    describe 'uncolor' do
-      it 'removes any ANSI color codes' do
-        expect('red'.red + 'blue'.blue).to eq "\e[1;31mred\e[0m\e[1;34mblue\e[0m"
-        expect(('red'.red + 'blue'.blue).uncolor).to eq 'redblue'
+      it "has #{color}ish color" do
+        expect(AmazingPrint::Colors.public_send(:"#{color}ish", color.to_s)).to eq("\e[0;#{i + 30}m#{color}\e[0m")
       end
     end
   end

data/spec/ext/action_controller_spec.rb

@@ -21,9 +21,9 @@ RSpec.describe 'AmazingPrint::ActionController', skip: -> { !ExtVerifier.has_rai
     let(:expected_output) do
       <<~OUTPUT
         {
-            \"post\"\e[0;37m => \e[0m{
-                     \"id\"\e[0;37m => \e[0m\e[1;34m1\e[0m,
-                \"content\"\e[0;37m => \e[0m\e[0;33m\"Some\"\e[0m
+            "post"\e[0;37m => \e[0m{
+                     "id"\e[0;37m => \e[0m\e[1;34m1\e[0m,
+                "content"\e[0;37m => \e[0m\e[0;33m"Some"\e[0m
             }
         }
       OUTPUT

data/spec/ext/active_record_spec.rb

@@ -23,11 +23,7 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
                   :rank => 1
         }
       EOS
-      if RUBY_VERSION < '1.9'
-        str.sub!('?', 'Sat Oct 10 12:30:00 UTC 1992')
-      else
-        str.sub!('?', '1992-10-10 12:30:00 UTC')
-      end
+      str.sub!('?', '1992-10-10 12:30:00 UTC')
       expect(out).to be_similar_to(str)
     end
 
@@ -51,13 +47,8 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
             }
         ]
       EOS
-      if RUBY_VERSION < '1.9'
-        str.sub!('??', 'Sat Oct 10 12:30:00 UTC 1992')
-        str.sub!('?!', 'Mon May 26 14:15:00 UTC 2003')
-      else
-        str.sub!('??', '1992-10-10 12:30:00 UTC')
-        str.sub!('?!', '2003-05-26 14:15:00 UTC')
-      end
+      str.sub!('??', '1992-10-10 12:30:00 UTC')
+      str.sub!('?!', '2003-05-26 14:15:00 UTC')
       expect(out).to be_similar_to(str)
     end
 
@@ -83,13 +74,8 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
             }
         ]
       EOS
-      if RUBY_VERSION < '1.9'
-        str.sub!('??', 'Sat Oct 10 12:30:00 UTC 1992')
-        str.sub!('?!', 'Mon May 26 14:15:00 UTC 2003')
-      else
-        str.sub!('??', '1992-10-10 12:30:00 UTC')
-        str.sub!('?!', '2003-05-26 14:15:00 UTC')
-      end
+      str.sub!('??', '1992-10-10 12:30:00 UTC')
+      str.sub!('?!', '2003-05-26 14:15:00 UTC')
       expect(out).to be_similar_to(str)
     end
   end
@@ -139,21 +125,13 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
         elsif activerecord_5_0?
           ActiveRecordData.raw_5_0_diana
         elsif activerecord_4_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_4_2_diana
-          else
-            ActiveRecordData.raw_4_2_diana_legacy
-          end
+          ActiveRecordData.raw_4_2_diana
         elsif activerecord_4_1?
           ActiveRecordData.raw_4_1_diana
         elsif activerecord_4_0?
           ActiveRecordData.raw_4_0_diana
         elsif activerecord_3_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_3_2_diana
-          else
-            ActiveRecordData.raw_3_2_diana_legacy
-          end
+          ActiveRecordData.raw_3_2_diana
         end
 
       if RUBY_PLATFORM == 'java' && !activerecord_6_1?
@@ -181,21 +159,13 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
         elsif activerecord_5_0?
           ActiveRecordData.raw_5_0_multi
         elsif activerecord_4_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_4_2_multi
-          else
-            ActiveRecordData.raw_4_2_multi_legacy
-          end
+          ActiveRecordData.raw_4_2_multi
         elsif activerecord_4_1?
           ActiveRecordData.raw_4_1_multi
         elsif activerecord_4_0?
           ActiveRecordData.raw_4_0_multi
         elsif activerecord_3_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_3_2_multi
-          else
-            ActiveRecordData.raw_3_2_multi_legacy
-          end
+          ActiveRecordData.raw_3_2_multi
         end
 
       if RUBY_PLATFORM == 'java' && !activerecord_6_1?
@@ -266,24 +236,24 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
           expect(out).to match(
             /\s+first\(\*args,\s&block\)\s+#<Class:\w+>\s+\(ActiveRecord::Querying\)/
           )
-        elsif RUBY_VERSION >= '3.0.0'
+        elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+          expect(out).to match(
+            /\s*first\(\*(\*|args),\s+\?,\s+&(&|block)\)\s+#<Class:User> \(ActiveRecord::Querying\)/
+          )
+        elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
           expect(out).to match(
             /\s*first\(\*(\*|args),\s+&(&|block)\)\s+#<Class:User> \(ActiveRecord::Querying\)/
           )
-        elsif RUBY_VERSION >= '2.7.2'
+        elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.2')
           expect(out).to match(
             /\s*first\(\*(\*|args),\s+&(&|block)\)\s+User/
           )
-        elsif RUBY_VERSION >= '2.6.7'
+        elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.7')
           expect(out).to match(
             /\s*first\(\*(\*|args),\s+&(&|block)\)\s+#<Class:ActiveRecord::Base> \(ActiveRecord::Querying\)/
           )
-        elsif RUBY_VERSION =~ /^2\.4\.([4-9]|[1-9][0-9])|^2\.[56]\./
+        elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.4')
           expect(out).to match(/\sfirst\(\*arg.*?\)\s+User/)
-        elsif RUBY_VERSION >= '1.9'
-          expect(out).to match(/\sfirst\(\*args,\s&block\)\s+Class \(ActiveRecord::Querying\)/)
-        else
-          expect(out).to match(/\sfirst\(\*arg1\)\s+Class \(ActiveRecord::Querying\)/)
         end
       else
         expect(out).to match(/\sfirst\(\*arg.*?\)\s+User \(ActiveRecord::Base\)/)
@@ -295,18 +265,16 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
         expect(out).to match(
           /\sprimary_key\(.*?\)\s+#<Class:\w+>\s\(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/
         )
-      elsif RUBY_VERSION >= '3.0.0'
+      elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
         expect(out).to match(/\sprimary_key\(.*?\)\s+#<Class:User> \(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/)
-      elsif RUBY_VERSION >= '2.6.7' && RUBY_VERSION < '2.7.0'
+      elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.7') && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
         expect(out).to match(/\sprimary_key\(.*?\)\s+#<Class:ActiveRecord::Base> \(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/)
-      elsif RUBY_VERSION =~ /^2\.4\.([4-9]|[1-9][0-9])|^2\.[56]\./ || RUBY_VERSION >= '2.7.2'
+      elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.4') || Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.2')
         expect(out).to match(/\sprimary_key\(.*?\)\s+User/)
-      elsif RUBY_VERSION >= '2.7.0'
+      elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
         expect(out).to match(
           /\sprimary_key\(.*?\)\s+.+Class.+\(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/
         )
-      else
-        expect(out).to match(/\sprimary_key\(.*?\)\s+Class \(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/)
       end
 
       # spec 3
@@ -316,16 +284,14 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
         expect(out).to match(/\svalidate\(\*arg.*?\)\s+User \(ActiveRecord::Base\)/)
       elsif RUBY_PLATFORM == 'java'
         expect(out).to match(/\svalidate\(\*arg.*?\)\s+#<Class:\w+> \(ActiveModel::Validations::ClassMethods\)/)
-      elsif RUBY_VERSION >= '3.0.0'
+      elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
         expect(out).to match(/\svalidate\(\*arg.*?\)\s+#<Class:User> \(ActiveModel::Validations::ClassMethods\)/)
-      elsif RUBY_VERSION =~ /2\.7\.(0|1)/ || (RUBY_VERSION >= '2.6.7' && RUBY_VERSION < '2.7.0')
+      elsif (Gem::Version.new('2.6.7')..Gem::Version.new('2.7.1')).cover? Gem::Version.new(RUBY_VERSION)
         expect(out).to match(
           /\svalidate\(\*args.*?\)\s+#<Class:ActiveRecord::Base> \(ActiveModel::Validations::ClassMethods\)/
         )
-      elsif RUBY_VERSION =~ /^2\.4\.([4-9]|[1-9][0-9])|^2\.[56]\./ || RUBY_VERSION >= '2.7.2'
+      elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.4') || Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.2')
         expect(out).to match(/\svalidate\(\*arg.*?\)\s+User/)
-      else
-        expect(out).to match(/\svalidate\(\*arg.*?\)\s+Class \(ActiveModel::Validations::ClassMethods\)/)
       end
     end
   end

data/spec/ext/nokogiri_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'AmazingPrint/Nokogiri' do
     # FIXME: Due to something strange with Nokogiri and JRuby, we need to remove extra blank lines.
     output = xml.ai.gsub(/\n\n/, "\n")
     expect(output).to eq <<~EOS
-      <?xml version=\"1.0\"?>\e[1;32m
+      <?xml version="1.0"?>\e[1;32m
       \e[0m<\e[1;36mhtml\e[0m>\e[1;32m
         \e[0m<\e[1;36mbody\e[0m>\e[1;32m
           \e[0m<\e[1;36mh1\e[0m/>\e[1;32m
@@ -20,7 +20,7 @@ RSpec.describe 'AmazingPrint/Nokogiri' do
   it 'colorizes contents' do
     xml = Nokogiri::XML('<html><body><h1>Hello</h1></body></html>')
     expect(xml.ai).to eq <<~EOS
-      <?xml version=\"1.0\"?>\e[1;32m
+      <?xml version="1.0"?>\e[1;32m
       \e[0m<\e[1;36mhtml\e[0m>\e[1;32m
         \e[0m<\e[1;36mbody\e[0m>\e[1;32m
           \e[0m<\e[1;36mh1\e[0m>\e[1;32mHello\e[0m<\e[1;36m/h1\e[0m>\e[1;32m
@@ -34,11 +34,11 @@ RSpec.describe 'AmazingPrint/Nokogiri' do
     # FIXME: Due to something strange with Nokogiri and JRuby, we need to remove extra blank lines.
     output = xml.ai.gsub(/\n\n/, "\n")
     expect(output).to eq <<~EOS
-      <?xml version=\"1.0\"?>\e[1;32m
+      <?xml version="1.0"?>\e[1;32m
       \e[0m<\e[1;36mhtml\e[0m>\e[1;32m
         \e[0m<\e[1;36mbody\e[0m>\e[1;32m
           \e[0m<\e[1;36mh1\e[0m>\e[1;32m
-            \e[0m<\e[1;36mspan\e[0m \e[1;33mclass=\"world\"\e[0m \e[1;33mid=\"hello\"\e[0m/>\e[1;32m
+            \e[0m<\e[1;36mspan\e[0m \e[1;33mclass="world"\e[0m \e[1;33mid="hello"\e[0m/>\e[1;32m
           \e[0m<\e[1;36m/h1\e[0m>\e[1;32m
         \e[0m<\e[1;36m/body\e[0m>\e[1;32m
       \e[0m<\e[1;36m/html\e[0m>

data/spec/ext/sequel_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'AmazingPrint/Sequel', skip: -> { !ExtVerifier.has_sequel? }.call
   end
 
   it 'does not crash if on Sequel::Model' do
-    out = @ap.awesome(::Sequel::Model)
+    out = @ap.awesome(Sequel::Model)
     expect(out).to be_similar_to('Sequel::Model < Object')
   end
 end