sass-embedded 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1974ef3b75975fec9f67f9b510a8b11556d999cc0af87224e27dacb918bd64f0
-  data.tar.gz: fa1c85a80f9a24bc5251e77680f521ff22e2f41e5d9cd70e083040791cbbe379
+  metadata.gz: b701a29895bdd5f8ff05a4a23d972b1db3a64c20e29a75e02f6e3d52e7db762a
+  data.tar.gz: 900620c0e33b9ae961f231cb249b00a74d0306e74dfa06f35996571319e47328
 SHA512:
-  metadata.gz: 88636d056f2cc41b7677351e265e6c8f7c097d278b1008bf650dfbcc417d33cd7514b7c0e8baf2b9f39590bb909a5f8292e4f0eca9ea01628a9a6e6a7398f7d5
-  data.tar.gz: 4069bbc0ef1cc24668483dbff8dad25ce4b60de43868d57d59d35f056781a54382ee0c273956523a51ab772e0531722fc9d1c22f026f2790262fdb785bb2a65b
+  metadata.gz: 8a5984ffbe81012da00d2b25101d4b8a850057684f880fb25a4c76041a2d93a79b8888919d61487fb74b4b4480e6be9b39f7ee2554408e62ad3fa6adb27a3341
+  data.tar.gz: 6450eafe143ecb655308d8c3c859c2a90c013bd753495fd6b12db87bea4ccb9bd89c616957ed08e47ef3a04daf90437a41b1836cef01f609750b9663044a96a1

data/ext/sass/Rakefile

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'open-uri'
-require 'open3'
 require 'rake/clean'
 
 task default: %i[install clean]
 
-task install: %w[sass_embedded embedded_sass_pb.rb]
+task install: %w[sass_embedded embedded.rb embedded_sass_pb.rb]
 
 CLEAN.include %w[protoc.exe *.proto *.tar.gz *.zip]
 
-CLOBBER.include %w[sass_embedded embedded_sass_pb.rb]
+CLOBBER.include %w[sass_embedded embedded.rb embedded_sass_pb.rb]
 
 file 'protoc.exe' do |t|
   fetch(ENV.fetch('PROTOC_BIN') { Configuration.default_protoc }, t.name)
@@ -24,12 +21,31 @@ file 'sass_embedded' do |t|
   rm archive
 end
 
-file 'embedded_sass.proto' => %w[sass_embedded] do |t|
+file 'embedded.rb' => %w[sass_embedded] do |t|
+  path = 'sass_embedded/dart-sass-embedded'
+  path = "#{path}#{(Gem.win_platform? ? ['.exe', '.bat'] : ['', '.sh']).find { |ext| File.exist? "#{path}#{ext}" }}"
+
+  raise "#{path} not found" unless File.exist? path
+
+  File.write(t.name, <<~EMBEDDED_RB)
+    # frozen_string_literal: true
+
+    module Sass
+      class Embedded
+        class Compiler
+          PATH = File.absolute_path('#{path}', __dir__)
+        end
+      end
+    end
+  EMBEDDED_RB
+end
+
+file 'embedded_sass.proto' => %w[embedded.rb] do |t|
   fetch(ENV.fetch('SASS_EMBEDDED_PROTOCOL') { Configuration.default_sass_embedded_protocol }, t.name)
 end
 
 rule '_pb.rb' => %w[.proto protoc.exe] do |t|
-  sh './protoc.exe', '--ruby_out=.', t.source
+  sh './protoc.exe', '--proto_path=.', '--ruby_out=.', t.source
 end
 
 # This is a FileUtils extension that defines several additional commands to be
@@ -52,6 +68,8 @@ module FileUtils
   end
 
   def fetch(uri_or_path, dest = nil)
+    require 'open-uri'
+
     begin
       uri = URI.parse(uri_or_path)
       path = URI::DEFAULT_PARSER.unescape(uri.path)
@@ -83,7 +101,7 @@ module FileUtils
 
     dest
   rescue StandardError
-    raise "Failed to fetch #{uri_or_path}"
+    raise IOError, "Failed to fetch #{uri_or_path}"
   end
 end
 
@@ -108,9 +126,13 @@ module Configuration
              'i386'
            when /arm64|aarch64/
              'aarch64'
-           when /^arm/
+           when /arm/
              # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
              OS == 'darwin' ? 'aarch64' : 'arm'
+           when /ppc64le|powerpc64le/
+             'powerpc64le'
+           when /s390x/
+             's390x'
            else
              RbConfig::CONFIG['host_cpu']
            end
@@ -118,95 +140,93 @@ module Configuration
 
   private_constant :Platform
 
-  class << self
-    def default_sass_embedded
-      repo = 'sass/dart-sass-embedded'
+  module_function
+
+  def default_sass_embedded
+    require 'json'
+
+    repo = 'https://github.com/sass/dart-sass-embedded'
+
+    spec = JSON.parse(File.read(File.absolute_path('package.json', __dir__)))
 
-      spec = JSON.parse(File.read(File.absolute_path('package.json', __dir__)))
+    tag_name = spec['dependencies']['sass-embedded']
 
-      tag_name = spec['dependencies']['sass-embedded']
+    message = "sass_embedded for #{Platform::OS}/#{Platform::ARCH} not available at #{repo}/releases/tag/#{tag_name}"
 
-      os = case Platform::OS
-           when 'darwin'
-             'macos'
-           when 'linux'
-             'linux'
-           when 'windows'
-             'windows'
+    os = case Platform::OS
+         when 'darwin'
+           'macos'
+         when 'linux'
+           'linux'
+         when 'windows'
+           'windows'
+         else
+           raise NotImplementedError, message
+         end
+
+    arch = case Platform::ARCH
+           when 'i386'
+             'ia32'
+           when 'x86_64'
+             'x64'
+           when 'aarch64'
+             Platform::OS == 'darwin' ? 'x64' : 'arm64'
            else
-             raise release_asset_not_available_error(repo, tag_name)
+             raise NotImplementedError, message
            end
 
-      arch = case Platform::ARCH
-             when 'x86_64'
-               'x64'
-             when 'i386'
-               'ia32'
-             when 'aarch64'
-               Platform::OS == 'darwin' ? 'x64' : 'arm64'
-             else
-               raise release_asset_not_available_error(repo, tag_name)
-             end
-
-      ext = case os
-            when 'windows'
-              'zip'
-            else
-              'tar.gz'
-            end
-
-      "https://github.com/#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
-    end
+    ext = Gem.win_platform? ? 'zip' : 'tar.gz'
+
+    "#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
+  end
 
-    def default_protoc
-      repo = 'protocolbuffers/protobuf'
+  def default_protoc
+    repo = 'https://repo.maven.apache.org/maven2/com/google/protobuf/protoc'
 
-      version = Gem::Dependency.new('google-protobuf').to_spec.version
+    version = Gem::Dependency.new('google-protobuf').to_spec.version
 
-      tag_name = "v#{version}"
+    message = "protoc for #{Platform::OS}/#{Platform::ARCH} not available at #{repo}/#{version}"
 
-      os = case Platform::OS
-           when 'darwin'
-             'osx'
-           when 'linux'
-             'linux'
-           when 'windows'
-             'windows'
+    os = case Platform::OS
+         when 'darwin'
+           'osx'
+         when 'linux'
+           'linux'
+         when 'windows'
+           'windows'
+         else
+           raise NotImplementedError, message
+         end
+
+    arch = case Platform::ARCH
+           when 'i386'
+             'x86_32'
+           when 'x86_64'
+             'x86_64'
+           when 'aarch64'
+             'aarch_64'
+           when 'powerpc64le'
+             'ppcle_64'
+           when 's390x'
+             's390_64'
            else
-             raise release_asset_not_available_error(repo, tag_name)
+             raise NotImplementedError, message
            end
 
-      arch = case Platform::ARCH
-             when 'x86_64'
-               'x86_64'
-             when 'i386'
-               'x86_32'
-             when 'aarch64'
-               'aarch_64'
-             else
-               raise release_asset_not_available_error(repo, tag_name)
-             end
-
-      "https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/#{version}/protoc-#{version}-#{os}-#{arch}.exe"
-    end
+    "#{repo}/#{version}/protoc-#{version}-#{os}-#{arch}.exe"
+  end
 
-    def default_sass_embedded_protocol
-      stdout, stderr, status = Open3.capture3(
-        File.absolute_path("sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__), '--version'
-      )
-      raise stderr unless status.success?
+  def default_sass_embedded_protocol
+    require 'json'
+    require 'open3'
+    require_relative 'embedded'
 
-      tag_name = JSON.parse(stdout)['protocolVersion']
-      "https://github.com/sass/embedded-protocol/raw/#{tag_name}/embedded_sass.proto"
-    end
+    stdout, stderr, status = Open3.capture3(Sass::Embedded::Compiler::PATH, '--version')
 
-    private
+    raise stderr unless status.success?
 
-    def release_asset_not_available_error(repo, tag_name)
-      NotImplementedError.new(
-        "Release asset for #{Platform::OS} #{Platform::ARCH} "\
-        "not available at https://github.com/#{repo}/releases/tag/#{tag_name}"
-      )
-    end
+    tag_name = JSON.parse(stdout)['protocolVersion']
+
+    "https://github.com/sass/embedded-protocol/raw/#{tag_name}/embedded_sass.proto"
   end
 end

data/lib/sass/embedded/compiler.rb

@@ -8,10 +8,6 @@ module Sass
     #
     # It runs the `dart-sass-embedded` process.
     class Compiler
-      PATH = File.absolute_path(
-        "../../../ext/sass/sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__
-      )
-
       def initialize
         @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(PATH)
         @stdin.binmode

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.0.17'
+    VERSION = '1.0.18'
   end
 end

data/lib/sass/embedded.rb

@@ -1,5 +1,39 @@
 # frozen_string_literal: true
 
+require_relative '../../ext/sass/embedded'
+require_relative '../../ext/sass/embedded_sass_pb'
+require_relative 'compile_error'
+require_relative 'compile_result'
+require_relative 'embedded/async'
+require_relative 'embedded/channel'
+require_relative 'embedded/compiler'
+require_relative 'embedded/dispatcher'
+require_relative 'embedded/host'
+require_relative 'embedded/host/function_registry'
+require_relative 'embedded/host/importer_registry'
+require_relative 'embedded/host/logger_registry'
+require_relative 'embedded/host/value_protofier'
+require_relative 'embedded/protofier'
+require_relative 'embedded/structifier'
+require_relative 'embedded/varint'
+require_relative 'embedded/version'
+require_relative 'logger'
+require_relative 'logger/source_location'
+require_relative 'logger/source_span'
+require_relative 'script_error'
+require_relative 'value'
+require_relative 'value/list'
+require_relative 'value/argument_list'
+require_relative 'value/boolean'
+require_relative 'value/color'
+require_relative 'value/function'
+require_relative 'value/fuzzy_math'
+require_relative 'value/map'
+require_relative 'value/null'
+require_relative 'value/number'
+require_relative 'value/number/unit'
+require_relative 'value/string'
+
 module Sass
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
   # its own communication {Channel} with a dedicated compiler process.

data/lib/sass.rb

@@ -1,38 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'sass/compile_error'
-require_relative 'sass/compile_result'
 require_relative 'sass/embedded'
-require_relative 'sass/embedded/async'
-require_relative 'sass/embedded/channel'
-require_relative 'sass/embedded/compiler'
-require_relative 'sass/embedded/dispatcher'
-require_relative 'sass/embedded/host'
-require_relative 'sass/embedded/host/function_registry'
-require_relative 'sass/embedded/host/importer_registry'
-require_relative 'sass/embedded/host/logger_registry'
-require_relative 'sass/embedded/host/value_protofier'
-require_relative 'sass/embedded/protofier'
-require_relative 'sass/embedded/structifier'
-require_relative 'sass/embedded/varint'
-require_relative 'sass/embedded/version'
-require_relative 'sass/embedded_protocol'
-require_relative 'sass/logger'
-require_relative 'sass/logger/source_location'
-require_relative 'sass/logger/source_span'
-require_relative 'sass/script_error'
-require_relative 'sass/value'
-require_relative 'sass/value/list'
-require_relative 'sass/value/argument_list'
-require_relative 'sass/value/boolean'
-require_relative 'sass/value/color'
-require_relative 'sass/value/function'
-require_relative 'sass/value/fuzzy_math'
-require_relative 'sass/value/map'
-require_relative 'sass/value/null'
-require_relative 'sass/value/number'
-require_relative 'sass/value/number/unit'
-require_relative 'sass/value/string'
 
 # The Sass module.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,6 @@ files:
 - lib/sass/embedded/structifier.rb
 - lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
-- lib/sass/embedded_protocol.rb
 - lib/sass/logger.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
@@ -161,8 +160,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.17
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.17
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.18
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.18
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass/embedded_protocol.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../ext/sass/embedded_sass_pb'