et_full_system 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08bde4482164de2dd1e60e2ec4b199aa6cba0a4915cdaa4b0d8d187995d30c99'
-  data.tar.gz: 90a09d9e484a60b2931cd57192293228c761eeefedc777f25389cb0baf338c03
+  metadata.gz: 36b49d2dfdf5d389e0ab6382f9d1dc98c4d2e65e5fa0125a517b8909902db8e2
+  data.tar.gz: 0d8ffa904de76bc90864ef55460866b0bc564a93762c4068ffbbfcc18db849b8
 SHA512:
-  metadata.gz: '092cb07b3fd1e6f086a30a7b675cfe85c8d06748cc4b531274a710aefdc1aa243f4aaf99a3004020f5b568f437f09611998ac64c6922033e1e7c35d5d8b2585f'
-  data.tar.gz: 46bab84cfa048119c8cd58dad5fee4bd208543adcf23f4191c18e07dd48af99d504b917ed82c07e9288552d9de708723b6d5b523b7bbbbba943862c8427e97f3
+  metadata.gz: 5f035f8bab5d1d9320abece1633acfaeb2050d1234eceb0f9f0498781b00bda433ea2d50348ec80b880efc1d8b69fb25609cbeb40f436bae3024dd6964d824ca
+  data.tar.gz: bc573df604ff711391df3840db89f8aa2985c8b9fbb9c69911bd434778a963c84ae6680634cc1d7b55dd9e04e780e218f0a7b7bfb273b731d9a20214550376ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (0.1.40)
+    et_full_system (0.1.41)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -18,8 +18,8 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.3)
-    aws-partitions (1.160.0)
-    aws-sdk-core (3.50.0)
+    aws-partitions (1.161.0)
+    aws-sdk-core (3.51.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
@@ -69,7 +69,7 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    multipart-post (2.1.0)
+    multipart-post (2.1.1)
     mustermann (1.0.3)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)

data/README.md

@@ -132,7 +132,7 @@ database, then they will both process jobs, meaning you might not see the jobs b
 Say I am working on a Mac and I wanted to work on some front end stuff in ET1 but wasn't touching any 
 background jobs in sidekiq - I would do this (with et_full_system docker server already running) :-
 
-    $ et_full_system docker update_service_url et1 http://docker.host.internal:3000
+    $ et_full_system docker update_service_url et1 http://host.docker.internal:3000
     
 And then start your local server, not forgetting any important environment variables (hint - to see what the docker version has them 
 set to - do use the service_env command as previously mentioned)    
@@ -157,6 +157,9 @@ wouldnt go to plan.
 
 The --without flag tells the system to start up, but exclude et1_web and et1_sidekiq
 
+Then, I do the same command as the previous example to tell it to use my local web server
+
+    $ et_full_system docker update_service_url et1 http://host.docker.internal:3000
 
 ## Usage (Without docker)
 

data/foreman/Procfile

@@ -10,3 +10,4 @@ atos_api_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_f
 s3_web: bash --login -c "dotenv -f ${FOREMAN_PATH}/minio.env minio server ${MINIO_STORAGE_PATH}"
 azure_blob_web: bash --login -c "azurite -l ${AZURITE_STORAGE_PATH}"
 fake_acas_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:${PORT} && rvm use && et_fake_acas_server --port=$PORT --threads=1:5"
+et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et_ccd_export && dotenv -f ${FOREMAN_PATH}/.env dotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run.sh"

data/foreman/et_ccd_export.env

@@ -0,0 +1,2 @@
+WEB_CONCURRENCY=1
+REDIS_DATABASE=2

data/lib/et_full_system/cli/local.rb

@@ -120,6 +120,7 @@ module EtFullSystem
         setup_api_service
         setup_admin_service
         setup_atos_service
+        setup_ccd_service
       end
     end
 
@@ -224,6 +225,13 @@ module EtFullSystem
       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 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" bundle install --with=#{options[:rails_env]}\""
+      puts cmd
+      external_command cmd, 'ccd setup'
+    end
 
     def update_rest_backend_url(service, url)
       connect_retry_countdown = 10

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "0.1.40"
+  VERSION = "0.1.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -160,6 +160,7 @@ files:
 - foreman/et_admin.env
 - foreman/et_api.env
 - foreman/et_atos.env
+- foreman/et_ccd_export.env
 - foreman/mailhog.env
 - foreman/minio.env
 - foreman/ports.env
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs