fastlane-plugin-android_testlab_script_swit 0.1.933 → 0.1.935

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98327db5dc73a4fcfd461f5a436ca9b449fe7e94dd41b01655782acd0c146c3f
-  data.tar.gz: ed4b920cb831ff2ba7319e0c4d757249967800359dff30faac6156a7905ff0a8
+  metadata.gz: 56bcf5c2ad3bcf5ef463227a72acd7dc662dcbb7a2b64b8faa5d087d107fa43b
+  data.tar.gz: aa1a698bdb13fc4f82c0f6ddc99eae6c0e54c28631d4fc5e3bdbdf1673c03858
 SHA512:
-  metadata.gz: 72bb8822e1da662b01a72aefb36cd03753a8f59d5b7ebc85f793693a707564eec78a103d0cee0ea979c47b8c75548257758e760b4643c89953fc4d27962feef9
-  data.tar.gz: 2060b04b4189f035665cfc24a0c4019f24630b1886515748973a8854a72ac5e2095ae3f041a62909014e474862d9dccdeb63426f3a7b25f3be530e014985fba5
+  metadata.gz: 9ee25e6d62df9b70039986b3c7ebe46e8624f48ecfff34acc66bb5c4bd1be0c52a252fc853a789e9a809e80bd74c537b6402536623599e47f0eb6ed84a23b97a
+  data.tar.gz: a93e77a0738b90e76ee6d9add3484f7adfeb4716b41cc7160e7224ea4302936aacbf9673cda4c86e3d1c7b586ac7655cc2559f3c38e39945314ea118febf212c

data/lib/fastlane/plugin/android_testlab_script_swit/actions/android_testlab_script_swit_action.rb

@@ -7,16 +7,6 @@ require 'httparty'
 module Fastlane
   module Actions
     class AndroidTestlabScriptSwitAction < Action
-
-        def self.measure_time
-          start_time = Time.now
-          yield
-          end_time = Time.now
-          duration_sec_total = (end_time - start_time).round(1)
-          duration_min = (duration_sec_total / 60).round(1)
-          duration_sec = duration_sec_total % 60
-          return "총 #{duration_min}분 테스트"
-      end
         
       # actions run
       def self.run(params)
@@ -24,99 +14,65 @@ module Fastlane
         UI.message("Start Action")
         UI.message("********************************")
         
-        # TestLab 작업 및 작업 소요시간 측정
-        duration = measure_time do
-            
-            # Result Bucket & Dir
-            results_bucket = params[:firebase_test_lab_results_bucket] || "#{params[:project_id]}_test_results"
-            results_dir = params[:firebase_test_lab_results_dir] || "firebase_test_result_#{DateTime.now.strftime('%Y-%m-%d-%H:%M:%S')}"
-
-            # Set Target Project ID
-            Helper.config(params[:project_id])
-
-            # Activate service account
-            Helper.authenticate(params[:gcloud_key_file])
-
-            # RoboScriptOption
-            robo_script_option = params[:robo_script_path].nil? ? "" : "--robo-script #{params[:robo_script_path]} "
-            
-            # Run Firebase Test Lab
-            Helper.run_tests(params[:gcloud_components_channel], "--type #{params[:type]} "\
-                      "--app #{params[:app_apk]} "\
-                      "#{"--test #{params[:app_test_apk]} " unless params[:app_test_apk].nil?}"\
-                      "#{"--use-orchestrator " if params[:type] == "instrumentation" && params[:use_orchestrator]}"\
-                      "#{params[:devices].map { |d| "--device model=#{d[:model]},version=#{d[:version]},locale=#{d[:locale]},orientation=#{d[:orientation]} " }.join}"\
-                      "--timeout #{params[:timeout]} "\
-                      "--results-bucket #{results_bucket} "\
-                      "--results-dir #{results_dir} "\
-                      "#{params[:extra_options]} "\
-                      "#{robo_script_option}"\
-                      "--format=json 1>#{Helper.if_need_dir(params[:console_log_file_name])}"
-            )
-            
-            # Fetch results
-            download_dir = params[:download_dir]
-            if download_dir
-              UI.message("Fetch results from Firebase Test Lab results bucket")
-              json.each do |status|
-                axis = status["axis_value"]
-                Helper.if_need_dir("#{download_dir}/#{axis}")
-                Helper.copy_from_gcs("#{results_bucket}/#{results_dir}/#{axis}", download_dir)
-                Helper.set_public("#{results_bucket}/#{results_dir}/#{axis}")
-              end
-            end
-            
-        end
-        
-        # Swit Result PayLoad
-        swit_device_payload = ""
-
-        # Swit Send PayLoad - 테스트 시간 추가
-        swit_webhook_payload = params[:swit_webhook_payload][0..-5] + ','
-        swit_device_payload += "{\"type\":\"rt_section\",\"indent\":1,\"elements\":[{\"type\":\"rt_text\",\"content\":\"테스트 시간 : \"},{\"type\":\"rt_text\",\"content\":\"#{duration}\",\"styles\":{\"bold\":true}}]},"
-
-        # Firebase Test Lab Result Json
-        resultJson = File.read(params[:console_log_file_name])
-
-        swit_device_payload = resultJson.map.with_index do |item, device_index|
-          axis_value_parts = item["axis_value"].split('-')
-          outcome = item["outcome"]
-
-          model         = axis_value_parts[0]
-          version       = axis_value_parts[1]
-          locale        = axis_value_parts[2]
-          orientation   = axis_value_parts[3]
-              
-          # 디바이스 정보
-          device_payload =
-              "[{\"type\":\"rt_section\",\"indent\":1,\"elements\":[{\"type\":\"rt_text\",\"content\":\"#{model}\"}]}, " +
-              "{\"type\":\"rt_section\",\"indent\":2,\"elements\":[{\"type\":\"rt_text\", \"content\": \"OS: #{version} / Locale: #{locale} / Orientation: #{orientation}\"}]}, "
-              
-          # 성공 여부
-          if outcome == 'Passed'
-            device_payload +=
-              "{\"type\":\"rt_section\",\"elements\":[{\"type\":\"rt_text\",\"content\":\"결과 : \"},{\"type\":\"rt_emoji\",\"name\":\":tada:\"},{\"type\":\"rt_text\",\"content\":\" Passed \"},{\"type\":\"rt_emoji\",\"name\":\":tada:\"}]}"
-          elsif outcome == 'Failed'
-            device_payload +=
-              "{\"type\":\"rt_section\",\"elements\":[{\"type\":\"rt_text\",\"content\":\"결과 : \"},{\"type\":\"rt_emoji\",\"name\":\":interrobang:\"},{\"type\":\"rt_text\",\"content\":\" Failed \"},{\"type\":\"rt_emoji\",\"name\": \":interrobang:\"}]}"
-          else # Skip or other outcomes
-            device_payload +=
-              "{\"type\":\"rt_section\",\"elements\":[{\"type\":{\"name\": \":bulb:\"}},{\"text\":{\"content\": \" Skipped or other outcomes \"}}, {\"emoji\":{\"name\": \":bulb:\"}}]}"
-          end
+        # Result Bucket & Dir
+        results_bucket = params[:firebase_test_lab_results_bucket] || "#{params[:project_id]}_test_results"
+        results_dir = params[:firebase_test_lab_results_dir] || "firebase_test_result_#{DateTime.now.strftime('%Y-%m-%d-%H:%M:%S')}"
 
-          device_payload += "]"
-          
-        end.join(',')
+        # Set Target Project ID
+        Helper.config(params[:project_id])
 
-        swit_device_payload.chomp!(',')
+        # Activate service account
+        Helper.authenticate(params[:gcloud_key_file])
 
-        # Swit PayLoad 병합
-        swit_webhook_payload += swit_device_payload + ']}]}'
+        # RoboScriptOption
+        robo_script_option = params[:robo_script_path].nil? ? "" : "--robo-script #{params[:robo_script_path]} "
+        
+        # Run Firebase Test Lab
+        
+        # 딜레이
+        params[:devices].each_with_index do |device, index|
+          # 딜레이 추가
+          sleep(index * 60)  # 각 디바이스별로 1분씩 증가하는 딜레이
+
+          # Run Firebase Test Lab for the current device
+          Helper.run_tests(params[:gcloud_components_channel], "--type #{params[:type]} "\
+                            "--app #{params[:app_apk]} "\
+                            "#{"--test #{params[:app_test_apk]} " unless params[:app_test_apk].nil?}"\
+                            "#{"--use-orchestrator " if params[:type] == "instrumentation" && params[:use_orchestrator]}"\
+                            "--device model=#{device[:model]},version=#{device[:version]},locale=#{device[:locale]},orientation=#{device[:orientation]} "\
+                            "--timeout #{params[:timeout]} "\
+                            "--results-bucket #{results_bucket} "\
+                            "--results-dir #{results_dir} "\
+                            "#{params[:extra_options]} "\
+                            "#{robo_script_option}"\
+                            "--format=json 1>#{Helper.if_need_dir(params[:console_log_file_name])}"
+        end
         
-        UI.message(swit_webhook_payload)
-         
-        # Swit WebHook
-        HTTParty.post(params[:swit_webhook_url], body: { body_text: swit_webhook_payload }.to_json, headers: { 'Content-Type' => 'application/json' })
+        
+        #Helper.run_tests(params[:gcloud_components_channel], "--type #{params[:type]} "\
+                  "--app #{params[:app_apk]} "\
+                  "#{"--test #{params[:app_test_apk]} " unless params[:app_test_apk].nil?}"\
+                  "#{"--use-orchestrator " if params[:type] == "instrumentation" && params[:use_orchestrator]}"\
+                  "#{params[:devices].map { |d| "--device model=#{d[:model]},version=#{d[:version]},locale=#{d[:locale]},orientation=#{d[:orientation]} " }.join}"\
+                  "--timeout #{params[:timeout]} "\
+                  "--results-bucket #{results_bucket} "\
+                  "--results-dir #{results_dir} "\
+                  "#{params[:extra_options]} "\
+                  "#{robo_script_option}"\
+                  "--format=json 1>#{Helper.if_need_dir(params[:console_log_file_name])}"
+        #)
+        
+        # Fetch results
+        download_dir = params[:download_dir]
+        if download_dir
+          UI.message("Fetch results from Firebase Test Lab results bucket")
+          json.each do |status|
+            axis = status["axis_value"]
+            Helper.if_need_dir("#{download_dir}/#{axis}")
+            Helper.copy_from_gcs("#{results_bucket}/#{results_dirresults_dir}/#{axis}", download_dir)
+            Helper.set_public("#{results_bucket}/#{results_dir}/#{axis}")
+          end
+        end
 
         UI.message("********************************")
         UI.message("Finish Action")
@@ -215,20 +171,6 @@ module Fastlane
                                          type: String,
                                          optional: false),
 
-            # swit_webhook url (false)
-            FastlaneCore::ConfigItem.new(key: :swit_webhook_url,
-                                         env_name: "SWIT_WEBHOOK_URL",
-                                         description: "The Swit WebHOOK URL",
-                                         type: String,
-                                         optional: true),
-
-            # swit_webhook payload (false)
-            FastlaneCore::ConfigItem.new(key: :swit_webhook_payload,
-                                         env_name: "SWIT_WEBHOOK_PAYLOAD",
-                                         description: "The Swit WebHOOK PAYLOAD",
-                                         type: String,
-                                         optional: true),
-
             # test apk (false)
             FastlaneCore::ConfigItem.new(key: :app_test_apk,
                                          env_name: "APP_TEST_APK",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidTestlabScriptSwit
-    VERSION = "0.1.933"
+    VERSION = "0.1.935"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_testlab_script_swit
 version: !ruby/object:Gem::Version
-  version: 0.1.933
+  version: 0.1.935
 platform: ruby
 authors:
 - 나비이쁜이
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler