fastlane-plugin-mango 1.3.15 → 1.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 789e89cc42d904d6f20d595d4e4e5e536688431cef29839e784e6fbe8dfd7e13
-  data.tar.gz: e4143d7a96c169910ec836972f4362b0244828f1899a7837b33911b62f31e7f3
+  metadata.gz: b7858bdb16a89774de4d49284cb900ec6bfd0b226d42765303a60a1daedc425f
+  data.tar.gz: 3dbfefd9bbf1edd815a7ad68ac260415d34c07adc2665d7027bb06833b8fb033
 SHA512:
-  metadata.gz: '0243850ec81a9f5108d5c6ca0a46770238fced448407bdb0c6abacb734bc7804bedc58880275187908cf2a7993a52c635d84749d155d62265e8401788b53dcd4'
-  data.tar.gz: f0dc414874f535ac73ba139fe5476516bc340d5b66b78fd162b6760ca4f783e4911d18ee4d36bec31032431869d093e6e364756ad7c216e6685bd91ae7846c61
+  metadata.gz: b60056f85329209a5cced72bd0181e023f4e12f1e8d1d058a8456deb956d6ee98a02af9d5eda0891c2d8f62c2ae6d0af8183f39b7c96cab20f78d8071a8a4e99
+  data.tar.gz: ac31d9b3f06da7fa85c100cd8838cb0925730e1135effc8801722ccfb4e7c98dc2651014fa0e40f7b3d15dec13f25ecb0f4ae91781070f3b10a3f0c64fa0f953

data/README.md

@@ -4,7 +4,7 @@
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-mango) [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/xing/mango/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/fastlane-plugin-mango.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-mango)
 
-A fastlane plugin that runs Android tasks on a specified [Docker](https://www.docker.com/) image
+A fastlane plugin that runs Android tasks on a specified [Docker](https://www.docker.com/) image. Can be used for orchestrating android tasks on a CI syste.
 
 <img src="assets/mango_logo.png" alt="Mango Logo" width="256px" height="256px"/>
 
@@ -47,19 +47,26 @@ desc "Run espresso tests on docker images"
    end
 ```
 
-or to this for unit tests or other gradle tasks:
+or to this for unit tests or other gradle tasks(some of the variables are optional):
 ```ruby
 desc "Run unit tests on docker images"
-  lane :Unit_Tests do
-     run_dockerized_task(
-       container_name: "unit_tests_container",
-       port_factor: options[:port_factor],
-       docker_image: "joesss/mango-base:latest",
-       is_running_on_emulator: false,
-       android_task: "./gradlew testDebug",
-       pull_latest_image: true         
-     )
-   end
+  lane :example do
+    run_dockerized_task(
+      container_name: "emulator_#{options[:port_factor]}",
+      port_factor: options[:port_factor],
+      docker_image: 'joesss/mango-base:latest',
+      android_task: './gradlew testDebug',
+      post_actions: 'adb logcat -d > logcat.txt',
+      bundle_install: true,
+      core_amount: '8',
+      workspace_dir: '/root/tests/espresso-tests',
+      docker_registry_login: "docker login -u='USER' -p='PASS' some.docker.com",
+      pull_latest_image: true,
+      pre_action: 'echo $GIT_BRANCH > /root/.branch',
+      vnc_enabled: false,
+      environment_variables: options[:environment_variables] ? options[:environment_variables].split(' ') : ''
+    )
+  end
 ```
 
 Now you can call this new lane by calling `bundle exec fastlane Espresso_Tests`.

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

@@ -11,6 +11,7 @@ module Fastlane
         mango_helper.setup_container
 
         docker_commander = Helper::DockerCommander.new(mango_helper.container_name)
+        Helper::EmulatorLanguage.set(params[:emulator_language], docker_commander) if params[:emulator_language]
 
         failure_buffer_timeout = 5
         timeout_command = "timeout #{params[:maximal_run_time] - failure_buffer_timeout}m"
@@ -22,10 +23,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')
@@ -189,6 +203,12 @@ module Fastlane
                                        description: 'A bool. True for vnc_enabled False for vnc_disabled',
                                        type: Boolean,
                                        default_value: true,
+                                       optional: true),
+
+          FastlaneCore::ConfigItem.new(key: :emulator_language,
+                                       env_name: 'EMULATOR_LANGUAGE',
+                                       description: 'A string that identify a device locale (e.g. de_DE)',
+                                       type: String,
                                        optional: true)
         ]
       end

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
@@ -43,6 +43,10 @@ module Fastlane
 
       def delete_container
         Actions.sh("docker rm -f #{container_name}") if container_name
+      rescue StandardError
+        sleep 5
+        UI.important('Was not able to delete the container after the first attempt, trying again')
+        retry
       end
 
       def disconnect_network_bridge
@@ -52,14 +56,22 @@ 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
       end
 
+      def cp(file:)
+        Actions.sh("docker cp #{file} #{container_name}:/root/tests/.")
+      end
+
       def prune
         Action.sh('docker system prune -f')
       end

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

@@ -0,0 +1,25 @@
+module Fastlane
+  module Helper
+    module EmulatorLanguage
+      def self.set(lang, docker_commander)
+        UI.important("Changing device locale to #{lang}")
+
+        retries ||= 5
+        language = lang.split('_')[0]
+        country = lang.split('_')[1]
+        apk_path = File.join(File.dirname(__FILE__), 'settings.apk')
+        docker_commander.cp(file: apk_path)
+        docker_commander.exec(command: 'adb install /root/tests/settings.apk')
+        docker_commander.exec(command: 'adb shell pm grant io.appium.settings android.permission.CHANGE_CONFIGURATION')
+        docker_commander.exec(command: "adb shell am broadcast -a io.appium.settings.locale -n io.appium.settings/.receivers.LocaleSettingReceiver --es lang #{language} --es country #{country}")
+      rescue StandardError => e
+        raise e if retries.zero?
+
+        puts "Got an exception: #{e.message}. Will retry in 5 seconds"
+        retries -= 1
+        sleep 5
+        retry
+      end
+    end
+  end
+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,6 +206,7 @@ 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|

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Mango
-    VERSION = '1.3.15'.freeze
+    VERSION = '1.3.34'.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.34
 platform: ruby
 authors:
 - Serghei Moret, Daniel Hartwich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-08-03 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: []
@@ -149,13 +149,15 @@ files:
 - lib/fastlane/plugin/mango/helper/cpu_load_handler.rb
 - lib/fastlane/plugin/mango/helper/docker_commander.rb
 - lib/fastlane/plugin/mango/helper/emulator_commander.rb
+- lib/fastlane/plugin/mango/helper/emulator_language.rb
 - lib/fastlane/plugin/mango/helper/mango_helper.rb
+- lib/fastlane/plugin/mango/helper/settings.apk
 - lib/fastlane/plugin/mango/version.rb
 homepage: https://github.com/xing/mango
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +172,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.4
+signing_key:
 specification_version: 4
-summary: This plugin Android tasks on docker images
+summary: This plugin orchtestrates Android tasks on docker images
 test_files: []