sass-embedded 0.7.7 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835b2c9a1ba57c2029d2742def3168da30f6779b79f6da189cd0bb17a050b4b4
-  data.tar.gz: 781cdcecc2740ef1d817328c019df048404b40e66019e3ea4714508db42050fb
+  metadata.gz: 9f134ae1ed21b1641b3c781ed7dc7c901c059ce3a8c9ac7038f4ee5f2ae9d313
+  data.tar.gz: 3c4758ba9de6440b17acca78d23d9b60ffd7b6683462168bd44f1aff0f466ded
 SHA512:
-  metadata.gz: 3ce7a3556eafb00728a5670800f9b60974fc62c81a6b4f934afc6f3a37b1a04544cbe6553fa629b2c33a31fdda8574d33943b417a0928e4d9946424b18117892
-  data.tar.gz: 23b8d42df92a6053034c3be000568dcb260c04afba8318b9b4d4f960d194b1483325720dfb4aaacec7266b05ce0455a24c16dc96122101ff8b79c52368c79f7d
+  metadata.gz: cbe0c28c51e406f51262ca10bffe6453caa73badc17cbfa61938030bbf94c9a1d9747dacde5471a28b9403409082da526815b5c23f37d0ade1844fd06cfd3ad2
+  data.tar.gz: d57f31a01741d59aa49bbf74be30d41f0da85f26b9d555e8a60695f9490a74e5043e9c7e6e148e6bf9d7fe5a740ea7e9cd34725f52ec68d46998b9a9a0b3cf8b

data/ext/extconf.rb

@@ -52,6 +52,7 @@ module Sass
       if uri.is_a?(URI::File) || uri.instance_of?(URI::Generic)
         FileUtils.copy_file uri.path, path
       elsif uri.respond_to? :open
+        puts "curl -fsSLo #{path} -- #{uri}"
         uri.open do |source|
           File.open(path, 'wb') do |destination|
             destination.write source.read
@@ -64,12 +65,18 @@ module Sass
       raise "Failed to get: #{uri}"
     end
 
-    def latest_release(repo, prerelease: false)
-      if prerelease
+    def latest_release(repo, prerelease: false, tag: false)
+      if prerelease || tag
         headers = {}
         headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
-        URI.parse("https://api.github.com/repos/#{repo}/releases").open(headers) do |file|
-          JSON.parse(file.read)[0]['tag_name']
+        if tag
+          URI.parse("https://api.github.com/repos/#{repo}/tags").open(headers) do |file|
+            JSON.parse(file.read)[0]['name']
+          end
+        else
+          URI.parse("https://api.github.com/repos/#{repo}/releases").open(headers) do |file|
+            JSON.parse(file.read)[0]['tag_name']
+          end
         end
       else
         URI.parse("https://github.com/#{repo}/releases/latest").open do |file|
@@ -81,10 +88,10 @@ module Sass
     def latest_sass_embedded
       repo = 'sass/dart-sass-embedded'
 
-      # TODO, don't use prerelease once a release is available
+      # TODO: don't use prerelease once a release is available
       tag_name = latest_release repo, prerelease: true
 
-      os = case Sass::Platform::OS
+      os = case Platform::OS
            when 'darwin'
              'macos'
            when 'linux'
@@ -92,16 +99,20 @@ module Sass
            when 'windows'
              'windows'
            else
-             raise "Unsupported OS: #{Sass::Platform::OS}"
+             raise "Unsupported OS: #{Platform::OS}"
            end
 
-      arch = case Sass::Platform::ARCH
+      arch = case Platform::ARCH
              when 'x86_64'
                'x64'
              when 'i386'
                'ia32'
+             when 'aarch64'
+               raise "Unsupported Arch: #{Platform::ARCH}" unless Platform::OS == 'darwin'
+
+               'x64'
              else
-               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+               raise "Unsupported Arch: #{Platform::ARCH}"
              end
 
       ext = case os
@@ -119,7 +130,7 @@ module Sass
 
       tag_name = latest_release repo
 
-      os = case Sass::Platform::OS
+      os = case Platform::OS
            when 'darwin'
              'osx'
            when 'linux'
@@ -127,12 +138,16 @@ module Sass
            when 'windows'
              'win'
            else
-             raise "Unsupported OS: #{Sass::Platform::OS}"
+             raise "Unsupported OS: #{Platform::OS}"
            end
 
-      arch = case Sass::Platform::ARCH
+      arch = case Platform::ARCH
              when 'aarch64'
-               'aarch_64'
+               if Platform::OS == 'darwin'
+                 'x86_64'
+               else
+                 'aarch_64'
+               end
              when 'sparcv9'
                's390'
              when 'i386'
@@ -142,7 +157,7 @@ module Sass
              when 'powerpc64'
                'ppcle_64'
              else
-               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+               raise "Unsupported Arch: #{Platform::ARCH}"
              end
 
       os_arch = case os
@@ -160,9 +175,8 @@ module Sass
     def latest_sass_embedded_protocol
       repo = 'sass/embedded-protocol'
 
-      # TODO: use latest release once available
-      # tag_name = latest_release repo
-      tag_name = 'HEAD'
+      # TODO: don't use tag once a release is available
+      tag_name = latest_release repo, tag: true
 
       "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
     end

data/lib/sass.rb

@@ -69,5 +69,5 @@ require_relative 'sass/error'
 require_relative 'sass/transport'
 require_relative 'sass/observer'
 require_relative 'sass/info'
-require_relative 'sass/render'
+require_relative 'sass/compile'
 require_relative 'sass/embedded'

data/lib/sass/{render.rb → compile.rb}

@@ -2,7 +2,7 @@
 
 module Sass
   # The {Observer} for {Embedded#render}.
-  class RenderContext
+  class CompileContext
     include Observer
 
     def initialize(transport, id,

data/lib/sass/embedded.rb

@@ -55,16 +55,16 @@ module Sass
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      message = RenderContext.new(@transport, next_id,
-                                  data: data,
-                                  file: file,
-                                  indented_syntax: indented_syntax,
-                                  include_paths: include_paths,
-                                  output_style: output_style,
-                                  source_map: source_map,
-                                  out_file: out_file,
-                                  functions: functions,
-                                  importer: importer).receive_message
+      message = CompileContext.new(@transport, next_id,
+                                   data: data,
+                                   file: file,
+                                   indented_syntax: indented_syntax,
+                                   include_paths: include_paths,
+                                   output_style: output_style,
+                                   source_map: source_map,
+                                   out_file: out_file,
+                                   functions: functions,
+                                   importer: importer).receive_message
 
       if message.failure
         raise RenderError.new(

data/lib/sass/transport.rb

@@ -31,7 +31,7 @@ module Sass
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
       poll do
-        $stderr.write @stderr.readline
+        warn(@stderr.readline, uplevel: 1)
       end
       poll do
         receive_proto read
@@ -68,9 +68,7 @@ module Sass
       Thread.new do
         loop do
           yield
-        rescue Interrupt
-          break
-        rescue IOError => e
+        rescue StandardError => e
           notify_observers(e, nil)
           close
           break
@@ -90,7 +88,7 @@ module Sass
       message = payload[payload.message.to_s]
       case message
       when EmbeddedProtocol::ProtocolError
-        notify_observers(ProtocolError.new(message.message), nil)
+        raise ProtocolError, message.message
       else
         notify_observers(nil, message)
       end

data/lib/sass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = '0.7.7'
+  VERSION = '0.7.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.11
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -150,12 +150,12 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/sass.rb
+- lib/sass/compile.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/info.rb
 - lib/sass/observer.rb
 - lib/sass/platform.rb
-- lib/sass/render.rb
 - lib/sass/result.rb
 - lib/sass/struct.rb
 - lib/sass/transport.rb
@@ -165,7 +165,7 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.7
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.11
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Use dart-sass with Ruby!