fastlane-plugin-mango 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 968c3231a114d8f5b371c05d887cc9e9dcb908f7baa8729370e9ba97dfab4c2c
-  data.tar.gz: c0a3a9c50e99ca15806fbb253e10349f6cd263677cf6e45dad03078e04ebc584
+  metadata.gz: b461b1084d0ae59adbf1f20844acf789c2c8f04ab66dd26f54ce90251960130c
+  data.tar.gz: 7a77604dc25fc8b70eeef54acfb3e66571c5b18506202d9c49f4c57854a68beb
 SHA512:
-  metadata.gz: db22d989c74376ec53583f7acb8254b4b01cabaff64a8742fa068b137bd023c1bc74dd80b3b0d8ebdde6f60e87b1e17324acf4968433239e1d3c5ac1023d4547
-  data.tar.gz: 7d87f2df5052ade2b4aa40eb3999e28b2fe6f30c9eaf0974681048042a0ac53a2270ccaab4579db8178e82ef6797ebe9f54a37efe3be30d02d5799c5c4c33729
+  metadata.gz: 9c6f546b393173e943ef8c60217ade021ba1cf7cb0e3c4ab5ff9734316eb49121f005d4ba9e33101a19bf786b611e6684cbf05623ede9b3ab9dfadcb87f9d37e
+  data.tar.gz: 1df19671e8722c6c5bec82a1b1f77d5c59f2917bd1a8652cd69772929c5af3d0ae28ec9bb5a6ede443d8383b8af806aeacf9c6c172ef9c1f46010b46e9055f98

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

@@ -8,6 +8,8 @@ module Fastlane
         mango_helper = Fastlane::Helper::MangoHelper.new(params)
         mango_helper.setup_container
 
+        docker_commander = Helper::DockerCommander.new(mango_helper.container_name)
+
         failure_buffer_timeout = 5
         timeout_command = "timeout #{params[:maximal_run_time] - failure_buffer_timeout}m"
         workspace_dir = params[:workspace_dir]
@@ -17,13 +19,13 @@ module Fastlane
           UI.success("Starting Android Task.")
           bundle_install = params[:bundle_install] ? '&& bundle install ' : ''
 
-          Helper::DockerCommander.docker_exec(command: "cd #{workspace_dir} #{bundle_install}&& #{timeout_command} #{android_task} || exit 1", container_name: mango_helper.container_name)
+          docker_commander.exec(command: "cd #{workspace_dir} #{bundle_install}&& #{timeout_command} #{android_task} || exit 1")
         end
 
       ensure
         post_actions = params[:post_actions]
         if post_actions && !mango_helper.kvm_disabled?
-          Helper::DockerCommander.docker_exec(command: "cd #{workspace_dir} && #{post_actions}", container_name: mango_helper.container_name)
+          docker_commander.exec(command: "cd #{workspace_dir} && #{post_actions}")
         end
 
         UI.important("Cleaning up #{params[:emulator_name]} container")

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

@@ -3,17 +3,23 @@ require 'os'
 
 module Fastlane
   module Helper
-    module DockerCommander
+    class DockerCommander
 
-      def self.pull_image(docker_image_name:)
+      attr_accessor :container_name
+
+      def initialize(container_name)
+        @container_name = container_name
+      end
+
+      def pull_image(docker_image_name:)
         handle_thin_pool_exception do
           Actions.sh("docker pull #{docker_image_name}")
         end
       end
 
-      def self.start_container(emulator_args:, docker_name:, docker_image:)
-        docker_name = if docker_name
-                        "--name #{docker_name}"
+      def start_container(emulator_args:, docker_image:)
+        docker_name = if container_name
+                        "--name #{container_name}"
                       else
                         ''
                       end
@@ -26,25 +32,33 @@ module Fastlane
         end
       end
 
-      def self.stop_container(container_name:)
+      def stop_container
         Actions.sh("docker stop #{container_name}") if container_name
       end
 
-      def self.delete_container(container_name:)
+      def delete_container
         Actions.sh("docker rm #{container_name}") if container_name
       end
 
-      def self.disconnect_network_bridge(container_name:)
+      def disconnect_network_bridge
         Actions.sh("docker network disconnect -f bridge #{container_name}") if container_name
       rescue StandardError
         # Do nothing if the network bridge is already gone
       end
 
-      def self.prune
+      def exec(command:)
+        if container_name
+          Actions.sh("docker exec -i #{container_name} bash -l -c \"#{command}\"")
+        else
+          raise('Cannot execute docker command because the container name is unknown')
+        end
+      end
+        
+      def prune
         Action.sh('docker system prune -f')
       end
 
-      def self.handle_thin_pool_exception(&block)
+      def handle_thin_pool_exception(&block)
         begin
           block.call
         rescue FastlaneCore::Interface::FastlaneShellError => exception
@@ -58,9 +72,6 @@ module Fastlane
         end
       end
 
-      def self.docker_exec(command:, container_name:)
-        Actions.sh("docker exec -i #{container_name} bash -l -c \"#{command}\"") if container_name
-      end
     end
   end
 end

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

@@ -2,23 +2,43 @@ require_relative 'docker_commander'
 
 module Fastlane
   module Helper
-    module EmulatorCommander
 
-      def self.disable_animations(container_name:)
-        DockerCommander.docker_exec(command: 'adb shell settings put global window_animation_scale 0.0', container_name: container_name)
-        DockerCommander.docker_exec(command: 'adb shell settings put global transition_animation_scale 0.0', container_name: container_name)
-        DockerCommander.docker_exec(command: 'adb shell settings put global animator_duration_scale 0.0', container_name: container_name)
+    class EmulatorCommander
+
+      attr_accessor :container_name
+
+      def initialize(container_name)
+        @container_name = container_name
+        @docker_commander = DockerCommander.new(container_name)
+      end
+
+      # Disables animation for faster and stable testing
+      def disable_animations
+        @docker_commander.exec(command: 'adb shell settings put global window_animation_scale 0.0')
+        @docker_commander.exec(command: 'adb shell settings put global transition_animation_scale 0.0')
+        @docker_commander.exec(command: 'adb shell settings put global animator_duration_scale 0.0')
+      rescue FastlaneCore::Interface::FastlaneShellError => e
+        # Under weird circumstances it can happen that adb is running but shell on the emu is not completely up
+        # it recovers after some time, so wait and retry
+        retry_counter = retry_counter.to_i + 1
+        if retry_counter <= 5
+          sleep 10*retry_counter
+          retry
+        else
+          raise e
+        end
       end
 
-      def self.increase_logcat_storage(container_name:)
-        DockerCommander.docker_exec(command: 'adb logcat -G 16m', container_name: container_name)
+      # Increases logcat storage
+      def increase_logcat_storage
+        @docker_commander.exec(command: 'adb logcat -G 16m')
       end
 
-      # Checks if created emulator is connected
-      def self.check_connection(container_name:)
+      # Restarts adb on the separate port and checks if created emulator is connected
+      def check_connection
         UI.success('Checking if emulator is connected to ADB.')
 
-        if emulator_is_healthy?(container_name: container_name)
+        if emulator_is_healthy?
           UI.success('Emulator connected successfully')
           true
         else
@@ -27,8 +47,8 @@ module Fastlane
         end
       end
 
-      def self.emulator_is_healthy?(container_name: container_name)
-        list_devices = DockerCommander.docker_exec(command: 'adb devices', container_name: container_name)
+      def emulator_is_healthy?
+        list_devices = @docker_commander.exec(command: 'adb devices')
         list_devices.include? "\tdevice"
       end
     end

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

@@ -26,6 +26,9 @@ module Fastlane
         @pre_action = params[:pre_action]
         @docker_registry_login = params[:docker_registry_login]
         @pull_latest_image = params[:pull_latest_image]
+        
+        @docker_commander = DockerCommander.new(container_name)
+        @emulator_commander = EmulatorCommander.new(container_name)
       end
 
       # Setting up the container:
@@ -48,7 +51,7 @@ module Fastlane
         pull_from_registry if @pull_latest_image
 
         # Make sure that network bridge for the current container is not already used
-        DockerCommander.disconnect_network_bridge(container_name: container_name)
+        @docker_commander.disconnect_network_bridge
 
         create_container
 
@@ -59,7 +62,7 @@ module Fastlane
         container_state = wait_for_healthy_container
 
         if is_running_on_emulator
-          connection_state = EmulatorCommander.check_connection(container_name: container_name)
+          connection_state = @emulator_commander.check_connection
           container_state = connection_state && connection_state
         end
 
@@ -76,25 +79,25 @@ module Fastlane
             exit 2
           end
 
-          if is_running_on_emulator && !EmulatorCommander.check_connection(container_name: container_name)
+          if is_running_on_emulator && !@emulator_commander.check_connection
             UI.important('Cannot connect to emulator. Exiting..')
             exit 2
           end
         end
 
         if is_running_on_emulator
-          EmulatorCommander.disable_animations(container_name: container_name)
-          EmulatorCommander.increase_logcat_storage(container_name: container_name)
+          @emulator_commander.disable_animations
+          @emulator_commander.increase_logcat_storage
         end
       end
 
       def kvm_disabled?
         begin
-          DockerCommander.docker_exec(command: 'kvm-ok > kvm-ok.txt', container_name: container_name)
+          @docker_commander.exec(command: 'kvm-ok > kvm-ok.txt')
         rescue StandardError
           # kvm-ok will always throw regardless of the result. therefore we save the output in the file and ignore the error
         end
-        DockerCommander.docker_exec(command: 'cat kvm-ok.txt', container_name: container_name).include?('KVM acceleration can NOT be used')
+        @docker_commander.exec(command: 'cat kvm-ok.txt').include?('KVM acceleration can NOT be used')
       end
 
       # Stops and remove container
@@ -124,15 +127,16 @@ module Fastlane
         print_cpu_load
         begin
           container = create_container_call
-          @container_name = container unless container_name
+          set_container_name(container)
         rescue StandardError
           UI.important("Something went wrong while creating: #{container_name}, will retry in #{@sleep_interval} seconds")
           print_cpu_load
-          DockerCommander.stop_container(container_name: container_name)
-          DockerCommander.delete_container(container_name: container_name)
+          @docker_commander.stop_container
+          @docker_commander.delete_container
+          
           sleep @sleep_interval
           container = create_container_call
-          @container_name = container unless container_name
+          set_container_name(container)
         end
         get_container_instance(container)
       end
@@ -154,7 +158,7 @@ module Fastlane
 
         emulator_args = is_running_on_emulator ? "-p #{no_vnc_port}:6080 -e DEVICE='#{device_name}'" : ''
 
-        DockerCommander.start_container(emulator_args: emulator_args, docker_name: container_name, docker_image: docker_image)
+        @docker_commander.start_container(emulator_args: emulator_args, docker_image: docker_image)
       end
 
       def execute_pre_action
@@ -165,7 +169,7 @@ module Fastlane
       def pull_from_registry
         docker_image_name = docker_image.gsub(':latest', '')
         Actions.sh(@docker_registry_login) if @docker_registry_login
-        DockerCommander.pull_image(docker_image_name: docker_image_name)
+        @docker_commander.pull_image(docker_image_name: docker_image_name)
       end
 
       # Checks that chosen ports are not already allocated. If they are, it will stop the allocated container
@@ -179,8 +183,8 @@ module Fastlane
         if port_open?('0.0.0.0', @no_vnc_port)
           UI.important('Something went wrong. VNC port is still busy')
           sleep @sleep_interval
-          DockerCommander.stop_container(container_name: container_name)
-          DockerCommander.delete_container(container_name: container_name)
+          @docker_commander.stop_container
+          @docker_commander.delete_container
         end
       end
 
@@ -281,6 +285,13 @@ module Fastlane
         raise "CPU was overloaded. Couldn't start emulator"
       end
 
+      # if we do not have container name, we cane use container ID that we got from create call
+      def set_container_name(container)
+        unless container_name
+          @container_name = @emulator_commander.container_name = @docker_commander.container_name = container
+        end
+      end
+
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Mango
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-mango
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Serghei Moret, Daniel Hartwich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api