fastlane-plugin-sentry 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254603126fe136f22cda805b86beb01ac197597a
-  data.tar.gz: 9acc2fe76b881829c9a8519652002f16176054d5
+  metadata.gz: 4e69a9ca0ab83f1dfb1a3945941d1cbdffe7fa3f
+  data.tar.gz: 788f571d8827f744c043d9a825ef967389fb5e9b
 SHA512:
-  metadata.gz: 6797c97ae2f62222f8600f86862a8d8fb592df44f388d284cb18e74f52dba8dac0f79e85faf5e1a7beb492999fb3e57501093a9be90b835268022c09cd279ff7
-  data.tar.gz: dcd3933d0e723ade6f6c1955871fda467b444047c6da18b40a540e8cc5b3f578aaf30d5f1faefbaeed7b71408057ab53d4a237458a7c4fd78160a8b0de4862c2
+  metadata.gz: ddc48fe46dca0b22e1028037ca06a4933427341d8c9294be7e9f970dcad5ea5c0deb24289d12b72d7c874561bde820d6b680fbbcb9f3545890fe0db7f1dd6a51
+  data.tar.gz: e69f9e50393323765acb76d2cbaa50e88f4b24f43775a3da24303c1ec43e45fffd24e5a6fa5dac91f11e26da429558b68898550462b15479aab59c8ab162c80e

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

@@ -2,17 +2,14 @@ module Fastlane
   module Actions
     class SentryUploadDsymAction < Action
       def self.run(params)
-
-        require 'rest-client'
+        check_sentry_cli!
 
         # Params - API
-        host = params[:api_host]
-        api_key = params[:api_key]
+        url = params[:url]
         auth_token = params[:auth_token]
+        api_key = params[:api_key]
         org = params[:org_slug]
         project = params[:project_slug]
-        timeout = params[:timeout]
-        use_curl = params[:use_curl]
 
         # Params - dSYM
         dsym_path = params[:dsym_path]
@@ -26,82 +23,80 @@ module Fastlane
           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
 
-        # Url to post dSYMs to
-        url = "#{host}/projects/#{org}/#{project}/files/dsyms/"
-
-        UI.message "Will upload dSYM(s) to #{url}"
+        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 $verbose
 
         # Verify dsym(s)
-        dsym_paths += [dsym_path]
+        dsym_paths += [dsym_path] unless dsym_path.nil?
         dsym_paths = dsym_paths.map { |path| File.absolute_path(path) }
         dsym_paths.each do |path|
           UI.user_error!("dSYM does not exist at path: #{path}") unless File.exists? path
         end
 
-        # Upload dsym(s)
-        uploaded_paths = dsym_paths.compact.map do |dsym|
-          upload_dsym(use_curl, dsym, url, timeout, api_key, auth_token)
-        end
-
-        # Return uplaoded dSYM paths
-        uploaded_paths
+        UI.success("sentry-cli #{Fastlane::Sentry::CLI_VERSION} installed!")
+        call_sentry_cli(dsym_paths, org, project)
+        UI.success("Successfully uploaded dSYMs!")
       end
 
-      def self.upload_dsym(use_curl, dsym, url, timeout, api_key, auth_token)
-        UI.message "Uploading... #{dsym}"
-        if use_curl
-          self.upload_dsym_curl(dsym, url, timeout, api_key, auth_token)
-        else
-          self.upload_dsym_restclient(dsym, url, timeout, api_key, auth_token)
-        end
-      end
-      
-      def self.upload_dsym_curl(dsym, url, timeout, api_key, auth_token)
-        has_api_key = !api_key.to_s.empty?
-        
-        status = 0
-        if has_api_key
-          status = sh "curl -s -o /dev/null -w '%{response_code}' --max-time #{timeout} --user #{api_key}: -F file=@#{dsym} #{url} | grep -o  '[1-4][0-9][0-9]' "
-        else
-          status = sh "curl -s -o /dev/null -w '%{response_code}' --max-time #{timeout} -H 'Authorization: Bearer #{auth_token}'  -F file=@#{dsym} #{url} | grep -o  '[1-4][0-9][0-9]' "
+      def self.check_sentry_cli!
+        if !`which sentry-cli`.include?('sentry-cli')
+          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
-        
-        status = status.to_i
-        if (200..299).member?(status)
-          return dsym
-        else
-          self.handle_error(nil, status)
+
+        sentry_cli_version = `sentry-cli --version`.gsub(/[^\d]/, '').to_i
+        required_version = Fastlane::Sentry::CLI_VERSION.gsub(/[^\d]/, '').to_i
+        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!")
         end
       end
-      
-      def self.upload_dsym_restclient(dsym, url, timeout, api_key, auth_token)
-        has_api_key = !api_key.to_s.empty?
-        
-        if has_api_key
-          resource = RestClient::Resource.new( url, user: api_key, password: '', timeout: timeout, open_timeout: timeout )
-        else
-          resource = RestClient::Resource.new( url, headers: {Authorization: "Bearer #{auth_token}"}, timeout: timeout, open_timeout: timeout )
-        end
-        
-        begin
-          resource.post(file: File.new(dsym, 'rb')) unless Helper.test?
-          UI.success 'dSYM successfully uploaded to Sentry!'
-          dsym
-        rescue RestClient::Exception => error
-          handle_error(error, error.http_code)
-        rescue => error
-          handle_error(error)
+
+      def self.call_sentry_cli(dsym_paths, org, project)
+        UI.message "Starting sentry-cli..."
+        require 'open3'
+        require 'shellwords'
+        org = Shellwords.escape(org)
+        project = Shellwords.escape(project)
+        error = []
+        Open3.popen3("sentry-cli upload-dsym '#{dsym_paths.join("','")}' --org #{org} --project #{project}") do |stdin, stdout, stderr, wait_thr|
+          while line = stderr.gets do
+            error << line.strip!
+          end
+          while line = stdout.gets do
+            UI.message(line.strip!)
+          end
+          exit_status = wait_thr.value
+          unless exit_status.success? && error.empty?
+            handle_error(error)
+          end
         end
       end
 
-      def self.handle_error(error, status = 0)
-        UI.error "Error: #{error}" if error
-        UI.important "Make sure your api_key or auth_token is configured correctly" if status == 401
-        UI.important "Make sure the org_slug and project_slug matches exactly what is displayed your admin panel's URL" if status == 404
-        UI.important "Your upload may have timed out for an unknown reason" if status == 100
-        UI.user_error! 'Error while trying to upload dSYM to Sentry'
+      def self.handle_error(errors)
+        fatal = false
+        for error in errors do
+          if error
+            if error.include?('[INFO]')
+              UI.verbose("#{error}")
+            else
+              UI.error("#{error}")
+              fatal = true
+            end
+          end
+        end
+        UI.user_error!('Error while trying to upload dSYM to Sentry') unless !fatal
       end
 
       #####################################################
@@ -122,21 +117,21 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :api_host,
-                                       env_name: "SENTRY_HOST",
-                                       description: "API host url for Sentry",
+          FastlaneCore::ConfigItem.new(key: :url,
+                                       env_name: "SENTRY_URL",
+                                       description: "Url for Sentry",
                                        is_string: true,
                                        default_value: "https://app.getsentry.com/api/0",
                                        optional: true
                                       ),
-          FastlaneCore::ConfigItem.new(key: :api_key,
-                                       env_name: "SENTRY_API_KEY",
-                                       description: "API key for Sentry",
-                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :auth_token,
                                        env_name: "SENTRY_AUTH_TOKEN",
                                        description: "Authentication token for Sentry",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :api_key,
+                                       env_name: "SENTRY_API_KEY",
+                                       description: "API key for Sentry",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :org_slug,
                                        env_name: "SENTRY_ORG_SLUG",
                                        description: "Organization slug for Sentry project",
@@ -145,7 +140,7 @@ module Fastlane
                                        end),
           FastlaneCore::ConfigItem.new(key: :project_slug,
                                        env_name: "SENTRY_PROJECT_SLUG",
-                                       description: "Prgoject slug for Sentry",
+                                       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),
@@ -163,33 +158,15 @@ module Fastlane
                                        default_value: Actions.lane_context[SharedValues::DSYM_PATHS],
                                        is_string: false,
                                        optional: true,
-                                       verify_block: proc do |value|
-                                         # validation is done in the action
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :timeout,
-                                       env_name: "SENTRY_TIMEOUT",
-                                       description: "Sentry upload API request timeout (in seconds)",
-                                       default_value: 120,
-                                       is_string: false,
-                                       optional: true,
-                                       verify_block: proc do |value|
-                                         # validation is done in the action
-                                       end),
-           FastlaneCore::ConfigItem.new(key: :use_curl,
-                                       env_name: "SENTRY_USE_CURL",
-                                       description: "Shells out the upload to `curl` instead of using `rest-client`. This MAY be needed for really large dSYM file sizes. Use this if you are receving timeouts",
-                                       default_value: false,
-                                       is_string: false,
-                                       optional: true,
                                        verify_block: proc do |value|
                                          # validation is done in the action
                                        end)
-                                       
+
         ]
       end
 
       def self.return_value
-        "The uploaded dSYM path(s)"
+        nil
       end
 
       def self.authors

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

@@ -1,5 +1,6 @@
 module Fastlane
   module Sentry
-    VERSION = "0.1.2"
+    VERSION = "1.0.0"
+    CLI_VERSION = "0.25.0"
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sentry
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Upload symbols to Sentry
 test_files: []
-has_rdoc: