Merge branch 'master' into hash-formats

Author: HarlemSquirrel

.github/workflows/lint.yml

@@ -1,21 +1,22 @@
 name: Lints
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:
       - master
 
 jobs:
-  build:
+  lint:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.1
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Lint files with Rubocop
       run: |

.github/workflows/rspec.yml

@@ -1,6 +1,7 @@
 name: Specs
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:
@@ -18,12 +19,15 @@ jobs:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
           - "head"
-          - "jruby"
+          - "jruby-9.3"
     runs-on: ${{ matrix.os }}-latest
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
@@ -32,7 +36,6 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y install libsqlite3-dev
-        gem install bundler
         bundle install --retry 3
     - name: Test with all appraisals
       if : ${{ matrix.ruby != 'head' }}

.rubocop.yml

@@ -29,3 +29,6 @@ Style/HashTransformValues:
 Style/StringLiterals:
   Exclude:
     - gemfiles/*
+
+Style/FetchEnvVar:
+  Enabled: false

.rubocop_todo.yml

@@ -1,11 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-09-12 22:42:23 UTC using RuboCop version 1.20.0.
+# on 2021-12-27 20:50:12 UTC using RuboCop version 1.24.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
+  Exclude:
+    - 'amazing_print.gemspec'
+
 # Offense count: 4
 # Configuration parameters: IgnoredMethods.
 Lint/AmbiguousBlockAssociation:
@@ -111,6 +119,11 @@ RSpec/BeforeAfterAll:
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
     - 'spec/core_ext/logger_spec.rb'
     - 'spec/core_ext/string_spec.rb'
     - 'spec/ext/action_view_spec.rb'
@@ -174,7 +187,7 @@ RSpec/MultipleDescribes:
 
 # Offense count: 43
 RSpec/MultipleExpectations:
-  Max: 20
+  Max: 21
 
 # Offense count: 1
 RSpec/NestedGroups:
@@ -221,14 +234,30 @@ Style/DocumentDynamicEvalDefinition:
   Exclude:
     - 'lib/amazing_print/core_ext/awesome_method_array.rb'
 
-# Offense count: 27
+# Offense count: 28
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'gemfiles/*'
+    - 'object_example.rb'
+
+# Offense count: 5
+Style/OpenStructUse:
+  Exclude:
+    - 'lib/amazing_print.rb'
+    - 'lib/amazing_print/ext/ostruct.rb'
+    - 'spec/ext/ostruct_spec.rb'
+
 # Offense count: 16
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 216

Appraisals

@@ -37,6 +37,22 @@ if RUBY_VERSION < '3'
   end
 end
 
+if RUBY_VERSION >= '2.7'
+  appraise 'rails-7.0' do
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0', platform: :jruby
+    gem 'rails', '~> 7.0.0'
+    gem 'sqlite3', platform: :mri
+  end
+
+  appraise 'mongoid-7.0' do
+    gem 'mongoid', '~> 7.0.0'
+  end
+
+  appraise 'mongoid-8.0' do
+    gem 'mongoid', '~> 8.0.0'
+  end
+end
+
 appraise 'rails-6.1' do
   gem 'activerecord-jdbcsqlite3-adapter', '~> 61.0', platform: :jruby
   gem 'rails', '~> 6.1.0'

CHANGELOG.md

@@ -1,52 +1,75 @@
+# CHANGELOG
+
 ## Unreleased
 
+## V1.6.0
+
+- Use pager with Pry #96
+- Add Rails 7 appraisal #98
+- Allow Hash keys to be colorized #99
+- Use CI merge queue #104
+- Add support for Ruby 3.3 #105
+- Add Mongoid field aliases #106
+- Add bigdecimal gem #109
+- Add ExtLoader to help with require order issues #110
+
+## 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
-  - Update AR specs for Ruby 2.6.7 #76
-  - Load .aprc configs only once. #74
-  - Add XDG config support #77
-  - Rubocop updates #79
-  - Update Irb integration for v1.2.6+ #81
+
+- Support loading config from `$XDG_CONFIG_HOME/aprc` - #63
+- Remove support for Rails 5.1 #75
+- Update AR specs for Ruby 2.6.7 #76
+- Load .aprc configs only once. #74
+- Add XDG config support #77
+- Rubocop updates #79
+- Update Irb integration for v1.2.6+ #81
 
 ## v1.3.0
-  - Fix HTML escaping problems #53
-  - Update test suite for Ruby 2.7.2 and JRuby #61
-  - Add ActionView spec for html_safe #65
-  - Add support for Rails 6.1 #68
-  - Update specs for Ruby 3.0 #69
+
+- Fix HTML escaping problems #53
+- Update test suite for Ruby 2.7.2 and JRuby #61
+- Add ActionView spec for html_safe #65
+- Add support for Rails 6.1 #68
+- Update specs for Ruby 3.0 #69
 
 ## v1.2.2
-  - Support Ruby 3.0 / IRB 1.2.6 - #57
-  - Fix FrozenError - #51
-  - Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1 - #46
-  - Add passing of `options` to `Logger#ap` - #55
+
+- Support Ruby 3.0 / IRB 1.2.6 - #57
+- Fix FrozenError - #51
+- Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1 - #46
+- Add passing of `options` to `Logger#ap` - #55
 
 ## v1.2.1
-  - Correctly print active_model_errors for models that don't have tables - #42 by sahglie
-  - Update AmazingPrint::MongoMapper for frozen strings - #44
 
-## v1.2.0
+- Correctly print active_model_errors for models that don't have tables - #42 by sahglie
+- Update AmazingPrint::MongoMapper for frozen strings - #44
 
-  - Fix frozen string literal issue with ActiveRecord
-  - Add uncolor String method to remove ANSI color codes - #30 by duffyjp
-  - Restore original copyright - #33 by amarshall
-  - Remove method core extension since it is not needed since ruby 1.9 - #37 by grosser
-  - Remove pale and black string color aliases - #38
-  - Fix formatting ActionController::Parameters - #29
+## v1.2.0
 
+- Fix frozen string literal issue with ActiveRecord
+- Add uncolor String method to remove ANSI color codes - #30 by duffyjp
+- Restore original copyright - #33 by amarshall
+- Remove method core extension since it is not needed since ruby 1.9 - #37 by grosser
+- Remove pale and black string color aliases - #38
+- Fix formatting ActionController::Parameters - #29
 
 ## v1.1.0
-  - Print out method keyword arguments
-  - Fix NoMethodError with Sequel
-  - Code cleanups
 
-Thanks for the great contributions from:
-
-  - andydna
-  - beanieboi
+- Print out method keyword arguments
+- Fix NoMethodError with Sequel
+- Code cleanups
 
+Thanks for the great contributions from:
 
+- andydna
+- beanieboi
 
 ## v1.0.0
-  - Initial Release.
+
+- Initial Release.

Gemfile

@@ -4,3 +4,15 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in amazing_print.gemspec
 gemspec
+
+# Development dependencies
+# Update this once https://github.com/thoughtbot/appraisal/pull/202 is released
+gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git', branch: :main
+
+gem 'bigdecimal'
+gem 'fakefs', '~> 1.2'
+gem 'nokogiri', '~> 1.10'
+gem 'pry'
+gem 'rspec', '~> 3.9'
+gem 'rubocop', '~> 1.20'
+gem 'rubocop-rspec', '~> 2.4'

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)
 
@@ -316,11 +315,11 @@ formatting:
 
     <%= ap @accounts.first, :html => true %>
 
-### String Convenience Methods ###
+### Colorizing Strings ###
 Use methods such as `.red` to set string color:
 
 ```ruby
-irb> puts "red text".red
+irb> puts AmazingPrint::Colors.red("red text")
 red text # (it's red)
 ```
 

amazing_print.gemspec

@@ -22,15 +22,6 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.files         = Dir['[A-Z]*[^~]'] + Dir['lib/**/*.rb'] + Dir['spec/**/*'] + ['.gitignore']
-  s.test_files    = Dir['spec/**/*']
   s.executables   = []
   s.require_paths = ['lib']
-
-  s.add_development_dependency 'appraisal', '~> 2.3'
-  s.add_development_dependency 'fakefs', '~> 1.2'
-  s.add_development_dependency 'nokogiri', '~> 1.10'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec', '~> 3.9'
-  s.add_development_dependency 'rubocop', '~> 1.20'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.4'
 end

gemfiles/rails_6.1.gemfile

@@ -3,7 +3,14 @@
 source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
+gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git", branch: :main
+gem "fakefs", "~> 1.2"
+gem "nokogiri", "~> 1.10"
+gem "pry"
 gem "rails", "~> 6.1.0"
+gem "rspec", "~> 3.9"
+gem "rubocop", "~> 1.20"
+gem "rubocop-rspec", "~> 2.4"
 gem "sqlite3", platform: :mri
 
 gemspec path: "../"