et_full_system 8.0.4 → 8.1.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae333db634ae66e6438da052ac10c3010236fc706f52f6f6cb26b1bbea3f98f
-  data.tar.gz: bd254da61c9acede0c44598d4508fd0c96740f0710e71f5cda9d632a78b70d27
+  metadata.gz: fa2a567c7fdaac726c60d3d4fbab9ce83068d73f4be685ff4b0d58f017653118
+  data.tar.gz: 20c116d6789fa576534588dc4c51a10c8ca17dd7594cf07ce43bd63a1735c2b9
 SHA512:
-  metadata.gz: 65ead2b3f9f607ee827b5abce2726696ee7b7c87d6d909282128d7fefe68f25b7c5298a3eb9db74c98055418cea99ba9f9a93adcb866c61b2df2c92e71ec8365
-  data.tar.gz: a323f0ad38e45bfb71708999f532752a39fa6af2bac84ce4517dc76eae4d615425fc6b1b54e59af3b352f890e500d2a32d6f2c532bca9deecd341b14c618be8d
+  metadata.gz: 371b17c780a8dd4da1a717f70d36fdf3b5ed78f6b0c460074652ae99f5412c81c15ea4bd2c6f1727249425687b80003b73d175bbeb98488c7c445b1da375c2e1
+  data.tar.gz: c124a3e02fbb78f8421004371ca128e28e571ae6d60392b7993c41c2fc74ffc6141f969c661860b76483de767e06a7f5d6b769a839c977cf3aac30432604506b

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+2.7.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (8.0.4)
+    et_full_system (8.1.0.pre.rc2)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
       et_fake_ccd (~> 1.0)
@@ -12,15 +12,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activesupport (6.1.7.3)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     azure-core (0.1.15)
       faraday (~> 0.9)
@@ -58,7 +58,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     iodine (0.7.54)
     json-schema (2.8.1)
@@ -70,7 +70,8 @@ GEM
       net-pop
       net-smtp
     mini_mime (1.1.2)
-    minitest (5.17.0)
+    mini_portile2 (2.8.2)
+    minitest (5.18.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
     net-imap (0.3.4)
@@ -82,12 +83,13 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pastel (0.8.0)
       tty-color (~> 0.5)
     public_suffix (5.0.1)
-    racc (1.6.2)
+    racc (1.7.0)
     rack (3.0.4.1)
     rake (13.0.1)
     roda (3.66.0)
@@ -96,15 +98,15 @@ GEM
       roda (>= 3.19.0)
       tty-logger (>= 0.3, < 1.0)
     rotp (6.2.2)
-    thor (1.2.1)
+    thor (1.2.2)
     tilt (2.1.0)
-    timeout (0.3.1)
+    timeout (0.3.2)
     tty-color (0.6.0)
     tty-logger (0.6.0)
       pastel (~> 0.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

data/docker/Dockerfile

@@ -8,7 +8,7 @@ ARG GEM_VERSION=>0
 ARG user_id=1000
 # Get latest rubygems
 RUN gem update --system
-RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo sqlite sqlite-dev nodejs npm yarn shared-mime-info git build-base libc6-compat curl bash openjdk11-jre python2 sassc file libreoffice
+RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo sqlite sqlite-dev nodejs npm yarn shared-mime-info git build-base libc6-compat curl bash openjdk11-jre python2 sassc
 RUN addgroup app --gid 1000
 RUN adduser -SD -u 1000 --shell /bin/bash --home /home/app app app
 RUN chown -R app:app /usr/local/bundle

data/lib/et_full_system/cli/local.rb

@@ -143,7 +143,8 @@ module EtFullSystem
     def setup
       setup_depencencies
       install_bundler if rvm_installed?
-      setup_ruby_versions unless !rvm_installed? || options.in_docker_compose?
+      install_rvm if options.in_docker_compose? && rvm_required?
+      setup_ruby_versions
       setup_services
     end
 
@@ -168,11 +169,8 @@ module EtFullSystem
 
     desc "setup_ruby_versions", "Install all ruby versions required"
     def setup_ruby_versions
-      versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
-        File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
-      end.uniq - [RUBY_VERSION]
 
-      versions.each do |version|
+      additional_ruby_versions.each do |version|
         puts "------------------------------------------------ SETTING UP ruby #{version} ---------------------------------------------------"
         cmd = "bash --login -c \"rvm install #{version}\""
         puts cmd
@@ -507,6 +505,29 @@ module EtFullSystem
       !`which rvm`.empty?
     end
 
+    def install_rvm
+      return if rvm_installed?
+
+      puts "------------------------------------------------ Installing rvm ---------------------------------------------------"
+      cmds = ["gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"]
+      cmds << "bash --login -c \"cd #{PROJECT_PATH} && curl -sSL https://get.rvm.io | bash -s stable\""
+
+      cmds.each do |cmd|
+        puts cmd
+        external_command cmd, 'rvm setup'
+      end
+    end
+
+    def additional_ruby_versions
+      @additional_ruby_versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
+        File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
+      end.uniq - [RUBY_VERSION]
+    end
+
+    def rvm_required?
+      additional_ruby_versions.any?
+    end
+
     def install_bundler
       puts "------------------------------------------------ Installing bundler ---------------------------------------------------"
       cmd ="bash --login -c \"cd #{PROJECT_PATH} && gem install bundler:1.17.3\""

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "8.0.4"
+  VERSION = "8.1.0-rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 8.0.4
+  version: 8.1.0.pre.rc2
 platform: ruby
 authors:
 - Gary Taylor
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -175,7 +175,7 @@ homepage: https://github.com/ministryofjustice/et-full-system
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,12 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs
 test_files: []