et_full_system 1.0.0 → 1.0.1.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2894ada07cd8b72a702d2727617b84839921134c1b10c238fa000e547d613d
-  data.tar.gz: dfb43dc20072b09ae299239ae58b2cb5e45899d34dba5e1f3a115050d55d1e7f
+  metadata.gz: 6beef42f9d18b4c7e277eb13c29ac2cd7e6c7faf8509f03479cf39db6c6a0516
+  data.tar.gz: 7c34827c01f39d2994555cb7429cd62a482c93cc5810a811aaa5684785637895
 SHA512:
-  metadata.gz: 9fdbff1b0639e733cdbb504ddf747d4a00ddad025cef8fcf13814d7137ec81c5d08afc5744427fc383772a36480f5bc895a0ce0f8ac3130337f56cf018106b31
-  data.tar.gz: fc3a77bfda7cbf97d5468eb5d26121fb554515b60f0f98c508bb8519aa39b96fd8e3c24984dbf3277b20d2c64d11e6a7d4671baa9a21e145fc1ee3e7a3797df1
+  metadata.gz: e2b5cc72dac96c68b58f7389b9c91b8a5de3bcf8ed562b7f411e07a7c94568cf6625cf3fd428b6aded5958b131ed41d38fcf534c0e969b4959f0f41e9f8e2ed0
+  data.tar.gz: a3de0af6328cb80a45e460bd5fccc1317c26569b51156a72bb7e255009149c69563fb869a7bb4fcb160b1353b6b663c296b1d0edd6a80a882e8906c91900da24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.0)
+    et_full_system (1.0.1.pre4)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -23,13 +23,13 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.266.0)
+    aws-partitions (1.269.0)
     aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.27.0)
+    aws-sdk-kms (1.28.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.60.1)

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

@@ -11,13 +11,15 @@ module EtFullSystem
         method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker', desc: "If specified, instead of using the built in fake ccd server, the system will connect to your local machine (see ccd-docker-host option also)"
         method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host', desc: "Only used if ccd-docker=true.  This specifies the host name of your machine when viewed from inside the docker container.  This defaults to docker.for.mac.localhost which is suitable for mac OSX only.  Consult docker documentation for other systems"
         method_option :with_test, type: :boolean, default: false, aliases: 'with-test'
-        method_option :use_selenium, type: :boolean, default: true, aliases: 'use-selenium', desc: 'Only used if with_test is true - says to use selenium in preference to zalenium'
+        method_option :use_selenium, type: :boolean, default: false, aliases: 'use-selenium', desc: 'Only used if with_test is true - says to use selenium in preference to zalenium'
         method_option :chrome_instances, type: :numeric, default: 1, aliases: 'chrome-instances', desc: 'Specify the number of chrome instances for selenium'
         method_option :firefox_instances, type: :numeric, default: 1, aliases: 'firefox-instances', desc: 'Specify the number of firefox instances for selenium'
-        method_option :record_video, type: :boolean, default: true, aliases: 'record-video', desc: 'When using zalenium, enable video recording'
+        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
             server_args = []
+            server_args << "--minimal" if options.minimal?
             server_args << "--without=#{options[:without].join(' ')}" unless options[:without].empty?
             env_vars = ["SERVER_ARGS='#{server_args.join(' ')}'"]
             env_vars << "LOCALHOST_FROM_DOCKER_IP=#{host_ip}"

data/lib/et_full_system/cli/docker.rb

@@ -87,8 +87,8 @@ module EtFullSystem
       puts "ET1 is now expected to be hosted on port #{port} on your machine. To configure your environment, run 'et_full_system docker et1_env > .env.local'"
     end
 
-    desc "reset_et1", "Configures the reverse proxy and invoker to use the internal systems instead of local"
-    def reset_et1
+    desc "enable_et1", "Configures the reverse proxy and invoker to use the internal systems instead of local"
+    def enable_et1
       invoker 'add', 'et1_web'
       invoker 'add', 'et1_sidekiq'
       puts "ET1 is now being hosted from inside docker container"
@@ -105,8 +105,8 @@ module EtFullSystem
       puts "ccd_export is now expected to be running on your machine. To configure your environment, run 'et_full_system docker ccd_export_env > .env.local'"
     end
 
-    desc "reset_ccd_export", "Configures invoker to use the internal systems instead of local"
-    def reset_ccd_export
+    desc "enable_ccd_export", "Configures invoker to use the internal systems instead of local"
+    def enable_ccd_export
       invoker 'add', 'et_ccd_export_sidekiq'
       puts "ccd_export is now being run from inside docker container"
     end
@@ -124,8 +124,8 @@ module EtFullSystem
       puts "api is now expected to be hosted on port #{port} on your machine. Also, you must provide your own sidekiq. To configure your environment, run 'et_full_system docker api_env > .env.local'"
     end
 
-    desc "reset_api", "Configures the reverse proxy and invoker to use the internal systems instead of local"
-    def reset_api
+    desc "enable_api", "Configures the reverse proxy and invoker to use the internal systems instead of local"
+    def enable_api
       invoker 'add', 'api_web'
       invoker 'add', 'api_sidekiq'
       puts "api is now being hosted from inside docker container"
@@ -143,8 +143,8 @@ module EtFullSystem
       puts "Admin is now expected to be hosted on port #{port} on your machine. To configure your environment, run 'et_full_system docker admin_env > .env.local'"
     end
 
-    desc "reset_admin", "Configures the reverse proxy and invoker to use the internal systems instead of local"
-    def reset_admin
+    desc "enable_admin", "Configures the reverse proxy and invoker to use the internal systems instead of local"
+    def enable_admin
       invoker 'add', 'admin_web'
       puts "Admin is now being hosted from inside docker container"
     end
@@ -161,8 +161,8 @@ module EtFullSystem
       puts "ET3 is now expected to be hosted on port #{port} on your machine. To configure your environment, run 'et_full_system docker et3_env > .env.local'"
     end
 
-    desc "reset_et3", "Configures the reverse proxy and invoker to use the internal systems instead of local"
-    def reset_et3
+    desc "enable_et3", "Configures the reverse proxy and invoker to use the internal systems instead of local"
+    def enable_et3
       invoker 'add', 'et3_web'
       puts "ET3 is now being hosted from inside docker container"
     end
@@ -186,6 +186,44 @@ module EtFullSystem
       end
     end
 
+    desc "restart_et1", "Restarts the et1 application"
+    def restart_et1
+      invoker 'reload', 'et1_web'
+      invoker 'reload', 'et1_sidekiq'
+      puts "ET1 Has been restarted"
+    end
+
+    desc "restart_api", "Restarts the api application"
+    def restart_api
+      invoker 'reload', 'api_web'
+      invoker 'reload', 'api_sidekiq'
+      puts "api Has been restarted"
+    end
+
+    desc "restart_et3", "Restarts the et3 application"
+    def restart_et3
+      invoker 'reload', 'et3_web'
+      puts "et3 Has been restarted"
+    end
+
+    desc "restart_admin", "Restarts the admin application"
+    def restart_admin
+      invoker 'reload', 'admin_web'
+      puts "admin Has been restarted"
+    end
+
+    desc "restart_atos_api", "Restarts the atos_api application"
+    def restart_atos_api
+      invoker 'reload', 'atos_api_web'
+      puts "atos_api Has been restarted"
+    end
+
+    desc "restart_ccd_export", "Restarts the ccd_export application"
+    def restart_ccd_export
+      invoker 'reload', 'et_ccd_export_sidekiq'
+      puts "ccd_export Has been restarted"
+    end
+
     private
 
     def run_compose_command(*args, silent: false)

data/lib/et_full_system/cli/local.rb

@@ -84,6 +84,7 @@ module EtFullSystem
     method_option :minio_storage_path, default: ENV.fetch('MINIO_STORAGE_PATH', '/tmp/minio_storage'), desc: "Where to store minio data"
     method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
     method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
+    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 server
       puts "Scheduling traefik config and file storage config"
       pid = fork do
@@ -92,12 +93,23 @@ module EtFullSystem
       end
       Process.detach(pid)
 
-      puts "Starting Procfile"
+      puts "Starting Invoker"
       ::Bundler.with_original_env do
-        concurrency = " -c #{procfile_concurrency_without(options[:without]).join(',')}"
+        without = options[:without]
+        if options.minimal?
+          without = ['et1', 'et3', 'admin', 'api', 'ccd_export', 'atos_api']
+        end
         cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
         STDERR.puts cmd
-        exec(cmd)
+        puts `#{cmd}`
+        return if without.empty?
+
+
+        stop_cmds = without.reduce([]) do |acc, service|
+          acc.concat(invoker_processes_for(service))
+        end
+        stop_cmd = stop_cmds.join(' && ')
+        puts `#{stop_cmd}`
       end
     end
 
@@ -159,10 +171,6 @@ module EtFullSystem
       end
     end
 
-    def procfile_concurrency_without(without)
-      procfile_services.map {|service| "#{service}=#{without.include?(service) ? 0 : 1}"}
-    end
-
     def external_command(cmd, tag)
       IO.popen(cmd) do |io|
         io.each do |line|

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.0"
+  VERSION = "1.0.1.pre4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.pre4
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -195,12 +195,11 @@ 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: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs