sass-embedded 1.62.0 → 1.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3d0d1ba450405b09e53f216d1e0997dcb5474b8fc4b28bd0995d9af22dffe2
-  data.tar.gz: 8ac843704ab8d7ab5a4468e9f7783e78aa0ea9f66eaf2193b315505fef01f1d0
+  metadata.gz: a23ad45f24f41d4cff9b9a89bdfb5d59fdd1c8ccc651bd3f95819a816aa2d3dc
+  data.tar.gz: 6eea5962316620e2fba19fd7e6a655205af9000110f9984dfe3db7e453e9d7b3
 SHA512:
-  metadata.gz: 2e832441f74f534c8598b3da5eba98c0b693c808b6834c7d194f3694642b58607aa4c55e21dd69905a64ed730b599addce1262bf22935fec63dc068380ebf951
-  data.tar.gz: 66dfe65efef95810ad39f5143e6abca7c918158db3d782c5a811fba9ad5e673a299b23f2111282c3daa95ab3eebb013d97fb9ab25ba7f3b1f825b0e59604499e
+  metadata.gz: d5cc1925d0eac966d08f4bd4e8bf52c29a131f4d94f98c7cec55f21d47b9dfae23c9d80de35403f5ed01093036c2c852141acc5f6a960c6d11931cc287bf5d96
+  data.tar.gz: e559e13e2dd633b8d420fedb57cc6b9dd67bc87a43fef3de2677ee689b9469f672a16c7ab091a87e8565921a152b6d330ae337f1b9456a530c2fcaa9cd746a93

data/ext/sass/Rakefile

@@ -21,12 +21,6 @@ file 'sass_embedded' do |t|
   archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded })
   unarchive archive
   rm archive
-
-  if ENV.key?('NIX_BINTOOLS')
-    sh 'patchelf',
-       '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp,
-       (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) })
-  end
 end
 
 file 'embedded.rb' => %w[sass_embedded] do |t|

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass-embedded": "1.62.0"
+    "sass-embedded": "1.62.1"
   }
 }

data/lib/sass/embedded/compiler.rb

@@ -9,7 +9,16 @@ module Sass
     # It runs the `dart-sass-embedded` process.
     class Compiler
       def initialize
-        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(*COMMAND, chdir: __dir__)
+        @stdin, @stdout, @stderr, @wait_thread = begin
+          Open3.popen3(*COMMAND, chdir: __dir__)
+        rescue Errno::ENOENT
+          require_relative 'elf'
+
+          raise if ELF::INTERPRETER.nil?
+
+          Open3.popen3(ELF::INTERPRETER, *COMMAND, chdir: __dir__)
+        end
+
         @stdin.binmode
         @stdout.binmode
         @stdin_mutex = Mutex.new

data/lib/sass/embedded/elf.rb

@@ -0,0 +1,275 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    # The {ELF} class.
+    #
+    # It parses ELF header to extract interpreter.
+    # @see https://github.com/torvalds/linux/blob/HEAD/include/uapi/linux/elf.h
+    # @see https://github.com/torvalds/linux/blob/HEAD/kernel/kexec_elf.c
+    class ELF
+      # rubocop:disable Naming/ConstantName
+
+      # 32-bit ELF base types.
+      Elf32_Addr  = :__u32
+      Elf32_Half  = :__u16
+      Elf32_Off   = :__u32
+      Elf32_Sword = :__s32
+      Elf32_Word  = :__u32
+
+      # 64-bit ELF base types.
+      Elf64_Addr   = :__u64
+      Elf64_Half   = :__u16
+      Elf64_SHalf  = :__s16
+      Elf64_Off    = :__u64
+      Elf64_Sword  = :__s32
+      Elf64_Word   = :__u32
+      Elf64_Xword  = :__u64
+      Elf64_Sxword = :__s64
+
+      # rubocop:enable Naming/ConstantName
+
+      # These constants are for the segment types stored in the image headers
+      PT_NULL         = 0
+      PT_LOAD         = 1
+      PT_DYNAMIC      = 2
+      PT_INTERP       = 3
+      PT_NOTE         = 4
+      PT_SHLIB        = 5
+      PT_PHDR         = 6
+      PT_TLS          = 7
+      PT_LOOS         = 0x60000000
+      PT_HIOS         = 0x6fffffff
+      PT_LOPROC       = 0x70000000
+      PT_HIPROC       = 0x7fffffff
+      PT_GNU_EH_FRAME = (PT_LOOS + 0x474e550)
+      PT_GNU_STACK    = (PT_LOOS + 0x474e551)
+      PT_GNU_RELRO    = (PT_LOOS + 0x474e552)
+      PT_GNU_PROPERTY = (PT_LOOS + 0x474e553)
+
+      # These constants define the different elf file types
+      ET_NONE   = 0
+      ET_REL    = 1
+      ET_EXEC   = 2
+      ET_DYN    = 3
+      ET_CORE   = 4
+      ET_LOPROC = 0xff00
+      ET_HIPROC = 0xffff
+
+      EI_NIDENT = 16
+
+      # rubocop:disable Naming/ConstantName
+
+      Elf32_Ehdr = [
+        [:unsigned_char, :e_ident, EI_NIDENT],
+        [Elf32_Half,     :e_type],
+        [Elf32_Half,     :e_machine],
+        [Elf32_Word,     :e_version],
+        [Elf32_Addr,     :e_entry],
+        [Elf32_Off,      :e_phoff],
+        [Elf32_Off,      :e_shoff],
+        [Elf32_Word,     :e_flags],
+        [Elf32_Half,     :e_ehsize],
+        [Elf32_Half,     :e_phentsize],
+        [Elf32_Half,     :e_phnum],
+        [Elf32_Half,     :e_shentsize],
+        [Elf32_Half,     :e_shnum],
+        [Elf32_Half,     :e_shstrndx]
+      ].freeze
+
+      Elf64_Ehdr = [
+        [:unsigned_char, :e_ident, EI_NIDENT],
+        [Elf64_Half,     :e_type],
+        [Elf64_Half,     :e_machine],
+        [Elf64_Word,     :e_version],
+        [Elf64_Addr,     :e_entry],
+        [Elf64_Off,      :e_phoff],
+        [Elf64_Off,      :e_shoff],
+        [Elf64_Word,     :e_flags],
+        [Elf64_Half,     :e_ehsize],
+        [Elf64_Half,     :e_phentsize],
+        [Elf64_Half,     :e_phnum],
+        [Elf64_Half,     :e_shentsize],
+        [Elf64_Half,     :e_shnum],
+        [Elf64_Half,     :e_shstrndx]
+      ].freeze
+
+      Elf32_Phdr = [
+        [Elf32_Word, :p_type],
+        [Elf32_Off,  :p_offset],
+        [Elf32_Addr, :p_vaddr],
+        [Elf32_Addr, :p_paddr],
+        [Elf32_Word, :p_filesz],
+        [Elf32_Word, :p_memsz],
+        [Elf32_Word, :p_flags],
+        [Elf32_Word, :p_align]
+      ].freeze
+
+      Elf64_Phdr = [
+        [Elf64_Word,  :p_type],
+        [Elf64_Word,  :p_flags],
+        [Elf64_Off,   :p_offset],
+        [Elf64_Addr,  :p_vaddr],
+        [Elf64_Addr,  :p_paddr],
+        [Elf64_Xword, :p_filesz],
+        [Elf64_Xword, :p_memsz],
+        [Elf64_Xword, :p_align]
+      ].freeze
+
+      # rubocop:enable Naming/ConstantName
+
+      # e_ident[] indexes
+      EI_MAG0    = 0
+      EI_MAG1    = 1
+      EI_MAG2    = 2
+      EI_MAG3    = 3
+      EI_CLASS   = 4
+      EI_DATA    = 5
+      EI_VERSION = 6
+      EI_OSABI   = 7
+      EI_PAD     = 8
+
+      # EI_MAG
+      ELFMAG0 = 0x7f
+      ELFMAG1 = 'E'.ord
+      ELFMAG2 = 'L'.ord
+      ELFMAG3 = 'F'.ord
+      ELFMAG  = [ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3].pack('C*')
+      SELFMAG = 4
+
+      # e_ident[EI_CLASS]
+      ELFCLASSNONE = 0
+      ELFCLASS32   = 1
+      ELFCLASS64   = 2
+      ELFCLASSNUM  = 3
+
+      # e_ident[EI_DATA]
+      ELFDATANONE = 0
+      ELFDATA2LSB = 1
+      ELFDATA2MSB = 2
+
+      def initialize(buffer)
+        @buffer = buffer
+        @ehdr = read_ehdr
+        @buffer.seek(@ehdr[:e_phoff], :SET)
+        @proghdrs = Array.new(@ehdr[:e_phnum]) do
+          read_phdr
+        end
+      end
+
+      def relocatable?
+        @ehdr[:e_type] == ET_REL
+      end
+
+      def executable?
+        @ehdr[:e_type] == ET_EXEC
+      end
+
+      def shared_object?
+        @ehdr[:e_type] == ET_DYN
+      end
+
+      def core?
+        @ehdr[:e_type] == ET_CORE
+      end
+
+      def interpreter
+        phdr = @proghdrs.find { |p| p[:p_type] == PT_INTERP }
+        return if phdr.nil?
+
+        @buffer.seek(phdr[:p_offset], :SET)
+        interpreter = @buffer.read(phdr[:p_filesz])
+        raise ArgumentError unless interpreter.end_with?("\0")
+
+        interpreter.chomp("\0")
+      end
+
+      private
+
+      def file_class
+        @ehdr[:e_ident][EI_CLASS]
+      end
+
+      def data_encoding
+        @ehdr[:e_ident][EI_DATA]
+      end
+
+      def read_ehdr
+        @ehdr = { e_ident: @buffer.read(EI_NIDENT).unpack('C*') }
+        raise ArgumentError unless @ehdr[:e_ident].slice(EI_MAG0, SELFMAG).pack('C*') == ELFMAG
+
+        case file_class
+        when ELFCLASS32
+          Elf32_Ehdr
+        when ELFCLASS64
+          Elf64_Ehdr
+        else
+          raise ArgumentError
+        end.drop(1).to_h do |field|
+          [field[1], read1(field[0])]
+        end.merge!(@ehdr)
+      end
+
+      def read_phdr
+        case file_class
+        when ELFCLASS32
+          Elf32_Phdr
+        when ELFCLASS64
+          Elf64_Phdr
+        else
+          raise ArgumentError
+        end.to_h do |field|
+          [field[1], read1(field[0])]
+        end
+      end
+
+      def read1(type)
+        case data_encoding
+        when ELFDATA2LSB
+          case type
+          when :__u16
+            @buffer.read(2).unpack1('v*')
+          when :__u32
+            @buffer.read(4).unpack1('V*')
+          when :__u64
+            buffer = @buffer.read(8).unpack('V*')
+            (buffer[1] << 32) | buffer[0]
+          else
+            raise ArgumentError
+          end
+        when ELFDATA2MSB
+          case type
+          when :__u16
+            @buffer.read(2).unpack1('n*')
+          when :__u32
+            @buffer.read(4).unpack1('N*')
+          when :__u64
+            buffer = @buffer.read(8).unpack('N*')
+            (buffer[0] << 32) | buffer[1]
+          else
+            raise ArgumentError
+          end
+        else
+          raise ArgumentError
+        end
+      end
+
+      INTERPRETER = proc do
+        proc_self_exe = '/proc/self/exe'
+        if File.exist?(proc_self_exe)
+          File.open(proc_self_exe, 'rb') do |exe|
+            elf = ELF.new(exe)
+            interpreter = elf.interpreter
+            if interpreter.nil? && elf.shared_object?
+              File.readlink(proc_self_exe)
+            else
+              interpreter
+            end
+          end
+        end
+      end.call
+    end
+
+    private_constant :ELF
+  end
+end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.62.0'
+    VERSION = '1.62.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.62.0
+  version: 1.62.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: 2.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: 2.20.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -131,6 +131,7 @@ files:
 - lib/sass/embedded/channel.rb
 - lib/sass/embedded/compiler.rb
 - lib/sass/embedded/dispatcher.rb
+- lib/sass/embedded/elf.rb
 - lib/sass/embedded/host.rb
 - lib/sass/embedded/host/function_registry.rb
 - lib/sass/embedded/host/importer_registry.rb
@@ -160,8 +161,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.62.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.62.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.62.1
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.62.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []