et_full_system 1.0.0.pre29 → 1.0.0.pre30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbee5bddfbf87aeef64f1d29860f6459207605633545d65d4354a0964be6840f
-  data.tar.gz: 997b39a8c280121f03e6e5e3ea856e73db0124477782e34811a89149a19be51f
+  metadata.gz: 6c619e685890fbc1c988a5e7fa0a55e658b9cf3ebba4a41fd8d13d85f8cc368d
+  data.tar.gz: 5492b1795c880177674724514095ad1a30466cda9455636938f8b4ca26fba891
 SHA512:
-  metadata.gz: caee6a149972b213d37a08af23352f9488a6875524433ae179cbcca6459570684ab2fe726f04eaab26b8c4b67c783b0c639e93ffa03bdd353c3ce04469d54dba
-  data.tar.gz: 0c0d1b3773b3b9ec56e9344671324442c5c1567a6875377e63bc91864322911b438a4e8d393dbf9b148abb8949b4fd2f9714fe5a694eef9f440e3b79ebf37195
+  metadata.gz: 3916660efa38ec304a228b87373df586429eae25072c5285a0941e505a71b0fff42a766e309b36e45ff1941f26dea08231220ec70ef67b95cb17ae6762d92bf5
+  data.tar.gz: 138e9913ce4162d3486eeb0558529457e0d83d7efda205c1521229550e6eaa78e29c1d5172bd10c04c6357165eada3b5f2023d089d19ac2946c576c06bb7b15f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.0.pre29)
+    et_full_system (1.0.0.pre30)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -23,7 +23,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.258.0)
+    aws-partitions (1.260.0)
     aws-sdk-core (3.86.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -78,7 +78,7 @@ GEM
     jmespath (1.4.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
@@ -89,7 +89,7 @@ GEM
     mustermann (1.0.3)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.2)
     puma (3.12.2)
     rack (2.0.8)
     rack-protection (2.0.7)
@@ -115,7 +115,7 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
 
 PLATFORMS

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 = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
+        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -32,17 +32,7 @@ module EtFullSystem
     def compose(*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 #{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(' ')}\""
+        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
         puts cmd
         exec(cmd)
       end
@@ -52,10 +42,10 @@ module EtFullSystem
     def reset
       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 down -v"
+        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
         puts cmd
         next unless system(cmd)
-        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
+        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
         puts cmd
         next unless system(cmd)
         self.class.start(['setup'])
@@ -67,7 +57,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 = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -83,27 +73,13 @@ 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 = "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
+        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        exec(compose_cmd)
       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']
@@ -121,35 +97,5 @@ 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.pre29"
+  VERSION = "1.0.0.pre30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre29
+  version: 1.0.0.pre30
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor