et_full_system 0.1.76 → 0.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2ebe2ee5cba408f767ad14b6c77bb605b04574d233c646148b1861ff042b663
-  data.tar.gz: 83e7d4e2440ae59ae99ad02a3e499075ac3f68abd2fa2c0654482b78aebf3758
+  metadata.gz: a16e0ca10760de7de9c31a7879781c69d59627c823bf37971e1637e768480af7
+  data.tar.gz: e1efc5bd2df19588c97e0859942356bb6c39f201323dfc9406b3d02c76fd59e8
 SHA512:
-  metadata.gz: b141d9e5bdbd686e334804956ad1ce088371e51bbf98191b62a2e338cc59cbd938d0479bec51c128c491a77d4653cedafb3f103b1d09c74240c3a1dbc94e06bd
-  data.tar.gz: 9154e9eb6703cfbdfad6f943f6f6954a1f4188ae2f0ba731a1fd5fc051732c94ebfa47a1875a424e5cbb5297196c346906aaa55cb8d71bf0c8c4eb4e58f17697
+  metadata.gz: 3773ee1b5b09508bd30d94005d2bea58c425afab787aa7a156142f956e3f7da2eb8faa1fd81f79e2110a7552caf86f1c1a851f6ec9379ad3df2abbc49bb41dbc
+  data.tar.gz: 6191244bbdfca12aec71d26ccf182a476dde4ae83bc5d70a98c992e9612c802f06dc35062234819980014459ceb6570dfad7a3598e916906ba241833d703e96a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (0.1.76)
+    et_full_system (0.1.77)
       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.214.0)
+    aws-partitions (1.218.0)
     aws-sdk-core (3.68.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
@@ -79,7 +79,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0904)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -111,7 +111,7 @@ GEM
       tilt (~> 2.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
 

data/lib/et_full_system/cli/docker.rb

@@ -1,4 +1,5 @@
 require_relative './docker/server'
+require 'json'
 module EtFullSystem
   #!/usr/bin/env ruby
   # frozen_string_literal: true
@@ -61,6 +62,11 @@ module EtFullSystem
       end
     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"
+    def local_service(service, port)
+      update_service_url(service, local_service_url(port))
+    end
+
     desc "service_env SERVICE", "Returns the environment variables configured for the specified service"
     def service_env(service)
       Bundler.with_original_env do
@@ -71,5 +77,24 @@ module EtFullSystem
         exec(compose_cmd)
       end
     end
+
+    private
+
+    def host_ip
+      JSON.parse `docker network inspect \`docker network list | grep docker_et_full_system | awk '{print $1}'\``
+    end
+
+    def local_service_url(port)
+      case ::EtFullSystem.os
+      when :linux, :unix
+        "http://#{host_ip}:#{port}"
+      when :osx
+        "http://docker.for.mac.localhost"
+      when :windows
+        "http://docker.for.windows.localhost"
+      else
+        raise "Unknown host type - this tool only supports mac, linux and windows"
+      end
+    end
   end
 end

data/lib/et_full_system/os.rb

@@ -0,0 +1,21 @@
+require 'rbconfig'
+
+module EtFullSystem
+  def self.os
+    @os ||= (
+    host_os = RbConfig::CONFIG['host_os']
+    case host_os
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      :windows
+    when /darwin|mac os/
+      :macosx
+    when /linux/
+      :linux
+    when /solaris|bsd/
+      :unix
+    else
+      raise "unknown os: #{host_os.inspect}"
+    end
+    )
+  end
+end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "0.1.76"
+  VERSION = "0.1.77"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 0.1.76
+  version: 0.1.77
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -175,6 +175,7 @@ files:
 - lib/et_full_system/cli/local.rb
 - lib/et_full_system/cli/local/file_storage.rb
 - lib/et_full_system/cli/workspace.rb
+- lib/et_full_system/os.rb
 - lib/et_full_system/version.rb
 - shell_scripts/docker_bootstrap.sh
 - shell_scripts/run_foreman