glamour 0.2.0-aarch64-linux-gnu → 0.2.2-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba23a86ee71f2d8b32df4bf0d315895b3c7a2585a50d0da65b51a44f28a207d
-  data.tar.gz: 3a5201cc02f596d2fd042f602952c6f4aab6306a1b5a234e9ae3eee29d92f65e
+  metadata.gz: 8f7dac1fa9a0d99cd7e8f702af8affdb6485aaab243d7140b5f38b8830aa6a55
+  data.tar.gz: 8bb1d744b0ab2d73eb76821d33c15ac919d273973ebf442804ce81816a28e595
 SHA512:
-  metadata.gz: d967fe9651b29a9598db06189b02385607d571eb482747fba09e9c3cb55222a5bf3f5ffb850ae4f6339ccba8c050d17b8d6698abf9dcd5a2d8ca08a82e207997
-  data.tar.gz: 74882233d9ffaf22714692fbb0035d991c7000fc96bae7baf7daf67c29cfe365fe0183f54eccf5b56693927e547d6d5dcfacfe38c3c19ff395c28580872aad0d
+  metadata.gz: 6200cd1cc82a915e4c8858dbc417a7a3700f8dea912a45626ed5dd4fa23091664725078bcdeea62534d5301243ddcfc78dcc53d733f8f9ebc15fdfb217c50e44
+  data.tar.gz: eddaeb4cf8f4c693e1455931bf08353524ba28fee3229a07447a131e63da58ed50c018a49d655cdee1cba450351833994d93fe269690f74efd3eeda10eaeaa4f

data/README.md

@@ -303,4 +303,14 @@ The gem is available as open source under the terms of the MIT License.
 
 ## Acknowledgments
 
-This gem wraps [charmbracelet/glamour](https://github.com/charmbracelet/glamour), part of the excellent [Charm](https://charm.sh) ecosystem.
+This gem wraps [charmbracelet/glamour](https://github.com/charmbracelet/glamour), part of the excellent [Charm](https://charm.sh) ecosystem. Charm Ruby is not affiliated with or endorsed by Charmbracelet, Inc.
+
+---
+
+Part of [Charm Ruby](https://charm-ruby.dev).
+
+<a href="https://charm-ruby.dev"><img alt="Charm Ruby" src="https://marcoroth.dev/images/heros/glamorous-christmas.png" width="400"></a>
+
+[Lipgloss](https://github.com/marcoroth/lipgloss-ruby) • [Bubble Tea](https://github.com/marcoroth/bubbletea-ruby) • [Bubbles](https://github.com/marcoroth/bubbles-ruby) • [Glamour](https://github.com/marcoroth/glamour-ruby) • [Huh?](https://github.com/marcoroth/huh-ruby) • [Harmonica](https://github.com/marcoroth/harmonica-ruby) • [Bubblezone](https://github.com/marcoroth/bubblezone-ruby) • [Gum](https://github.com/marcoroth/gum-ruby) • [ntcharts](https://github.com/marcoroth/ntcharts-ruby)
+
+The terminal doesn't have to be boring.

data/ext/glamour/extconf.rb

@@ -42,16 +42,20 @@ unless File.exist?(File.join(go_lib_dir, "libglamour.a"))
   ERROR
 end
 
+go_lib_path = File.join(go_lib_dir, "libglamour.a")
+
 $LDFLAGS << " -L#{go_lib_dir}"
 $INCFLAGS << " -I#{go_lib_dir}"
 
-$LOCAL_LIBS << " #{go_lib_dir}/libglamour.a"
-
 case RbConfig::CONFIG["host_os"]
 when /darwin/
+  $LDFLAGS << " -Wl,-load_hidden,#{go_lib_path}"
+  $LDFLAGS << " -Wl,-exported_symbol,_Init_glamour"
   $LDFLAGS << " -framework CoreFoundation -framework Security -framework SystemConfiguration"
   $LDFLAGS << " -lresolv"
 when /linux/
+  $LOCAL_LIBS << " #{go_lib_path}"
+  $LDFLAGS << " -Wl,--exclude-libs,ALL"
   $LDFLAGS << " -lpthread -lm -ldl"
   $LDFLAGS << " -lresolv" if find_library("resolv", "res_query")
 end

data/ext/glamour/extension.c

@@ -178,8 +178,18 @@ static VALUE glamour_version_rb(VALUE self) {
 
 /* Renderer class methods */
 
+static const rb_data_type_t renderer_data_type = {
+  .wrap_struct_name = "Glamour::Renderer",
+  .function = {
+    .dmark = NULL,
+    .dfree = NULL,
+    .dsize = NULL,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE renderer_alloc(VALUE klass) {
-  return Data_Wrap_Struct(klass, NULL, NULL, NULL);
+  return TypedData_Wrap_Struct(klass, &renderer_data_type, NULL);
 }
 
 static VALUE renderer_initialize(int argc, VALUE *argv, VALUE self) {

data/lib/glamour/version.rb

@@ -3,5 +3,5 @@
 # rbs_inline: enabled
 
 module Glamour
-  VERSION = "0.2.0" #: String
+  VERSION = "0.2.2" #: String
 end

data/lib/glamour.rb

@@ -3,8 +3,16 @@
 # rbs_inline: enabled
 
 require "json"
+
 require_relative "glamour/version"
-require_relative "glamour/glamour"
+
+begin
+  major, minor, _patch = RUBY_VERSION.split(".") #: [String, String, String]
+  require_relative "glamour/#{major}.#{minor}/glamour"
+rescue LoadError
+  require_relative "glamour/glamour"
+end
+
 require_relative "glamour/renderer"
 require_relative "glamour/style"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glamour
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: aarch64-linux-gnu
 authors:
 - Marco Roth