crystalruby 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c9b23b060f8c69dea9daa64e7842bc795b9b6039177dd5b1f9dac2067f5cefe
-  data.tar.gz: 1d6bdf9475bca49e8298e58378ef7391a6f7acee3e68c310d6d4f41b0090e69f
+  metadata.gz: cccd1a9a08608d1973ec2cca190828d8475652337dbe6ec16b9d7cac1646cdab
+  data.tar.gz: 441bf39c0a3627d6df202c54c3440bb69e47c91473c1974b3caa330e0defa7a9
 SHA512:
-  metadata.gz: c63ab3d286e099b28ca64d24d3500132959056745b3eb47ce92bca0b2d6615b2027a590f1c3844e789fffdf610bf06babb07842eedc22a66d55d7e7e01060cd8
-  data.tar.gz: 50ff5f69decbfe21785d2f6951c576a7efbbab51ff02660e2cc4ea019122ae94b28459fb7572e1702155feb8e6669b1013779dd2c41461024a65ce45f45e341e
+  metadata.gz: fafb4fecf18aa7e5221642fbb956457987b286d50600f0ced48a91eaf10a4e2ccc83546d2632058b765256fc3510ce17cc5a6aa37455583279fb101a0c56fe70
+  data.tar.gz: 77fdc7ebdd02dab88243aec94eb6e06fc0bf2b65685b2eeb0b0304ad3087903879759823045c4ee07c9453715800237c1a230a1fdc7fb0e8eb2bc3636fb90e18

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.3.4] - 2025-05-04
+
+- Added support for Crystal 1.16.0
+
 ## [Unreleased]
 
 - Added support for running `crustalruby` without the `crystal` binary in dry mode. [#15]

data/lib/crystalruby/reactor.rb

@@ -10,8 +10,10 @@ module CrystalRuby
     module_function
 
     class SingleThreadViolation < StandardError; end
+
     class StopReactor < StandardError; end
 
+    @op_count = 0
     @single_thread_mode = false
 
     REACTOR_QUEUE = Queue.new
@@ -44,7 +46,7 @@ module CrystalRuby
 
     # We memoize callbacks, once per return type
     CALLBACKS_MAP = Hash.new do |h, rt|
-      h[rt] = FFI::Function.new(:void, [:int, *(rt == :void ? [] : [rt])]) do |tid, ret|
+      h[rt] = FFI::Function.new(:void, [:int, *((rt == :void) ? [] : [rt])]) do |tid, ret|
         THREAD_MAP[tid][:error] = nil
         THREAD_MAP[tid][:result] = ret
         THREAD_MAP[tid][:cond].signal
@@ -108,8 +110,8 @@ module CrystalRuby
           @op_count += 1
           invoke_gc_if_due!(lib)
         end
-      rescue StopReactor => e
-      rescue StandardError => e
+      rescue StopReactor
+      rescue => e
         CrystalRuby.log_error "Error: #{e}"
         CrystalRuby.log_error e.backtrace
       end
@@ -123,12 +125,13 @@ module CrystalRuby
       now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       # Initialize state variables if not already set.
-      @last_gc_time       ||= now
-      @last_gc_op_count   ||= @op_count
+      @last_gc_time ||= now
+      @op_count ||= 0
+      @last_gc_op_count ||= @op_count
       @last_mem_check_time ||= now
 
       # Calculate differences based on ops and time.
-      ops_since_last_gc  = @op_count - @last_gc_op_count
+      ops_since_last_gc = @op_count - @last_gc_op_count
       time_since_last_gc = now - @last_gc_time
 
       # Start with our two “cheap” conditions.
@@ -136,7 +139,7 @@ module CrystalRuby
 
       if due
         # Update the baseline values after GC is scheduled.
-        @last_gc_time     = now
+        @last_gc_time = now
         # If we just did a memory check, use that value; otherwise, fetch one now.
         @last_gc_op_count = @op_count
         Types::Allocator.gc_hint_reset!
@@ -173,10 +176,10 @@ module CrystalRuby
       tvars[:error] = nil
       begin
         tvars[:result] = receiver.send(op_name, *args)
-      rescue StopReactor => e
+      rescue StopReactor
         tvars[:cond].signal
         raise
-      rescue StandardError => e
+      rescue => e
         tvars[:error] = e
       end
       tvars[:cond].signal
@@ -191,8 +194,8 @@ module CrystalRuby
       if @single_thread_mode || (Thread.current.object_id == @main_thread_id && op_name != :yield)
         unless Thread.current.object_id == @main_thread_id
           raise SingleThreadViolation,
-                "Single thread mode is enabled, cannot run in multi-threaded mode. " \
-                "Reactor was started from: #{@main_thread_id}, then called from #{Thread.current.object_id}"
+            "Single thread mode is enabled, cannot run in multi-threaded mode. " \
+            "Reactor was started from: #{@main_thread_id}, then called from #{Thread.current.object_id}"
         end
         invoke_gc_if_due!(lib)
         return receiver.send(op_name, *args)

data/lib/crystalruby/templates/index.cr

@@ -25,6 +25,9 @@ module CrystalRuby
     return if self.initialized
     self.initialized = true
     argv_ptr = ARGV1.to_unsafe
+    {%% if compare_versions(Crystal::VERSION, "1.16.0") >= 0  %%}
+      Crystal.init_runtime
+    {%% end %%}
     Crystal.main_user_code(0, pointerof(argv_ptr))
     self.libname = String.new(libname)
     GC.init
@@ -57,7 +60,7 @@ module CrystalRuby
     self.callbacks.send(callback)
   end
 
-  def self.synchronize
+  def self.synchronize(&)
     LibC.pthread_mutex_lock(self.rc_mux)
     yield
     LibC.pthread_mutex_unlock(self.rc_mux)

data/lib/crystalruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CrystalRuby
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crystalruby
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest
@@ -56,16 +56,22 @@ dependencies:
   name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: Embed Crystal code directly in Ruby.
 email:
 - wc@pico.net.nz
@@ -82,7 +88,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- crystalruby.gemspec
 - examples/adder/adder.rb
 - exe/crystalruby
 - lib/crystalruby.rb

data/crystalruby.gemspec

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/crystalruby/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "crystalruby"
-  spec.version = CrystalRuby::VERSION
-  spec.authors = ["Wouter Coppieters"]
-  spec.email = ["wc@pico.net.nz"]
-
-  spec.summary = "Embed Crystal code directly in Ruby."
-  spec.description = "Embed Crystal code directly in Ruby."
-  spec.homepage = "https://github.com/wouterken/crystalruby"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.2"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git appveyor Gemfile])
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency "digest"
-  spec.add_dependency "ffi"
-  spec.add_dependency "fileutils", "~> 1.7"
-  spec.add_dependency "prism", "~> 1.3.0"
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end