fastlane-plugin-sentry 1.4.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '06911d0bda091746e4d3bade971e07af60834d3d'
-  data.tar.gz: a1f76d7091c4c2643a95566b721d3371644f494c
+SHA256:
+  metadata.gz: 44cdcc376ab1d5eb23be4b3df42df41439d9513223d75da50dce1e2bb355b45e
+  data.tar.gz: 2d704986551776f3541123eb35c57b1929f0ed61e43a38c4b8c246de2e84a112
 SHA512:
-  metadata.gz: 1564c04efe1b966ee9a839a594d58ed7742f218fe17946c49a70c060100e187ea83d540e811002c64aaed73ff7e4998c4b38ba6990bda517b3a2f48d79ba9418
-  data.tar.gz: 491d8f2f4709b00788200417bf0ad8a9232bc55bd335b698448e069b208bab9ca004abf2392247acfa0d0fb0c6d656549ef58f7b19ed31bda9e4b2b1c6f85438
+  metadata.gz: 77d45a74189f1150f3ede90a134f7e8b7bf1a62e637fa4631b74dcfac93b7c518593f930c2488bcde7674567b0fd0345647e8dc2379e70eca02057188b97bb84
+  data.tar.gz: d8240c42154fe0fdc00a36c0f6cba559cddf896a1ba3d321c5ece6ee4a863c1271e03a323fa1fe3efe6e4df782716d256494cc5b0184bb389069a30971b8041e

data/README.md

@@ -7,7 +7,7 @@
 </p>
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-sentry)
-[![Build Status](https://img.shields.io/travis/getsentry/fastlane-plugin-sentry/master.svg?style=flat)](https://travis-ci.org/getsentry/fastlane-plugin-sentry)
+[![Tests](https://img.shields.io/github/workflow/status/getsentry/sentry-fastlane/test?label=Tests)](https://github.com/getsentry/sentry-fastlane/actions?query=workflow%3A"test")
 [![Gem Version](https://badge.fury.io/rb/fastlane-plugin-sentry.svg)](https://badge.fury.io/rb/fastlane-plugin-sentry)
 
 ## Getting Started
@@ -38,7 +38,7 @@ sentry_upload_dsym(
   auth_token: '...', # Do not use if using api_key
   org_slug: '...',
   project_slug: '...',
-  symbol_maps: 'path to bcsymbols folder' # use this if you have a bcsymbols folder
+  symbol_maps: 'path to bcsymbols folder', # use this if you have a bcsymbols folder
   dsym_path: './App.dSYM.zip',
   info_plist: '...' # optional, sentry-cli tries to find the correct plist by itself
 )
@@ -91,6 +91,33 @@ sentry_upload_sourcemap(
 )
 ```
 
+#### Uploading Proguard Mapping File
+
+```ruby
+sentry_upload_proguard(
+  api_key: '...', # Do not use if using auth_token
+  auth_token: '...', # Do not use if using api_key
+  org_slug: '...',
+  project_slug: '...',
+  android_manifest_path: 'path to merged AndroidManifest file' # found in `app/build/intermediates/manifests/full`
+  mapping_path: 'path to mapping.txt to upload',
+)
+```
+
+#### Associating commits
+
+Useful for telling Sentry which commits are associated with a release.
+
+```ruby
+sentry_set_commits(
+  version: '...',
+  app_identifier: '...', # pass in the bundle_identifer of your app
+  auto: false, # enable completely automated commit management
+  clear: false, # clear all current commits from the release
+  commit: '...', # commit spec, see `sentry-cli releases help set-commits` for more information
+)
+```
+
 ## Issues and Feedback
 
 For any other issues and feedback about this plugin, please submit it to this repository.
@@ -101,7 +128,7 @@ For some more detailed help with plugins problems, check out the [Plugins Troubl
 
 ## Using `fastlane` Plugins
 
-For more information about how the `fastlane` plugin system works, check out the [Plugins documentation](https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Plugins.md) in the main `fastlane` repo.
+For more information about how the `fastlane` plugin system works, check out the [Plugins documentation](https://docs.fastlane.tools/plugins/create-plugin/) in the main `fastlane` repo.
 
 ## About `fastlane`
 

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

@@ -8,7 +8,7 @@ module Fastlane
         Helper::SentryConfig.parse_api_params(params)
 
         version = params[:version]
-        version = "#{params[:app_identifier]}-#{params[:version]}" if params[:app_identifier]
+        version = "#{params[:app_identifier]}@#{params[:version]}" if params[:app_identifier]
 
         command = [
           "sentry-cli",

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

@@ -8,7 +8,7 @@ module Fastlane
         Helper::SentryConfig.parse_api_params(params)
 
         version = params[:version]
-        version = "#{params[:app_identifier]}-#{params[:version]}" if params[:app_identifier]
+        version = "#{params[:app_identifier]}@#{params[:version]}" if params[:app_identifier]
 
         command = [
           "sentry-cli",

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

@@ -0,0 +1,79 @@
+module Fastlane
+  module Actions
+    class SentrySetCommitsAction < Action
+      def self.run(params)
+        require 'shellwords'
+
+        Helper::SentryHelper.check_sentry_cli!
+        Helper::SentryConfig.parse_api_params(params)
+
+        version = params[:version]
+        version = "#{params[:app_identifier]}@#{params[:version]}" if params[:app_identifier]
+
+        command = [
+          "sentry-cli",
+          "releases",
+          "set-commits",
+          version
+        ]
+
+        command.push('--auto') if params[:auto]
+        command.push('--clear') if params[:clear]
+        command.push('--commit').push(params[:commit]) unless params[:commit].nil?
+
+        Helper::SentryHelper.call_sentry_cli(command)
+        UI.success("Successfully set commits for release: #{version}")
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Set commits of a release"
+      end
+
+      def self.details
+        [
+          "This action allows you to set commits in a release for a project on Sentry.",
+          "See https://docs.sentry.io/cli/releases/#sentry-cli-commit-integration for more information."
+        ].join(" ")
+      end
+
+      def self.available_options
+        Helper::SentryConfig.common_api_config_items + [
+          FastlaneCore::ConfigItem.new(key: :version,
+                                       description: "Release version on Sentry"),
+          FastlaneCore::ConfigItem.new(key: :app_identifier,
+                                      short_option: "-a",
+                                      env_name: "SENTRY_APP_IDENTIFIER",
+                                      description: "App Bundle Identifier, prepended to version",
+                                      optional: true),
+          FastlaneCore::ConfigItem.new(key: :auto,
+                                      description: "Enable completely automated commit management",
+                                      is_string: false,
+                                      default_value: false),
+          FastlaneCore::ConfigItem.new(key: :clear,
+                                      description: "Clear all current commits from the release",
+                                      is_string: false,
+                                      default_value: false),
+          FastlaneCore::ConfigItem.new(key: :commit,
+                                      description: "Commit spec, see `sentry-cli releases help set-commits` for more information",
+                                      optional: true)
+        ]
+      end
+
+      def self.return_value
+        nil
+      end
+
+      def self.authors
+        ["brownoxford"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Fastlane
         file = params[:file]
 
         version = params[:version]
-        version = "#{params[:app_identifier]}-#{params[:version]}" if params[:app_identifier]
+        version = "#{params[:app_identifier]}@#{params[:version]}" if params[:app_identifier]
 
         command = [
           "sentry-cli",

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

@@ -0,0 +1,75 @@
+module Fastlane
+  module Actions
+    class SentryUploadProguardAction < Action
+      def self.run(params)
+        Helper::SentryHelper.check_sentry_cli!
+        Helper::SentryConfig.parse_api_params(params)
+
+        # Params - mapping & manifest
+        mapping_path = params[:mapping_path]
+        android_manifest_path = params[:android_manifest_path]
+
+        # Verify files
+        UI.user_error!("Mapping file does not exist at path: #{mapping_path}") unless File.exist? mapping_path
+        UI.user_error!("AndroidManifest.xml file does not exist at path: #{android_manifest_path}") unless File.exist? android_manifest_path
+
+        command = [
+          "sentry-cli",
+          "upload-proguard",
+          "--android-manifest",
+          android_manifest_path,
+          mapping_path
+        ]
+
+        Helper::SentryHelper.call_sentry_cli(command)
+        UI.success("Successfully uploaded mapping file!")
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Upload mapping to a project on Sentry"
+      end
+
+      def self.details
+        [
+          "This action allows you to upload the proguard mapping file to Sentry.",
+          "See https://docs.sentry.io/cli/dif/proguard for more information."
+        ].join(" ")
+      end
+
+      def self.available_options
+        Helper::SentryConfig.common_api_config_items + [
+          FastlaneCore::ConfigItem.new(key: :mapping_path,
+                                      env_name: "ANDROID_MAPPING_PATH",
+                                      description: "Path to your proguard mapping.txt file",
+                                      optional: false,
+                                      verify_block: proc do |value|
+                                        UI.user_error! "Could not find your mapping file at path '#{value}'" unless File.exist?(value)
+                                      end),
+          FastlaneCore::ConfigItem.new(key: :android_manifest_path,
+                                      env_name: "ANDROID_MANIFEST_PATH",
+                                      description: "Path to your merged AndroidManifest file. This is usually found under `app/build/intermediates/manifests/full`",
+                                      optional: false,
+                                      verify_block: proc do |value|
+                                        UI.user_error! "Could not find your merged AndroidManifest file at path '#{value}'" unless File.exist?(value)
+                                      end)
+        ]
+      end
+
+      def self.return_value
+        nil
+      end
+
+      def self.authors
+        ["mpp-anasa"]
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+    end
+  end
+end

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

@@ -10,23 +10,36 @@ module Fastlane
         version = params[:version]
         sourcemap = params[:sourcemap]
 
-        version = "#{params[:app_identifier]}-#{params[:version]}" if params[:app_identifier]
+        version = "#{params[:app_identifier]}@#{params[:version]}" if params[:app_identifier]
 
         command = [
           "sentry-cli",
           "releases",
           "files",
-          Shellwords.escape(version),
+          version,
           "upload-sourcemaps",
           sourcemap.to_s
         ]
 
         command.push('--rewrite') if params[:rewrite]
+        command.push('--no-rewrite') unless params[:rewrite]
         command.push('--strip-prefix') if params[:strip_prefix]
         command.push('--strip-common-prefix') if params[:strip_common_prefix]
         command.push('--url-prefix').push(params[:url_prefix]) unless params[:url_prefix].nil?
         command.push('--dist').push(params[:dist]) unless params[:dist].nil?
 
+        unless params[:ignore].nil?
+          # normalize to array
+          unless params[:ignore].kind_of?(Enumerable)
+            params[:ignore] = [params[:ignore]]
+          end
+          # no nil or empty strings
+          params[:ignore].reject! { |e| e.strip.empty? rescue true }
+          command.push('--ignore').push(*params[:ignore]) if params[:ignore].any?
+        end
+
+        command.push('--ignore-file').push(params[:ignore_file]) unless params[:ignore_file].nil?
+
         Helper::SentryHelper.call_sentry_cli(command)
         UI.success("Successfully uploaded files to release: #{version}")
       end
@@ -82,6 +95,13 @@ module Fastlane
                                        short_option: "-a",
                                        env_name: "SENTRY_APP_IDENTIFIER",
                                        description: "App Bundle Identifier, prepended to version",
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :ignore,
+                                       description: "Ignores all files and folders matching the given glob or array of globs",
+                                       is_string: false,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :ignore_file,
+                                       description: "Ignore all files and folders specified in the given ignore file, e.g. .gitignore",
                                        optional: true)
 
         ]

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

@@ -41,12 +41,13 @@ module Fastlane
         has_api_key = !api_key.to_s.empty?
         has_auth_token = !auth_token.to_s.empty?
 
-        skip_params_check = false
-        if !has_org || !has_project || !has_auth_token
-          skip_params_check = fallback_sentry_cli
-        end
+        ENV['SENTRY_URL'] = url unless url.to_s.empty?
+        ENV['SENTRY_LOG_LEVEL'] = 'INFO' if FastlaneCore::Globals.verbose?
 
-        if !skip_params_check
+        # Fallback to .sentryclirc if possible when no auth token is provided
+        if !has_api_key && !has_auth_token && fallback_sentry_cli_auth
+            UI.important("No auth config provided, will fallback to .sentryclirc")
+        else
           # Will fail if none or both authentication methods are provided
           if !has_api_key && !has_auth_token
             UI.user_error!("No API key or authentication token found for SentryAction given, pass using `api_key: 'key'` or `auth_token: 'token'`")
@@ -57,21 +58,20 @@ module Fastlane
           end
           ENV['SENTRY_API_KEY'] = api_key unless api_key.to_s.empty?
           ENV['SENTRY_AUTH_TOKEN'] = auth_token unless auth_token.to_s.empty?
-          ENV['SENTRY_URL'] = url unless url.to_s.empty?
-          ENV['SENTRY_LOG_LEVEL'] = 'INFO' if FastlaneCore::Globals.verbose?
+        end
+
+        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 config provided, will fallback to .sentryclirc")
+          UI.important("No org/project config provided, will fallback to .sentryclirc")
         end
       end
 
-      def self.fallback_sentry_cli
+      def self.fallback_sentry_cli_auth
         sentry_cli_result = JSON.parse(`sentry-cli info --config-status-json`)
         return (sentry_cli_result["auth"]["successful"] &&
-          !sentry_cli_result["auth"]["type"].nil? &&
-          !sentry_cli_result["config"]["org"].nil? &&
-          !sentry_cli_result["config"]["project"].nil?)
+          !sentry_cli_result["auth"]["type"].nil?)
       end
     end
   end

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

@@ -33,12 +33,12 @@ module Fastlane
         end
         final_command = command.map { |arg| Shellwords.escape(arg) }.join(" ")
         Open3.popen3(final_command) do |stdin, stdout, stderr, wait_thr|
-          while (line = stderr.gets)
-            error << line.strip!
-          end
           while (line = stdout.gets)
             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)

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

@@ -1,6 +1,6 @@
 module Fastlane
   module Sentry
-    VERSION = "1.4.1"
-    CLI_VERSION = "1.19.1"
+    VERSION = "1.8.1"
+    CLI_VERSION = "1.63.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sentry
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Sentry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -91,8 +91,10 @@ files:
 - lib/fastlane/plugin/sentry.rb
 - lib/fastlane/plugin/sentry/actions/sentry_create_release.rb
 - lib/fastlane/plugin/sentry/actions/sentry_finalize_release.rb
+- lib/fastlane/plugin/sentry/actions/sentry_set_commits.rb
 - lib/fastlane/plugin/sentry/actions/sentry_upload_dsym.rb
 - lib/fastlane/plugin/sentry/actions/sentry_upload_file.rb
+- lib/fastlane/plugin/sentry/actions/sentry_upload_proguard.rb
 - lib/fastlane/plugin/sentry/actions/sentry_upload_sourcemap.rb
 - lib/fastlane/plugin/sentry/helper/sentry_config.rb
 - lib/fastlane/plugin/sentry/helper/sentry_helper.rb
@@ -116,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Upload symbols to Sentry