sass-embedded 0.7.8 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182ccd964e82f33282215272b2fe64abb8caa446988d81564c85e237236e3db4
-  data.tar.gz: 72ff376803cd9da9de460e6418c8c9025c8c8614d4ce331cf837ed0ac554e713
+  metadata.gz: af7015aac4279ef9b4ea9a4cca2ca236e1722c70db19e4c21a35c9df64d5667e
+  data.tar.gz: 8dcf794cff743d2e5f24b7bcd817d7bcef2867549fe0eda94634966a96e8e8c4
 SHA512:
-  metadata.gz: 358fb5171fcfd2af9e687e4a8a1662644504b71892f2b052d7340eaf44c32940958aa0bdf20b387ed5cd33b33fa4091751cceb96e08d9d899000100ca9554a4d
-  data.tar.gz: c94db17eae89bcc55d3ea762bb5e138e701f1b1d209f6033e0f33639a4ee6324865230734a026a96f2a5fa5287e8710e89badbb3965a0bfe7d790eb7d1e8e380
+  metadata.gz: 76a76058b210b7ae057ed71dd25f12625a04396c84c447dd8075ca4ff6ca4d52df009243cbd110009902fa727489e79bd20b1798670222cbe3c312f5ade5aa7d
+  data.tar.gz: f5d40d128f9c9fbaee17728c9092b6b6c86f1908f474a94e6b43918cb2db389154fa246d4b2b9ee083e916d62ba19f9aec767e35cd8d7c39c25462e90a3f9d5c

data/ext/dependencies.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Sass
+  module Dependencies
+    REQUIREMENTS = {
+      'protocolbuffers/protobuf' => '~> 3.17',
+      'sass/embedded-protocol' => '~> 1.0.0-beta.12',
+      'sass/dart-sass-embedded' => '~> 1.0.0-beta.9'
+    }.freeze
+  end
+end

data/ext/extconf.rb

@@ -5,13 +5,14 @@ require 'mkmf'
 require 'json'
 require 'open-uri'
 require 'fileutils'
+require_relative './dependencies'
 require_relative '../lib/sass/platform'
 
 module Sass
   # The dependency downloader. This downloads all the dependencies during gem
   # installation. The companion Makefile then unpacks all downloaded
-  # dependencies. By default it downloads the latest release of each
-  # dependency from GitHub releases.
+  # dependencies. By default it downloads the release of each dependency
+  # from GitHub releases.
   #
   # It is possible to specify an alternative source or version of each
   # dependency. Local sources can be used for offline installation.
@@ -23,9 +24,9 @@ module Sass
   #     --with-sass-embedded-protocol=file:///path/to/embedded_sass.proto
   class Extconf
     def initialize
-      get_with_config('protoc', true) { latest_protoc }
-      get_with_config('sass-embedded', true) { latest_sass_embedded }
-      get_with_config('sass-embedded-protocol', true) { latest_sass_embedded_protocol }
+      get_with_config('protoc', true) { default_protoc }
+      get_with_config('sass-embedded', true) { default_sass_embedded }
+      get_with_config('sass-embedded-protocol', true) { default_sass_embedded_protocol }
     end
 
     private
@@ -52,6 +53,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,27 +66,36 @@ module Sass
       raise "Failed to get: #{uri}"
     end
 
-    def latest_release(repo, prerelease: false)
-      if prerelease
-        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']
-        end
-      else
+    def resolve_tag_name(repo, *requirements, gh_release: true)
+      requirements = Gem::Requirement.create(*requirements)
+
+      if requirements == Gem::Requirement.default && gh_release
         URI.parse("https://github.com/#{repo}/releases/latest").open do |file|
           File.basename file.base_uri.to_s
         end
+      else
+        headers = {}
+        headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
+        if gh_release
+          URI.parse("https://api.github.com/repos/#{repo}/releases?per_page=100").open(headers) do |file|
+            JSON.parse(file.read).map { |release| release['tag_name'] }
+          end
+        else
+          URI.parse("https://api.github.com/repos/#{repo}/tags?per_page=100").open(headers) do |file|
+            JSON.parse(file.read).map { |tag| tag['name'] }
+          end
+        end
+          .find { |version| Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version)) }
+          &.to_s
       end
     end
 
-    def latest_sass_embedded
+    def default_sass_embedded
       repo = 'sass/dart-sass-embedded'
 
-      # TODO, don't use prerelease once a release is available
-      tag_name = latest_release repo, prerelease: true
+      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo])
 
-      os = case Sass::Platform::OS
+      os = case Platform::OS
            when 'darwin'
              'macos'
            when 'linux'
@@ -92,16 +103,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
@@ -114,12 +129,14 @@ module Sass
       "https://github.com/#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
     end
 
-    def latest_protoc
+    def default_protoc
       repo = 'protocolbuffers/protobuf'
 
-      tag_name = latest_release repo
+      spec = Gem::Dependency.new('google-protobuf', Sass::Dependencies::REQUIREMENTS[repo]).to_spec
+
+      tag_name = "v#{spec.version}"
 
-      os = case Sass::Platform::OS
+      os = case Platform::OS
            when 'darwin'
              'osx'
            when 'linux'
@@ -127,12 +144,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 +163,7 @@ module Sass
              when 'powerpc64'
                'ppcle_64'
              else
-               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+               raise "Unsupported Arch: #{Platform::ARCH}"
              end
 
       os_arch = case os
@@ -157,12 +178,10 @@ module Sass
       "https://github.com/#{repo}/releases/download/#{tag_name}/protoc-#{tag_name[1..]}-#{os_arch}.#{ext}"
     end
 
-    def latest_sass_embedded_protocol
+    def default_sass_embedded_protocol
       repo = 'sass/embedded-protocol'
 
-      # TODO: use latest release once available
-      # tag_name = latest_release repo
-      tag_name = 'HEAD'
+      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo], gh_release: false)
 
       "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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.12
 platform: ruby
 authors:
 - なつき
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: '3.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: '3.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,15 @@ files:
 - LICENSE
 - README.md
 - ext/Makefile
+- ext/dependencies.rb
 - 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,8 +166,8 @@ 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.8
-post_install_message:
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.12
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.2.26
+signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []