et_full_system 1.0.0.pre30 → 1.0.0.pre31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c619e685890fbc1c988a5e7fa0a55e658b9cf3ebba4a41fd8d13d85f8cc368d
-  data.tar.gz: 5492b1795c880177674724514095ad1a30466cda9455636938f8b4ca26fba891
+  metadata.gz: bb9a683ea5a3e40229ada751ece14d89f153a101bf48e5150c2c6c7b7dce52e2
+  data.tar.gz: cb2e66dee02b45c5b70c61c615ee86dc8ec1a78d4749b4eacdcd22fa6a36bd0a
 SHA512:
-  metadata.gz: 3916660efa38ec304a228b87373df586429eae25072c5285a0941e505a71b0fff42a766e309b36e45ff1941f26dea08231220ec70ef67b95cb17ae6762d92bf5
-  data.tar.gz: 138e9913ce4162d3486eeb0558529457e0d83d7efda205c1521229550e6eaa78e29c1d5172bd10c04c6357165eada3b5f2023d089d19ac2946c576c06bb7b15f
+  metadata.gz: 8e8d999bf1c3989b172ca0b2fceb6ca9d364dd27fec0902e0956f61b6b5de371c004d0db1f4cfa52de4afacf56b5049aa863e39671ddd7416ad5087838c9ebbe
+  data.tar.gz: 594a1fc691a2f1ecbdeceea614bf6068fb1a7976cade8346872eabbcf1e577b1b3261d57d7dc518fc0aedcdd9a22c60eddfac994484ed652b93b89cdeb649553

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.0.pre30)
+    et_full_system (1.0.0.pre31)
       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

@@ -22,7 +22,7 @@ module EtFullSystem
       Bundler.with_original_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 = "docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
+        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -32,7 +32,17 @@ module EtFullSystem
     def compose(*args)
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
+        puts cmd
+        exec(cmd)
+      end
+    end
+
+    desc "invoker", "Provides access to the invoker system running inside docker"
+    def invoker(*args)
+      Bundler.with_original_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
         exec(cmd)
       end
@@ -42,10 +52,10 @@ module EtFullSystem
     def reset
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
         puts cmd
         next unless system(cmd)
-        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
         puts cmd
         next unless system(cmd)
         self.class.start(['setup'])
@@ -57,7 +67,7 @@ module EtFullSystem
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local update_service_url #{service} #{url}\""
-        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -73,13 +83,27 @@ module EtFullSystem
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local service_env #{service}\""
-        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
-        exec(compose_cmd)
+        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        puts compose_cmd
+        result = `#{compose_cmd}`
+        replace_db_host_port(result)
+        replace_redis_host_port(result)
+        replace_smtp_host_port(result)
+        puts result
       end
     end
 
     private
 
+    def run_compose_command(*args, silent: false)
+      Bundler.with_original_env do
+        gem_root = File.absolute_path('../../..', __dir__)
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
+        puts cmd unless silent
+        `#{cmd}`
+      end
+    end
+
     def host_ip
       result = JSON.parse `docker network inspect \`docker network list | grep docker_et_full_system | awk '{print $1}'\``
       result.first.dig('IPAM', 'Config').first['Gateway']
@@ -97,5 +121,35 @@ module EtFullSystem
         raise "Unknown host type - this tool only supports mac, linux and windows"
       end
     end
+
+    def replace_db_host_port(env)
+      env.gsub!(/^DB_HOST=.*$/, 'DB_HOST=localhost')
+      env.gsub!(/^DB_PORT=.*$/, "DB_PORT=#{db_port}")
+    end
+
+    def replace_redis_host_port(env)
+      env.gsub!(/^REDIS_HOST=.*$/, 'REDIS_HOST=localhost')
+      env.gsub!(/^REDIS_PORT=.*$/, "REDIS_PORT=#{redis_port}")
+    end
+
+    def replace_smtp_host_port(env)
+      env.gsub!(/^SMTP_HOSTNAME=.*$/, 'SMTP_HOSTNAME=localhost')
+      env.gsub!(/^SMTP_PORT=.*$/, "SMTP_PORT=#{smtp_port}")
+    end
+
+    def db_port
+      result = run_compose_command :port, :db, 5432
+      result.split(':').last.strip
+    end
+
+    def redis_port
+      result = run_compose_command :port, :redis, 6379
+      result.split(':').last.strip
+    end
+
+    def smtp_port
+      result = run_compose_command :port, :et, 1025
+      result.split(':').last.strip
+    end
   end
 end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.0.pre30"
+  VERSION = "1.0.0.pre31"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre30
+  version: 1.0.0.pre31
 platform: ruby
 authors:
 - Gary Taylor