canopus 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20fa9cab0519ae8959585f06d1d0b599a770a9a154b9f6dabd258ae82f6c469
-  data.tar.gz: 8dc607311d74a51fc70a13c8bd6fdec3b626a99377935b9e68e1a3b015462cbb
+  metadata.gz: 013571d4fd7a6edfd38e0110f8a2a36107932361bd19153d161632b354d16c27
+  data.tar.gz: 4330cff9ebe687ff4841736a7f1a5da170d1201956b132104389fecae9cb5a2d
 SHA512:
-  metadata.gz: 84a896182add9dce7fb75a12de42e30a79e219e25295f6629478585ddd7653d8f29ee27361228ca32921277deffb22ad5cba1546ad31959bc85ca0162ab89574
-  data.tar.gz: 2ca8a81c3359b955f1c9f84f89d9e8312cc1fcd797f3ea52a1fcb40e5e89fb9a8f1de770e6c7c44996730e694a665f682ae5d1519bd1e8f935bb300cc85c30fe
+  metadata.gz: d13cf4ece7e1b4ebe6bcaf02e216ccfece40a33bada9abb1e7ff6b829ec9f0448a8931936e0229a7038840a9926f8a2d363346ba9c6d84bcc5aace62d57cf246
+  data.tar.gz: c87250d7daf362912550a79cd1a45e82306cbe1086e73561832ac551004ea1e67f10b21a049a7d7755f955acdfdfb24aadf44dee35d35eac05fd3f5a0b803d5a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.6.2 — 2026-09-23
+
+- Use Xamidimura for stable source snapshots and SHA-256 save-conflict checks.
+- Require CRuby 3.2 or newer for Xamidimura compatibility.
+
 ## 0.6.1 — 2026-09-21
 
 - Add a deterministic terminal walkthrough cast and editor demo image with regeneration tasks.

data/README.md

@@ -10,7 +10,7 @@
   <a href="https://rubygems.org/gems/canopus"><img src="https://img.shields.io/gem/v/canopus.svg" alt="Gem version"></a>
   <a href="https://rubygems.org/gems/canopus"><img src="https://img.shields.io/gem/dt/canopus.svg" alt="Gem downloads"></a>
   <a href="https://github.com/noxdea/canopus/actions/workflows/main.yml"><img src="https://github.com/noxdea/canopus/actions/workflows/main.yml/badge.svg" alt="CI"></a>
-  <img src="https://img.shields.io/badge/CRuby-%3E%3D%203.1-cc342d.svg" alt="CRuby 3.1 or newer">
+  <img src="https://img.shields.io/badge/CRuby-%3E%3D%203.2-cc342d.svg" alt="CRuby 3.2 or newer">
   <a href="LICENSE.txt"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="MIT license"></a>
 </p>
 
@@ -53,7 +53,7 @@ gem install canopus
 canopus --version
 ```
 
-Canopus requires CRuby 3.1 or newer. The launcher enables YJIT when supported
+Canopus requires CRuby 3.2 or newer. The launcher enables YJIT when supported
 and otherwise uses the interpreter. Native windows also require the `fiddle`
 standard-library component; some Ruby distributions package it separately.
 

data/docs/adr/005-windows-runtime.md

@@ -13,7 +13,7 @@ and performance expectations.
 
 ## Decision
 
-Require CRuby 3.1 or newer. Attempt to enable YJIT on macOS and Linux, falling
+Require CRuby 3.2 or newer. Attempt to enable YJIT on macOS and Linux, falling
 back to the interpreter when the selected Ruby build lacks it. On native Windows,
 preserve an already enabled JIT but do not pass an unsupported YJIT flag.
 

data/docs/tasks.md

@@ -59,6 +59,6 @@ and all output parsing remains frame-budgeted. Matcher lines and unfinished
 input are limited to 64 KiB, each matcher retains at most 1,000 diagnostics,
 and regular expressions use a timeout. A matcher that times out is disabled for
 the rest of that task run while its already-published diagnostics are retained.
-On Ruby 3.1, one timeout on a complete line is deferred to the next frame before
-disabling, which avoids dropping a matcher after a transient scheduler delay;
-an unterminated final line is disabled on its first timeout.
+On unsupported Ruby 3.1, one timeout on a complete line is deferred to the next
+frame before disabling, which avoids dropping a matcher after a transient
+scheduler delay; an unterminated final line is disabled on its first timeout.

data/exe/canopus

@@ -3,8 +3,8 @@
 
 require "rbconfig"
 require "rubygems"
-unless RUBY_ENGINE == "ruby" && (RUBY_VERSION.split(".").first(2).map(&:to_i) <=> [3, 1]) >= 0
-  abort "Canopus requires CRuby 3.1 or newer."
+unless RUBY_ENGINE == "ruby" && (RUBY_VERSION.split(".").first(2).map(&:to_i) <=> [3, 2]) >= 0
+  abort "Canopus requires CRuby 3.2 or newer."
 end
 unless RUBY_PLATFORM.match?(/mswin|mingw/) || RbConfig::CONFIG["YJIT_SUPPORT"] != "yes" ||
     (defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?) || ENV["CANOPUS_YJIT_REEXEC"] == "1"

data/lib/canopus/buffer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "digest"
 require "tempfile"
 require "denebola"
 require_relative "denebola_compat"
@@ -26,14 +25,17 @@ module Canopus
         return new("", path: path, read_only: true, rope: rope, encoding: detection.encoding,
           bom: detection.bom, detection: detection)
       end
-      raw = File.binread(path)
+      snapshot = Xamidimura::SourceRevision.read(path)
+      raw = snapshot.bytes
       detection = detect_bytes(raw, encoding: encoding)
       raise Error, "cannot edit binary file" if detection.binary
       text = Menkar.decode(raw, detection)
       new(text, path: path, encoding: detection.encoding, bom: detection.bom, detection: detection,
-        disk_digest: Digest::SHA256.hexdigest(raw))
+        disk_digest: snapshot.digest)
     rescue Menkar::Error => error
       raise Error, error.message
+    rescue Xamidimura::Error => error
+      raise Error, "cannot read #{path}: #{error.message}"
     rescue EncodingError => error
       raise Error, "cannot decode #{path}: #{error.message}"
     end
@@ -279,7 +281,7 @@ module Canopus
         destination = File.realpath(destination) if File.symlink?(destination)
         original = File.file?(destination) ? File.binread(destination) : nil
         same_file = @path && (File.expand_path(path) == @path || (File.exist?(@path) && File.exist?(destination) && File.identical?(@path, destination)))
-        if !force && same_file && @disk_digest && (!original || Digest::SHA256.hexdigest(original) != @disk_digest)
+        if !force && same_file && @disk_digest && (!original || Xamidimura::SourceRevision.digest(original) != @disk_digest)
           raise SaveConflict, "file changed on disk: #{path}"
         end
         raise SaveConflict, "destination exists: #{path}" if !force && original && (!same_file || !@disk_digest)
@@ -301,7 +303,7 @@ module Canopus
           @detection = detection
           @encoding, @bom = detection.encoding, detection.bom
         end
-        @saved_rope, @disk_digest = snapshot, Digest::SHA256.hexdigest(encoded)
+        @saved_rope, @disk_digest = snapshot, Xamidimura::SourceRevision.digest(encoded)
         self
       end
     rescue EncodingError => error

data/lib/canopus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canopus
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/canopus.rb

@@ -11,6 +11,7 @@ require "denebola"
 require "zaniah"
 require "porrima"
 require "thuban"
+require "xamidimura"
 require_relative "canopus/command"
 require_relative "canopus/panel"
 require_relative "canopus/decoration"

data/tools/check_dependencies.rb

@@ -13,7 +13,7 @@ smoke = ARGV.first && File.expand_path(ARGV.fetch(0))
 abort "Usage: ruby tools/check_dependencies.rb [smoke.rb]" if ARGV.length > 1 || (smoke && !File.file?(smoke))
 specification = Gem::Specification.load(File.join(root, "#{entry}.gemspec"))
 dependencies = specification.runtime_dependencies.map(&:name).sort
-expected = %w[alhena alkaid antares denebola editorconfig gienah kochab megrez menkar porrima prism rexml rouge sadr saiph spica tarazed thuban timeout unicode-display_width zaniah]
+expected = %w[alhena alkaid antares denebola editorconfig gienah kochab megrez menkar porrima prism rexml rouge sadr saiph spica tarazed thuban timeout unicode-display_width xamidimura zaniah]
 abort "unexpected runtime gem dependencies" unless dependencies == expected
 abort "native extension declaration" unless specification.extensions.empty?
 abort "packaged native binary" if specification.files.any? { |path| path.match?(/\.(?:so|bundle|dll|dylib|a|o)\z/i) }
@@ -33,10 +33,10 @@ Dir.mktmpdir("#{entry}-install-") do |directory|
   environment = ENV.each_key.grep(/\ABUNDLE/).to_h { |key| [key, nil] }.merge(
     "GEM_HOME" => installation, "GEM_PATH" => ([installation] + Gem.path).join(File::PATH_SEPARATOR),
     "RUBYLIB" => nil, "RUBYOPT" => nil, "GIENAH_PATH" => nil, "ZANIAH_PATH" => nil, "ALKAID_PATH" => nil, "ANTARES_PATH" => nil,
-    "MEGREZ_PATH" => nil, "MENKAR_PATH" => nil, "SADR_PATH" => nil, "SAIPH_PATH" => nil, "TARAZED_PATH" => nil
+    "MEGREZ_PATH" => nil, "MENKAR_PATH" => nil, "SADR_PATH" => nil, "SAIPH_PATH" => nil, "TARAZED_PATH" => nil, "XAMIDIMURA_PATH" => nil
   )
   {"GIENAH_PATH" => "gienah", "ZANIAH_PATH" => "zaniah", "ALKAID_PATH" => "alkaid", "ANTARES_PATH" => "antares", "MEGREZ_PATH" => "megrez", "MENKAR_PATH" => "menkar", "SADR_PATH" => "sadr", "SAIPH_PATH" => "saiph",
-   "TARAZED_PATH" => "tarazed"}.each do |variable, name|
+   "TARAZED_PATH" => "tarazed", "XAMIDIMURA_PATH" => "xamidimura"}.each do |variable, name|
     next unless ENV[variable]
 
     dependency_root = File.realpath(ENV.fetch(variable))

data/tools/package.rb

@@ -91,7 +91,7 @@ module CanopusPackage
         $shortcut = $shell.CreateShortcut((Join-Path $Destination 'Canopus.lnk'))
         $shortcut.TargetPath = Join-Path $PSScriptRoot 'canopus.cmd'
         $shortcut.WorkingDirectory = [Environment]::GetFolderPath('UserProfile')
-        $shortcut.Description = 'Canopus text editor (requires CRuby 3.1+)'
+        $shortcut.Description = 'Canopus text editor (requires CRuby 3.2+)'
         $shortcut.Save()
       POWERSHELL
       write_windows_installers(output, version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canopus
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Yudai Takada
@@ -301,6 +301,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: xamidimura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: zaniah
   requirement: !ruby/object:Gem::Requirement
@@ -526,7 +540,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="