fastlane-plugin-android_emulator 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c342be284340d90d3080c8548d3eeeeabb7d0c36f59029f2e8e8e9e762a64dca
-  data.tar.gz: 67f0593397dbe0179bbee05734668e3bc1ca38ffd9da6ed1780608c127f93e55
+  metadata.gz: beb865e27d0b2be0c355ddba749cc7097993f89bfae2804f6c99151eed0f013c
+  data.tar.gz: 9ec7938d8ccc8846b5b3404412105207c772d03151082286e3a82a7f6ab2f182
 SHA512:
-  metadata.gz: 25a713f0b52b55c5b78342cd3f977b68874e29239c5f6b2686abb9268d353241b3637b6b5e5be254424be7cd7b7556b2d34668f7a0c8168c5c46324aa4656796
-  data.tar.gz: 7385cc4e351984156f4f14f98b0e899f9a255345c56605f73e65d10260120e0ee911cc0124a1bb0a0242c35c182a9b4915a86c08f41034394679da40e144da4c
+  metadata.gz: ca1b197134b7bea5b817bc47678099579d4d1eb63a7aeb559cacf3546dbdb6d66029c9f0ff474ddbc363b9f50833812408d3eeb36a08be8076cfcd59df179805
+  data.tar.gz: 376f98f5022bc8e3194f8a6be1064dc3f100def542cc99e94f0521f0fe7788ded3ba0653e3d30e28faa3ae361893a70d4f2d77634cc45c048e1402998bb05246

data/README.md

@@ -16,12 +16,12 @@ Creates and starts a new Android Emulator (AVD)
 
 With additional features:
 
-* set location
-* set demo-mode (great for Screengrab 😀)
+- set location
+- set demo-mode (great for Screengrab 😀)
 
 ## Example
 
-**Available Options:** sdk_dir, package, name, device, port, location, demo_mode, cold_boot
+**Available Options:** sdk_dir, package, name, device, port, location, demo_mode, cold_boot, additional_options
 
 ```ruby
 android_emulator(
@@ -30,12 +30,14 @@ android_emulator(
 	demo_mode: true,
 	sdk_dir: "PATH_TO_SDK",
 	device: "Nexus 5",
-	cold_boot: false
+	cold_boot: false,
+	additional_options: [
+		"key=value"
+	]
 )
 ```
 
-Or you can use it with our [Android SDK Update Plugin](https://github.com/NovaTecConsulting/fastlane-plugin-android_sdk_update) 
-
+Or you can use it with our [Android SDK Update Plugin](https://github.com/NovaTecConsulting/fastlane-plugin-android_sdk_update)
 
 ```ruby
 ENV["AVD_PACKAGE"] = "system-images;android-24;google_apis;x86_64"
@@ -62,6 +64,7 @@ rake
 ```
 
 To automatically fix many of the styling issues, use
+
 ```
 rubocop -a
 ```

data/lib/fastlane/plugin/android_emulator/actions/android_emulator_action.rb

@@ -4,9 +4,13 @@ require_relative '../helper/android_emulator_helper'
 module Fastlane
   module Actions
     class AndroidEmulatorAction < Action
-      def self.avd_active(params)
+      def self.avd_active(params, config_file)
         image = params[:package].gsub(";", "/")
-        return File.readlines("#{Dir.home}/.android/avd/#{params[:name]}.avd/config.ini").grep(/#{image}/).size > 0
+        if File.exist?(config_file)
+          return File.readlines(config_file).grep(/#{image}/).size > 0
+        else
+          return false
+        end
       end
 
       def self.run(params)
@@ -18,21 +22,41 @@ module Fastlane
         system("#{adb} emu kill > /dev/null 2>&1 &")
         sleep(3)
 
-        if !avd_active(params) || params[:cold_boot]
+        config_file = "#{Dir.home}/.android/avd/#{params[:name]}.avd/config.ini"
+
+        if !avd_active(params, config_file) || params[:cold_boot]
           UI.message("Creating new emulator")
           FastlaneCore::CommandExecutor.execute(
-            command: "#{sdk_dir}/tools/bin/avdmanager create avd -n '#{params[:name]}' -f -k '#{params[:package]}' -d '#{params[:device]}'",
+            command: "#{sdk_dir}/cmdline-tools/latest/bin/avdmanager create avd -n '#{params[:name]}' -f -k '#{params[:package]}' -d '#{params[:device]}'",
             print_all: true,
-            print_command: false
+            print_command: true
           )
 
+          configuration = {}
+          File.readlines(config_file).each do |definition|
+            key, value = definition.split("=")
+            configuration[key.strip] = value.strip
+          end
+
           UI.message("Override configuration")
-          open("#{Dir.home}/.android/avd/#{params[:name]}.avd/config.ini", 'a') { |f|
-            f << "hw.gpu.mode=auto\n"
-            f << "hw.gpu.enabled=yes\n"
-            f << "skin.dynamic=yes\n"
-            f << "skin.name=1080x1920\n"
+          additional = {
+            "hw.gpu.mode" => "auto",
+            "hw.gpu.enabled" => "yes",
+            "skin.dynamic" => "yes",
+            "skin.name" => "1080x1920"
           }
+
+          if params[:additional_options]
+            params[:additional_options].each do |option|
+              key, value = option.split("=")
+              additional[key.strip] = value.strip
+            end
+          end
+
+          configuration = configuration.merge(additional)
+          open(config_file, 'w') do |f|
+            configuration.each { |key, value| f << "#{key.strip}=#{value.strip}\n" }
+          end
         end
 
         # Verify HAXM installed on mac
@@ -46,7 +70,7 @@ module Fastlane
         system("LC_NUMERIC=C; #{sdk_dir}/emulator/emulator @#{params[:name]} -port #{port} > /dev/null 2>&1 &")
         sh("#{adb} -e wait-for-device")
 
-        until Actions.sh("#{adb} -e shell getprop dev.bootcomplete", log: false).strip == "1" do
+        until Actions.sh("#{adb} -e shell getprop dev.bootcomplete", log: false).strip == "1"
           sleep(5)
         end
 
@@ -78,7 +102,8 @@ module Fastlane
             location: "9.1808 48.7771",
             package: "system-images;android-24;google_apis;x86_64",
             demo_mode: true,
-            sdk_dir: "PATH_TO_SDK"
+            sdk_dir: "PATH_TO_SDK",
+            additional_options: []
           )'
         ]
       end
@@ -114,7 +139,7 @@ module Fastlane
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :location,
                                        env_name: "AVD_LOCATION",
-                                       description: "Set location of the the emulator '<longitude> <latitude>'",
+                                       description: "Set location of the emulator '<longitude> <latitude>'",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :demo_mode,
                                        env_name: "AVD_DEMO_MODE",
@@ -125,7 +150,14 @@ module Fastlane
                                        env_name: "AVD_COLD_BOOT",
                                        description: "Create a new AVD every run",
                                        is_string: false,
-                                       default_value: false)
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :additional_options,
+                                       env_name: "AVD_ADDITIONAL_OPTIONS",
+                                       description: "Set additional options of the emulation",
+                                       type: Array,
+                                       is_string: false,
+                                       optional: true)
+
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidEmulator
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_emulator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michael Ruhl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry