et_full_system 1.0.1.pre12 → 1.0.1.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0edeab6a7cd7ea33c538daab1e6fef4b6f1027f11c465169319a972b22d70a
-  data.tar.gz: 8a4923bb3363a3948abaaccc8e5ad75eca38cc80a970393c6c293864bf9940a0
+  metadata.gz: cd5e77f9c1537d80363b72411fc7443723f6b41881db76d468d1fec97604bd5b
+  data.tar.gz: 231278716422d0b818138127f81fc9861915074c245e2af19454fb3c86a62e61
 SHA512:
-  metadata.gz: d38f980990c69b5c8412f88c0c4725472b0b9fc034327a830da19a3aeaabb7d27b1950e4931d5ed011f10d076832c64578e6c1fc5664b81809bd780a4d32f6e8
-  data.tar.gz: d356969a269e60114cfc1f67cf93cb33c2bac2185e381a48e96eacdfec7e150ca27318019721a1135e44ecba360a0c6a662653b2b505aedaf951bb4226dfde3c
+  metadata.gz: d161596981a35cd4ee5e366c7104e0316b4f577bbaca1885cf3affc8feb57b1615fbeccf2aa5e5992111f7abecc2dee31b6c80f25f58b45844b3f1b0fc9f9319
+  data.tar.gz: a7a87c6d25caa5d4b6020d77ebf744f6ce4cc11f037657d71530c0be41a55282092579234b90b11e6ffe822a118b7c74140bea4bd7684d1b017993304fee4248

data/Gemfile.lock

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

data/lib/et_full_system/cli/docker.rb

@@ -40,7 +40,7 @@ module EtFullSystem
 
     desc "invoker", "Provides access to the invoker system running inside docker"
     def invoker(*args)
-      puts run_on_local("invoker #{args.join(' ')}")
+      run_on_local("invoker #{args.join(' ')}")
     end
 
     desc "reset", "Bring down the server, remove all caches, rebuild the Dockerfile etc..."
@@ -59,7 +59,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)
-      puts run_on_local("update_service_url #{service} #{url}\"")
+      run_on_local("update_service_url #{service} #{url}")
     end
 
     desc "local_service SERVICE PORT", "Configures the reverse proxy to connect to a specific port on the host machine - the URL is calculated - otherwise it is the same as update_service_url"
@@ -82,7 +82,7 @@ module EtFullSystem
 
     desc "local_ccd_export", "Disables the sidekiq process in the invoker system to allow a developer to run it locally"
     def local_ccd_export
-      puts run_on_local('disable_ccd_export')
+      run_on_local('disable_ccd_export')
       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
 
@@ -130,7 +130,7 @@ module EtFullSystem
 
     desc "service_env SERVICE", "Returns the environment variables configured for the specified service"
     def service_env(service)
-      result = run_on_local("service_env #{service}")
+      result = run_on_local("service_env #{service}", return_output: true)
       replace_db_host_port(result)
       replace_redis_host_port(result)
       replace_smtp_host_port(result)
@@ -139,103 +139,107 @@ module EtFullSystem
 
     desc "enable_et1", "Configures the reverse proxy and invoker to use the internal systems instead of local"
     def enable_et1
-      puts run_on_local("enable_et1")
+      run_on_local("enable_et1")
     end
 
     desc "enable_ccd_export", "Configures invoker to use the internal systems instead of local"
     def enable_ccd_export
-      puts run_on_local("enable_ccd_export")
+      run_on_local("enable_ccd_export")
     end
 
     desc "enable_atos_api", "Configures invoker to use the internal systems instead of local"
     def enable_atos_api
-      puts run_on_local("enable_atos_api")
+      run_on_local("enable_atos_api")
     end
 
     desc "enable_api", "Configures the reverse proxy and invoker to use the internal systems instead of local"
     def enable_api
-      puts run_on_local("enable_api")
+      run_on_local("enable_api")
     end
 
     desc "enable_admin", "Configures the reverse proxy and invoker to use the internal systems instead of local"
     def enable_admin
-      puts run_on_local("enable_admin")
+      run_on_local("enable_admin")
     end
 
     desc "enable_et3", "Configures the reverse proxy and invoker to use the internal systems instead of local"
     def enable_et3
-      puts run_on_local("enable_et3")
+      run_on_local("enable_et3")
     end
 
     desc "disable_et1", "Stops et1 from running in the stack"
     def disable_et1
-      puts run_on_local("disable_et1")
+      run_on_local("disable_et1")
     end
 
     desc "disable_ccd_export", "Stops ccd_export from running in the stack"
     def disable_ccd_export
-      puts run_on_local("disable_ccd_export")
+      run_on_local("disable_ccd_export")
     end
 
     desc "disable_atos_api", "Stops atos_api running in the stack"
     def disable_atos_api
-      puts run_on_local("disable_atos_api")
+      run_on_local("disable_atos_api")
     end
 
     desc "disable_api", "Stops api from running in the stack"
     def disable_api
-      puts run_on_local("disable_api")
+      run_on_local("disable_api")
     end
 
     desc "disable_admin", "Stops admin from running in the stack"
     def disable_admin
-      puts run_on_local("disable_admin")
+      run_on_local("disable_admin")
     end
 
     desc "disable_et3", "Stops et3 from running in the stack"
     def disable_et3
-      puts run_on_local("disable_et3")
+      run_on_local("disable_et3")
     end
 
     desc "restart_et1", "Restarts the et1 application"
     def restart_et1
-      puts run_on_local("restart_et1")
+      run_on_local("restart_et1")
     end
 
     desc "restart_api", "Restarts the api application"
     def restart_api
-      puts run_on_local("restart_api")
+      run_on_local("restart_api")
     end
 
     desc "restart_et3", "Restarts the et3 application"
     def restart_et3
-      puts run_on_local("restart_et3")
+      run_on_local("restart_et3")
     end
 
     desc "restart_admin", "Restarts the admin application"
     def restart_admin
-      puts run_on_local("restart_admin")
+      run_on_local("restart_admin")
     end
 
     desc "restart_atos_api", "Restarts the atos_api application"
     def restart_atos_api
-      puts run_on_local("restart_atos_api")
+      run_on_local("restart_atos_api")
     end
 
     desc "restart_ccd_export", "Restarts the ccd_export application"
     def restart_ccd_export
-      puts run_on_local("restart_ccd_export")
+      run_on_local("restart_ccd_export")
     end
 
     private
 
-    def run_on_local(cmd)
+    def run_on_local(cmd, return_output: false)
       Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local #{cmd}\""
         compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
         puts compose_cmd
-        `#{compose_cmd}`
+        if return_output
+          `#{compose_cmd}`
+        else
+          system(compose_cmd)
+        end
       end
     end
 

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.1.pre12"
+  VERSION = "1.0.1.pre13"
 end

metadata

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