fastlane-plugin-create_simulator_devices 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d67f3fc97805357d10286a81d1d7fcbf18ede6af69da32b176c6fcd73ab72a2f
-  data.tar.gz: baf9ecd15c0dc7fbc66c413f61d48f44bf37a6ff32963fb4647cdcf9b586bdeb
+  metadata.gz: '028a321da872a819f1f84bfa2d7d8a33e39c489be64136c40cbb32636034e779'
+  data.tar.gz: a2b0bac0404220a52607287990e7b712c48919db6b0b06c6233ce07c2a134b78
 SHA512:
-  metadata.gz: 8de8e706a371d863ee1646ca85c899ee96c42ce7f94a2c6bb97fabbc579b03af429ddc439356ea7a6d429507e0ccc4c21fda66007ffef6a16fd6925e99ef033f
-  data.tar.gz: ddd40fb588c98656bae804668cc5ee899af6c09fc660a629edc6a6c443f431832375a0e3930dcb27ebc89153d325780386961dc8e4fececb877fb16b2488648a
+  metadata.gz: 9a8e2b2c8c7c42b4c7dac0e21ea6494e5ccd3c349b6be1c3ad36ee59ebeb08e179a68bd16bfde0cb1e7cf0241ffe9e0fbe7cddadd237f5c75dc32850b0100f0c
+  data.tar.gz: 81cfa75b45ad704d9a8ebdd221e7415ca0a48eb07ec9f4040369035ee434dc58325f88c615915356e498039f6e0c00afacf1235538951ee2abd4c8c737b1cf96

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/device.rb

@@ -5,13 +5,15 @@ module Fastlane
     module SimCTL
       # Represents a device.
       class Device
-        attr_accessor :udid, :name, :device_type_identifier, :available
+        attr_accessor :udid, :name, :device_type_identifier, :available, :data_path, :log_path
 
-        def initialize(name:, udid:, device_type_identifier:, available:)
+        def initialize(name:, udid:, device_type_identifier:, available:, data_path:, log_path:) # rubocop:disable Metrics/ParameterLists
           self.name = name
           self.udid = udid
           self.device_type_identifier = device_type_identifier
           self.available = available
+          self.data_path = data_path
+          self.log_path = log_path
         end
 
         def available?
@@ -27,7 +29,9 @@ module Fastlane
             name: hash[:name],
             udid: hash[:udid],
             device_type_identifier: hash[:deviceTypeIdentifier],
-            available: hash[:isAvailable]
+            available: hash[:isAvailable],
+            data_path: hash[:dataPath],
+            log_path: hash[:logPath]
           )
         end
       end

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/runner.rb

@@ -44,7 +44,7 @@ module Fastlane
         end
 
         # Install missing runtimes if needed.
-        runtime_helper.install_missing_runtimes(required_devices)
+        runtime_helper.install_missing_runtimes(required_devices, remove_cached_runtimes: remove_cached_runtimes)
 
         # Create missing devices for required devices.
         create_missing_devices(required_devices)

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/runtime_helper.rb

@@ -39,7 +39,7 @@ module Fastlane
         shell_helper.simctl_devices_for_runtimes(force: true)
       end
 
-      def install_missing_runtimes(required_devices)
+      def install_missing_runtimes(required_devices, remove_cached_runtimes:)
         needed_runtimes = required_devices.filter_map(&:required_runtime).uniq
 
         missing_runtimes = missing_runtimes(needed_runtimes)

data/lib/fastlane/plugin/create_simulator_devices/helpers/gather_simctl_diagnose/runner.rb

@@ -50,13 +50,17 @@ module Fastlane
         end
 
         # Return distinct matched devices strings
-        matched_devices = create_simulator_devices_runner.find_runtime_and_device_for_required_devices(required_devices)
+        matched_simctl_devices = create_simulator_devices_runner.find_runtime_and_device_for_required_devices(required_devices)
           .reject { |required_device| required_device.simctl_device.nil? }
+          .map(&:simctl_device)
 
-        matched_devices_udids = matched_devices.map { |matched_device| matched_device.simctl_device.udid }
+        matched_devices_udids = matched_simctl_devices.map(&:udid)
         UI.message("Available simulator devices: #{matched_devices_udids.join(', ')}")
 
-        temp_output_dir = "#{File.expand_path(output_dir)}/simctl_diagnose_#{Time.now.strftime('%Y%m%d%H%M%S')}"
+        full_output_dir_path = File.expand_path(output_dir)
+        temp_output_dir = "#{full_output_dir_path}/simctl_diagnose"
+
+        FileUtils.mkdir_p(temp_output_dir)
 
         diagnose_args = matched_devices_udids.map { |udid| "--udid=#{udid}" }
         diagnose_args << '-b' # Do NOT show the resulting archive in a Finder window upon completion.
@@ -68,17 +72,42 @@ module Fastlane
 
         collect_diagnose_data_script_path = File.expand_path("#{__dir__}/scripts/collect_simctl_diagnose_data.sh")
 
+        UI.message("Collecting diagnose data to #{temp_output_dir}...")
         shell_helper.sh(
           command: "SIMCTL_DIAGNOSE_OUTPUT_FOLDER=#{temp_output_dir.shellescape} #{collect_diagnose_data_script_path.shellescape} #{cmd_args}",
-          print_command: verbose,
+          print_command: true,
           print_command_output: verbose
         )
 
         archive_name = "#{temp_output_dir}.tar.gz"
         Actions.lane_context[Actions::SharedValues::GATHER_SIMCTL_DIAGNOSE_OUTPUT_FILE] = archive_name
 
+        copy_data_containers_and_logs(matched_simctl_devices, full_output_dir_path) if include_booted_device_data_directory || include_all_device_logs
+
         archive_name
       end
+
+      def copy_data_containers_and_logs(matched_simctl_devices, output_dir)
+        matched_simctl_devices.each do |simctl_device|
+          copy_data_container_and_logs(simctl_device, output_dir)
+        end
+      end
+
+      def copy_data_container_and_logs(simctl_device, output_dir)
+        if File.exist?(simctl_device.data_path)
+          UI.message("Copying data from #{simctl_device.data_path} to #{output_dir}...")
+          shell_helper.sh(
+            command: "tar -czf #{output_dir}/#{simctl_device.name.shellescape}_#{simctl_device.udid.shellescape}_data.tar.gz --cd #{File.dirname(simctl_device.data_path).shellescape} #{File.basename(simctl_device.data_path).shellescape}"
+          )
+        end
+
+        return unless File.exist?(simctl_device.log_path)
+
+        UI.message("Copying logs from #{simctl_device.log_path} to #{output_dir}...")
+        shell_helper.sh(
+          command: "tar -czf #{output_dir}/#{simctl_device.name.shellescape}_#{simctl_device.udid.shellescape}_logs.tar.gz --cd #{File.dirname(simctl_device.log_path).shellescape} #{File.basename(simctl_device.log_path).shellescape}"
+        )
+      end
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Fastlane
   module CreateSimulatorDevices
-    VERSION = '0.0.14'
+    VERSION = '0.0.16'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-create_simulator_devices
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Vitalii Budnik