fastlane-plugin-sentry 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e45e9018f65e93450dd418c3a2ff4568b9098c84c59be28a502f26d088d83c7
-  data.tar.gz: 9bb0b7eb1e0300dc10a1b605b3115838ec234eaf4a361f7a288d5a31d836a568
+  metadata.gz: 6ae029189f96f28c4c0e81d5427cad5fc32a22dc7223e6bb95f11dc4168f4e3e
+  data.tar.gz: a602515e84a17e78d912bf5477971ad032e41e310894c998447647fe9298c4ce
 SHA512:
-  metadata.gz: b1fb02191b9ad8333ff0bee6d3112aed1eca0532dbcdea51fa73aa6e589106003226eb5a65be44b09ee75623b2ffe7fe4df72d58b5bb2566651f2ee63784755c
-  data.tar.gz: f721c6840dc15c23edd3fbe099ecee3e97ec9863667afa1d5dc6453ae08ade79128fd26f3fdce665afce19ac3f923ea41b3b442c110a058c1521a497e928d408
+  metadata.gz: d41ef68814ee11cc6ae5fa12ea7f77bcd332b7fece1df443176a59e937e8fc6dc5178e671d73559e969b86c9242e1731bb37fb3370ebf329a2db64c018f38877
+  data.tar.gz: c6697d4c92339bb72cc668f830b5e5ea6ffaef8ea150cb77f2cb62cf228d1349d183bfc0e950c5a6275b935c758e38a311de13e1525a2fb5c27649336533d148

data/README.md

@@ -12,12 +12,38 @@
 
 ## Getting Started
 
-This project is a [fastlane](https://github.com/fastlane/fastlane) plugin. To get started with fastlane-plugin-sentry, add it to your project by running:
+This project is a [fastlane](https://github.com/fastlane/fastlane) plugin. To get started with fastlane-plugin-sentry, you can either add it globally for all projects, or locally to an individual project.
+
+### Globally
+
+If you install the gem globally, you can run it with any project that is setup for using `fastlane`.
+
+```bash
+gem install fastlane-plugin-sentry
+```
+
+Add the actions you want to use to your `Fastfile` file and call `fastlane` to run.
+
+### Locally
+
+You can also add the plugin for individual projects. Navigate to your project where `fastlane` is already set up and run the following command:
 
 ```bash
-fastlane add_plugin sentry
+bundle exec fastlane add_plugin sentry
 ```
 
+Fastlane will guide you through the process. It will add a `Pluginfile` where the sentry plugin is listed and also update the `Gemfile` and `Gemfile.lock` to include it as a dependency.
+
+```ruby
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-sentry'
+```
+
+Add the actions you want to use to your `Fastfile` file and call `bundle exec fastlane` to run.
+
 ## Sentry Actions
 
 A subset of actions provided by the CLI: https://docs.sentry.io/learn/cli/
@@ -56,7 +82,7 @@ Further options:
 - __derived_data__: Optional. Search for debug symbols in Xcode's derived data.
 - __no_zips__: Do not search in ZIP files.
 - __info_plist__: Optional. Optional path to the Info.plist. We will try to find this automatically if run from Xcode.  Providing this information will associate the debug symbols with a specific ITC application and build in Sentry.  Note that if you provide the plist explicitly it must already be processed.
-- __no_reprocessing__: Optional. Do not trigger reprocessing after uploading.                           
+- __no_reprocessing__: Optional. Do not trigger reprocessing after uploading.
 - __force_foreground__: Optional. Wait for the process to finish. By default, the upload process will detach and continue in the background when triggered from Xcode.  When an error happens, a dialog is shown.  If this parameter is passed Xcode will wait for the process to finish before the build finishes and output will be shown in the Xcode build output.
 - __include_sources__: Optional. Include sources from the local file system and upload them as source bundles.
 - __wait__: Wait for the server to fully process uploaded files. Errors can only be displayed if --wait is specified, but this will significantly slow down the upload process.
@@ -119,7 +145,7 @@ sentry_upload_sourcemap(
   app_identifier: '...', # pass in the bundle_identifer of your app
   build: '...', # Optionally pass in the build number of your app
   dist: '...', # optional distribution of the release usually the buildnumber
-  sourcemap: 'main.jsbundle.map', # sourcemap to upload
+  sourcemap: 'main.jsbundle.map', # Sourcemap(s) to upload. Path(s) can be a comma-separated string or an array of strings.
   rewrite: true
 )
 ```
@@ -174,6 +200,10 @@ sentry_create_deploy(
 )
 ```
 
+### Specify custom sentry-cli path
+
+Starting with version `1.13.0`, the plugin bundles both macOS and Windows 64 bit executables of `sentry-cli`. You can also specify a custom `sentry-cli` path by adding `sentry_cli_path` to any action.
+
 ### Checking the sentry-cli is installed
 
 Useful for checking that the sentry-cli is installed and meets the minimum version requirements before starting to build your app in your lane.

data/bin/sentry_cli_path

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'os'
+
+if OS.windows?
+  print File.join(__dir__, 'sentry-cli-Windows-x86_64.exe')
+else
+  print File.join(__dir__, 'sentry-cli-Darwin-universal')
+end

data/lib/fastlane/plugin/sentry/actions/sentry_upload_dsym.rb

@@ -84,7 +84,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/sentry/actions/sentry_upload_sourcemap.rb

@@ -10,15 +10,15 @@ module Fastlane
         version = "#{params[:app_identifier]}@#{params[:version]}" if params[:app_identifier]
         version = "#{version}+#{params[:build]}" if params[:build]
 
-        sourcemap = params[:sourcemap]
+        sourcemaps = params[:sourcemap]
 
         command = [
           "releases",
           "files",
           version,
-          "upload-sourcemaps",
-          sourcemap.to_s
+          "upload-sourcemaps"
         ]
+        command += sourcemaps
 
         command.push('--rewrite') if params[:rewrite]
         command.push('--no-rewrite') unless params[:rewrite]
@@ -52,12 +52,12 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Upload a sourcemap to a release of a project on Sentry"
+        "Upload one or more sourcemap(s) to a release of a project on Sentry"
       end
 
       def self.details
         [
-          "This action allows you to upload a sourcemap to a release of a project on Sentry.",
+          "This action allows you to upload one or more sourcemap(s) to a release of a project on Sentry.",
           "See https://docs.sentry.io/learn/cli/releases/#upload-sourcemaps for more information."
         ].join(" ")
       end
@@ -79,9 +79,12 @@ module Fastlane
                                        description: "Distribution in release",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :sourcemap,
-                                       description: "Path to the sourcemap to upload",
-                                       verify_block: proc do |value|
-                                         UI.user_error! "Could not find sourcemap at path '#{value}'" unless File.exist?(value)
+                                       description: "Path or an array of paths to the sourcemap(s) to upload",
+                                       type: Array,
+                                       verify_block: proc do |values|
+                                         [*values].each do |value|
+                                           UI.user_error! "Could not find sourcemap at path '#{value}'" unless File.exist?(value)
+                                         end
                                        end),
           FastlaneCore::ConfigItem.new(key: :rewrite,
                                        description: "Rewrite the sourcemaps before upload",

data/lib/fastlane/plugin/sentry/helper/sentry_config.rb

@@ -75,8 +75,10 @@ module Fastlane
         if has_org && has_project
           ENV['SENTRY_ORG'] = Shellwords.escape(org) unless org.to_s.empty?
           ENV['SENTRY_PROJECT'] = Shellwords.escape(project) unless project.to_s.empty?
-        else
-          UI.important("No org/project config provided, will fallback to .sentryclirc")
+        elsif !has_org
+          UI.important("Missing 'org_slug' parameter. Provide both 'org_slug' and 'project_slug'. Falling back to .sentryclirc")
+        elsif !has_project
+          UI.important("Missing 'project_slug' parameter. Provide both 'org_slug' and 'project_slug'. Falling back to .sentryclirc")
         end
       end
 

data/lib/fastlane/plugin/sentry/helper/sentry_helper.rb

@@ -2,27 +2,19 @@ module Fastlane
   module Helper
     class SentryHelper
       def self.find_and_check_sentry_cli_path!(params)
-        sentry_path = params[:sentry_cli_path] || FastlaneCore::CommandExecutor.which('sentry-cli')
-        if sentry_path.nil?
-          UI.error("You have to install sentry-cli version #{Fastlane::Sentry::CLI_VERSION} to use this plugin")
-          UI.error("")
-          UI.error("Install it using:")
-          UI.command("brew install getsentry/tools/sentry-cli")
-          UI.error("OR")
-          UI.command("curl -sL https://sentry.io/get-cli/ | bash")
-          UI.error("If you don't have homebrew, visit http://brew.sh")
-          UI.user_error!("Install sentry-cli and start your lane again!")
-        end
+        bundled_sentry_cli_path = `bundle exec sentry_cli_path`
+        bundled_sentry_cli_version = Gem::Version.new(`#{bundled_sentry_cli_path} --version`.scan(/(?:\d+\.?){3}/).first)
+
+        sentry_cli_path = params[:sentry_cli_path] || bundled_sentry_cli_path
 
-        sentry_cli_version = Gem::Version.new(`#{sentry_path} --version`.scan(/(?:\d+\.?){3}/).first)
+        sentry_cli_version = Gem::Version.new(`#{sentry_cli_path} --version`.scan(/(?:\d+\.?){3}/).first)
 
-        required_version = Gem::Version.new(Fastlane::Sentry::CLI_VERSION)
-        if sentry_cli_version < required_version
-          UI.user_error!("Your sentry-cli is outdated, please upgrade to at least version #{Fastlane::Sentry::CLI_VERSION} and start your lane again!")
+        if sentry_cli_version < bundled_sentry_cli_version
+          UI.user_error!("Your sentry-cli is outdated, please upgrade to at least version #{bundled_sentry_cli_version} and start your lane again!")
         end
 
-        UI.success("sentry-cli #{sentry_cli_version} installed!")
-        sentry_path
+        UI.success("Using sentry-cli #{sentry_cli_version}")
+        sentry_cli_path
       end
 
       def self.call_sentry_cli(params, sub_command)
@@ -30,43 +22,39 @@ module Fastlane
         command = [sentry_path] + sub_command
         UI.message "Starting sentry-cli..."
         require 'open3'
+
+        final_command = command.map { |arg| Shellwords.escape(arg) }.join(" ")
+
         if FastlaneCore::Globals.verbose?
-          UI.verbose("sentry-cli command:\n\n")
-          UI.command(command.to_s)
-          UI.verbose("\n\n")
+          UI.command(final_command)
         end
-        final_command = command.map { |arg| Shellwords.escape(arg) }.join(" ")
-        out = []
-        error = []
-        Open3.popen3(final_command) do |stdin, stdout, stderr, wait_thr|
-          while (line = stdout.gets)
-            out << line
-            UI.message(line.strip!)
-          end
-          while (line = stderr.gets)
-            error << line.strip!
-          end
-          exit_status = wait_thr.value
-          unless exit_status.success? && error.empty?
-            handle_error(error)
+
+        Open3.popen3(final_command) do |stdin, stdout, stderr, status_thread|
+          out_reader = Thread.new do
+            output = []
+
+            stdout.each_line do |line|
+              l = line.strip!
+              UI.message(l)
+              output << l
+            end
+
+            output.join
           end
-        end
-        out.join
-      end
 
-      def self.handle_error(errors)
-        fatal = false
-        for error in errors do
-          if error
-            if error =~ /error/
-              UI.error(error.to_s)
-              fatal = true
-            else
-              UI.verbose(error.to_s)
+          err_reader = Thread.new do
+            stderr.each_line do |line|
+              UI.message(line.strip!)
             end
           end
+
+          unless status_thread.value.success?
+            UI.user_error!('Error while calling Sentry CLI')
+          end
+
+          err_reader.join
+          out_reader.value
         end
-        UI.user_error!('Error while calling Sentry CLI') if fatal
       end
     end
   end

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

@@ -1,6 +1,5 @@
 module Fastlane
   module Sentry
-    VERSION = "1.12.0"
-    CLI_VERSION = "1.72.0"
+    VERSION = "1.13.0"
   end
 end

data/lib/fastlane/plugin/sentry.rb

@@ -2,7 +2,7 @@ require 'fastlane/plugin/sentry/version'
 
 module Fastlane
   module Sentry
-    # Return all .rb files inside the "actions" and "helper" directory
+    # Return all .rb files inside the "actions" and "helper"  directory
     def self.all_classes
       Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
     end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sentry
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Sentry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,12 +102,16 @@ dependencies:
         version: '0'
 description: 
 email: hello@sentry.io
-executables: []
+executables:
+- sentry_cli_path
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/sentry-cli-Darwin-universal
+- bin/sentry-cli-Windows-x86_64.exe
+- bin/sentry_cli_path
 - lib/fastlane/plugin/sentry.rb
 - lib/fastlane/plugin/sentry/actions/sentry_check_cli_installed.rb
 - lib/fastlane/plugin/sentry/actions/sentry_create_deploy.rb
@@ -114,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="