et_full_system 8.0.1 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f706e8b1dfa087b7b491b78d590f698708120211b7f445bfea2be0316875d82
-  data.tar.gz: 1a9a8d9f965c86d74b52855791022d4b1b003aa0666e388f04fdf7d3385c1987
+  metadata.gz: a350b05415d7344bc33b8c18cd042599d5f307c1c33e78b4bdac71d26e4eb971
+  data.tar.gz: 9524bbcae757362c3963ca7fd94b37e883c82184be4f4364e2915a0b379dd7e8
 SHA512:
-  metadata.gz: 90ed5e0c2e919724c54e25f755e2e9a1c0f81ce1991fec0ebc3ca896681de1fc850ad5bad865f695e9a0436ff860d5c75864ed52962c70c7e578e9dcd93849cd
-  data.tar.gz: 92ac40ac2cc0addde8dff08ef2b04b975fee3fdbd36ac17df66c0547ef6fd84c8f8db74c93b5326d061faddca245b32ec6f2516f854b643115400c64241575aa
+  metadata.gz: 74be420ab9e61254c6a2046d5e4da067dcf377b9c9b9fc4ee2115502b0c25e6074606e93f9fcbca4e583074acb5b7a7eb5fe0aca9c7ff8827a1d4cd91bc170bc
+  data.tar.gz: 7a730b292cc6119104b50e9ce07c8b42da40ca2aabea7dfccdc119341174ea1e615c0b2ae58069230de8819fde15a7f4dec6a76b47e8e77221a4a1064198436c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (8.0.1)
+    et_full_system (8.0.3)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
       et_fake_ccd (~> 1.0)
@@ -31,8 +31,8 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6, >= 1.6.8)
-    concurrent-ruby (1.2.0)
-    date (3.3.3)
+    concurrent-ruby (1.2.2)
+    date (3.0.3)
     dotenv (2.8.1)
     et_fake_ccd (1.1.11)
       activemodel (~> 6.1)
@@ -64,49 +64,45 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     jwt (2.7.0)
-    mail (2.8.0.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
+    minitest (5.13.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
     net-imap (0.3.4)
       date
       net-protocol
-    net-pop (0.1.2)
-      net-protocol
+    net-pop (0.1.0)
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
-      net-protocol
-    nokogiri (1.14.1)
-      mini_portile2 (~> 2.8.0)
+    net-smtp (0.1.0)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     pastel (0.8.0)
       tty-color (~> 0.5)
     public_suffix (5.0.1)
-    racc (1.6.2)
+    racc (1.4.16)
     rack (3.0.4.1)
     rake (13.0.1)
-    roda (3.64.0)
+    roda (3.65.0)
       rack
     roda-enhanced_logger (0.4.0)
       roda (>= 3.19.0)
       tty-logger (>= 0.3, < 1.0)
     rotp (6.2.2)
     thor (1.2.1)
-    tilt (2.0.11)
-    timeout (0.3.1)
+    tilt (2.1.0)
+    timeout (0.1.0)
     tty-color (0.6.0)
     tty-logger (0.6.0)
       pastel (~> 0.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

data/docker/docker-compose.yml

@@ -144,7 +144,7 @@ services:
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
   redis:
-    image: redis
+    image: redis:4.0-alpine
     ports:
       - "${REDIS_PORT:-0}:6379"
     networks:

data/lib/et_full_system/cli/local.rb

@@ -142,6 +142,7 @@ module EtFullSystem
     method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
     def setup
       setup_depencencies
+      install_bundler if rvm_installed?
       setup_ruby_versions unless !rvm_installed? || options.in_docker_compose?
       setup_services
     end
@@ -360,7 +361,7 @@ module EtFullSystem
 
     def setup_et1_service
       puts "------------------------------------------------ SETTING UP ET1 SERVICE ---------------------------------------------------"
-      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'et1 setup'
 
@@ -375,7 +376,7 @@ module EtFullSystem
 
     def setup_et3_service
       puts "------------------------------------------------ SETTING UP ET3 SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'et3 setup'
 
@@ -386,7 +387,7 @@ module EtFullSystem
 
     def setup_admin_service
       puts "------------------------------------------------ SETTING UP ADMIN SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'admin setup'
 
@@ -398,7 +399,7 @@ module EtFullSystem
 
     def setup_api_service
       puts "------------------------------------------------ SETTING UP API SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'api setup'
 
@@ -410,14 +411,14 @@ module EtFullSystem
 
     def setup_atos_service
       puts "------------------------------------------------ SETTING UP ATOS SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/atos && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_atos.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/atos && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_atos.env\" bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'atos setup'
     end
 
     def setup_ccd_service
       puts "------------------------------------------------ SETTING UP CCD EXPORT SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'ccd setup'
     end
@@ -505,5 +506,12 @@ module EtFullSystem
     def rvm_installed?
       !`which rvm`.empty?
     end
+
+    def install_bundler
+      puts "------------------------------------------------ Installing bundler ---------------------------------------------------"
+      cmd ="bash --login -c \"cd #{PROJECT_PATH} && gem install bundler:1.17.3\""
+      puts cmd
+      external_command cmd, 'ccd setup'
+    end
   end
 end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "8.0.1"
+  VERSION = "8.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.3
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor