fastlane-plugin-sentry 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eedf8ffeb09a61be134683706e0ab09419b2f201
-  data.tar.gz: 5967e62c0efb55df6136b8a6c8f25cb97b5bf57c
+  metadata.gz: fe52a765522b2b77f2616428d31271c6739a6254
+  data.tar.gz: f11bf44961e87ab53989b21c9a44c5288d92b48e
 SHA512:
-  metadata.gz: 3d3cf80b02975ced953bd69c2ccd605ad174575694ef46050cd76a95018f2f7727474fb168f5aa7885a3a033db5e1e4adc3c80c25cbf92f4379170eb994d0038
-  data.tar.gz: d8104621c96e78566311bd40e5d1186925e2adf49f374ca3dcc830573c55da8e381e27dc9bb528aa4db2b6e089dfdec7c8316a1ca94f85805697d38eee1c2abb
+  metadata.gz: 6faaba7d865fd281f64d8e13d9e3750dc194666da123face8de194c4dc05960d29c9da6dfb2074fd20722f197ceb82ac7228a6bbd9009347ee62a66aa7c56e71
+  data.tar.gz: 602c3b563a5ed0bb0887a831d3ac39747725ebc0fb1408c8819479df27d701292502952eb50b349ef36983208c6e7911ce37ad7cea57edff0f26c9d2ebb4d07a

data/README.md

@@ -19,6 +19,7 @@ A subset of actions provided by the CLI: https://docs.sentry.io/learn/cli/
 
 `auth_token` is the preferred way to authentication method with Sentry. This can be obtained on https://sentry.io/api/.
 `api_key` still works but will eventually become deprecated. This can be obtained through the settings of your project.
+Also note that as of version `1.2.0` you no longer have to provide the required parameters, we will try to fallback to your `.sentryclirc` config file if possible.
 
 The following environment variables may be used in place of parameters: `SENTRY_API_KEY`, `SENTRY_AUTH_TOKEN`, `SENTRY_ORG_SLUG`, and `SENTRY_PROJECT_SLUG`.
 

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

@@ -19,15 +19,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :org_slug,
                                        env_name: "SENTRY_ORG_SLUG",
                                        description: "Organization slug for Sentry project",
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No organization slug for SentryAction given, pass using `org_slug: 'org'`") unless value and !value.empty?
-                                       end),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :project_slug,
                                        env_name: "SENTRY_PROJECT_SLUG",
                                        description: "Project slug for Sentry",
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No project slug for SentryAction given, pass using `project_slug: 'project'`") unless value and !value.empty?
-                                       end)
+                                       optional: true)
         ]
       end
 
@@ -40,24 +36,42 @@ module Fastlane
         org = params[:org_slug]
         project = params[:project_slug]
 
+        has_org = !org.to_s.empty?
+        has_project = !project.to_s.empty?
         has_api_key = !api_key.to_s.empty?
         has_auth_token = !auth_token.to_s.empty?
 
-        # 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'`")
-        elsif has_api_key && has_auth_token
-          UI.user_error!("Both API key and authentication token found for SentryAction given, please only give one")
-        elsif has_api_key && !has_auth_token
-          UI.deprecated("Please consider switching to auth_token ... api_key will be removed in the future")
+        skip_params_check = false
+        if !has_org || !has_project || !has_auth_token
+          skip_params_check = fallback_sentry_cli
+        end
+
+        if !skip_params_check
+          # 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'`")
+          elsif has_api_key && has_auth_token
+            UI.user_error!("Both API key and authentication token found for SentryAction given, please only give one")
+          elsif has_api_key && !has_auth_token
+            UI.deprecated("Please consider switching to auth_token ... api_key will be removed in the future")
+          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'] = 'debug' if FastlaneCore::Globals.verbose?
+          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")
         end
+      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'] = 'debug' if FastlaneCore::Globals.verbose?
-        ENV['SENTRY_ORG'] = Shellwords.escape(org) unless org.to_s.empty?
-        ENV['SENTRY_PROJECT'] = Shellwords.escape(project) unless project.to_s.empty?
+      def self.fallback_sentry_cli
+        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?)
       end
     end
   end

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

@@ -1,6 +1,6 @@
 module Fastlane
   module Sentry
-    VERSION = "1.1.0"
-    CLI_VERSION = "1.6.0"
+    VERSION = "1.2.0"
+    CLI_VERSION = "1.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sentry
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sentry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry