fastlane-plugin-sentry 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33bc0c3cb58355cfad0087ef35c0583dcd30d608
-  data.tar.gz: 51cd6de4e8ecc29e876fd11932d7947500ade905
+  metadata.gz: 254603126fe136f22cda805b86beb01ac197597a
+  data.tar.gz: 9acc2fe76b881829c9a8519652002f16176054d5
 SHA512:
-  metadata.gz: 6a94d0a437671feed2a5cc8b6a30500f760ccb64f75feff98ca6efcaa3eb1efdeb1e20404e812618ec30c52179e07fdf02e8735b00f571c8442f88d649348894
-  data.tar.gz: 3c57d653fb016c83b88f8d641cd5fbb08522191765a36edb60ab88f1f55297a8eb99a9b4cc25a6e311730fe7bfa853b73961a7eb157d1279cb1a3caaf6dcb497
+  metadata.gz: 6797c97ae2f62222f8600f86862a8d8fb592df44f388d284cb18e74f52dba8dac0f79e85faf5e1a7beb492999fb3e57501093a9be90b835268022c09cd279ff7
+  data.tar.gz: dcd3933d0e723ade6f6c1955871fda467b444047c6da18b40a540e8cc5b3f578aaf30d5f1faefbaeed7b71408057ab53d4a237458a7c4fd78160a8b0de4862c2

data/README.md

@@ -1,7 +1,7 @@
 # fastlane-plugin-sentry `fastlane` Plugin
 
 [![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)
 
 ## Getting Started
 

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

@@ -11,6 +11,8 @@ module Fastlane
         auth_token = params[:auth_token]
         org = params[:org_slug]
         project = params[:project_slug]
+        timeout = params[:timeout]
+        use_curl = params[:use_curl]
 
         # Params - dSYM
         dsym_path = params[:dsym_path]
@@ -28,11 +30,6 @@ module Fastlane
 
         # Url to post dSYMs to
         url = "#{host}/projects/#{org}/#{project}/files/dsyms/"
-        if has_api_key
-          resource = RestClient::Resource.new( url, api_key, '' )
-        else
-          resource = RestClient::Resource.new( url, headers: {Authorization: "Bearer #{auth_token}"} )
-        end
 
         UI.message "Will upload dSYM(s) to #{url}"
 
@@ -45,29 +42,65 @@ module Fastlane
 
         # Upload dsym(s)
         uploaded_paths = dsym_paths.compact.map do |dsym|
-          upload_dsym(resource, dsym)
+          upload_dsym(use_curl, dsym, url, timeout, api_key, auth_token)
         end
 
         # Return uplaoded dSYM paths
         uploaded_paths
       end
 
-      def self.upload_dsym(resource, dsym)
+      def self.upload_dsym(use_curl, dsym, url, timeout, api_key, auth_token)
         UI.message "Uploading... #{dsym}"
-        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)
+        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]' "
+        end
+        
+        status = status.to_i
+        if (200..299).member?(status)
+          return dsym
+        else
+          self.handle_error(nil, status)
+        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)
+        end
       end
 
       def self.handle_error(error, status = 0)
-        UI.error "Error: #{error}"
+        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'
       end
 
@@ -130,9 +163,28 @@ 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
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Sentry
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sentry
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -117,3 +117,4 @@ signing_key:
 specification_version: 4
 summary: Upload symbols to Sentry
 test_files: []
+has_rdoc: