sq_mini_racer 0.3.1.0.0 → 0.3.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a4f1dcba4f3dd9929c02a63a4ca5e123626c670aec78dd1bd99e045b4406ef
-  data.tar.gz: 162ccdbc01829df6b722e885d6242c17764373b66d5610287a7604d6dcf9dbc1
+  metadata.gz: d8ffbedb494b5384038b21e205060ab0ef1a56a852cdab5904b3462952af6206
+  data.tar.gz: b9d185c49effc232ff2f6bd31e5475f9c4e6a05f5de81b35619ee0c16045dec3
 SHA512:
-  metadata.gz: b3182e0f36469dbc4a2d5a254c879f7bfb51d1dd2abe903284cb9aefaecc8743fdd16408dec1ae58ab61e90b1e19c61152dbc80ed4d9c92f550684469c80e2b9
-  data.tar.gz: ab44723c482430200ffc20a127cc27672020de03a22e1edd84a42212166742dbe006173951bd345a0f76437ab6186cb5078faa7de2b5d6d41d27df8a0c2f3109
+  metadata.gz: 7dfc7a570a835dc0231f451ac9016e49be96ed2ef59e940df3eb0911e1df9921cce4b0da739a0e100e5c8ae4cc6122ecf417a851a2661586aea892b2f52e204d
+  data.tar.gz: fac74a6bd2be1e22956e6575e1787c1e42de977c0e1065b564f13bf7e1fa33075b2db4b2c306fc4f14f816ccd196673a6e7bbf998d7a12cf7a3888d0095c5a3d

data/azure-pipelines.yml

@@ -64,6 +64,6 @@ jobs:
 
   - template: azure-template.yml
     parameters:
-      name: macos_10_14
-      displayName: MacOS 10.14
-      imageName: 'macos-10.14'
+      name: macos_10_15
+      displayName: MacOS 10.15
+      imageName: 'macos-10.15'

data/ext/mini_racer_extension/extconf.rb

@@ -29,49 +29,52 @@ def libv8_gem_name
   'libv8-node'
 end
 
-def libv8_version
-  '14.14.0.0.beta2'
+def libv8_requirement
+  '~> 14.14.0.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_no_libc
-  platform_no_libc = ruby_platform.to_s.split('-')[0..1].join('-')
-  "#{libv8_gem_name}-#{libv8_version}-#{platform_no_libc}.gemspec"
-end
-
-def libv8_gemspec
-  "#{libv8_basename}.gemspec"
+def libv8_gemspec(version)
+  "#{libv8_basename(version)}.gemspec"
 end
 
 def libv8_local_path(path=Gem.path)
-  gemspecs = [libv8_gemspec, libv8_gemspec_no_libc].uniq
-  puts "looking for #{gemspecs.join(', ')} in installed gems"
-  candidates = path.product(gemspecs)
-    .map { |(p, gemspec)| File.join(p, 'specifications', gemspec) }
-  p candidates
-  found = candidates.select { |f| File.exist?(f) }.first
-
-  unless found
-    puts "#{gemspecs.join(', ')} not found in installed gems"
+  name_glob = "#{libv8_gem_name}-*-#{ruby_platform}"
+
+  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}"
 
-  gemdir = File.basename(found, '.gemspec')
-  dir = File.expand_path(File.join(found, '..', '..', 'gems', gemdir))
+  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
@@ -79,25 +82,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-node.rb in #{vendor_path}"
-  unless Dir.glob(File.join(vendor_path, libv8_basename, 'lib', 'libv8-node.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 { @version = 'musl' } if str =~ /-musl/ && p.version.nil?
     p.instance_eval { @cpu = 'x86_64' } if str =~ /universal.*darwin/
   end
 end
@@ -121,21 +111,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_gem_name} (version #{libv8_version}) in rubygems.org
+  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)
@@ -147,19 +139,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])
@@ -173,18 +165,20 @@ 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
-  unless ENV['ONLY_INSTALLED_LIBV8_GEM']
-    libv8_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

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.0"
+  VERSION = "0.3.1.0.1"
 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.0
+  version: 0.3.1.0.1
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,10 +138,10 @@ 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.0/CHANGELOG
-  documentation_uri: https://www.rubydoc.info/gems/mini_racer/0.3.1.0.0
-  source_code_uri: https://github.com/discourse/mini_racer/tree/v0.3.1.0.0
-post_install_message: 
+  changelog_uri: https://github.com/discourse/mini_racer/blob/v0.3.1.0.1/CHANGELOG
+  documentation_uri: https://www.rubydoc.info/gems/mini_racer/0.3.1.0.1
+  source_code_uri: https://github.com/discourse/mini_racer/tree/v0.3.1.0.1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Minimal embedded v8 for Ruby
 test_files: []