fastlane-plugin-android_emulator 0.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ae1d26eff6437f47f28af479ac38c7f73e549a8
-  data.tar.gz: b23b045f89541ecdc445ee78e1dbbdcd7f75e3ce
+SHA256:
+  metadata.gz: c342be284340d90d3080c8548d3eeeeabb7d0c36f59029f2e8e8e9e762a64dca
+  data.tar.gz: 67f0593397dbe0179bbee05734668e3bc1ca38ffd9da6ed1780608c127f93e55
 SHA512:
-  metadata.gz: 8ed7317eb7423db1d580c363a6948b7fce3d9d73319c3230cb292eff0e304c6102e2266f2c2f0e5d0b283ca10812775d819392269090eb91e47e83fb819c078a
-  data.tar.gz: 06c221714b1856cb5cfb19f5d52f1461beabe0fb9d68f7e7ecb8d78b45d148a3e0717bbefe9faa50f46f25e3c59e1b8f8e9a5d9a15b0ebd347ee6e4ea04f4940
+  metadata.gz: 25a713f0b52b55c5b78342cd3f977b68874e29239c5f6b2686abb9268d353241b3637b6b5e5be254424be7cd7b7556b2d34668f7a0c8168c5c46324aa4656796
+  data.tar.gz: 7385cc4e351984156f4f14f98b0e899f9a255345c56605f73e65d10260120e0ee911cc0124a1bb0a0242c35c182a9b4915a86c08f41034394679da40e144da4c

data/README.md

@@ -13,6 +13,7 @@ fastlane add_plugin android_emulator
 ## About android_emulator
 
 Creates and starts a new Android Emulator (AVD)
+
 With additional features:
 
 * set location
@@ -20,12 +21,16 @@ With additional features:
 
 ## Example
 
+**Available Options:** sdk_dir, package, name, device, port, location, demo_mode, cold_boot
+
 ```ruby
 android_emulator(
 	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",
+	device: "Nexus 5",
+	cold_boot: false
 )
 ```
 
@@ -39,11 +44,12 @@ ENV["AVD_PACKAGE"] = "system-images;android-24;google_apis;x86_64"
  android_sdk_update(
 	additional_packages: [
 		ENV["AVD_PACKAGE"],
-        "emulator"]
+		"emulator"
+	]
 )
 
 android_emulator(
- 	location: '9.1808 48.7771'
+	location: '9.1808 48.7771'
 )
 ```
 

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

@@ -3,45 +3,50 @@ require_relative '../helper/android_emulator_helper'
 
 module Fastlane
   module Actions
-    module SharedValues
-      ANDROID_SDK_DIR = :ANDROID_SDK_DIR
-    end
-
     class AndroidEmulatorAction < Action
+      def self.avd_active(params)
+        image = params[:package].gsub(";", "/")
+        return File.readlines("#{Dir.home}/.android/avd/#{params[:name]}.avd/config.ini").grep(/#{image}/).size > 0
+      end
+
       def self.run(params)
         sdk_dir = params[:sdk_dir]
+        port = params[:port]
         adb = "#{sdk_dir}/platform-tools/adb"
 
         UI.message("Stopping emulator")
         system("#{adb} emu kill > /dev/null 2>&1 &")
-
-        UI.message("Creating new emulator")
-        FastlaneCore::CommandExecutor.execute(
-          command: "#{sdk_dir}/tools/bin/avdmanager create avd -n '#{params[:name]}' -f -k '#{params[:package]}' -d 'Nexus 5'",
-          print_all: true,
-          print_command: false
-        )
-
-        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"
-        }
+        sleep(3)
+
+        if !avd_active(params) || 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]}'",
+            print_all: true,
+            print_command: false
+          )
+
+          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"
+          }
+        end
 
         # Verify HAXM installed on mac
         if FastlaneCore::Helper.mac?
           kextstat = Actions.sh("kextstat", log: false)
 
-          UI.user_error! "Please install the HAXM-Extension" unless kextstat.include?("intel")
+          UI.important("Please install the HAXM-Extension for better performance") unless kextstat.include?("intel")
         end
 
         UI.message("Starting emulator")
-        system("LC_NUMERIC=C; #{sdk_dir}/tools/emulator @#{params[:name]} > /dev/null 2>&1 &")
+        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 init.svc.bootanim", log: false).include? "stopped" do
+        until Actions.sh("#{adb} -e shell getprop dev.bootcomplete", log: false).strip == "1" do
           sleep(5)
         end
 
@@ -55,6 +60,8 @@ module Fastlane
           sh("#{adb} -e shell settings put global sysui_demo_allowed 1")
           sh("#{adb} -e shell am broadcast -a com.android.systemui.demo -e command clock -e hhmm 0700")
         end
+
+        ENV['SCREENGRAB_SPECIFIC_DEVICE'] = "emulator-#{port}"
       end
 
       def self.description
@@ -81,7 +88,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :sdk_dir,
                                        env_name: "ANDROID_SDK_DIR",
                                        description: "Path to the Android SDK DIR",
-                                       default_value: Actions.lane_context[SharedValues::ANDROID_SDK_DIR],
+                                       default_value: ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_SDK'],
                                        optional: false,
                                        verify_block: proc do |value|
                                          UI.user_error!("No ANDROID_SDK_DIR given, pass using `sdk_dir: 'sdk_dir'`") unless value and !value.empty?
@@ -95,6 +102,16 @@ module Fastlane
                                        description: "Name of the AVD",
                                        default_value: "fastlane",
                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :device,
+                                        env_name: "AVD_DEVICE",
+                                        description: "Device",
+                                        default_value: "Nexus 5",
+                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :port,
+                                       env_name: "AVD_PORT",
+                                       description: "Port of the emulator",
+                                       default_value: "5554",
+                                       optional: false),
           FastlaneCore::ConfigItem.new(key: :location,
                                        env_name: "AVD_LOCATION",
                                        description: "Set location of the the emulator '<longitude> <latitude>'",
@@ -103,7 +120,12 @@ module Fastlane
                                        env_name: "AVD_DEMO_MODE",
                                        description: "Set the emulator in demo mode",
                                        is_string: false,
-                                       default_value: true)
+                                       default_value: true),
+          FastlaneCore::ConfigItem.new(key: :cold_boot,
+                                       env_name: "AVD_COLD_BOOT",
+                                       description: "Create a new AVD every run",
+                                       is_string: false,
+                                       default_value: false)
         ]
       end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_emulator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Ruhl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.78.0
-description: 
+description:
 email: michael.ruhl@novatec-gmbh.de
 executables: []
 extensions: []
@@ -152,7 +152,7 @@ homepage: https://github.com/NovaTecConsulting/fastlane-plugin-android_emulator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Creates and starts an Android Emulator (AVD)
 test_files: []