sass-embedded 1.97.2 → 1.97.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8c67967dcd0ffd3183eadf5e482721ed2c35b12987497c475d4a41c25218c9
-  data.tar.gz: 4aba477d727272315f9b69379f5038d8ef5aa75c1fcd2de284966fecdf225444
+  metadata.gz: 69ad28409fe8586fa06a9ffe3d02d412d358d650c2a7af0ee7461dc399b8c41e
+  data.tar.gz: df624753f2563939ddcb4c0f5093e5d26021e1587798f7d69985acb9d980c7cc
 SHA512:
-  metadata.gz: 98590ea940f4f78a3acc12a50f5ef39fad42f5041531f514588e031c848a0c640cd8bcc29bebd6eab2372d3cc0e955e47ddc161c1f5d79cf77092bdb7bea3452
-  data.tar.gz: 4dc1f91d80447947558d35745da44bf3a544af5c9a0635795c41d630596306125a4043b765ab9d76c6b46795500e4fad51b56af83ead5b19013c04282cca1921
+  metadata.gz: c70a16af5daec1ca1de21c571c1b7e0062e91628ceb5277b11675676444fa517dc7a1c959273b71824decc5d8ca3fae4f1f72c5e3f0c7eff9508a1e0202f6574
+  data.tar.gz: 777f55af979a6fe281df80ceec7ca5e84ab04d07a815edcf34a46fa9e13f03c514c003707bad4ddb099d214f72ffdbea67e345df01b8e2369e3d6cf069e07f99

data/ext/sass/Rakefile

@@ -17,7 +17,6 @@ task install: %w[cli.rb]
 CLEAN.include %w[
   protoc.exe
   ruby
-  true
   *.proto
   *.tar.gz
   *.zip
@@ -172,117 +171,6 @@ rule '_pb.rb' => %w[.proto protoc.exe] do |t|
   sh './protoc.exe', '--proto_path=.', '--ruby_out=.', t.source
 end
 
-file 'true' do |t|
-  case Platform::CPU
-  when 'aarch64'
-    ei_class  = ELF::ELFCLASS64
-    ei_data   = ELF::ELFDATA2LSB
-    e_machine = 0xb7
-    e_flags   = 0
-
-    # 0000000000400078 <PT_LOAD#0>:
-    #   400078: d2800ba8     	mov	x8, #0x5d               // =93
-    #   40007c: d2800000     	mov	x0, #0x0                // =0
-    #   400080: d4000001     	svc	#0
-    entry_point = [0xd2800ba8, 0xd2800000, 0xd4000001].pack('L<3')
-  when 'arm'
-    ei_class  = ELF::ELFCLASS32
-    ei_data   = ELF::ELFDATA2LSB
-    e_machine = 0x28
-    e_flags   = 0x5000400
-
-    # 00400054 <PT_LOAD#0>:
-    #   400054: 2701         	movs	r7, #0x1
-    #   400056: 2000         	movs	r0, #0x0
-    #   400058: df00         	svc	#0x0
-    entry_point = [0x2701, 0x2000, 0xdf00].pack('S<3')
-  when 'riscv64'
-    ei_class  = ELF::ELFCLASS64
-    ei_data   = ELF::ELFDATA2LSB
-    e_machine = 0xf3
-    e_flags   = 0x5
-
-    # 0000000000400078 <PT_LOAD#0>:
-    #   400078: 05d00893     	li	a7, 0x5d
-    #   40007c: 4501         	li	a0, 0x0
-    #   40007e: 00000073     	ecall
-    entry_point = [0x05d00893, 0x4501, 0x00000073].pack('L<S<L<')
-  when 'x86_64'
-    ei_class  = ELF::ELFCLASS64
-    ei_data   = ELF::ELFDATA2LSB
-    e_machine = 0x3e
-    e_flags   = 0
-
-    # 0000000000400078 <PT_LOAD#0>:
-    #   400078: 31 ff                        	xorl	%edi, %edi
-    #   40007a: b8 3c 00 00 00               	movl	$0x3c, %eax
-    #   40007f: 0f 05                        	syscall
-    entry_point = %w[31ffb83c0000000f05].pack('H*')
-  else
-    raise NotImplementedError
-  end
-
-  case ei_class
-  when ELF::ELFCLASS32
-    e_ehsize    = ELF::Elf32_Ehdr.sizeof
-    e_phentsize = ELF::Elf32_Phdr.sizeof
-    e_shentsize = ELF::Elf32_Shdr.sizeof
-  when ELF::ELFCLASS64
-    e_ehsize    = ELF::Elf64_Ehdr.sizeof
-    e_phentsize = ELF::Elf64_Phdr.sizeof
-    e_shentsize = ELF::Elf64_Shdr.sizeof
-  else
-    raise EncodingError
-  end
-
-  e_phoff  = e_ehsize
-
-  p_offset = e_phoff + e_phentsize
-  p_vaddr  = (2**22) + p_offset
-  p_filesz = entry_point.length
-  p_memsz  = p_filesz
-
-  e_entry  = p_vaddr
-  e_entry += 1 if Platform::CPU == 'arm'
-
-  ELF.allocate.instance_eval do
-    @ehdr = {
-      e_ident: [127, 69, 76, 70, ei_class, ei_data, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      e_type: ELF::ET_EXEC,
-      e_machine:,
-      e_version: 1,
-      e_entry:,
-      e_phoff:,
-      e_shoff: 0,
-      e_flags:,
-      e_ehsize:,
-      e_phentsize:,
-      e_phnum: 1,
-      e_shentsize:,
-      e_shnum: 0,
-      e_shstrndx: 0
-    }
-    @phdrs = [
-      {
-        p_type: ELF::PT_LOAD,
-        p_flags: ELF::PF_R | ELF::PF_X,
-        p_offset:,
-        p_vaddr:,
-        p_paddr: 0,
-        p_filesz:,
-        p_memsz:,
-        p_align: 4096
-      }
-    ]
-    @shdrs = []
-
-    File.open(t.name, 'wb', 0o755) do |file|
-      dump(file)
-      file.write(entry_point)
-    end
-  end
-end
-
 # This is a FileUtils extension that defines several additional commands to be
 # added to the FileUtils utility functions.
 module FileUtils
@@ -359,91 +247,6 @@ end
 
 # The {Platform} module.
 module Platform
-  # @see https://docs.freebsd.org/en/articles/linux-emulation/
-  # @see https://docs.freebsd.org/en/books/handbook/linuxemu/
-  module Linuxulator
-    module_function
-
-    def enabled?
-      return false unless RbConfig::CONFIG['host_os'].include?('freebsd')
-
-      return true if defined?(Platform::OS) && Platform::OS.include?('linux')
-
-      begin
-        Rake::Task['true'].invoke unless File.exist?('true')
-      rescue NotImplementedError
-        return false
-      end
-
-      system('./true', %i[out err] => File::NULL) == true
-    end
-
-    def host_os(root = compat_linux_emul_path)
-      return 'linux-none' unless File.symlink?(File.absolute_path('proc/self/exe', root))
-
-      if (Platform::CPU == 'aarch64' &&
-          File.exist?(File.absolute_path('lib/ld-linux-aarch64.so.1', root))) ||
-         (Platform::CPU == 'riscv64' &&
-          File.exist?(File.absolute_path('lib/ld-linux-riscv64-lp64d.so.1', root))) ||
-         (Platform::CPU == 'x86_64' &&
-          File.exist?(File.absolute_path('lib64/ld-linux-x86-64.so.2', root)))
-        return 'linux-gnu'
-      end
-
-      if Platform::CPU == 'arm' &&
-         File.exist?(File.absolute_path('lib/ld-linux-armhf.so.3', root))
-        return 'linux-gnueabihf'
-      end
-
-      if %w[aarch64 riscv64 x86_64].include?(Platform::CPU) &&
-         File.exist?(File.absolute_path("lib/ld-musl-#{Platform::CPU}.so.1", root))
-        return 'linux-musl'
-      end
-
-      if Platform::CPU == 'arm' &&
-         File.exist?(File.absolute_path('lib/ld-musl-armhf.so.1', root))
-        return 'linux-musleabihf'
-      end
-
-      if %w[aarch64 riscv64 x86_64].include?(Platform::CPU) &&
-         File.exist?(File.absolute_path('system/bin/linker64', root))
-        return 'linux-android'
-      end
-
-      if Platform::CPU == 'arm' &&
-         File.exist?(File.absolute_path('system/bin/linker', root))
-        return 'linux-androideabi'
-      end
-
-      'linux-none'
-    end
-
-    def compat_linux_emul_path
-      require 'fiddle'
-
-      lib = Fiddle.dlopen(nil)
-      sysctlbyname = Fiddle::Function.new(
-        lib['sysctlbyname'],
-        [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_SIZE_T],
-        Fiddle::TYPE_INT
-      )
-
-      name = Fiddle::Pointer.to_ptr('compat.linux.emul_path')
-      oldp = Fiddle::NULL
-      oldlenp = Fiddle::Pointer.malloc(Fiddle::SIZEOF_SIZE_T, Fiddle::RUBY_FREE)
-      newp = Fiddle::NULL
-      newlen = 0
-      raise SystemCallError.new(nil, Fiddle.last_error) if sysctlbyname.call(name, oldp, oldlenp, newp, newlen) == -1
-
-      oldp = Fiddle::Pointer.malloc(oldlenp.ptr.to_i, Fiddle::RUBY_FREE)
-      raise SystemCallError.new(nil, Fiddle.last_error) if sysctlbyname.call(name, oldp, oldlenp, newp, newlen) == -1
-
-      oldp.to_s
-    rescue SystemCallError
-      nil
-    end
-  end
-
   HOST_CPU = RbConfig::CONFIG['host_cpu'].downcase
 
   CPU = case HOST_CPU
@@ -461,7 +264,7 @@ module Platform
           HOST_CPU
         end
 
-  HOST_OS = (Linuxulator.enabled? ? Linuxulator.host_os : RbConfig::CONFIG['host_os']).downcase
+  HOST_OS = RbConfig::CONFIG['host_os'].downcase
 
   OS = case HOST_OS
        when /darwin/

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "file:sass-1.97.2.tgz"
+    "sass": "file:sass-1.97.3.tgz"
   }
 }

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.97.2'
+    VERSION = '1.97.3'
   end
 end

data/lib/sass/fork_tracker.rb

@@ -5,46 +5,54 @@ module Sass
   #
   # It tracks objects that need to be closed after `Process.fork`.
   module ForkTracker
-    HASH = {}.compare_by_identity
+    module_function
 
-    MUTEX = Mutex.new
+    if Process.respond_to?(:_fork)
+      # TODO: remove next line once ruby 3.1 support is dropped
+      require 'set' unless defined?(::Set)
 
-    private_constant :HASH, :MUTEX
+      SET = Set.new.compare_by_identity
 
-    module_function
+      MUTEX = Mutex.new
+
+      private_constant :SET, :MUTEX
 
-    def add(obj)
-      MUTEX.synchronize do
-        HASH[obj] = true
+      def add(object)
+        MUTEX.synchronize do
+          SET.add(object)
+        end
       end
-    end
 
-    def delete(obj)
-      MUTEX.synchronize do
-        HASH.delete(obj)
+      def delete(object)
+        MUTEX.synchronize do
+          SET.delete(object)
+        end
       end
-    end
 
-    def each(...)
-      MUTEX.synchronize do
-        HASH.keys
-      end.each(...)
-    end
+      def each(&)
+        MUTEX.synchronize do
+          SET.to_a
+        end.each(&)
+      end
 
-    # The {CoreExt} module.
-    #
-    # It closes objects after `Process.fork`.
-    module CoreExt
-      def _fork
-        pid = super
-        ForkTracker.each(&:close) if pid.zero?
-        pid
+      # The {CoreExt} module.
+      #
+      # It closes objects after `Process.fork`.
+      module CoreExt
+        def _fork
+          pid = super
+          ForkTracker.each(&:close) if pid.zero?
+          pid
+        end
       end
-    end
 
-    private_constant :CoreExt
+      private_constant :CoreExt
 
-    Process.singleton_class.prepend(CoreExt) if Process.respond_to?(:_fork)
+      Process.singleton_class.prepend(CoreExt)
+    else
+      def add(object); end
+      def delete(object); end
+    end
   end
 
   private_constant :ForkTracker

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.97.2
+  version: 1.97.3
 platform: ruby
 authors:
 - なつき
@@ -52,7 +52,7 @@ files:
 - exe/sass
 - ext/sass/Rakefile
 - ext/sass/package.json
-- ext/sass/sass-1.97.2.tgz
+- ext/sass/sass-1.97.3.tgz
 - lib/sass-embedded.rb
 - lib/sass/calculation_value.rb
 - lib/sass/calculation_value/calculation_operation.rb
@@ -126,8 +126,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.97.2
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.97.2
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.97.3
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.97.3
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []