sq_mini_racer 0.2.5.0.1.beta3 → 0.2.5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da357c40be27bea96942a9307f09e08a95e85484aca11ae2ed32ed5f1647d53e
-  data.tar.gz: 17ef93bbcfa122b9c66f3d7f6e6a3a37a9212cd6395d87312582127d7495dbef
+  metadata.gz: 124526376fa9a93ba73fd7205e15abca399022b37b91f5f6fd994ecadaf63714
+  data.tar.gz: 5a20fb645e0fbf6f8da6b4bdfbda258f29c05e6d9861928a28c2f2b0311bf7f1
 SHA512:
-  metadata.gz: 874a341ec3a205c40c327ed1f70f69852aee45fe3d7451a5727afb7b6e3e55431ef2701eb1010c8473ed9aa0a5575edba93762f5778553b78181dab1938cce97
-  data.tar.gz: 942afef2686240680342a0108f840d7d8fe86f3d610a5f6607e4d7c6831d565fc3aaaf3e445268c68dfde741ced678d2be39f11cc15517769db3ceb82d342678
+  metadata.gz: b2cb15116b9cda7b82245dee09f93f02cb4634911ef29d2606d084436b7d0d284b6940d69cbc8fd8dc83bfb865b586c943f0c4e13513b8c66ed2437116aaa340
+  data.tar.gz: f09c7e9b3ad2c3a34514bca93b5f209e1f49a2d8b873a0edf4f1ec0ba55c16dad035809a71364b7da1a817a8677342ed63cbd6a8bd0c4e588db6ee10b3b035af

data/.dockerignore

@@ -0,0 +1,12 @@
+/.bundle/
+/.yardoc
+Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+lib/sq_mini_racer_extension.so
+lib/sq_mini_racer_loader.so
+*.bundle

data/Dockerfile

@@ -0,0 +1,23 @@
+ARG RUBY_VERSION=2.7
+FROM ruby:${RUBY_VERSION}
+
+RUN test ! -f /etc/alpine-release || apk add --no-cache build-base git
+
+# without this `COPY .git`, we get the following error:
+#   fatal: not a git repository (or any of the parent directories): .git
+# but with it we need the full gem just to compile the extension because
+# of gemspec's `git --ls-files`
+# COPY .git /code/.git
+
+COPY Gemfile mini_racer.gemspec /code/
+COPY lib/sqreen/mini_racer/version.rb /code/lib/sqreen/mini_racer/version.rb
+WORKDIR /code
+RUN bundle install
+
+COPY Rakefile /code/
+COPY ext /code/ext/
+RUN bundle exec rake compile
+
+COPY . /code/
+CMD bundle exec irb -rmini_racer
+

data/azure-pipelines.yml

@@ -0,0 +1,69 @@
+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

@@ -0,0 +1,92 @@
+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: $(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
+
+      - ${{ 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)

data/ext/mini_racer_extension/extconf.rb

@@ -26,46 +26,58 @@ def cppflags_add_cpu_extension!
 end
 
 def libv8_gem_name
-  return "libv8-solaris" if IS_SOLARIS
-  return "libv8-alpine" if IS_LINUX_MUSL
+  #return "libv8-solaris" if IS_SOLARIS
+  #return "libv8-alpine" if IS_LINUX_MUSL
 
-  'libv8'
+  'libv8-node'
 end
 
-def libv8_version
-  '7.3.492.27.1'
+def libv8_requirement
+  '~> 12.18.4.0.beta1'
 end
 
-def libv8_basename
-  "#{libv8_gem_name}-#{libv8_version}-#{ruby_platform}"
+def libv8_basename(version)
+  "#{libv8_gem_name}-#{version}-#{ruby_platform}"
 end
 
-def libv8_gemspec
-  "#{libv8_basename}.gemspec"
+def libv8_gemspec(version)
+  "#{libv8_basename(version)}.gemspec"
 end
 
 def libv8_local_path(path=Gem.path)
-  puts "looking for #{libv8_gemspec} in installed gems"
-  candidates = path.map { |p| File.join(p, 'specifications', libv8_gemspec) }
-  found = candidates.select { |f| File.exist?(f) }.first
+  name_glob = "#{libv8_gem_name}-*-#{ruby_platform}"
 
-  unless found
-    puts "#{libv8_gemspec} not found in installed gems"
+  puts "looking for #{name_glob} in #{path.inspect}"
+
+  paths = path.map { |p| Dir.glob(File.join(p, 'specifications', name_glob + '.gemspec')) }.flatten
+
+  if paths.empty?
+    puts "#{name_glob} not found in #{path.inspect}"
+    return
+  end
+
+  specs = paths.map { |p| [p, eval(File.read(p))] }
+               .select { |_, spec| Gem::Requirement.new(libv8_requirement).satisfied_by?(spec.version) }
+  found_path, found_spec = specs.sort_by { |_, spec| spec.version }.last
+
+  unless found_path && found_spec
+    puts "not found in specs: no '#{libv8_requirement}' in #{paths.inspect}"
     return
   end
 
-  puts "found in installed specs: #{found}"
+  puts "found in specs: #{found_path}"
 
-  dir = File.expand_path(File.join(found, '..', '..', 'gems', libv8_basename))
+  gemdir = File.basename(found_path, '.gemspec')
+  dir = File.expand_path(File.join(found_path, '..', '..', 'gems', gemdir))
 
   unless Dir.exist?(dir)
-    puts "not found in installed gems: #{dir}"
+    puts "not found in gems: #{dir}"
     return
   end
 
-  puts "found in installed gems: #{dir}"
+  puts "found in gems: #{dir}"
 
-  dir
+  [dir, found_spec]
 end
 
 def vendor_path
@@ -73,26 +85,12 @@ def vendor_path
 end
 
 def libv8_vendor_path
-  puts "looking for #{libv8_basename} in #{vendor_path}"
-  path = Dir.glob("#{vendor_path}/#{libv8_basename}").first
-
-  unless path
-    puts "#{libv8_basename} not found in #{vendor_path}"
-    return
-  end
-
-  puts "looking for #{libv8_basename}/lib/libv8.rb in #{vendor_path}"
-  unless Dir.glob(File.join(vendor_path, libv8_basename, 'lib', 'libv8.rb')).first
-    puts "#{libv8_basename}/lib/libv8.rb not found in #{vendor_path}"
-    return
-  end
-
-  path
+  libv8_local_path([vendor_path])
 end
 
 def parse_platform(str)
   Gem::Platform.new(str).tap do |p|
-    p.instance_eval { @os = 'linux-musl' } if str =~ /musl/
+    p.instance_eval { @version = 'musl' } if str =~ /-musl/ && p.version.nil?
     p.instance_eval { @cpu = 'x86_64' } if str =~ /universal.*darwin/
   end
 end
@@ -116,21 +114,23 @@ def libv8_remote_search
   json = JSON.parse(body)
 
   versions = json.select do |v|
-    Gem::Version.new(v['number']) == Gem::Version.new(libv8_version)
+    Gem::Requirement.new(libv8_requirement).satisfied_by?(Gem::Version.new(v['number']))
   end
   abort(<<-ERROR) if versions.empty?
-  ERROR: could not find #{libv8_version}
+  ERROR: could not find #{libv8_gem_name} (requirement #{libv8_requirement}) in rubygems.org
   ERROR
 
   platform_versions = versions.select do |v|
     parse_platform(v['platform']) == ruby_platform unless v['platform'] =~ /universal.*darwin/
   end
   abort(<<-ERROR) if platform_versions.empty?
-  ERROR: found #{libv8_gem_name}-#{libv8_version}, but no binary for #{ruby_platform}
-         try "gem install #{libv8_gem_name} -v '#{libv8_version}'" to attempt to build libv8 from source
+  ERROR: found gems matching #{libv8_gem_name}:'#{libv8_requirement}', but no binary for #{ruby_platform}
+         try "gem install #{libv8_gem_name}:'#{libv8_requirement}'" to attempt to build #{libv8_gem_name} from source
   ERROR
 
-  platform_versions.first
+  puts "found #{libv8_gem_name} for #{ruby_platform} on rubygems: #{platform_versions.map { |v| v['number'] }.join(', ')}"
+
+  platform_versions.sort_by { |v| Gem::Version.new(v['number']) }.last
 end
 
 def libv8_download_uri(name, version, platform)
@@ -142,19 +142,19 @@ def libv8_downloaded_gem(name, version, platform)
 end
 
 def libv8_download(name, version, platform)
-  FileUtils.mkdir_p(vendor_path)
+  FileUtils.mkdir_p(File.join(vendor_path, 'cache'))
   body = http_get(libv8_download_uri(name, version, platform))
-  File.open(File.join(vendor_path, libv8_downloaded_gem(name, version, platform)), 'wb') { |f| f.write(body) }
+  File.open(File.join(vendor_path, 'cache', libv8_downloaded_gem(name, version, platform)), 'wb') { |f| f.write(body) }
 end
 
 def libv8_install!
-  cmd = "gem install #{libv8_gem_name} --version '#{libv8_version}' --install-dir '#{vendor_path}'"
+  cmd = "gem install #{libv8_gem_name} --version '#{libv8_requirement}' --install-dir '#{vendor_path}'"
   puts "installing #{libv8_gem_name} using `#{cmd}`"
   rc = system(cmd)
 
   abort(<<-ERROR) unless rc
-  ERROR: could not install #{libv8_gem_name} #{libv8_version}
-          try "gem install #{libv8_gem_name} -v '#{libv8_version}'" to attempt to build libv8 from source
+  ERROR: could not install #{libv8_gem_name}:#{libv8_requirement}
+          try "gem install #{libv8_gem_name} -v '#{libv8_requirement}'" to attempt to build libv8 from source
   ERROR
 
   libv8_local_path([vendor_path])
@@ -168,16 +168,21 @@ def libv8_vendor!
   puts "downloading #{libv8_downloaded_gem(libv8_gem_name, version['number'], version['platform'])} to #{vendor_path}"
   libv8_download(libv8_gem_name, version['number'], version['platform'])
 
-  package = Gem::Package.new(File.join(vendor_path, libv8_downloaded_gem(libv8_gem_name, version['number'], version['platform'])))
-  package.extract_files(File.join(vendor_path, File.basename(libv8_downloaded_gem(libv8_gem_name, version['number'], version['platform']), '.gem')))
+  package = Gem::Package.new(File.join(vendor_path, 'cache', libv8_downloaded_gem(libv8_gem_name, version['number'], version['platform'])))
+  package.extract_files(File.join(vendor_path, 'gems', File.basename(libv8_downloaded_gem(libv8_gem_name, version['number'], version['platform']), '.gem')))
+  FileUtils.mkdir_p(File.join(vendor_path, 'specifications'))
+  File.open(File.join(vendor_path, 'specifications', File.basename(libv8_downloaded_gem(libv8_gem_name, version['number'], version['platform']), '.gem') + '.gemspec'), 'wb') { |f| f.write(package.spec.to_ruby) }
 
   libv8_vendor_path
 end
 
 def ensure_libv8_load_path
-  puts "detected platform #{RUBY_PLATFORM} => #{ruby_platform}"
+  puts "platform ruby:#{RUBY_PLATFORM} rubygems:#{Gem::Platform.new(RUBY_PLATFORM)} detected:#{ruby_platform}"
 
-  libv8_path = libv8_local_path || libv8_vendor_path || libv8_vendor!
+  libv8_path, spec = libv8_local_path
+  if !ENV['ONLY_INSTALLED_LIBV8_GEM'] && !libv8_path
+    libv8_path, spec = libv8_vendor_path || libv8_vendor!
+  end
 
   abort(<<-ERROR) unless libv8_path
   ERROR: could not find #{libv8_gem_name}
@@ -189,7 +194,7 @@ end
 
 ensure_libv8_load_path
 
-require 'libv8'
+require 'libv8-node'
 
 IS_DARWIN = RUBY_PLATFORM =~ /darwin/
 
@@ -208,6 +213,8 @@ 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
 
 if ENV['CXX']
   puts "SETTING CXX"
@@ -246,7 +253,7 @@ if enable_config('debug') || enable_config('asan')
   CONFIG['debugflags'] << ' -ggdb3 -O0'
 end
 
-Libv8.configure_makefile
+Libv8::Node.configure_makefile
 
 if enable_config('asan')
   $CPPFLAGS.insert(0, " -fsanitize=address ")

data/lib/sqreen/mini_racer/version.rb

@@ -2,6 +2,6 @@ module Sqreen
 module MiniRacer
   # part before qualifier is the number of the last upstream release
   # since we synced with it
-  VERSION = "0.2.5.0.1.beta3"
+  VERSION = "0.2.5.0.2"
 end
 end

data/mini_racer.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake-compiler"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sq_mini_racer
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0.1.beta3
+  version: 0.2.5.0.2
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,14 +61,18 @@ extensions:
 - ext/prv_ext_loader/extconf.rb
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- azure-pipelines.yml
+- azure-template.yml
 - bin/console
 - bin/setup
 - ext/mini_racer_extension/compat.hpp
@@ -99,7 +89,7 @@ homepage: https://github.com/sqreen/mini_racer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,13 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Minimal embedded v8 for Ruby
 test_files: []