fastlane-plugin-mango 1.3.15 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 789e89cc42d904d6f20d595d4e4e5e536688431cef29839e784e6fbe8dfd7e13
-  data.tar.gz: e4143d7a96c169910ec836972f4362b0244828f1899a7837b33911b62f31e7f3
+  metadata.gz: c5e9db6561834f87bc0a4c5607f7ca117532d38d35f846ed6a389e16c7da3223
+  data.tar.gz: fbdff88d36c647a249c76c58a9345e5aee75a23bc231ffcd01f86986bad41357
 SHA512:
-  metadata.gz: '0243850ec81a9f5108d5c6ca0a46770238fced448407bdb0c6abacb734bc7804bedc58880275187908cf2a7993a52c635d84749d155d62265e8401788b53dcd4'
-  data.tar.gz: f0dc414874f535ac73ba139fe5476516bc340d5b66b78fd162b6760ca4f783e4911d18ee4d36bec31032431869d093e6e364756ad7c216e6685bd91ae7846c61
+  metadata.gz: 3e015e871f2eceac9afb44618dab0023819f96d3066d709b540f2e7fdd4a830c970897d192f6ac0ac36a73d06fffb7992805a1ccc8f813439d3144d3a7abf569
+  data.tar.gz: 077d01545b646eea107ac015b1d7f847d8ffe41a66f1c33786ae0318d39b71e7ae6321564b9a420121f86c0676ae1150ce42774c57e00240694324fcb912f522

data/lib/fastlane/plugin/mango/actions/run_dockerized_task_action.rb

@@ -22,10 +22,23 @@ module Fastlane
 
           docker_commander.exec(command: "cd #{workspace_dir} #{bundle_install}&& #{timeout_command} #{android_task} || exit 1")
         end
+      rescue StandardError => e
+        begin
+          Actions.sh("docker logs #{mango_helper.container_name} --tail 200")
+        rescue StandardError
+          # do nothing
+        end
+        docker_commander.exec(command:
+                                  'cat /var/log/supervisor/docker-android.stderr.log', raise_when_fail: false)
+        docker_commander.exec(command: 'cat /var/log/supervisor/supervisord.log',
+                              raise_when_fail: false)
+        raise e
       ensure
         begin
           post_actions = params[:post_actions]
-          docker_commander&.exec(command: "cd #{workspace_dir} && #{post_actions}") if post_actions && !mango_helper.kvm_disabled?
+          if post_actions && !mango_helper.kvm_disabled?
+            docker_commander&.exec(command: "cd #{workspace_dir} && #{post_actions}")
+          end
 
           UI.important("Cleaning up #{params[:emulator_name]} container")
           docker_commander.delete_container if mango_helper&.instance_variable_get('@container')

data/lib/fastlane/plugin/mango/helper/cpu_load_handler.rb

@@ -25,6 +25,7 @@ module Fastlane
           30.times do
             load = cpu_load
             return true if load <= cpu_core_amount.to_i * 1.5
+
             print_cpu_load(load)
             UI.important('Waiting for available resources..')
             sleep 60

data/lib/fastlane/plugin/mango/helper/docker_commander.rb

@@ -11,8 +11,8 @@ module Fastlane
 
       def pull_image(docker_image_name:)
         Actions.sh("docker pull #{docker_image_name}")
-      rescue StandardError => exception
-        prune if exception.message =~ /Create more free space in thin pool/
+      rescue StandardError => e
+        prune if e.message =~ /Create more free space in thin pool/
         Actions.sh("docker pull #{docker_image_name}")
       end
 
@@ -34,8 +34,8 @@ module Fastlane
         # interested in the last line, since it contains the id of the created container.
         UI.important("Attaching #{ENV['PWD']} to the docker container")
         Actions.sh("docker run -v $PWD:/root/tests --privileged -t -d #{core_amount} #{emulator_args} #{docker_name} #{docker_image}").chomp
-      rescue StandardError => exception
-        if exception.message =~ /Create more free space in thin pool/ && (retries += 1) < 2
+      rescue StandardError => e
+        if e.message =~ /Create more free space in thin pool/ && (retries += 1) < 2
           prune
           retry
         end
@@ -52,9 +52,13 @@ module Fastlane
         # Do nothing if the network bridge is already gone
       end
 
-      def exec(command:)
+      def exec(command:, raise_when_fail: true)
         if container_name
-          Actions.sh("docker exec -i #{container_name} bash -l -c \"#{command}\"")
+          begin
+            Actions.sh("docker exec #{container_name} bash -l -c \"#{command}\"")
+          rescue StandardError => e
+            raise(e) if raise_when_fail
+          end
         else
           raise('Cannot execute docker command because the container name is unknown')
         end

data/lib/fastlane/plugin/mango/helper/mango_helper.rb

@@ -6,7 +6,8 @@ require_relative 'cpu_load_handler'
 module Fastlane
   module Helper
     class MangoHelper
-      attr_reader :container_name, :no_vnc_port, :device_name, :docker_image, :timeout, :port_factor, :maximal_run_time, :sleep_interval, :is_running_on_emulator, :environment_variables, :vnc_enabled, :core_amount
+      attr_reader :container_name, :no_vnc_port, :device_name, :docker_image, :timeout, :port_factor,
+                  :maximal_run_time, :sleep_interval, :is_running_on_emulator, :environment_variables, :vnc_enabled, :core_amount
 
       def initialize(params)
         @container_name = params[:container_name]
@@ -162,7 +163,8 @@ module Fastlane
         end
         emulator_args = is_running_on_emulator ? "-p #{no_vnc_port}:6080 -e DEVICE='#{device_name}'" : ''
         emulator_args = "#{emulator_args}#{additional_env}"
-        @docker_commander.start_container(emulator_args: emulator_args, docker_image: docker_image, core_amount: core_amount)
+        @docker_commander.start_container(emulator_args: emulator_args, docker_image: docker_image,
+                                          core_amount: core_amount)
       end
 
       def execute_pre_action
@@ -204,10 +206,11 @@ module Fastlane
       # Checks if container is already available
       def container_available?
         return false unless container_name
+
         all_containers = Docker::Container.all(all: true)
 
         all_containers.each do |container|
-          if container.info['Names'].first[1..-1] == container_name
+          if container.info['Names'].first[1..] == container_name
             @container = container
             return true
           end

data/lib/fastlane/plugin/mango/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Mango
-    VERSION = '1.3.15'.freeze
+    VERSION = '1.3.23'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-mango
 version: !ruby/object:Gem::Version
-  version: 1.3.15
+  version: 1.3.23
 platform: ruby
 authors:
 - Serghei Moret, Daniel Hartwich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -112,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: serghei.moret@xing.com, hartwich.daniel@gmail.com
 executables: []
 extensions: []
@@ -155,7 +155,7 @@ homepage: https://github.com/xing/mango
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: This plugin Android tasks on docker images
 test_files: []