et_full_system 1.0.1.pre10 → 1.0.1.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c348c56dee5621c78c06f0044dd1e412ceda73ff8916b751605df03177f82591
-  data.tar.gz: d6f339f49b61238bce69e7b71346b72ae2d18fdebcf72632c5c01e6ed560448a
+  metadata.gz: 508b9e39387ef85680ad1d6dbee3e91995a0f5de3491aa08ee3ff7f86371202e
+  data.tar.gz: '0534904636bb52053f459d86cce29823f06ec152b9c0cf0932041e8c67f398c8'
 SHA512:
-  metadata.gz: 979ff9e902ae2c222927d6c51d93bc71e75152280311038474637bd3aed2791f673645961b86c06eef8e5ceb36dc50debacb6788ce4df10dc44729462023ab3c
-  data.tar.gz: 1d7a988ea389bdbb596c671911251866552da6d850637424e2ca72db13d84d2a8922280038eb097bcce8bd12684dca59f04541f3795c969dad79ed0039a6fc21
+  metadata.gz: a9a6c95074e206bfe598a165335c8808eb257c363d88800feb35a5ef49e7bc960c68e8a9fb81623f0dd3799e88c3b6576492ddcd3f10bccdd02bbf7288310f0b
+  data.tar.gz: c433e84bd8c6c56bd88ba471ab0f75e9ea885adee126501ddf3e6eebe3820185aa291116bdab1f1f4538b9f19c57c911cea59250ba7f88f9ce6346b265df7aed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.1.pre10)
+    et_full_system (1.0.1.pre11)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -92,7 +92,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     public_suffix (4.0.3)
     puma (3.12.2)
-    rack (2.1.1)
+    rack (2.1.2)
     rack-protection (2.0.8.1)
       rack
     rake (10.5.0)

data/lib/et_full_system/cli/docker.rb

@@ -39,14 +39,8 @@ module EtFullSystem
     end
 
     desc "invoker", "Provides access to the invoker system running inside docker"
-    def invoker(*args, show_output: true, show_command: true)
-      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
-        result = `#{cmd}`
-        puts result if show_output
-      end
+    def invoker(*args)
+      run_on_local("invoker #{args.join(' ')}")
     end
 
     desc "reset", "Bring down the server, remove all caches, rebuild the Dockerfile etc..."
@@ -65,13 +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)
-      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}"
-        puts compose_cmd
-        `#{compose_cmd}`
-      end
+      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,17 +70,10 @@ module EtFullSystem
     desc "local_et1 PORT", "Configures the reverse proxy and the invoker system to allow a developer to run the web server and sidekiq locally"
     def local_et1(port)
       local_service('et1', port)
-      invoker 'remove', 'et1_web'
-      invoker 'remove', 'et1_sidekiq'
+      disable_et1
       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 "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"
-    end
 
     desc "et1_env", "Shows et1's environment variables as they should be on a developers machine running locally"
     def et1_env
@@ -101,22 +82,10 @@ 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
-      invoker 'remove', 'et_ccd_export_sidekiq'
+      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
 
-    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
-
-    desc "enable_atos_api", "Configures invoker to use the internal systems instead of local"
-    def enable_atos_api
-      invoker 'add', 'atos_api_web'
-      puts "atos_api is now being run from inside docker container"
-    end
-
     desc "ccd_export_env", "Shows ccd_export's environment variables as they should be on a developers machine running locally"
     def ccd_export_env
       service_env('et_ccd_export')
@@ -125,18 +94,10 @@ module EtFullSystem
     desc "local_api PORT", "Configures the reverse proxy and the invoker system to allow a developer to run the web server and sidekiq locally"
     def local_api(port)
       local_service('api', port)
-      invoker 'remove', 'api_web'
-      invoker 'remove', 'api_sidekiq'
+      disable_api
       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 "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"
-    end
-
     desc "api_env", "Shows api's environment variables as they should be on a developers machine running locally"
     def api_env
       service_env('api')
@@ -145,16 +106,10 @@ module EtFullSystem
     desc "local_admin PORT", "Configures the reverse proxy and the invoker system to allow a developer to run the admin web server locally"
     def local_admin(port)
       local_service('admin', port)
-      invoker 'remove', 'admin_web'
+      disable_admin
       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 "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
-
     desc "admin_env", "Shows admin's environment variables as they should be on a developers machine running locally"
     def admin_env
       service_env('admin')
@@ -163,15 +118,10 @@ module EtFullSystem
     desc "local_et3 PORT", "Configures the reverse proxy and the invoker system to allow a developer to run the et3 web server locally"
     def local_et3(port)
       local_service('et3', port)
-      invoker 'remove', 'et3_web'
+      disable_et3
       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 "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
 
     desc "et3_env", "Shows et3's environment variables as they should be on a developers machine running locally"
     def et3_env
@@ -180,58 +130,115 @@ module EtFullSystem
 
     desc "service_env SERVICE", "Returns the environment variables configured for the specified service"
     def service_env(service)
-      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}"
-        result = `#{compose_cmd}`
-        replace_db_host_port(result)
-        replace_redis_host_port(result)
-        replace_smtp_host_port(result)
-        puts result
-      end
+      result = run_on_local("service_env #{service}")
+      replace_db_host_port(result)
+      replace_redis_host_port(result)
+      replace_smtp_host_port(result)
+      puts result
+    end
+
+    desc "enable_et1", "Configures the reverse proxy and invoker to use the internal systems instead of local"
+    def 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
+      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
+      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
+      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
+      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
+      run_on_local("enable_et3")
+    end
+
+    desc "disable_et1", "Stops et1 from running in the stack"
+    def disable_et1
+      run_on_local("disable_et1")
+    end
+
+    desc "disable_ccd_export", "Stops ccd_export from running in the stack"
+    def 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
+      run_on_local("disable_atos_api")
+    end
+
+    desc "disable_api", "Stops api from running in the stack"
+    def disable_api
+      run_on_local("disable_api")
+    end
+
+    desc "disable_admin", "Stops admin from running in the stack"
+    def disable_admin
+      run_on_local("disable_admin")
+    end
+
+    desc "disable_et3", "Stops et3 from running in the stack"
+    def disable_et3
+      run_on_local("disable_et3")
     end
 
     desc "restart_et1", "Restarts the et1 application"
     def restart_et1
-      invoker 'reload', 'et1_web'
-      invoker 'reload', 'et1_sidekiq'
-      puts "ET1 Has been restarted"
+      run_on_local("restart_et1")
     end
 
     desc "restart_api", "Restarts the api application"
     def restart_api
-      invoker 'reload', 'api_web'
-      invoker 'reload', 'api_sidekiq'
-      puts "api Has been restarted"
+      run_on_local("restart_api")
     end
 
     desc "restart_et3", "Restarts the et3 application"
     def restart_et3
-      invoker 'reload', 'et3_web'
-      puts "et3 Has been restarted"
+      run_on_local("restart_et3")
     end
 
     desc "restart_admin", "Restarts the admin application"
     def restart_admin
-      invoker 'reload', 'admin_web'
-      puts "admin Has been restarted"
+      run_on_local("restart_admin")
     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"
+      run_on_local("restart_atos_api")
     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"
+      run_on_local("restart_ccd_export")
     end
 
     private
 
+    def run_on_local(cmd)
+      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}`
+      end
+    end
+
     def run_compose_command(*args, silent: false)
       Bundler.with_unbundled_env do
         gem_root = File.absolute_path('../../..', __dir__)

data/lib/et_full_system/cli/local.rb

@@ -168,6 +168,129 @@ module EtFullSystem
       puts "The service must be one of #{lookup.keys}"
     end
 
+    desc "invoker", "Provides access to the invoker system"
+    def invoker(*args)
+      cmd = "invoker #{args.join(' ')}"
+      puts cmd
+      result = `#{cmd}`
+      puts result
+      result
+    end
+
+    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 running"
+    end
+
+    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 running"
+    end
+
+    desc "enable_atos_api", "Configures invoker to use the internal systems instead of local"
+    def enable_atos_api
+      invoker 'add', 'atos_api_web'
+      puts "atos_api is now running"
+    end
+
+    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 running"
+    end
+
+    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 running"
+    end
+
+    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 running"
+    end
+
+    desc "disable_et1", "Stops <service> from running in the stack"
+    def disable_et1
+      invoker 'remove', 'et1_web'
+      invoker 'remove', 'et1_sidekiq'
+      puts "ET1 is now stopped"
+    end
+
+    desc "disable_ccd_export", "Stops ccd_export from running in the stack"
+    def disable_ccd_export
+      invoker 'remove', 'et_ccd_export_sidekiq'
+      puts "ccd_export is now stopped"
+    end
+
+    desc "disable_atos_api", "Stops atos_api from running in the stack"
+    def disable_atos_api
+      invoker 'remove', 'atos_api_web'
+      puts "atos_api is now stopped"
+    end
+
+    desc "disable_api", "Stops api from running in the stack"
+    def disable_api
+      invoker 'remove', 'api_web'
+      invoker 'remove', 'api_sidekiq'
+      puts "api is now stopped"
+    end
+
+    desc "disable_admin", "Stops admin from running in the stack"
+    def disable_admin
+      invoker 'remove', 'admin_web'
+      puts "Admin is now stopped"
+    end
+
+    desc "disable_et3", "Stops et3 from running in the stack"
+    def disable_et3
+      invoker 'remove', 'et3_web'
+      puts "ET3 is now stopped"
+    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 invoker_processes_for(service)

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.1.pre10"
+  VERSION = "1.0.1.pre11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre10
+  version: 1.0.1.pre11
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor