et_full_system 1.0.0.pre19 → 1.0.0.pre25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14ec03e610ed34c4ccbb7e778910882c5730c9d9e8215a6186d86d4e907adcfd
-  data.tar.gz: 853c84d37c911dde2b262fc5fd3ee1641ad8218a4efd5ac00c899216c2a18408
+  metadata.gz: bf30e87b89f12fe27b013d6a107f3e692deaef4fa4aaa095d004aea2baf1162e
+  data.tar.gz: 1aaaba9f339201bf68982b2ee220c38622a0971c1f4fb7cae87e59688085c924
 SHA512:
-  metadata.gz: 274e21e7e359f0f893dba6de9729899803d7e6c5ff1c74eea541b4d3dd1c8c24f0809f59908c7a2f7ed0a8302b847726efb6fa467e75cd2d79a5efd00bcd68f8
-  data.tar.gz: f556dc33c0690dd981a780df6363ea268c0c85696de8fb17a15117603b61e867c23c04f268a1f18ee310e2083daef6255e1e51dc04c95f5d239e2142ac02da37
+  metadata.gz: d2dc2f83cdcc789599b82ddd0868171f39cce77044216268345c75b0c423252325276723c60e36114973aa2ed55c4efc06010980d3fd19631857b9382f06144f
+  data.tar.gz: 8b293bc0aa9eb0b938589114da4e5489c98ccd5915cbc60c6211c5be0db3e1d2e3c5e3e1a6ccb3d1dc64a222af9b137dd29142fe2cc2f66336f57613316cd430

data/Gemfile.lock

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

data/foreman/.env

@@ -1,6 +1,8 @@
 DB_HOST=${DB_HOST}
+DB_PORT=5432
 DB_USERNAME=postgres
 REDIS_HOST=${REDIS_HOST}
+REDIS_PORT=6379
 RAILS_LOG_TO_STDOUT='true'
 WEB_CONCURRENCY=1
 SECRET_KEY_BASE=sdlkjewfkjhfviuhduihenrjk435r89esfd7cv983qh2n4r3q27yh4u5rtfg

data/lib/et_full_system/cli/docker.rb

@@ -85,12 +85,24 @@ module EtFullSystem
         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
-        exec(compose_cmd)
+        result = `#{compose_cmd}`
+        replace_db_host_port(result)
+        replace_redis_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']
@@ -108,5 +120,25 @@ 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 db_port
+      result = run_compose_command :port, :db, 5432
+      result.split(':').last
+    end
+
+    def redis_port
+      result = run_compose_command :port, :redis, 6379
+      result.split(':').last
+    end
   end
 end

data/lib/et_full_system/cli/local.rb

@@ -146,7 +146,8 @@ module EtFullSystem
       parsed.each_pair do |name, value|
         puts "#{name}=#{value}"
       end
-
+    rescue KeyError
+      puts "The service must be one of #{lookup.keys}"
     end
 
     private

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.0.pre19"
+  VERSION = "1.0.0.pre25"
 end

metadata

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