fastlane-plugin-create_simulator_devices 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b2c73d26a678b6c2871d2749da24233ff2d889d4b089eee2cbf25edf5b8de4d
-  data.tar.gz: 16a9a49267d3820cac3ca95ee16160657f589d785bf56b040d37ae9b92b8c865
+  metadata.gz: 8bf78a070d8cc87783033a6d6dfb1c778a2cacc388cf0e5f691308955e94f848
+  data.tar.gz: 1a4fae00d92ff2e0c1f2a15a3f0804cb519fc9e2cedafa98e183ab0da6d39b74
 SHA512:
-  metadata.gz: ca21d83129049ad9a69689ed417bf4b333b55b3a08facc8c09d2992bf475da42818b53367a28a56423c8887073c5922f883d433c36688f79f44165c744e6a072
-  data.tar.gz: 145a144f2da681665e846dfdc7a348ef52883df996f64c6498d17a08edb6fe86c9959e119a5bb16d51b6ae2c8f64cb21831db666603eb9bc2fbb5567939a063a
+  metadata.gz: b47dc812e54c36acd0a95131838b5f45b0ab2fc9422965c961b4002acfdaf275ac9e1a870336a778043908cb62da3e6656ae3feb29c657bee6b80200dc320a24
+  data.tar.gz: e21033bc755e645677f98e54ddb553cafbaf674ac01e6d34bd07dce967b17a2f1c5459c0928d0edf06de002abae337940e122bff507c63850a85101d749d2771

data/lib/fastlane/plugin/create_simulator_devices/actions/gather_simctl_diagnose_action.rb

@@ -46,7 +46,8 @@ module Fastlane
           output_dir: params[:output_dir],
           timeout: params[:timeout],
           include_all_device_logs: params[:include_all_device_logs],
-          include_booted_device_data_directory: params[:include_booted_device_data_directory]
+          include_booted_device_data_directory: params[:include_booted_device_data_directory],
+          include_nonbooted_device_data_directory: params[:include_nonbooted_device_data_directory]
         )
 
         runner.run(required_devices)
@@ -127,6 +128,12 @@ module Fastlane
                                          description: 'Include booted device data directory. Warning: May include private information, app data containers, and increases the size of the archive! Default is NOT to collect the data container',
                                          type: Boolean,
                                          optional: true,
+                                         default_value: false),
+          ::FastlaneCore::ConfigItem.new(key: :include_nonbooted_device_data_directory,
+                                         env_name: 'GATHER_SIMCTL_DIAGNOSE_INCLUDE_NONBOOTED_DEVICE_DATA_DIRECTORY',
+                                         description: 'Include non-booted device data directory. Warning: May include private information, app data containers, and increases the size of the archive! Default is NOT to collect the data container',
+                                         type: Boolean,
+                                         optional: true,
                                          default_value: false)
         ]
       end

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

@@ -5,13 +5,16 @@ 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, :state
 
-        def initialize(name:, udid:, device_type_identifier:, available:)
+        def initialize(name:, udid:, device_type_identifier:, available:, data_path:, log_path:, state:) # 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
+          self.state = state
         end
 
         def available?
@@ -27,7 +30,10 @@ 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],
+            state: hash[:state]
           )
         end
       end

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

@@ -12,7 +12,8 @@ module Fastlane
     class Runner
       UI = ::Fastlane::UI unless defined?(UI)
 
-      attr_accessor :shell_helper, :verbose, :runtime_helper, :device_naming_style, :create_simulator_devices_runner, :output_dir, :timeout, :include_all_device_logs, :include_booted_device_data_directory, :print_command, :print_command_output
+      attr_accessor :shell_helper, :verbose, :runtime_helper, :device_naming_style, :create_simulator_devices_runner, :output_dir, :timeout, :include_all_device_logs, :include_booted_device_data_directory, :print_command, :print_command_output,
+                    :include_nonbooted_device_data_directory
 
       def initialize( # rubocop:disable Metrics/ParameterLists
         runtime_helper:,
@@ -23,7 +24,8 @@ module Fastlane
         output_dir:,
         timeout:,
         include_all_device_logs:,
-        include_booted_device_data_directory:
+        include_booted_device_data_directory:,
+        include_nonbooted_device_data_directory:
       )
         self.shell_helper = shell_helper
         self.verbose = verbose
@@ -34,6 +36,7 @@ module Fastlane
         self.timeout = timeout
         self.include_all_device_logs = include_all_device_logs
         self.include_booted_device_data_directory = include_booted_device_data_directory
+        self.include_nonbooted_device_data_directory = include_nonbooted_device_data_directory
       end
 
       def run(devices) # rubocop:disable Metrics/AbcSize
@@ -50,13 +53,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 +75,44 @@ 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_nonbooted_device_data_directory
+
         archive_name
       end
+
+      def copy_data_containers_and_logs(matched_simctl_devices, output_dir)
+        matched_simctl_devices
+          .reject { |simctl_device| simctl_device.state == 'Booted' }
+          .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.15'
+    VERSION = '0.0.17'
   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.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Vitalii Budnik