sq_mini_racer 0.3.1.0.2 → 0.3.1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e68f36f6b57f07077c1f7914e2e902c6e824ee2de5d00008a5f5df50acee72b7
-  data.tar.gz: f7cf237de4ca9714d8588d3d8fc88afdc3a5eaf561b5ba96e78f7f2acfd10e3f
+  metadata.gz: 6b2a41e728b0e6df27793c497d38dd6ede2431b8667b7efc50e8e686e175f329
+  data.tar.gz: 01dafad126f4119f4e2de4aaa48f9e1e5fa2e335b976c5ff41aa3ce74d6b9ba2
 SHA512:
-  metadata.gz: 63227b1b45f9d20020553c96b3dda2e8e5d679ad92720131e7f5feea1055a08093270c1f8eef8cd6e1b0860fb2bdb17e004aac33c5a1000cdc0f3bbca0b66563
-  data.tar.gz: ec0c9d009c94031a1a1dd3857bede44239fe657ea4999a167ee75e2f57873107870d7c8db77721ef088cc7fe6c9b8e88aacca3c32a127aafc692e886b4c86155
+  metadata.gz: eea5ddc65e27bb6cc9cdbdf36fcc43b4b0507807c312af8016a4a7cd4aef55fd60dc7d6c1c8bbbd600a20140c172878526ad541701523d974ee49989d5dbcafa
+  data.tar.gz: d23467f72730c1b9e3f6d10655647368ee40535253024bcc2fff91b45c3c9a7451a585f641e0bfb5a74b231f3b5367216dbeac8b4e11d2c3c767e09e34d9ca0b

data/ext/mini_racer_extension/extconf.rb

@@ -8,6 +8,7 @@ require 'rubygems/package'
 
 IS_SOLARIS = RUBY_PLATFORM =~ /solaris/
 IS_LINUX_MUSL = RUBY_PLATFORM =~ /linux-musl/
+IS_INTEL = RUBY_PLATFORM =~ /x86_64/
 
 def cppflags_clear_std!
   $CPPFLAGS.gsub! /-std=[^\s]+/, ''
@@ -22,7 +23,7 @@ def cppflags_add_cpu_extension!
     $CPPFLAGS += " -mavx2"
   else
     $CPPFLAGS += " -mssse3"
-  end
+  end if IS_INTEL
 end
 
 def libv8_gem_name
@@ -30,7 +31,7 @@ def libv8_gem_name
 end
 
 def libv8_requirement
-  '~> 14.14.0.0.beta1'
+  '~> 15.5.1.0.beta1'
 end
 
 def libv8_basename(version)
@@ -212,8 +213,9 @@ cppflags_add_cpu_extension!
 $CPPFLAGS += " -Wno-reserved-user-defined-literal" if IS_DARWIN
 
 $LDFLAGS.insert(0, " -stdlib=libc++ ") if IS_DARWIN
-$LDFLAGS += " -Wl,--no-undefined " unless IS_DARWIN
-$LDFLAGS += " -Wl,-undefined,error " if IS_DARWIN
+# causes problems on some systems
+# $LDFLAGS += " -Wl,--no-undefined " unless IS_DARWIN
+# $LDFLAGS += " -Wl,-undefined,error " if IS_DARWIN
 
 if ENV['CXX']
   puts "SETTING CXX"

data/ext/mini_racer_extension/mini_racer_extension.cc

@@ -34,7 +34,9 @@
 #include <atomic>
 #include <math.h>
 #include "compat.hpp"
+#ifdef __x86_64__
 #include "simdutf8check.h"
+#endif
 
 #include <time.h>
 
@@ -564,11 +566,13 @@ static inline Local<Value> convert_ruby_str_to_v8(
     static const rb_encoding *usascii_enc = rb_usascii_encoding();
     static const rb_encoding *latin1_enc = rb_enc_find("ISO-8859-1");
     assert(latin1_enc != nullptr);
+#ifdef __x86_64__
 #ifndef __AVX2__
 # define validate_utf8 validate_utf8_fast
 #else
     static const (*validate_utf8)(const char *, size_t) =
             best_utf8_validate_func();
+#endif
 #endif
 
     rb_encoding *enc = rb_enc_get(value);
@@ -577,8 +581,12 @@ static inline Local<Value> convert_ruby_str_to_v8(
     if (len < 0 || len > INT_MAX) {
         return Null(isolate);
     }
+#ifdef __x86_64__
     bool is_valid_utf8 = enc == utf8_enc &&
             validate_utf8(str, static_cast<size_t>(len));
+#else
+    bool is_valid_utf8 = false;
+#endif
 
     MaybeLocal<String> v8str;
     int int_len = static_cast<int>(len);
@@ -641,7 +649,11 @@ static Local<Value> convert_ruby_to_v8(Isolate* isolate, Local<Context> context,
     case T_FLOAT:
 	return scope.Escape(Number::New(isolate, NUM2DBL(value)));
     case T_STRING:
-            return scope.Escape(convert_ruby_str_to_v8(scope, isolate, value));
+//#ifndef __x86_64__
+//	return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, (int)RSTRING_LEN(value)).ToLocalChecked());
+//#else
+	return scope.Escape(convert_ruby_str_to_v8(scope, isolate, value));
+//#endif
     case T_NIL:
 	return scope.Escape(Null(isolate));
     case T_TRUE:
@@ -672,7 +684,11 @@ static Local<Value> convert_ruby_to_v8(Isolate* isolate, Local<Context> context,
     case T_SYMBOL:
         {
 	value = rb_funcall(value, rb_intern("to_s"), 0);
-            return scope.Escape(convert_ruby_str_to_v8(scope, isolate, value));
+//#ifndef __x86_64__
+//	return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, (int)RSTRING_LEN(value)).ToLocalChecked());
+//#else
+	return scope.Escape(convert_ruby_str_to_v8(scope, isolate, value));
+//#endif
         }
     case T_DATA:
         {
@@ -704,7 +720,11 @@ static Local<Value> convert_ruby_to_v8(Isolate* isolate, Local<Context> context,
             if (rb_respond_to(value, rb_intern("to_s"))) {
                 // TODO: if this throws we're screwed
                 value = rb_funcall(value, rb_intern("to_s"), 0);
+//#ifndef __x86_64__
+//                return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, (int)RSTRING_LEN(value)).ToLocalChecked());
+//#else
                 return scope.Escape(convert_ruby_str_to_v8(scope, isolate, value));
+//#endif
             }
             return scope.Escape(
                 String::NewFromUtf8Literal(isolate, "Undefined Conversion"));

data/lib/sqreen/mini_racer/version.rb

@@ -2,6 +2,6 @@ module Sqreen
 module MiniRacer
   # first three numbers is the upstream version
   # that we last merged with
-  VERSION = "0.3.1.0.2"
+  VERSION = "0.3.1.0.6"
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sq_mini_racer
 version: !ruby/object:Gem::Version
-  version: 0.3.1.0.2
+  version: 0.3.1.0.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,8 +118,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- azure-pipelines.yml
-- azure-template.yml
 - bin/console
 - bin/setup
 - ext/mini_racer_extension/compat.hpp
@@ -138,9 +136,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/discourse/mini_racer/issues
-  changelog_uri: https://github.com/discourse/mini_racer/blob/v0.3.1.0.2/CHANGELOG
-  documentation_uri: https://www.rubydoc.info/gems/mini_racer/0.3.1.0.2
-  source_code_uri: https://github.com/discourse/mini_racer/tree/v0.3.1.0.2
+  changelog_uri: https://github.com/discourse/mini_racer/blob/v0.3.1.0.6/CHANGELOG
+  documentation_uri: https://www.rubydoc.info/gems/mini_racer/0.3.1.0.6
+  source_code_uri: https://github.com/discourse/mini_racer/tree/v0.3.1.0.6
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -157,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Minimal embedded v8 for Ruby

data/azure-pipelines.yml

@@ -1,69 +0,0 @@
-jobs:
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_0
-      displayName: Linux Ruby 2.0
-      rubyVersion: '2.0'
-      publishCoverage: true
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_1
-      displayName: Linux Ruby 2.1
-      rubyVersion: '2.1'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_2
-      displayName: Linux Ruby 2.2
-      rubyVersion: '2.2'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_3
-      displayName: Linux Ruby 2.3
-      rubyVersion: '2.3'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_4
-      displayName: Linux Ruby 2.4
-      rubyVersion: '2.4'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_5
-      displayName: Linux Ruby 2.5
-      rubyVersion: '2.5'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_6
-      displayName: Linux Ruby 2.6
-      rubyVersion: '2.6'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_7
-      displayName: Linux Ruby 2.7
-      rubyVersion: '2.7'
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_7_mini_racer
-      displayName: Linux Ruby 2.7 (with mini_racer)
-      rubyVersion: '2.7'
-      with_mini_racer: true
-
-  - template: azure-template.yml
-    parameters:
-      name: linux_2_7_therubyracer
-      displayName: Linux Ruby 2.7 (with therubyracer)
-      rubyVersion: '2.7'
-      with_therubyracer: true
-
-  - template: azure-template.yml
-    parameters:
-      name: macos_10_15
-      displayName: MacOS 10.15
-      imageName: 'macos-10.15'

data/azure-template.yml

@@ -1,101 +0,0 @@
-parameters:
-  name: ~
-  displayName: ~
-  rubyVersion: bundled
-  imageName: ubuntu-18.04
-  publishCoverage: false
-  with_mini_racer: false
-  with_therubyracer: false
-
-jobs:
-  - job: ${{ parameters.name }}
-    displayName: ${{ parameters.displayName }}
-    pool:
-      vmImage: ${{ parameters.imageName }}
-
-    variables:
-      TESTOPTS: -v
-      ${{ if eq(parameters.publishCoverage, true) }}:
-        CPPFLAGS: --coverage
-        LDFLAGS: --coverage
-      ${{ if eq(parameters.rubyVersion, 'bundled') }}:
-        gem: gem
-        bundle: bundle
-      ${{ if ne(parameters.rubyVersion, 'bundled') }}:
-        gem: /opt/ruby/${{ parameters.rubyVersion }}/bin/gem
-        bundle: /opt/ruby/${{ parameters.rubyVersion }}/bin/bundle
-        GEM_HOME: /opt/ruby/${{ parameters.rubyVersion }}/lib/ruby/gems/${{ parameters.rubyVersion }}.0
-
-    steps:
-      - checkout: self
-        displayName: Checkout
-        clean: true
-        submodules: recursive
-
-      - ${{ if ne(parameters.rubyVersion, 'bundled') }}:
-        - script: |
-            sudo apt-get install -y gnupg
-            sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 5D98E7264E3F3D89463B314B12229434A9F003C9
-            echo deb [arch=amd64] http://sqreen-download-private.s3.amazonaws.com/deb bionic main | sudo tee -a /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y sq-ruby${{ parameters.rubyVersion }} ruby-
-          displayName: Install Ruby
-
-      - ${{ if eq(parameters.rubyVersion, 'bundled') }}:
-        - script: sudo $(gem) install bundler --version '< 2.0' --no-document
-          displayName: Install bundler
-
-      - ${{ if eq(parameters.imageName, 'ubuntu-18.04') }}:
-        - script: |
-            sudo apt-get install -y build-essential git curl valgrind g++ make
-          displayName: Install Linux packages
-
-      - script: $(bundle) install --path vendor/bundle
-        displayName: Install gem dependencies
-        env:
-          ${{ if eq(parameters.with_mini_racer, true) }}:
-            LOAD_MINI_RACER: 1
-          ${{ if eq(parameters.with_therubyracer, true) }}:
-            LOAD_THERUBYRACER: 1
-
-      - script: PATH=`dirname $(bundle)`:$PATH CPPFLAGS=$(CPPFLAGS) LDFLAGS=$(LDFLAGS) $(bundle) exec rake compile
-        displayName: Compile extension
-
-      - script: |
-          find . -name '*.log' -exec cat '{}' \;
-        displayName: Print logs
-        condition: failed()
-
-      - script: TESTOPTS=--junit $(bundle) exec rake test
-        displayName: Run tests
-        env:
-          ${{ if eq(parameters.with_mini_racer, true) }}:
-            LOAD_MINI_RACER: 1
-          ${{ if eq(parameters.with_therubyracer, true) }}:
-            LOAD_THERUBYRACER: 1
-
-      - task: PublishTestResults@2
-        displayName: Publish test results
-        condition: succeededOrFailed()
-        inputs:
-          testResultsFormat: 'JUnit'
-          testResultsFiles: '**/report.xml'
-          searchFolder: '$(System.DefaultWorkingDirectory)'
-          mergeTestResults: true
-
-      - ${{ if and(eq(parameters.imageName, 'ubuntu-18.04'), eq(parameters.with_mini_racer, false), eq(parameters.with_therubyracer, false)) }}:
-        - script: $(bundle) exec rake test:valgrind
-          displayName: Run tests w/ valgrind
-
-      - script: |
-          PATH=$PATH:$(dirname $(which $(gem)))
-          $(bundle) exec rake build
-          sudo PATH=$PATH $(gem) install pkg/*.gem
-        displayName: Check that the gem is installable
-
-      - ${{ if eq(parameters.publishCoverage, true) }}:
-          - bash: >
-              test -z "$CODECOV_TOKEN" || bash <(curl -s https://codecov.io/bash)
-            displayName: "Publish coverage (Codecov)"
-            env:
-              CODECOV_TOKEN: $(CODECOV_TOKEN)