sass-embedded 1.89.2 → 1.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36bb5875ffa8c93160a1eb7ccd8a13a7fee9b33968c6614a43abee78fd4a4404
-  data.tar.gz: 86bbbc7b4dcac415a4b66a4d1ebbf573acc3f2477a67682b54068fdf42fab74e
+  metadata.gz: b86edb0f5fc64eaed25b369b4d4a2fa596255f8d41a21109f3a83fcfebd528a1
+  data.tar.gz: 3059faf9da290fe6a1ca108820190d378d4c9ef5973a8da53e9fe1e03a58c951
 SHA512:
-  metadata.gz: 1ae02a2ef4458ada385cf2cef677149b8783fef102968b92f99bed5ee05d85c2632562180da5eccb8eaf8b541e93aab050c59c344cf19921e6f5cd4e5fe5efee
-  data.tar.gz: 3ed9a4d0d923a26eb456005a74eee97ad288ebb0529b4537c3dee95097f7b098493310b60ef5a65b193fb100f253479779e1b820adb8eaa26ec8a49486b6f9ea
+  metadata.gz: b04d824ffcd30038cf6409f3f235725ca3db972d9e1226cc4cc7fda17debc891ed5d3bdeb9bbe546cc080e758ec94a49b4fdb8c33fc5c7444178ce6241c6214a
+  data.tar.gz: e9a20af1c74c4595afebaa176dc4bae0a5dcfaed5ba77237af5f530ff3f53ac8a84913810ae15cc2d64d525b6c9d1a0eb4bd9c51b7eab4c22e630a0e5395e388

data/ext/sass/Rakefile

@@ -209,17 +209,6 @@ file 'true' do |t|
     #   40007a: b8 3c 00 00 00               	movl	$0x3c, %eax
     #   40007f: 0f 05                        	syscall
     entry_point = %w[31ffb83c0000000f05].pack('H*')
-  when 'i386'
-    ei_class  = ELF::ELFCLASS32
-    ei_data   = ELF::ELFDATA2LSB
-    e_machine = 0x03
-    e_flags   = 0
-
-    # 00400054 <PT_LOAD#0>:
-    #   400054: 31 db                        	xorl	%ebx, %ebx
-    #   400056: b8 01 00 00 00               	movl	$0x1, %eax
-    #   40005b: cd 80                        	int	$0x80
-    entry_point = %w[31dbb801000000cd80].pack('H*')
   else
     raise NotImplementedError
   end
@@ -288,99 +277,23 @@ end
 # This is a FileUtils extension that defines several additional commands to be
 # added to the FileUtils utility functions.
 module FileUtils
-  # PowerShell quirks:
-  # - `powershell -Command -`:
-  #     Arguments must be part of command, thus cannot pass arguments safely without escaping.
-  # - `powershell -Command <script-block> [-args <arg-array>]`:
-  #     This only works when invoking powershell subshell in powershell.
-  # - `powershell -Command <string> [<CommandParameters>]`:
-  #     CommandParameters are joined with command and then parsed, thus cannot pass arguments safely without escaping.
-  # - `powershell -File -`:
-  #     Arguments must be part of file, thus cannot pass arguments safely without escaping.
-  # - `powershell -File <filePath> <args>`:
-  #     This is the only way to pass arguments safely without escaping.
-  def powershell(file, *args)
-    sh 'powershell', '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File', file, *args
-  end
-
-  def junzip(archive, dest = '.')
-    require 'java'
-
-    Rake.rake_output_message "Archive:  #{archive}" if Rake::FileUtilsExt.verbose_flag
-
-    current_directory = java.nio.file.Paths.get(org.jruby.Ruby.getGlobalRuntime.getCurrentDirectory)
-    zip_file = java.util.zip.ZipFile.new(current_directory.resolve(archive).toFile)
-    dest_path = current_directory.resolve(dest).normalize
-    entries = zip_file.entries
-    while entries.hasMoreElements
-      entry = entries.nextElement
-      name = entry.getName
-      path = dest_path.resolve(name).normalize
-      raise SecurityError unless path.startsWith(dest_path)
-
-      Rake.rake_output_message "  inflating: #{name}" if Rake::FileUtilsExt.verbose_flag
-
-      if entry.isDirectory
-        java.nio.file.Files.createDirectories(path)
-      else
-        java.nio.file.Files.createDirectories(path.getParent)
-        java.nio.file.Files.copy(zip_file.getInputStream(entry), path)
-      end
-    end
-  ensure
-    zip_file&.close
-  end
-
-  def unarchive(archive, dest = '.')
-    case archive.downcase
-    when ->(name) { name.include?('.tar.') || name.end_with?('.tar') }
-      mkdir_p dest
-      sh 'tar', '-vxC', dest, '-f', archive, '--no-same-owner', '--no-same-permissions'
-    when ->(name) { name.end_with?('.zip') }
-      if RUBY_PLATFORM == 'java'
-        junzip archive, dest
-      elsif Gem.win_platform?
-        powershell 'expand-archive.ps1', '-Force', '-LiteralPath', archive, '-DestinationPath', dest
-      else
-        sh 'unzip', '-od', dest, archive
-      end
+  def unarchive(archive)
+    if Gem.win_platform?
+      sh File.absolute_path('tar.exe', Utils.windows_system_directory), '-vxf', archive
+    elsif archive.downcase.end_with?('.zip')
+      sh 'unzip', '-o', archive
     else
-      raise ArgumentError, "Unknown archive format #{archive}"
+      sh 'tar', '-vxf', archive, '--no-same-owner', '--no-same-permissions'
     end
   end
 
   def fetch(source_uri, dest_path = nil)
-    require 'rubygems/remote_fetcher'
-
-    source_uri = "/#{source_uri}" if !source_uri.start_with?('/') && File.absolute_path?(source_uri)
-
-    source_uri = begin
-      Gem::Uri.parse!(source_uri)
-    rescue NoMethodError
-      begin
-        URI.parse(source_uri)
-      rescue StandardError
-        URI.parse(URI::DEFAULT_PARSER.escape(source_uri.to_s))
-      end
-    end
-
-    scheme = source_uri.scheme
-    source_path = begin
-      Gem::URI::DEFAULT_PARSER
-    rescue NameError
-      URI::DEFAULT_PARSER
-    end.unescape(source_uri.path)
+    dest_path = File.basename(source_uri) if dest_path.nil?
 
-    dest_path = File.basename(source_path) if dest_path.nil?
-
-    fetcher = Gem::RemoteFetcher.fetcher
-    symbol = :"fetch_#{scheme.nil? ? 'file' : scheme}"
-    raise ArgumentError, "Unsupported URI scheme #{scheme}" unless fetcher.respond_to?(symbol)
-
-    Rake.rake_output_message "fetch #{Gem::Uri.new(source_uri).redacted}" if Rake::FileUtilsExt.verbose_flag
+    Rake.rake_output_message "fetch #{source_uri}" if Rake::FileUtilsExt.verbose_flag
 
     unless Rake::FileUtilsExt.nowrite_flag
-      data = fetcher.public_send(symbol, source_uri)
+      data = Utils.fetch_https(source_uri)
       Gem.write_binary(dest_path, data)
     end
 
@@ -464,9 +377,7 @@ module Platform
          (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))) ||
-         (Platform::CPU == 'i386' &&
-          File.exist?(File.absolute_path('lib/ld-linux.so.2', root)))
+          File.exist?(File.absolute_path('lib64/ld-linux-x86-64.so.2', root)))
         return 'linux-gnu'
       end
 
@@ -475,7 +386,7 @@ module Platform
         return 'linux-gnueabihf'
       end
 
-      if %w[aarch64 riscv64 x86_64 i386].include?(Platform::CPU) &&
+      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
@@ -485,10 +396,8 @@ module Platform
         return 'linux-musleabihf'
       end
 
-      if (%w[aarch64 riscv64 x86_64].include?(Platform::CPU) &&
-          File.exist?(File.absolute_path('system/bin/linker64', root))) ||
-         (Platform::CPU == 'i386' &&
-          File.exist?(File.absolute_path('system/bin/linker', root)))
+      if %w[aarch64 riscv64 x86_64].include?(Platform::CPU) &&
+         File.exist?(File.absolute_path('system/bin/linker64', root))
         return 'linux-android'
       end
 
@@ -625,8 +534,6 @@ module SassConfig
   end
 
   def protoc
-    require 'rubygems/remote_fetcher'
-
     repo = 'https://repo.maven.apache.org/maven2/com/google/protobuf/protoc'
 
     dependency = Gem::Dependency.new('google-protobuf')
@@ -665,7 +572,7 @@ module SassConfig
 
     uri = "#{repo}/#{version}/protoc-#{version}-#{os}-#{cpu}.exe"
 
-    Gem::RemoteFetcher.fetcher.fetch_https(Gem::Uri.new("#{uri}.sha1"))
+    Utils.fetch_https("#{uri}.sha1")
 
     uri
   rescue Gem::RemoteFetcher::FetchError
@@ -678,7 +585,7 @@ module SassConfig
     versions.sort.reverse_each do |v|
       uri = "#{repo}/#{v}/protoc-#{v}-#{os}-#{cpu}.exe"
 
-      Gem::RemoteFetcher.fetcher.fetch_https(Gem::Uri.new("#{uri}.sha1"))
+      Utils.fetch_https("#{uri}.sha1")
 
       return uri
     rescue Gem::RemoteFetcher::FetchError
@@ -690,16 +597,13 @@ module SassConfig
 
   def embedded_sass_protocol
     require 'json'
-    require 'open3'
-
-    stdout, stderr, status = Open3.capture3(RbConfig.ruby,
-                                            File.absolute_path('../../exe/sass', __dir__),
-                                            '--embedded',
-                                            '--version')
 
-    raise stderr unless status.success?
+    version = Utils.capture(RbConfig.ruby,
+                            File.absolute_path('../../exe/sass', __dir__),
+                            '--embedded',
+                            '--version')
 
-    tag_name = JSON.parse(stdout)['protocolVersion']
+    tag_name = JSON.parse(version)['protocolVersion']
 
     "https://github.com/sass/sass/raw/embedded-protocol-#{tag_name}/spec/embedded_sass.proto"
   rescue StandardError # TODO: remove after https://github.com/sass/dart-sass/pull/2413
@@ -744,3 +648,41 @@ module SassConfig
     end
   end
 end
+
+# The {Utils} module.
+module Utils
+  module_function
+
+  def capture(...)
+    require 'open3'
+
+    stdout, stderr, status = Open3.capture3(...)
+
+    raise stderr unless status.success?
+
+    stdout
+  end
+
+  def fetch_https(source_uri)
+    require 'rubygems/remote_fetcher'
+
+    source_uri = begin
+      Gem::Uri.parse!(source_uri)
+    rescue NoMethodError
+      URI.parse(source_uri)
+    end
+
+    Gem::RemoteFetcher.fetcher.fetch_https(source_uri)
+  end
+
+  def windows_system_directory
+    path = capture('powershell.exe',
+                   '-NoLogo',
+                   '-NoProfile',
+                   '-NonInteractive',
+                   '-Command',
+                   '[Environment]::GetFolderPath([Environment+SpecialFolder]::System) | Write-Host -NoNewline')
+
+    File.absolute_path(path)
+  end
+end

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.89.2"
+    "sass": "1.91.0"
   }
 }

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.89.2'
+    VERSION = '1.91.0'
   end
 end

data/lib/sass/value/color.rb

@@ -421,9 +421,9 @@ module Sass
       def _in_gamut?
         return true unless _space.bounded?
 
-        _is_channel_in_gamut(channel0, _space.channels[0]) &&
-          _is_channel_in_gamut(channel1, _space.channels[1]) &&
-          _is_channel_in_gamut(channel2, _space.channels[2])
+        _is_channel_in_gamut?(channel0, _space.channels[0]) &&
+          _is_channel_in_gamut?(channel1, _space.channels[1]) &&
+          _is_channel_in_gamut?(channel2, _space.channels[2])
       end
 
       def _to_gamut(method)
@@ -485,7 +485,7 @@ module Sass
         ((hue % 360) + 360 + (invert ? 180 : 0)) % 360
       end
 
-      def _is_channel_in_gamut(value, channel)
+      def _is_channel_in_gamut?(value, channel)
         case channel
         when LinearChannel
           FuzzyMath.less_than_or_equals?(value, channel.max) && FuzzyMath.greater_than_or_equals?(value, channel.min)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.89.2
+  version: 1.91.0
 platform: ruby
 authors:
 - なつき
@@ -52,7 +52,6 @@ files:
 - exe/sass
 - ext/sass/Rakefile
 - ext/sass/embedded_sass_pb.rb
-- ext/sass/expand-archive.ps1
 - ext/sass/package.json
 - lib/sass-embedded.rb
 - lib/sass/calculation_value.rb
@@ -124,8 +123,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.89.2
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.89.2
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.91.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.91.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -142,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []

data/ext/sass/expand-archive.ps1

@@ -1 +0,0 @@
-Expand-Archive @args