sassc 2.1.0.pre1 → 2.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2772176f5c2bacf4de7b0834cbf272937b6116fa74fb17a17f29d9724b88f7
-  data.tar.gz: bb3876936e8d92ba560939f5e26b2c164d6c979dd346a4c49bebab568f3c8fde
+  metadata.gz: cded5a763843c824e5d515d37545e852120a63d187b39d8214c7fe002f9c57a4
+  data.tar.gz: cda45eb98106cfaba4ae9c21fe3016af2239d330bdadc8fe4a1f86acde5da078
 SHA512:
-  metadata.gz: 22d29a7b4470fcaf270a7c0c9a8abda0ada4242ca1d62f2c6c096a3119b3178369c8b4a168395f2cdf80498630b6f7e6d21eaa32048db01fd7fa31d134292368
-  data.tar.gz: '080d0c1eb2a7545a7f4762963e2ca0b6edd8b271c0aeb8d238afc92a90d03f8db0f43e569fc22e9eb8b957447184b88f7df673157e8ad3d448ba6857494bf639'
+  metadata.gz: d85b37901cc1ed34a21d2e9a4ab2ceb1fcb94bd70354a0b4f1640fe76b1301b088616db73ed8dd79d51a74e1341c1a39fcf60feb11400bb7a0820d9aee6bf2a4
+  data.tar.gz: 49ee4ffcf2c78f6be513af3b549ac1a09f89b1c4e64e57c807a33da5edad0663c8e5053f1ae0dd701e62bd487405f746bf8da1cdb4c4555186b3bf355efdc201

data/.gitignore

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

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/ext/depend

@@ -0,0 +1,4 @@
+# Replaces default mkmf dependencies. Default mkmf dependencies include all libruby headers.
+# We don't need libruby and some of these headers are missing on JRuby (breaking compilation there).
+$(OBJS): $(HDRS)
+

data/ext/extconf.rb

@@ -10,30 +10,76 @@ if !File.directory?(libsass_dir) ||
     fail 'Could not fetch libsass'
 end
 
-# Only needed because rake-compiler expects `.bundle` on macOS:
-# https://github.com/rake-compiler/rake-compiler/blob/9f15620e7db145d11ae2fc4ba032367903f625e3/features/support/platform_extension_helpers.rb#L5
-dl_ext = (RUBY_PLATFORM =~ /darwin/ ? 'bundle' : 'so')
+require 'mkmf'
 
-File.write 'Makefile', <<-MAKEFILE
-ifndef DESTDIR
-	LIBSASS_OUT = #{gem_root}/lib/sassc/libsass.#{dl_ext}
-else
-	LIBSASS_OUT = $(DESTDIR)$(PREFIX)/libsass.#{dl_ext}
-endif
+$CXXFLAGS << ' -std=c++11'
 
-SUB_DIR := #{libsass_dir}
+# Set to true when building binary gems
+if enable_config('static-stdlib', false)
+  $LDFLAGS << ' -static-libgcc -static-libstdc++'
+end
+
+# Set to false when building binary gems
+if enable_config('march-tune-native', true)
+  $CFLAGS << ' -march=native -mtune=native'
+  $CXXFLAGS << ' -march=native -mtune=native'
+end
+
+if enable_config('lto', true)
+  $CFLAGS << ' -flto'
+  $CXXFLAGS << ' -flto'
+  $LDFLAGS << ' -flto'
+end
+
+# Disable noisy compilation warnings.
+$warnflags = ''
+$CFLAGS.gsub!(/[\s+](-ansi|-std=[^\s]+)/, '')
+
+dir_config 'libsass'
+
+libsass_version = Dir.chdir(libsass_dir) do
+  if File.exist?('VERSION')
+    File.read('VERSION').chomp
+  elsif File.exist?('.git')
+    ver = %x[git describe --abbrev=4 --dirty --always --tags].chomp
+    File.write('VERSION', ver)
+    ver
+  end
+end
+
+if libsass_version
+  libsass_version_def = %Q{ -DLIBSASS_VERSION='"#{libsass_version}"'}
+  $CFLAGS << libsass_version_def
+  $CXXFLAGS << libsass_version_def
+end
+
+$INCFLAGS << " -I$(srcdir)/libsass/include"
+$VPATH << "$(srcdir)/libsass/src"
+Dir.chdir(__dir__) do
+  $VPATH += Dir['libsass/src/*/'].map { |p| "$(srcdir)/#{p}" }
+  $srcs = Dir['libsass/src/**/*.{c,cpp}']
+end
+
+MakeMakefile::LINK_SO << "\nstrip -x $@"
 
-libsass.#{dl_ext}:#{' clean' if ENV['CLEAN']}
-	$(MAKE) -C '$(SUB_DIR)' lib/libsass.so
-	cp '$(SUB_DIR)/lib/libsass.so' libsass.#{dl_ext}
-	strip -x libsass.#{dl_ext}
+# Don't link libruby.
+$LIBRUBYARG = nil
 
-install: libsass.#{dl_ext}
-	cp libsass.#{dl_ext} '$(LIBSASS_OUT)'
+# Disable .def file generation for mingw, as it defines an
+# `Init_libsass` export which we don't have.
+MakeMakefile.send(:remove_const, :EXPORT_PREFIX)
+MakeMakefile::EXPORT_PREFIX = nil
 
-clean:
-	$(MAKE) -C '$(SUB_DIR)' clean
-	rm -f '$(LIBSASS_OUT)' libsass.#{dl_ext}
+if RUBY_ENGINE == 'jruby' &&
+   Gem::Version.new(RUBY_ENGINE_VERSION) < Gem::Version.new('9.2.8.0')
+  # COUTFLAG is not set correctly on jruby<9.2.8.0
+  # See https://github.com/jruby/jruby/issues/5749
+  MakeMakefile.send(:remove_const, :COUTFLAG)
+  MakeMakefile::COUTFLAG = '-o $(empty)'
+
+  # CCDLFLAGS is not set correctly on jruby<9.2.8.0
+  # See https://github.com/jruby/jruby/issues/5751
+  $CXXFLAGS << ' -fPIC'
+end
 
-.PHONY: clean install
-MAKEFILE
+create_makefile 'sassc/libsass'

data/ext/libsass/VERSION

@@ -0,0 +1 @@
+3.6.0

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

@@ -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: ruby
 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,18 +153,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/depend
 - ext/extconf.rb
-- ext/libsass/.editorconfig
-- ext/libsass/.gitattributes
-- ext/libsass/.gitignore
-- ext/libsass/COPYING
-- ext/libsass/GNUmakefile.am
-- ext/libsass/INSTALL
-- ext/libsass/LICENSE
-- ext/libsass/Makefile
-- ext/libsass/Makefile.conf
-- ext/libsass/configure.ac
-- ext/libsass/contrib/libsass.spec
+- ext/libsass/VERSION
 - ext/libsass/contrib/plugin.cpp
 - ext/libsass/include/sass.h
 - ext/libsass/include/sass/base.h
@@ -172,12 +163,7 @@ files:
 - ext/libsass/include/sass/functions.h
 - ext/libsass/include/sass/values.h
 - ext/libsass/include/sass/version.h
-- ext/libsass/include/sass/version.h.in
 - ext/libsass/include/sass2scss.h
-- ext/libsass/m4/.gitkeep
-- ext/libsass/m4/m4-ax_cxx_compile_stdcxx_11.m4
-- ext/libsass/res/resource.rc
-- ext/libsass/src/GNUmakefile.am
 - ext/libsass/src/ast.cpp
 - ext/libsass/src/ast.hpp
 - ext/libsass/src/ast2c.cpp
@@ -292,7 +278,6 @@ files:
 - ext/libsass/src/source_map.hpp
 - ext/libsass/src/subset_map.cpp
 - ext/libsass/src/subset_map.hpp
-- ext/libsass/src/support/libsass.pc.in
 - ext/libsass/src/to_value.cpp
 - ext/libsass/src/to_value.hpp
 - ext/libsass/src/units.cpp
@@ -309,12 +294,6 @@ files:
 - ext/libsass/src/util_string.hpp
 - ext/libsass/src/values.cpp
 - ext/libsass/src/values.hpp
-- ext/libsass/version.sh
-- ext/libsass/win/libsass.sln
-- ext/libsass/win/libsass.sln.DotSettings
-- ext/libsass/win/libsass.targets
-- ext/libsass/win/libsass.vcxproj
-- ext/libsass/win/libsass.vcxproj.filters
 - lib/sassc.rb
 - lib/sassc/dependency.rb
 - lib/sassc/engine.rb

data/ext/libsass/.editorconfig

@@ -1,15 +0,0 @@
-# This file is for unifying the coding style for different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[{Makefile, GNUmakefile.am}]
-indent_style = tab
-indent_size = 4

data/ext/libsass/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

data/ext/libsass/.gitignore

@@ -1,86 +0,0 @@
-# Miscellaneous stuff
-
-/sassc
-/sass-spec
-/plugins/
-
-VERSION
-.DS_Store
-.sass-cache
-*.gem
-*.gcno
-.svn/*
-.cproject
-.project
-.settings/
-*.db
-*.aps
-
-# Configuration stuff
-
-GNUmakefile.in
-GNUmakefile
-/aclocal.m4
-/autom4te.cache/
-/src/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/libtool
-/m4/libtool.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4
-/script/ar-lib
-/script/compile
-/script/config.guess
-/script/config.sub
-/script/depcomp
-/script/install-sh
-/script/ltmain.sh
-/script/missing
-/script/test-driver
-/src/stamp-h1
-/src/Makefile.in
-/src/Makefile
-libsass/*
-
-# Build stuff
-
-*.o
-*.lo
-*.so
-*.dll
-*.a
-*.suo
-*.sdf
-*.opendb
-*.opensdf
-a.out
-libsass.js
-tester
-tester.exe
-build/
-config.h.in*
-lib/pkgconfig/
-
-bin/*
-.deps/
-.libs/
-win/bin
-*.user
-win/*.db
-
-# Final results
-
-sassc++
-libsass.la
-src/support/libsass.pc
-
-# Cloned testing dirs
-sassc/
-sass-spec/
-
-installer/