fastlane-plugin-debug_file 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079226ebaba880735af3cabaed19276177316c093b6db6d81ddaa9c89279bd81'
-  data.tar.gz: 2c8c6d1e32ca4d7cb468bd8b16339d8e91d5f2074c15efad70c1ac8475b18e10
+  metadata.gz: 6de0426bbcc785a3db2a4483af51de043a9e862a8cb6f792d7ffee43e773bb4d
+  data.tar.gz: 3d296aba5604d577407a2f8c7cb64914e8fd940b83b9a532d16c57617b60e869
 SHA512:
-  metadata.gz: 5375e5d39b154be40cc1e58712bed9d0dce3417f85c3ef0a6abfc0690979e8e342cd484101bc407307120f0955b5ebea87f0d01728a41d339fd6b0e064b64171
-  data.tar.gz: a5e53a19cdf77e09f4f4328a3f18c5e2f8ac8a2bc0618190c012b3b0273c914a584cfc4f9ce3b50a3d2a70df5f12796ff40ae25dfbd9c2b3b1ffe2cea981f126
+  metadata.gz: f8b7037b037a4280d390dc92358c41e81993211b87106274807d2b4c66e3c6a54813c48811d10caa2c2dc528598e503f770e2adef084481b61b854754f8f8c3e
+  data.tar.gz: f20e6363150ab34eba59af8616764f730f3a65a95b7e6e6d13d87dabf8943d4c9285c9d16a792ff800444be6fa516d41a45fd493b6465ae88081a3c13ac9f9c0

data/lib/fastlane/plugin/debug_file/actions/dsym_action.rb

@@ -14,29 +14,32 @@ module Fastlane
       OUTPUT_PATH = '.'
 
       def self.run(params)
-        archive_path = File.expand_path(params[:archive_path])
-        scheme = params[:scheme]
         overwrite = params[:overwrite]
 
-        app_dsym_filename = "#{scheme}.app.dsym"
-
-        output_path = params[:output_path]
-        output_file = File.join(output_path, "#{app_dsym_filename}.zip")
-
-        Helper::DebugFileHelper.determine_output_file(output_file, overwrite)
+        archive_path = params[:archive_path]
+        scheme = params[:scheme]
+        runner = ::DebugFile::Runner.new({
+          archive_path: archive_path,
+          scheme: scheme
+        })
+
+        dsym = runner.latest_dsym
+        unless dsym
+          UI.user_error! "Not matched any archive [#{archive_path}] with scheme [#{scheme}]"
+        end
 
-        archive_dsym_path = last_created_dsym(scheme, archive_path)
-        if archive_dsym_path && !Dir.exist?(archive_dsym_path)
-          UI.user_error! "Not matched any archive with scheme: #{scheme}"
+        Fastlane::UI.success "Selected #{dsym[:name]} #{dsym[:release_version]} (#{dsym[:build]}) - #{dsym[:created_at]}"
+        dsym[:machos].each do |macho|
+          Fastlane::UI.message " • #{macho[:uuid]} (#{macho[:arch]})"
         end
 
-        xcarchive_file = File.basename(File.dirname(archive_dsym_path))
-        xcarchive_info_file = File.join(File.expand_path('../', archive_dsym_path), 'Info.plist')
-        xcarchive_info = Helper::DebugFileHelper.xcarchive_metadata(xcarchive_info_file)
-        release_version, build_version, created_at = version_info(xcarchive_info)
-        UI.success "Selected dSYM archive: #{release_version} (#{build_version}) [#{xcarchive_file}] #{created_at}"
+        app_dsym_filename = File.basename(dsym[:dsym_path])
+        output_file = File.join(params[:output_path], "#{app_dsym_filename}.zip")
+        Helper::DebugFileHelper.determine_output_file(output_file, overwrite)
 
+        archive_dsym_path = File.dirname(dsym[:dsym_path])
         extra_dsym = params[:extra_dsym] || []
+
         dsym_files = [app_dsym_filename].concat(extra_dsym).uniq
         dsym_files.each_with_index do |filename, i|
           path = File.join(archive_dsym_path, filename)
@@ -46,47 +49,15 @@ module Fastlane
             dsym_files.delete_at(i)
           end
         end
-        UI.success "Prepare #{dsym_files.size} dSYM file(s) compressing"
+
+        UI.message "Prepare #{dsym_files.size} dSYM file(s) compressing"
+        UI.verbose dsym_files
         Helper::DebugFileHelper.compress(dsym_files, output_file)
 
         UI.success "Compressed dSYM file: #{output_file}"
         Helper::DebugFileHelper.store_shard_value SharedValues::DF_DSYM_ZIP_PATH, output_file
       end
 
-      def self.last_created_dsym(scheme, archive_path)
-        info_path = File.join(archive_path, '**', '*.xcarchive', 'Info.plist')
-        matched_paths = []
-
-        UI.verbose "Finding #{scheme} xcarchive in #{archive_path} ..."
-        Dir.glob(info_path) do |path|
-          info = Helper::DebugFileHelper.xcarchive_metadata(path)
-          name = Helper::DebugFileHelper.fetch_key(info, 'Name')
-          if scheme == name
-            xcarchive = File.basename(File.dirname(path))
-            release_version, build_version, created_at = version_info(info)
-            UI.verbose " => #{release_version} (#{build_version}) [#{xcarchive}] was created at #{created_at}"
-
-            matched_paths << path
-          end
-        end
-
-        return if matched_paths.empty?
-
-        UI.verbose "Found #{matched_paths.size} matched dSYM archive(s) of #{scheme}"
-        last_created_path = matched_paths.size == 1 ? matched_paths.first : matched_paths.max_by { |p| File.stat(p).mtime }
-        File.join(File.dirname(last_created_path), 'dSYMs')
-      end
-      private_class_method :last_created_dsym
-
-      def self.version_info(info)
-        release_version = Helper::DebugFileHelper.fetch_key(info, 'ApplicationProperties', 'CFBundleShortVersionString')
-        build = Helper::DebugFileHelper.fetch_key(info, 'ApplicationProperties', 'CFBundleVersion')
-        created_at = Helper::DebugFileHelper.fetch_key(info, 'CreationDate')
-
-        [release_version, build, created_at]
-      end
-      private_class_method :version_info
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -100,12 +71,13 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :archive_path,
                                        env_name: 'DF_DSYM_ARCHIVE_PATH',
                                        description: 'The archive path of xcode',
-                                       type: String,
                                        default_value: Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE] || ::DebugFile::Runner::ARCHIVE_PATH,
-                                       optional: true),
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :scheme,
                                        env_name: 'DF_DSYM_SCHEME',
                                        description: 'The scheme name of app',
+                                       optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :extra_dsym,
                                        env_name: 'DF_DSYM_EXTRA_DSYM',

data/lib/fastlane/plugin/debug_file/runner.rb

@@ -19,52 +19,64 @@ module DebugFile
     end
 
     def list_dsym
-      archive_path = File.expand_path(options.fetch(:archive_path, ARCHIVE_PATH))
+      return [fetch_project_info(archive_path)] if project_archive_path? && !options[:scheme]
+
       search_dsym(archive_path, options[:scheme])
     end
 
     private
 
     def search_dsym(path, scheme = nil)
-      info_path = File.join(path, '**', '*.xcarchive', 'Info.plist')
-      matched_paths = []
-
+      project_path = File.join(path, '**', '*.xcarchive')
       obj = []
-      Dir.glob(info_path) do |path|
-        info = Fastlane::Helper::DebugFileHelper.xcarchive_metadata(path)
-        name = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'Name')
-        next unless scheme.to_s.empty? || scheme == name
+      Dir.glob(project_path) do |path|
+        next unless item = fetch_project_info(path, scheme)
 
-        release_version = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'ApplicationProperties', 'CFBundleShortVersionString')
-        build = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'ApplicationProperties', 'CFBundleVersion')
-        dsym_path = Dir.glob(File.join(File.dirname(path), 'dSYMs', "#{name}.app.dSYM", '**', '*', name)).first
-        created_at = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'CreationDate')
+        yield item if block_given?
+        obj << item
+      end
 
-        machos = []
-        Fastlane::Helper::DebugFileHelper.macho_metadata(dsym_path).each do |macho|
-          machos << {
-            arch: macho.cpusubtype,
-            uuid: macho[:LC_UUID][0].uuid_string
-          }
-        end
+      obj
+    end
 
-        item = {
-          root_path: File.basename(File.dirname(path)),
-          dsym_path: dsym_path,
-          machos: machos,
-          info: info,
-          name: name,
-          release_version: release_version,
-          build: build,
-          created_at: created_at,
-        }
+    def fetch_project_info(path, scheme = nil)
+      info = Fastlane::Helper::DebugFileHelper.xcarchive_metadata(File.join(path, 'Info.plist'))
+      name = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'Name')
+      return unless scheme.to_s.empty? || scheme == name
 
-        yield item if block_given?
+      release_version = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'ApplicationProperties', 'CFBundleShortVersionString')
+      build = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'ApplicationProperties', 'CFBundleVersion')
+      dsym_path = File.join(path, 'dSYMs', "#{name}.app.dSYM")
+      dsym_binray_path = Dir.glob(File.join(dsym_path, '**', '*', name)).first
+      created_at = Fastlane::Helper::DebugFileHelper.fetch_key(info, 'CreationDate')
 
-        obj << item
+      machos = []
+      Fastlane::Helper::DebugFileHelper.macho_metadata(dsym_binray_path).each do |macho|
+        machos << {
+          arch: macho.cpusubtype,
+          uuid: macho[:LC_UUID][0].uuid_string
+        }
       end
 
-      obj
+      {
+        root_path: File.basename(File.dirname(path)),
+        dsym_path: dsym_path,
+        machos: machos,
+        info: info,
+        name: name,
+        release_version: release_version,
+        build: build,
+        created_at: created_at,
+      }
+    end
+
+    def project_archive_path?
+      File.file?(File.join(archive_path, 'Info.plist')) &&
+        Dir.exist?(File.join(archive_path, 'dSYMs'))
+    end
+
+    def archive_path
+      @archive_path ||= File.expand_path(options.fetch(:archive_path, ARCHIVE_PATH))
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module DebugFile
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-debug_file
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-macho