et_full_system 1.0.1.pre6 → 1.0.1.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648fdb20bd2dcbeb31de1ce2effdb3f9640ffd481f93bafab90b450111d7f288
-  data.tar.gz: eb9f9b70f1c6abb153fb707f3662f92e610e6f7a0e95ebe36f822160828f1dbf
+  metadata.gz: 7eb334eebd95d45582461f5508598207a8016ab2b4b9485b479594156081d348
+  data.tar.gz: 010fbfe640e2c99f15f1af32df4c4ea9293bb8e9535b59f5d5fab1bd9c591f44
 SHA512:
-  metadata.gz: c3cfe3116eb5f62a41179c88aa73948a12a19bd58a698a57793add3e646acfc74fc981f75087ec77243c45015882a772e0af9e4f892f746e372424a26858952a
-  data.tar.gz: c1c8ec7f5e3f2587814382a13205bc06383da08cf85c085d9b3bcecab68f86e2b579ba8a90a3cc9b41f97cee8c02b17a1928a23ac65214a6b7848300b3c05a71
+  metadata.gz: '094a1e73f90aa368f49ad741d885f1038ff1312a6c97b8a93023cbf0fa0b49fc9a025f92800ebd2aad0c0be93c42dbee03edd5bc67adbc8c9bb5479fa1bc1c62'
+  data.tar.gz: 8cc836c173f12dd18d137078656bd1c63981876bcf3b11fac32f38320d77fa05dfd704bdb46f3661f5fcd189cde195f5e8205f4d37a30a4d21594590dea39d72

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.1.pre6)
+    et_full_system (1.0.1.pre7)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

data/lib/et_full_system/cli/docker/server.rb

@@ -17,7 +17,7 @@ module EtFullSystem
         method_option :record_video, type: :boolean, default: false, aliases: 'record-video', desc: 'When using zalenium, enable video recording'
         method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
         def up(*args)
-          Bundler.with_original_env do
+          Bundler.with_unbundled_env do
             server_args = []
             server_args << "--minimal" if options.minimal?
             server_args << "--without=#{options[:without].join(' ')}" unless options[:without].empty?
@@ -56,7 +56,7 @@ module EtFullSystem
 
         desc "down", "Stops the full system server on docker"
         def down(*args)
-          ::Bundler.with_original_env do
+          ::Bundler.with_unbundled_env do
             gem_root = File.absolute_path('../../../..', __dir__)
             cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down #{args.join(' ')}"
             puts cmd

data/lib/et_full_system/cli/docker.rb

@@ -10,7 +10,7 @@ module EtFullSystem
 
     desc "bootstrap", "Used by the docker-compose file (using sudo) - do not use yourself"
     def bootstrap
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         cmd = File.absolute_path('../../../shell_scripts/docker_bootstrap.sh', __dir__)
         puts cmd
         exec(cmd)
@@ -19,7 +19,7 @@ module EtFullSystem
 
     desc "setup", "Sets up the system for initial run - or after changing branches, adding gems etc.. in any of the services"
     def setup
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
         compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
@@ -30,7 +30,7 @@ module EtFullSystem
 
     desc "compose", "Provides access to the docker-compose command"
     def compose(*args)
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
         puts cmd
@@ -40,7 +40,7 @@ module EtFullSystem
 
     desc "invoker", "Provides access to the invoker system running inside docker"
     def invoker(*args, show_output: true, show_command: true)
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et bash -lc \"invoker #{args.join(' ')}\""
         puts cmd if show_command
@@ -51,7 +51,7 @@ module EtFullSystem
 
     desc "reset", "Bring down the server, remove all caches, rebuild the Dockerfile etc..."
     def reset
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
         puts cmd
@@ -65,7 +65,7 @@ module EtFullSystem
 
     desc "update_service_url SERVICE URL", "Configures the reverse proxy to connect to a specific url for a service - note the URL must be reachable from the docker container and the server must be running"
     def update_service_url(service, url)
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local update_service_url #{service} #{url}\""
         compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
@@ -174,7 +174,7 @@ module EtFullSystem
 
     desc "service_env SERVICE", "Returns the environment variables configured for the specified service"
     def service_env(service)
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local service_env #{service}\""
         compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
@@ -227,7 +227,7 @@ module EtFullSystem
     private
 
     def run_compose_command(*args, silent: false)
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
         puts cmd unless silent

data/lib/et_full_system/cli/local/file_storage.rb

@@ -49,7 +49,7 @@ module EtFullSystem
         end
 
         def setup_azure_storage
-          Bundler.with_original_env do
+          Bundler.with_unbundled_env do
             puts `bash --login -c "cd systems/api && rvm use && dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_api.env\"  bundle exec bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
 
           end

data/lib/et_full_system/cli/local.rb

@@ -94,7 +94,7 @@ module EtFullSystem
       Process.detach(pid)
 
       puts "Starting Invoker"
-      ::Bundler.with_original_env do
+      ::Bundler.with_unbundled_env do
         without = options[:without]
         if options.minimal?
           without = ['et1', 'et3', 'admin', 'api', 'ccd_export', 'atos_api']
@@ -108,10 +108,10 @@ module EtFullSystem
             "invoker remove #{proc}"
           end
           stop_cmd = stop_cmds.join(' && ')
-          puts "---------------------- DISABLING SERVICES IN 5 SECONDS ---------------------------"
+          puts "---------------------- DISABLING SERVICES IN 10 SECONDS ---------------------------"
           puts "command is #{stop_cmd}"
           Thread.new do
-            sleep 5
+            sleep 10
             puts `#{stop_cmd}`
           end
         end
@@ -132,7 +132,7 @@ module EtFullSystem
 
     desc "setup_services", "Sets up all services in one command"
     def setup_services
-      ::Bundler.with_original_env do
+      ::Bundler.with_unbundled_env do
         setup_et1_service
         setup_et3_service
         setup_api_service
@@ -177,7 +177,7 @@ module EtFullSystem
       when 'api' then ['api_web', 'api_sidekiq']
       when 'admin' then ['admin_web']
       when 'atos_api' then ['atos_api_web']
-      when 'ccd_export' then ['et_ccd_export_web']
+      when 'ccd_export' then ['et_ccd_export_sidekiq']
       else raise "Unknown service #{service}"
       end
     end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.1.pre6"
+  VERSION = "1.0.1.pre7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre6
+  version: 1.0.1.pre7
 platform: ruby
 authors:
 - Gary Taylor