et_full_system 1.0.1.pre14 → 1.0.1.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d953ca5a51b548447f8c4c49422b19315029c081ea88415eb6f881cf4a4ce7
-  data.tar.gz: 4e336ef3aae83383c3b2ff7fadb970f63b6f04b5bde28d237c1901019d4db087
+  metadata.gz: a595ff0430c23541f5e72d79666eb638f9c199098f35362e36ad7543c2bc4b4f
+  data.tar.gz: 151477baf3daa1172c9b3cd354fdd627f9c19c21c01c204515b5aebcbfb67ea6
 SHA512:
-  metadata.gz: '0288afe0df558a547e1c05e9b39ea28771f8112b09c43df2e558c85c7eac5860370d0d33a5f55f56ec779127e5b4ed06d84dcab2d2811331ef2df71b58850c77'
-  data.tar.gz: 84e922c8d0ec187c843954b513d96cf7067b5876397f8ea4b9fc8dfc3e7ec21ae09634baaa612c43c7e4f56f366ed9ab140919f522f0b091c661ac2f384ccb09
+  metadata.gz: 6e63c655c24fb076afe4c5b5afb5fa0846f785b199de2159ffc4ddb0ea1039a29a78cc6a5b0b1457c78ad4636ebfe66c8f28b2e440db404947d5b6b97fdbce23
+  data.tar.gz: 8f99162467117b4dad1e81d49089adc4f5461a5e5d80cd7ed213124029de90bdd796fa1bb5b1a05f38042e1ee68097ee34052e295b12e504909d20e6f8a7a53d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.1.pre14)
+    et_full_system (1.0.1.pre16)
       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.269.0)
+    aws-partitions (1.270.0)
     aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

data/lib/et_full_system/cli/docker.rb

@@ -10,7 +10,7 @@ module EtFullSystem
 
     desc "bootstrap", "Used by the docker-compose file (using sudo) - do not use yourself"
     def bootstrap
-      Bundler.with_unbundled_env do
+      unbundled do
         cmd = File.absolute_path('../../../shell_scripts/docker_bootstrap.sh', __dir__)
         puts cmd
         exec(cmd)
@@ -19,7 +19,7 @@ module EtFullSystem
 
     desc "setup", "Sets up the system for initial run - or after changing branches, adding gems etc.. in any of the services"
     def setup
-      Bundler.with_unbundled_env do
+      unbundled 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} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
@@ -30,7 +30,7 @@ module EtFullSystem
 
     desc "compose", "Provides access to the docker-compose command"
     def compose(*args)
-      Bundler.with_unbundled_env do
+      unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
         puts cmd
@@ -45,7 +45,7 @@ module EtFullSystem
 
     desc "reset", "Bring down the server, remove all caches, rebuild the Dockerfile etc..."
     def reset
-      Bundler.with_unbundled_env do
+      unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
         puts cmd
@@ -229,12 +229,16 @@ module EtFullSystem
 
     private
 
+    def unbundled(&block)
+      method = Bundler.respond_to?(:with_unbundled_env) ? :with_unbundled_env : :with_original_env
+      Bundler.send(method, &block)
+    end
+
     def run_on_local(cmd, return_output: false)
-      Bundler.with_unbundled_env do
+      unbundled 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
         if return_output
           `#{compose_cmd}`
         else
@@ -244,7 +248,7 @@ module EtFullSystem
     end
 
     def run_compose_command(*args, silent: false)
-      Bundler.with_unbundled_env do
+      unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
         puts cmd unless silent

data/lib/et_full_system/cli/docker/server.rb

@@ -17,7 +17,7 @@ module EtFullSystem
         method_option :record_video, type: :boolean, default: false, aliases: 'record-video', desc: 'When using zalenium, enable video recording'
         method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
         def up(*args)
-          Bundler.with_unbundled_env do
+          unbundled do
             server_args = []
             server_args << "--minimal" if options.minimal?
             server_args << "--without=#{options[:without].join(' ')}" unless options[:without].empty?
@@ -56,7 +56,7 @@ module EtFullSystem
 
         desc "down", "Stops the full system server on docker"
         def down(*args)
-          ::Bundler.with_unbundled_env do
+          unbundled do
             gem_root = File.absolute_path('../../../..', __dir__)
             cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down #{args.join(' ')}"
             puts cmd
@@ -68,6 +68,12 @@ module EtFullSystem
 
         private
 
+        def unbundled(&block)
+          method = Bundler.respond_to?(:with_unbundled_env) ? :with_unbundled_env : :with_original_env
+          Bundler.send(method, &block)
+        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']

data/lib/et_full_system/cli/local.rb

@@ -94,7 +94,7 @@ module EtFullSystem
       Process.detach(pid)
 
       puts "Starting Invoker"
-      ::Bundler.with_unbundled_env do
+      unbundled do
         without = options[:without]
         if options.minimal?
           without = ['et1', 'et3', 'admin', 'api', 'ccd_export', 'atos_api']
@@ -132,7 +132,7 @@ module EtFullSystem
 
     desc "setup_services", "Sets up all services in one command"
     def setup_services
-      ::Bundler.with_unbundled_env do
+      unbundled do
         setup_et1_service
         setup_et3_service
         setup_api_service
@@ -293,6 +293,11 @@ module EtFullSystem
 
     private
 
+    def unbundled(&block)
+      method = Bundler.respond_to?(:with_unbundled_env) ? :with_unbundled_env : :with_original_env
+      Bundler.send(method, &block)
+    end
+
     def invoker_processes_for(service)
       case service
       when 'et1' then ['et1_web', 'et1_sidekiq']

data/lib/et_full_system/cli/local/file_storage.rb

@@ -19,6 +19,11 @@ module EtFullSystem
 
         private
 
+        def unbundled(&block)
+          method = Bundler.respond_to?(:with_unbundled_env) ? :with_unbundled_env : :with_original_env
+          Bundler.send(method, &block)
+        end
+
         def setup_s3_storage
           config = {
             region: ENV.fetch('AWS_REGION', 'us-east-1'),
@@ -49,7 +54,7 @@ module EtFullSystem
         end
 
         def setup_azure_storage
-          Bundler.with_unbundled_env do
+          unbundled do
             puts `bash --login -c "cd systems/api && rvm use && dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_api.env\"  bundle exec bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
 
           end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.1.pre14"
+  VERSION = "1.0.1.pre16"
 end

metadata

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