fastlane-plugin-automated_test_emulator_run 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4a08b6203a0781bbcd1ec0af9fbeb0bbe243ed
-  data.tar.gz: 9f01308e8fc7f3fe2d5c6e2bc1b43f203c2c4676
+  metadata.gz: 47b69ec230b262c21569fb926c9bb6ad44069cac
+  data.tar.gz: 28f03519649872e9f414ee92db0eb90acd592894
 SHA512:
-  metadata.gz: 940b6378c58e9c8fcf8248855d923e5c2d61b75bf6c3d95f91aaf1b780cf8f33599051efba6103a9d1b485d479f5b90a29880b7967c59c79ced22b95e1cb7dba
-  data.tar.gz: 5b7ebd2ded5fdb2b5c4383638914f57f008529ec48ae35d5de0c57b618ff8249224464e34a6183cfab1ed0a5d6d5de9b0c4a7891682a3967b2dd43b8d9049526
+  metadata.gz: 73fb3d64a9f37728d449c9a5389cc40925088165cfe4ae5a6138df3d77bc86172561ba48aa6ff8f8d197477435eb03422ae202cf15a52d4740832bf3470cf779
+  data.tar.gz: 72ff66992cfc958c71a3eefa64c799e8c8fd78e49f6d1b0c323a1c0582fb9534400b7def37b730c6f2db432d664b2538187f08a1652d9458186aad9fee8f6094

data/lib/fastlane/plugin/automated_test_emulator_run/actions/automated_test_emulator_run_action.rb

@@ -13,10 +13,6 @@ module Fastlane
 
         UI.message("The automated_test_emulator_run plugin is working!")
 
-        # Create output file
-        file = Tempfile.new('emulator_output')
-        UI.message(["Created temp file for emulator output", file.path].join(" ").yellow)
-
         # Find unused port
         port = getUnusedTcpPort
         if params[:avd_port].nil? 
@@ -50,7 +46,7 @@ module Fastlane
         UI.message("Setting up run commands".yellow)
         create_avd_command = ["echo \"no\" |", sdkRoot + "/tools/android", "create avd", avd_name, target_id, avd_abi, avd_tag, avd_create_options].join(" ")
         get_devices_command = sdkRoot + "/tools/android list avd".chomp
-        start_avd_command = [sdkRoot + "/tools/" + emulator_binary, avd_port, "-avd #{params[:avd_name]}", avd_initdata, avd_start_options, "&>#{file.path} &"].join(" ")
+        start_avd_command = [sdkRoot + "/tools/" + emulator_binary, avd_port, "-avd #{params[:avd_name]}", avd_initdata, avd_start_options, " &"].join(" ")
         shell_command = "#{params[:shell_command]}" unless params[:shell_command].nil?
         gradle_task = "#{params[:gradle_task]}" unless params[:gradle_task].nil?
 
@@ -72,29 +68,25 @@ module Fastlane
         UI.message("Starting AVD....".yellow)
 
         emulatorStarted = false
-        begin
-          Action.sh(start_avd_command)
-          emulatorStarted = waitFor_emulatorBoot(sdkRoot, port, params)
-
-          UI.message("Starting tests".green)
-          begin
-            unless shell_command.nil?
-              UI.message("Using shell command".green)
-              Action.sh(shell_command)
-            end
+      
+        Action.sh(start_avd_command)
+        emulatorStarted = waitFor_emulatorBoot(sdkRoot, port, params)
 
-            unless gradle_task.nil?
-              UI.message("Using gradle task".green)
-              gradle.trigger(task: params[:gradle_task], flags: params[:gradle_flags], serial: nil)
-            end
+        UI.message("Starting tests".green)
+        begin
+          unless shell_command.nil?
+            UI.message("Using shell command".green)
+            Action.sh(shell_command)
           end
 
-          if emulatorStarted
-            waitFor_emulatorStop(sdkRoot, port, params, file)
+          unless gradle_task.nil?
+            UI.message("Using gradle task".green)
+            gradle.trigger(task: params[:gradle_task], flags: params[:gradle_flags], serial: nil)
           end
-        ensure
-          file.close
-          file.unlink
+        end
+
+        if emulatorStarted
+          waitFor_emulatorStop(sdkRoot, port, params)
         end
       end
 
@@ -128,7 +120,7 @@ module Fastlane
             currentTime = Time.now
 
             if (currentTime - startTime) >= timeoutInSeconds
-              UI.message("Emulator loading took more than 2 minutes and 30 seconds. Not waiting anymore and trying to run with devices only!".yellow)
+              UI.message("Emulator loading took more than 5 minutes. Not waiting anymore and trying to run with devices only!".yellow)
               return false
             end
 
@@ -140,10 +132,9 @@ module Fastlane
         end
       end
 
-      def self.waitFor_emulatorStop(sdkRoot, port, params, file)
+      def self.waitFor_emulatorStop(sdkRoot, port, params)
           adb = Helper::AdbHelper.new(adb_path: sdkRoot + "/platform-tools/adb")
-          temp = File.open(file.path).read
-
+         
           UI.message("Shutting down emulator...".green)
           adb.trigger(command: "emu kill", serial: "emulator-#{port}")
 
@@ -203,7 +194,7 @@ module Fastlane
                                      optional: true,
                                      conflicting_options: [:shell_command],
                                      is_string: true),
-          
+           
           FastlaneCore::ConfigItem.new(key: :emulator_binary,
                                      env_name: "EMULATOR_BINARY",
                                      description: "Emulator binary file you would like to use in order to start emulator",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AutomatedTestEmulatorRun
-    VERSION = "0.4.4"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-automated_test_emulator_run
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Kamil Krzyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry