Upgrade rails to 6.1 and migrate nodejs to mini_racer

omnibus/Gemfile

@@ -10,6 +10,7 @@ gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software.git'
 # Install artifactory. Used for publishing packages.
 gem 'artifactory'
 
+# gem 'inspec-core', '~> 4.38'
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
 # the Test Kitchen-based build lab. You can skip these unnecessary dependencies

omnibus/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: c172afb1399eb676e86f6f8c155fe747e0312f38
+  revision: a4fab5f0c2314f73fc79dfb77bde63e45588dfc0
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 8.0.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: a4bf7ea04b0d3689f9b8d172535f3976d07ecc1b
+  revision: 62bf487e4361c856e18f89e00ece1d980558b33a
   specs:
-    omnibus (8.1.15)
+    omnibus (8.1.16)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
@@ -100,9 +100,9 @@ GEM
       tty-table (~> 0.11)
       uuidtools (>= 2.1.5, < 3.0)
     chef-cleanroom (1.0.2)
-    chef-cli (5.3.1)
+    chef-cli (5.4.1)
       addressable (>= 2.3.5, < 2.9)
-      chef (>= 15.0)
+      chef (>= 16.0)
       cookbook-omnifetch (~> 0.5)
       diff-lcs (>= 1.0, < 1.4)
       ffi-yajl (>= 1.0, < 3.0)
@@ -162,7 +162,7 @@ GEM
     faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
-    faraday_middleware (1.0.0)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fauxhai-ng (9.0.0)
       net-ssh
@@ -424,4 +424,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

omnibus/config/software/supermarket-cookbooks.rb

@@ -22,8 +22,9 @@
 build do
   cookbooks_path = "#{install_dir}/embedded/cookbooks"
   env = with_standard_compiler_flags(with_embedded_path)
-  
+
   gem "install berkshelf"
+
   command "berks vendor #{cookbooks_path}", env: env
 
   block do

omnibus/config/software/supermarket-ctl.rb

@@ -26,7 +26,7 @@
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 
-  #bundle "install", env: env
+  bundle "install --binstubs", env: env
 
   block do
     erb source: "supermarket-ctl.erb",

omnibus/config/software/supermarket.rb

@@ -24,8 +24,7 @@
 dependency "chef-gem"
 dependency "git"
 dependency "nginx"
-# dependency "nodejs"
-# dependency "nodejs-binary"
+dependency "nodejs-binary"
 dependency "postgresql"
 dependency "redis"
 dependency "ruby"
@@ -39,9 +38,9 @@
   env['PATH'] = "#{env['PATH']}:#{install_dir}/embedded/nodejs/bin"
 
   if Bundler.feature_flag.cache_all?
-    bundle "package --no-install"
+    bundle "package --no-install", env: env
   else
-    bundle "package --all --no-install"
+    bundle "package --all --no-install", env: env
   end
 
   bundle "install" \
@@ -55,7 +54,7 @@
 
   # This fails because we're installing Ruby C extensions in the wrong place!
   # bundle "exec rake assets:precompile", env: env.merge('RAILS_ENV' => 'production')
-  bundle "exec rake assets:precompile"
+  bundle "exec rake assets:precompile", env: env
 
   sync project_dir, "#{install_dir}/embedded/service/supermarket/",
     exclude: %w( .cookbooks .direnv .envrc .env.* .gitignore .kitchen*

omnibus/cookbooks/omnibus-supermarket/Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 
 gem 'inspec'
 gem 'inspec-bin'
+gem 'mini_racer', "~> 0.3.1", platforms: :ruby
 
 # gems for testing the build cookbooks
 # once we get the ctl omnibus def using its own gemspec this whole file can die

src/supermarket/Gemfile

@@ -13,7 +13,7 @@ gem "sidekiq", "~> 4.2"
 gem "sidekiq-cron"
 
 gem "aws-sdk-s3"
-gem "chef", require: false
+gem "chef", "~> 16.13", require: false
 gem "compass-rails"
 gem "ddtrace", require: false
 gem "dotenv"
@@ -52,9 +52,8 @@ gem "validate_url"
 gem "virtus", "1.0.2", require: false # Pin to a version before the handling of nil in collection coercion was fixed.
 gem "yajl-ruby"
 
-gem 'mini_racer'
-gem 'execjs'
 gem 'listen'
+gem 'therubyracer', platforms: :ruby
 
 group :doc do
   gem "yard", require: false

src/supermarket/Gemfile.lock

@@ -98,6 +98,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    bcrypt_pbkdf (1.1.0)
     brakeman (5.1.1)
     builder (3.2.4)
     byebug (11.1.3)
@@ -112,15 +113,18 @@ GEM
     capybara-screenshot (1.0.25)
       capybara (>= 1.0, < 4)
       launchy
-    chef (17.2.29)
+    chef (16.14.1)
       addressable
-      chef-config (= 17.2.29)
-      chef-utils (= 17.2.29)
+      bcrypt_pbkdf (~> 1.1)
+      bundler (>= 1.10)
+      chef-config (= 16.14.1)
+      chef-utils (= 16.14.1)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.5.0)
+      ffi (>= 1.9.25)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
@@ -132,25 +136,30 @@ GEM
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.1.1, < 4.0)
       net-sftp (>= 2.1.2, < 4.0)
-      ohai (~> 17.0)
+      net-ssh (>= 5.1, < 7)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (~> 16.0)
+      pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
       train-core (~> 3.2, >= 3.2.28)
       train-winrm (>= 0.2.5)
+      tty-prompt (~> 0.21)
+      tty-screen (~> 0.6)
+      tty-table (~> 0.11)
       uuidtools (>= 2.1.5, < 3.0)
-    chef-config (17.2.29)
+    chef-config (16.14.1)
       addressable
-      chef-utils (= 17.2.29)
+      chef-utils (= 16.14.1)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-telemetry (1.0.29)
+    chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (17.2.29)
-      concurrent-ruby
+    chef-utils (16.14.1)
     chef-vault (4.1.0)
     chef-zero (15.0.7)
       ffi-yajl (~> 2.2)
@@ -201,7 +210,7 @@ GEM
       msgpack
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.4.4)
+    diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
@@ -214,7 +223,7 @@ GEM
     et-orbi (1.2.4)
       tzinfo
     excon (0.84.0)
-    execjs (2.8.1)
+    execjs (2.7.0)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -235,7 +244,7 @@ GEM
     faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
-    faraday_middleware (1.0.0)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
     ffi (1.15.3)
     ffi-compiler (1.0.1)
@@ -303,7 +312,7 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iniparse (1.5.0)
-    inspec-core (4.38.3)
+    inspec-core (4.38.9)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -351,7 +360,7 @@ GEM
       addressable (~> 2.0)
       excon
       http (>= 2.0, < 5.0)
-    libv8-node (15.14.0.1)
+    libv8 (3.16.14.19)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
@@ -412,6 +421,11 @@ GEM
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
     newrelic_rpm (7.2.0)
     nio4r (2.5.7)
     nokogiri (1.11.7)
@@ -430,9 +444,9 @@ GEM
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (17.1.0)
-      chef-config (>= 14.12, < 18)
-      chef-utils (>= 16.0, < 18)
+    ohai (16.13.0)
+      chef-config (>= 12.8, < 17)
+      chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -563,6 +577,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.6.0)
       redis (>= 2.2, < 5)
+    ref (2.0.0)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rinku (2.0.6)
@@ -608,7 +623,7 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
     ruby-filemagic (0.7.2)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
     rufus-lru (1.1.0)
@@ -664,11 +679,14 @@ GEM
     syslog-logger (1.6.8)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
+      ref
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tomlrb (1.3.0)
-    train-core (3.7.4)
+    train-core (3.8.1)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
@@ -772,7 +790,7 @@ DEPENDENCIES
   brakeman
   capybara
   capybara-screenshot
-  chef
+  chef (~> 16.13)
   chefstyle
   compass-rails
   database_cleaner
@@ -834,6 +852,7 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   statsd-ruby
+  therubyracer
   tomlrb
   uglifier
   unicorn

src/supermarket/engines/fieri/Gemfile.lock

@@ -82,8 +82,8 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
-    cookstyle (7.15.1)
-      rubocop (= 1.18.3)
+    cookstyle (7.15.4)
+      rubocop (= 1.18.4)
     crack (0.4.5)
       rexml
     crass (1.0.6)