Add Ruby 4.0 to CI

Author: marcoroth

.github/workflows/build-gems.yml

@@ -84,8 +84,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
-          bundler-cache: false
+          bundler-cache: true
 
       - name: Download gem artifacts
         uses: actions/download-artifact@v4

.github/workflows/main.yml

@@ -17,6 +17,7 @@ jobs:
           - '3.2'
           - '3.3'
           - '3.4'
+          - '4.0'
 
     steps:
       - name: Checkout
@@ -41,7 +42,7 @@ jobs:
         run: bundle exec rake compile
 
       - name: Run tests
-        run: bundle exec mtest
+        run: bundle exec rake test
 
       - name: Run steep check
         run: bundle exec steep check

.ruby-version

@@ -1 +1 @@
-3.4.7
+4.0.0

Gemfile

@@ -5,11 +5,10 @@ source "https://rubygems.org"
 gemspec
 
 gem "irb"
-gem "maxitest"
-gem "minitest", "~> 5.16"
+gem "maxitest", github: "marcoroth/maxitest"
 gem "rake", "~> 13.0"
-gem "rake-compiler", "~> 1.2"
-gem "rake-compiler-dock", "~> 1.5"
+gem "rake-compiler", "~> 1.3"
+gem "rake-compiler-dock", "~> 1.11"
 gem "rbs-inline", "~> 0.12"
-gem "rubocop", "~> 1.21"
+gem "rubocop"
 gem "steep", "~> 1.10"

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/marcoroth/maxitest.git
+  revision: 359ea6ce0b1a2c5adbba55d275eef8e6a4a73e81
+  specs:
+    maxitest (6.1.0)
+      minitest (>= 6.0.0, < 6.1.0)
+
 PATH
   remote: .
   specs:
@@ -21,33 +28,31 @@ GEM
       uri (>= 0.13.1)
     ast (2.4.3)
     base64 (0.3.0)
-    bigdecimal (3.3.1)
-    concurrent-ruby (1.3.5)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     csv (3.3.5)
     date (3.5.1)
     drb (2.2.3)
-    erb (6.0.0)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
+    erb (6.0.1)
+    ffi (1.17.2)
     fileutils (1.8.0)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.1)
-    irb (1.15.3)
+    io-console (0.8.2)
+    irb (1.16.0)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.17.1)
+    json (2.18.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    maxitest (6.0.1)
-      minitest (>= 5.20.0, < 5.26.0)
-    minitest (5.25.5)
+    minitest (6.0.0)
+      prism (~> 1.5)
     mutex_m (0.3.0)
     parallel (1.27.0)
     parser (3.3.10.0)
@@ -56,40 +61,40 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.6.0)
-    psych (5.3.0)
+    prism (1.7.0)
+    psych (5.3.1)
       date
       stringio
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    rake-compiler (1.3.0)
+    rake-compiler (1.3.1)
       rake
-    rake-compiler-dock (1.10.0)
+    rake-compiler-dock (1.11.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.9.5)
+    rbs (3.10.0)
       logger
     rbs-inline (0.12.0)
       prism (>= 0.29)
       rbs (>= 3.8.0)
-    rdoc (6.17.0)
+    rdoc (7.0.3)
       erb
       psych (>= 4.0.0)
       tsort
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
-    rubocop (1.81.7)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.48.0)
@@ -114,32 +119,32 @@ GEM
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 5)
       uri (>= 0.12.0)
-    stringio (3.1.9)
-    strscan (3.1.5)
+    stringio (3.2.0)
+    strscan (3.1.6)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
+    unicode-emoji (4.2.0)
     uri (1.1.1)
 
 PLATFORMS
-  arm64-darwin-24
+  arm64-darwin
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   glamour!
   irb
-  maxitest
-  minitest (~> 5.16)
+  maxitest!
   rake (~> 13.0)
-  rake-compiler (~> 1.2)
-  rake-compiler-dock (~> 1.5)
+  rake-compiler (~> 1.3)
+  rake-compiler-dock (~> 1.11)
   rbs-inline (~> 0.12)
-  rubocop (~> 1.21)
+  rubocop
   steep (~> 1.10)
 
 BUNDLED WITH

README.md

@@ -1,13 +1,13 @@
 <div align="center">
-  <h1>Glamour</h1>
-  <h4>Stylesheet-based Markdown Rendering for Ruby CLI Apps</h4>
+  <h1>Glamour for Ruby</h1>
+  <h4>Stylesheet-based markdown rendering for your CLI apps.</h4>
 
   <p>
     <a href="https://rubygems.org/gems/glamour"><img alt="Gem Version" src="https://img.shields.io/gem/v/glamour"></a>
     <a href="https://github.com/marcoroth/glamour-ruby/blob/main/LICENSE.txt"><img alt="License" src="https://img.shields.io/github/license/marcoroth/glamour-ruby"></a>
   </p>
 
-  <p>Ruby bindings for <a href="https://github.com/charmbracelet/glamour">charmbracelet/glamour</a>.<br/>Render markdown documents with beautiful styling on ANSI-compatible terminals.</p>
+  <p>Ruby bindings for <a href="https://github.com/charmbracelet/glamour">charmbracelet/glamour</a>.<br/>Render markdown documents & templates on ANSI compatible terminals.</p>
 </div>
 
 ## Installation

ext/glamour/extension.c

@@ -171,7 +171,7 @@ static VALUE glamour_upstream_version_rb(VALUE self) {
 static VALUE glamour_version_rb(VALUE self) {
   VALUE gem_version = rb_const_get(self, rb_intern("VERSION"));
   VALUE upstream_version = glamour_upstream_version_rb(self);
-  VALUE format_string = rb_utf8_str_new_cstr("glamour v%s (upstream v%s) [Go native extension]");
+  VALUE format_string = rb_utf8_str_new_cstr("glamour v%s (upstream %s) [Go native extension]");
 
   return rb_funcall(rb_mKernel, rb_intern("sprintf"), 3, format_string, gem_version, upstream_version);
 }

glamour.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors = ["Marco Roth"]
   spec.email = ["marco.roth@intergga.ch"]
 
-  spec.summary = "Ruby wrapper for Charm's glamour stylesheet-based markdown rendering for Ruby CLI apps."
-  spec.description = spec.summary
+  spec.summary = "Ruby wrapper for Charm's glamour. Stylesheet-based markdown rendering for your CLI apps."
+  spec.description = "Glamour lets you render markdown documents & templates on ANSI compatible terminals."
   spec.homepage = "https://github.com/marcoroth/glamour-ruby"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.2.0"

lib/glamour.rb

@@ -16,11 +16,11 @@ class << self
     # @rbs style: String | singleton(Glamour::Style) -- style name or Style subclass
     # @rbs width: Integer -- optional word wrap width
     # @rbs return: String -- rendered output with ANSI escape codes
-    def render(markdown, style: "auto", width: 0, **)
+    def render(markdown, style: "auto", width: 0, **options)
       if style_class?(style)
-        render_with_style_class(markdown, style, width: width, **)
+        render_with_style_class(markdown, style, width: width, **options)
       else
-        render_native(markdown, style: style, width: width, **)
+        render_native(markdown, style: style, width: width, **options)
       end
     end
 

lib/glamour/style.rb

@@ -33,8 +33,8 @@ def to_json(*_args)
       # @rbs markdown: String -- the markdown content to render
       # @rbs width: Integer -- optional word wrap width
       # @rbs return: String -- rendered output with ANSI escape codes
-      def render(markdown, width: 0, **)
-        Glamour.render(markdown, style: self, width: width, **)
+      def render(markdown, width: 0, **options)
+        Glamour.render(markdown, style: self, width: width, **options)
       end
 
       # @rbs return: true