sassc 2.1.0.pre1-x86-mingw32 → 2.1.0.pre2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137213d24e1402de715a72abda7db4d4bfa62edba1103693a7440ec35c92ac1a
-  data.tar.gz: 1cde21c700a2ed23cb1980b9a4776ae55f35b333e626a1105747261a674af58a
+  metadata.gz: 8935c9cc61e66535ddc5f275fd069836399ff019c4c6ee3100b343bc5c9a9adc
+  data.tar.gz: f69f26268dc43a45bd18dc0389969b24fe46f8c8eb1e456f86470367d07bd5ff
 SHA512:
-  metadata.gz: 7aae31a1033573b0f6b80e090543bc175a659954ade524e0e2b062304062601a8e733aefed306facb9fd628e9f18ee15cd3c0409b98042b7ec7ef8efd02b27eb
-  data.tar.gz: 783cef16f7dcd949c6dfe0f2fecaa0f318b4dfd94622d2b5ba9a5f090ed369e0e995608e460758fdb984f637d089f9c646817f322495345518b28dceff85ee08
+  metadata.gz: 06e75dd08b39f29feeab79848e85aebca296dcb034f5ed25bf17f8d7160b21462550131ddc2ec523c1a6acf95b320bd54f36f57901867b9c007f60c3a971ffa3
+  data.tar.gz: 6643de90219d0a9fe349de16e1c2cfd8bcd0431c0958c4e6807dc53813e742ba089aff93fad1b3f5781ed25384cd229c2fee5c7d0041344fbae1f10fe1f742ee

data/.gitignore

@@ -15,3 +15,4 @@
 *.gem
 mkmf.log
 vendor/bundle
+/ext/Makefile

data/.travis.yml

@@ -3,9 +3,12 @@ language: ruby
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "bundle exec rake test"
 rvm:
+  - 2.0.0
+  - 2.1.10
+  - 2.2.10
   - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+- **2.1.0.pre2**
+  - [Reduce Ruby warnings](https://github.com/sass/sassc-ruby/pull/124)
+  - [prefer equal? to determine object identity](https://github.com/sass/sassc-ruby/pull/122)
+  - [Link C/C++ stdlib statically for binary gems](https://github.com/sass/sassc-ruby/pull/127)
 - **2.1.0.pre1**
   - [Update Libsass to 3.6.0](https://github.com/sass/sassc-ruby/pull/96/files)
   - [Support old Ruby versions](https://github.com/sass/sassc-ruby/pull/117/files)

data/Rakefile

@@ -4,12 +4,27 @@ task default: :test
 
 require 'rake/extensiontask'
 gem_spec = Gem::Specification.load("sassc.gemspec")
+
+# HACK: Prevent rake-compiler from overriding required_ruby_version,
+# because the shared library here is Ruby-agnostic.
+# See https://github.com/rake-compiler/rake-compiler/issues/153
+module FixRequiredRubyVersion
+  def required_ruby_version=(*); end
+end
+Gem::Specification.send(:prepend, FixRequiredRubyVersion)
+
 Rake::ExtensionTask.new('libsass', gem_spec) do |ext|
   ext.name = 'libsass'
   ext.ext_dir = 'ext'
   ext.lib_dir = 'lib/sassc'
   ext.cross_compile = true
   ext.cross_platform = %w[x86-mingw32 x64-mingw32 x86-linux x86_64-linux]
+
+  # Link C++ stdlib statically when building binary gems.
+  ext.cross_config_options << '--enable-static-stdlib'
+
+  ext.cross_config_options << '--disable-march-tune-native'
+
   ext.cross_compiling do |spec|
     spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
   end
@@ -18,11 +33,19 @@ end
 desc 'Compile all native gems via rake-compiler-dock (Docker)'
 task 'gem:native' do
   require 'rake_compiler_dock'
-  RakeCompilerDock.sh "bundle && gem i rake --no-document && "\
-                      "rake cross native gem MAKE='nice make -j`nproc`' "\
-                      "RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0"
+
+  # The RUBY_CC_VERSION here doesn't matter for the final package.
+  # Only one version should be specified, as the shared library is Ruby-agnostic.
+  #
+  # g++-multilib is installed for 64->32-bit cross-compilation.
+  RakeCompilerDock.sh "sudo apt-get install -y g++-multilib && bundle && gem i rake --no-document && "\
+                      "rake clean && rake cross native gem MAKE='nice make -j`nproc`' "\
+                      "RUBY_CC_VERSION=2.6.0 CLEAN=1"
 end
 
+CLEAN.include 'tmp', 'pkg', 'lib/sassc/libsass.so', 'ext/libsass/VERSION',
+              'ext/*.{o,so,bundle}', 'ext/Makefile'
+
 desc "Run all tests"
 task test: 'compile:libsass' do
   $LOAD_PATH.unshift('lib', 'test')

data/lib/sassc/native.rb

@@ -6,16 +6,8 @@ module SassC
   module Native
     extend FFI::Library
 
-    spec = Gem.loaded_specs["sassc"]
-    gem_root = spec.gem_dir
-
-    dl_ext = (RUBY_PLATFORM =~ /darwin/ ? 'bundle' : 'so')
-    ruby_version_so_path = "#{gem_root}/lib/sassc/#{RUBY_VERSION[/\d+.\d+/]}/libsass.#{dl_ext}"
-    if File.exist?(ruby_version_so_path)
-      ffi_lib ruby_version_so_path
-    else
-      ffi_lib "#{gem_root}/lib/sassc/libsass.#{dl_ext}"
-    end
+    dl_ext = (RbConfig::CONFIG['host_os'] =~ /darwin/ ? 'bundle' : 'so')
+    ffi_lib File.expand_path("libsass.#{dl_ext}", __dir__)
 
     require_relative "native/sass_value"
 
@@ -42,7 +34,7 @@ module SassC
 
     # Remove the redundant "sass_" from the beginning of every method name
     def self.attach_function(*args)
-      super if args.size != 3
+      return super if args.size != 3
 
       if args[0] =~ /^sass_/
         args.unshift args[0].to_s.sub(/^sass_/, "")

data/lib/sassc/native/native_functions_api.rb

@@ -98,11 +98,6 @@ module SassC
       attach_function "sass_color_set_#{color_channel}".to_sym, [:sass_value_ptr, :double], :void
     end
 
-    # ADDAPI size_t ADDCALL sass_list_get_length(const union Sass_Value* v)
-    # ADDAPI union Sass_Value* ADDCALL sass_list_get_value (const union Sass_Value* v, size_t i);
-    attach_function :sass_list_get_length, [:sass_value_ptr], :size_t
-    attach_function :sass_list_get_value, [:sass_value_ptr, :size_t], :sass_value_ptr
-
     # ADDAPI char* ADDCALL sass_error_get_message (const union Sass_Value* v);
     # ADDAPI void ADDCALL sass_error_set_message (union Sass_Value* v, char* msg);
     attach_function :sass_error_get_message, [:sass_value_ptr], :string

data/lib/sassc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SassC
-  VERSION = "2.1.0.pre1"
+  VERSION = "2.1.0.pre2"
 end

data/sassc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.required_ruby_version = ">= 2.3.3"
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.require_paths = ["lib"]
 
@@ -40,18 +40,30 @@ Gem::Specification.new do |spec|
   gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
 
   libsass_dir = File.join(gem_dir, 'ext', 'libsass')
-  if !File.directory?(libsass_dir)
-    $stderr.puts "Error: ext/libsass not checked out. Please run:\n\n"\
-                 "  git submodule update --init"
-    exit 1
+  if !File.directory?(libsass_dir) ||
+      # '.', '..', and possibly '.git' from a failed checkout:
+      Dir.entries(libsass_dir).size <= 3
+    Dir.chdir(__dir__) { system('git submodule update --init') } or
+        fail 'Could not fetch libsass'
+  end
+
+  # Write a VERSION file for non-binary gems (for `SassC::Native.version`).
+  if !File.exist?(File.join(libsass_dir, 'VERSION'))
+    libsass_version = Dir.chdir(libsass_dir) do
+      %x[git describe --abbrev=4 --dirty --always --tags].chomp
+    end
+    File.write(File.join(libsass_dir, 'VERSION'), libsass_version)
   end
 
   Dir.chdir(libsass_dir) do
     submodule_relative_path = File.join('ext', 'libsass')
+    skip_re = %r{(^("?test|docs|script)/)|\.md$|\.yml$}
+    only_re = %r{\.[ch](pp)?$}
     `git ls-files`.split($\).each do |filename|
-      next if filename =~ %r{(^("?test|docs|script)/)|\.md$|\.yml$}
+      next if filename =~ skip_re || filename !~ only_re
       spec.files << File.join(submodule_relative_path, filename)
     end
+    spec.files << File.join(submodule_relative_path, 'VERSION')
   end
 
 end

data/test/engine_test.rb

@@ -286,7 +286,7 @@ CSS
     def test_empty_template_returns_a_new_object
       input = String.new
       output = Engine.new(input).render
-      assert input.object_id != output.object_id, 'empty template must return a new object'
+      assert !input.equal?(output), 'empty template must return a new object'
     end
 
     def test_empty_template_encoding_matches_input

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre1
+  version: 2.1.0.pre2
 platform: x86-mingw32
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -153,16 +153,13 @@ files:
 - README.md
 - Rakefile
 - lib/sassc.rb
-- lib/sassc/2.3/libsass.so
-- lib/sassc/2.4/libsass.so
-- lib/sassc/2.5/libsass.so
-- lib/sassc/2.6/libsass.so
 - lib/sassc/dependency.rb
 - lib/sassc/engine.rb
 - lib/sassc/error.rb
 - lib/sassc/functions_handler.rb
 - lib/sassc/import_handler.rb
 - lib/sassc/importer.rb
+- lib/sassc/libsass.so
 - lib/sassc/native.rb
 - lib/sassc/native/lib_c.rb
 - lib/sassc/native/native_context_api.rb
@@ -215,10 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: 2.7.dev
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"