fastlane-plugin-instrumented_tests 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f9b58e24abc1295eca1af888789dc922c73d2d
-  data.tar.gz: 3fef50aa36cb239263fec444da4162652fb5d984
+  metadata.gz: 44fb638f00eb58f13471775fe1efa67db839e815
+  data.tar.gz: a2f1a28d771d8f431cedea9f0fa203ef0af45bfe
 SHA512:
-  metadata.gz: f835bf89786381419422ef3895e28a27721237c08b8a3808a994de2ac4844397dc17a0c380d3fe4e5aba810e04d00d936712b5500ed1b2183c71e3f15f6b80ec
-  data.tar.gz: 5c6b0d709dcb145fb48f9c1698d75038dabed3975146ffa0e7fb68384167f67111838820d07d4c386605a566753b065690db25bf77b6d2f583fa1a667dd768bc
+  metadata.gz: 53daa02770fb89b387444ce37be34f0fa145b30dde20507e857b44fd9d6ace9b894fa73871a298f58ddb241bfeb5069c775ad055bf733b6a189d3240f4e47178
+  data.tar.gz: 480a0bfcfef42cef95b847a4249bbefaac5ddf6a76130968e2f174c867bfe1658ffa124af681330d51c83f97b627fadbe2f82a43dac59498a5a594d9e13ec425

data/lib/fastlane/plugin/instrumented_tests/actions/instrumented_tests_action.rb

@@ -8,71 +8,90 @@ module Fastlane
 
     class InstrumentedTestsAction < Action
       def self.run(params)
-        file = Tempfile.new('emulator_output')
+        setup_parameters(params)
+        begin
+          delete_old_emulators(params)
+          create_emulator(params)
+          start_emulator(params)
+
+          begin
+            wait_emulator_boot(params)
+            execute_gradle(params)
+          ensure
+            stop_emulator(params)
+          end
+        ensure
+          @emulator_output.close
+          @emulator_output.unlink
+        end
+      end
+
+      def self.setup_parameters(params)
+        # port must be an even integer number between 5554 and 5680
+        params[:avd_port]=Random.rand(50)*2+5580 if params[:avd_port].nil?
+        raise ":avd_port must be at least 5554" if params[:avd_port]<5554
+        raise ":avd_port must be lower than 5680" if params[:avd_port]>5680
+        raise ":avd_port must be an even number" if params[:avd_port]%2 != 0
+
+        params[:avd_hide]=Helper.is_ci? if params[:avd_hide].nil?
 
-        # Set up params
+        @android_serial="emulator-#{params[:avd_port]}"
+        # maybe create this in a way that the creation and destruction are in the same method
+        @emulator_output = Tempfile.new('emulator_output')
+      end
+
+      def self.delete_old_emulators(params)
+        devices = `#{params[:sdk_path]}/tools/android list avd`.chomp
+
+        unless devices.match(/#{params[:avd_name]}/).nil?
+          Action.sh("#{params[:sdk_path]}/tools/android delete avd -n #{params[:avd_name]}")
+        end
+      end
+
+      def self.create_emulator(params)
         avd_name = "--name \"#{params[:avd_name]}\""
         target_id = "--target #{params[:target_id]}"
         avd_options = params[:avd_options] unless params[:avd_options].nil?
         avd_abi = "--abi #{params[:avd_abi]}" unless params[:avd_abi].nil?
         avd_tag = "--tag #{params[:avd_tag]}" unless params[:avd_tag].nil?
         create_avd = ["#{params[:sdk_path]}/tools/android", "create avd", avd_name, target_id, avd_abi, avd_tag, avd_options].join(" ")
-        start_avd = ["#{params[:sdk_path]}/tools/emulator", "-avd #{params[:avd_name]}", "-gpu on -no-boot-anim &>#{file.path} &"]
-        devices = `#{params[:sdk_path]}/tools/android list avd`.chomp
-
-        # Delete avd if one already exists for clean state.
-        unless devices.match(/#{params[:avd_name]}/).nil?
-          Action.sh("#{params[:sdk_path]}/tools/android delete avd -n #{params[:avd_name]}")
-        end
 
         UI.important("Creating AVD...")
         Action.sh(create_avd)
+      end
 
+      def self.start_emulator(params)
         UI.important("Starting AVD...")
-        begin
-          Action.sh(start_avd)
-
-          # Wait for device to be fully
-          boot_emulator(params)
-
-          begin
-            Fastlane::Actions::GradleAction.run(task: params[:task], flags: params[:flags], project_dir: params[:project_dir], 
-              print_command: true, print_command_output: true)
-          ensure
-            stop_emulator(params, file)
-          end
-        ensure
-          file.close
-          file.unlink
-        end
+        ui_args="-gpu on"
+        ui_args="-gpu on -no-audio -no-window" if params[:avd_hide]
+        start_avd = ["#{params[:sdk_path]}/tools/emulator", "-avd #{params[:avd_name]}", "#{ui_args}", "-port #{params[:avd_port]} &>#{@emulator_output.path} &"]
+        Action.sh(start_avd)
       end
 
-      def self.boot_emulator(params)
+      def self.wait_emulator_boot(params)
         UI.important("Waiting for emulator to finish booting... May take a few minutes...")
+        adb = Helper::AdbHelper.new(adb_path: "#{params[:sdk_path]}/platform-tools/adb")
         loop do
-          bootCompletedCommand = "#{params[:sdk_path]}/platform-tools/adb shell getprop sys.boot_completed" 
-          stdout, _stdeerr, _status = Open3.capture3(bootCompletedCommand)
+          boot_complete_cmd = "ANDROID_SERIAL=#{@android_serial} #{params[:sdk_path]}/platform-tools/adb shell getprop sys.boot_completed" 
+          stdout, _stdeerr, _status = Open3.capture3(boot_complete_cmd)
 
           if stdout.strip == "1"
             UI.success("Emulator Booted!")
             break
           end
+          sleep(1)
         end
       end
 
-      def self.stop_emulator(params, file)
+      def self.execute_gradle(params)
+        Fastlane::Actions::GradleAction.run(task: params[:task], flags: params[:flags], project_dir: params[:project_dir], 
+          serial: @android_serial, print_command: true, print_command_output: true)
+      end
+
+      def self.stop_emulator(params)
         UI.important("Shutting down emulator...")
         adb = Helper::AdbHelper.new(adb_path: "#{params[:sdk_path]}/platform-tools/adb")
-        temp = File.open(file.path).read
-        port = temp.match(/console on port (\d+),/)
-        if port
-          port = port[1]
-        else
-          UI.important("Could not find emulator port number, using default port.")
-          port = "5554"
-        end
-
-        adb.trigger(command: "emu kill", serial: "emulator-#{port}")
+        adb.trigger(command: "emu kill", serial: @android_serial)
 
         UI.success("Deleting emulator...")
         Action.sh("#{params[:sdk_path]}/tools/android delete avd -n #{params[:avd_name]}")
@@ -117,6 +136,16 @@ module Fastlane
                                        description: "The sys-img tag to use for the AVD. The default is to auto-select if the platform has only one tag for its system images",
                                        is_string: true,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :avd_port,
+                                       env_name: "AVD_PORT",
+                                       description: "The port used for communication with the emulator. If not set it is randomly selected",
+                                       is_string: false,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :avd_hide,
+                                       env_name: "AVD_HIDE",
+                                       description: "Hide the avd interface, required for CI. Default true if on CI, false if not on CI",
+                                       is_string: false,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :sdk_path,
                                        env_name: "ANDROID_HOME",
                                        description: "The path to your android sdk directory",
@@ -147,7 +176,7 @@ module Fastlane
       end
 
       def self.authors
-        ["joshrlesch"]
+        ["joshrlesch", "lexxdark"]
       end
 
       def self.is_supported?(platform)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module InstrumentedTests
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-instrumented_tests
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Silviu Paragina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry