fastlane-plugin-waldo 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ed8c04c2045ecc72f5bae2886d924aa267dbf01
-  data.tar.gz: 56f47c14e035e955ca002a891648d4a96cfc1596
+SHA256:
+  metadata.gz: c63c5e44aa13f38c39db0a944c6ac663ed82b1c568c839cee17563e5d0f659d2
+  data.tar.gz: 1874dcff9398d14a9cd6b0587fc2e1a3bd129c49bdbf228fb9ee9a3a7d444f39
 SHA512:
-  metadata.gz: 9507565edfe335c48757bc2283057b7a5235e0cf712c94fd5e70d4fd26ad3ba3f9ee8c13fcbad1126cc8c29ca178e6a188ce27d5ea85ce0fe569fba7cc6efb07
-  data.tar.gz: 5a07ca19ae171dddb902bfb96677c40fa0b00ab5a42b201529d89c3708d6328689105db90a081e033daf0b1fe19ddbd466a78409169cbd54eb377a66459a4f9c
+  metadata.gz: cbcbbf1b372bfcdaefcce1c1b211f0bbfa8e0142780abe73a7863006356e321ec18b7b22778a6a82effa4a2f59963c233cc8ba6b08fd8707370bab77b508adc4
+  data.tar.gz: 38fb3a7fb99ca9572cf7a573cd85abe0179e7b21b126e4c23958929d903ed21e83c72527d4859fc51a1feb126b367dc7ce1bc7a2df7d945fc5b6044a2e8d51f0

data/lib/fastlane/plugin/waldo/actions/waldo_action.rb

@@ -10,6 +10,7 @@ module Fastlane
                                               title: "Summary for waldo #{Fastlane::Waldo::VERSION.to_s}")
 
         Helper::WaldoHelper.upload_build
+        Helper::WaldoHelper.upload_symbols
       end
 
       def self.authors
@@ -22,6 +23,8 @@ module Fastlane
           apk_path_default = Dir["*.apk"].last || Dir[File.join('app', 'build', 'outputs', 'apk', 'app-release.apk')].last
         when :ios
           app_path_default = Dir["*.app"].sort_by { |x| File.mtime(x) }.last
+          # No default dsym_path for now; user must specify it explicitly:
+          # dsym_path_default = (Dir["./**/*.dSYM"] + Dir["./**/*.dSYM.zip"]).sort_by { |x| File.mtime(x) }.last
           ipa_path_default = Dir["*.ipa"].sort_by { |x| File.mtime(x) }.last
         end
 
@@ -39,6 +42,14 @@ module Fastlane
                                        default_value: Actions.lane_context[Actions::SharedValues::IPA_OUTPUT_PATH] || ipa_path_default,
                                        default_value_dynamic: true,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :dsym_path,
+                                       env_name: 'WALDO_DSYM_PATH',
+                                       # No default dsym_path for now; user must specify it explicitly:
+                                       description: 'Path to your dSYM file(s)',
+                                       # description: 'Path to your dSYM file(s) (optional if you use the _gym_ or _xcodebuild_ action)',
+                                       # default_value: Actions.lane_context[Actions::SharedValues::DSYM_OUTPUT_PATH] || dsym_path_default,
+                                       # default_value_dynamic: true,
+                                       optional: true),
           # Android-specific
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                        env_name: 'WALDO_APK_PATH',

data/lib/fastlane/plugin/waldo/helper/waldo_helper.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'json'
 require 'net/http'
 
 module Fastlane
@@ -48,12 +49,14 @@ module Fastlane
 
         apk_path = in_params[:apk_path]
         app_path = in_params[:app_path]
+        dsym_path = in_params[:dsym_path]
         ipa_path = in_params[:ipa_path]
         upload_token = in_params[:upload_token]
         variant_name = in_params[:variant_name]
 
         apk_path.gsub!("\\ ", ' ') if apk_path
         app_path.gsub!("\\ ", ' ') if app_path
+        dsym_path.gsub!("\\ ", ' ') if dsym_path
         ipa_path.gsub!("\\ ", ' ') if ipa_path
 
         out_params[:apk_path] = apk_path if apk_path
@@ -73,6 +76,7 @@ module Fastlane
           out_params[:ipa_path] = ipa_path if ipa_path
         end
 
+        out_params[:dsym_path] = dsym_path if dsym_path && (app_path || ipa_path)
         out_params[:upload_token] = upload_token if upload_token && !upload_token.empty?
         out_params[:variant_name] = variant_name if variant_name
 
@@ -246,6 +250,43 @@ module Fastlane
           URI(uri_string)
       end
 
+      def self.make_symbols_request(uri)
+        if File.file?(@dsym_path)
+          body_path = @dsym_path
+        else
+          dsym_basename = File.basename(@dsym_path)
+          dsym_dirname = File.dirname(@dsym_path)
+
+          body_path = File.join(Dir.tmpdir, "#{dsym_basename}.zip")
+
+          unless zip(src_path: dsym_basename,
+                     zip_path: body_path,
+                     cd_path: dsym_dirname)
+            return nil
+          end
+        end
+
+        request = Net::HTTP::Post.new(uri.request_uri)
+
+        request['Authorization'] = get_authorization
+        request['Transfer-Encoding'] = 'chunked'
+        request['User-Agent'] = get_user_agent
+
+        request.body_stream = WaldoReadIO.new(body_path)
+        request.content_type = 'application/zip'
+
+        request
+      end
+
+      def self.make_symbols_uri
+          uri_string = 'https://api.waldo.io/versions/'
+
+          uri_string += @build_upload_id
+          uri_string += '/symbols'
+
+          URI(uri_string)
+      end
+
       def self.parse_build_response(response)
         dump_response(response) if FastlaneCore::Globals.verbose?
 
@@ -257,6 +298,10 @@ module Fastlane
         else
           handle_error("Build failed to upload to Waldo: #{response.code} #{response.message}")
         end
+
+        result = JSON.parse(response.body)
+
+        @build_upload_id = result["id"]
       end
 
       def self.parse_error_response(response)
@@ -272,6 +317,19 @@ module Fastlane
         end
       end
 
+      def self.parse_symbols_response(response)
+        dump_response(response) if FastlaneCore::Globals.verbose?
+
+        case response.code.to_i
+        when 200..299
+          UI.success('Symbols successfully uploaded to Waldo!')
+        when 401
+          UI.error('Token is invalid or missing for symbols upload to Waldo!')
+        else
+          UI.error("Symbols failed to upload to Waldo: #{response.code} #{response.message}")
+        end
+      end
+
       def self.upload_build
         begin
           @variant_name ||= Actions.lane_context[Actions::SharedValues::GRADLE_BUILD_TYPE]
@@ -282,12 +340,12 @@ module Fastlane
 
           return unless request
 
-          UI.success('Uploading the build to Waldo. This could take a while…')
+          UI.success('Uploading build to Waldo')
 
           dump_request(request) if FastlaneCore::Globals.verbose?
 
           Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-            http.read_timeout = 120   # 2 minutes
+            http.read_timeout = 120 # 2 minutes
 
             parse_build_response(http.request(request))
           end
@@ -306,7 +364,7 @@ module Fastlane
 
           request = make_error_request(uri, message)
 
-          UI.error('Uploading error report to Waldo…')
+          UI.error('Uploading error report to Waldo')
 
           dump_request(request) if FastlaneCore::Globals.verbose?
 
@@ -322,9 +380,38 @@ module Fastlane
         end
       end
 
+      def self.upload_symbols
+        begin
+          return unless @dsym_path
+
+          uri = make_symbols_uri
+
+          request = make_symbols_request(uri)
+
+          return unless request
+
+          UI.success('Uploading symbols to Waldo')
+
+          dump_request(request) if FastlaneCore::Globals.verbose?
+
+          Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+            http.read_timeout = 120 # 2 minutes
+
+            parse_symbols_response(http.request(request))
+          end
+        rescue Net::ReadTimeout => exc
+          handle_error('Symbols upload to Waldo timed out!')
+        rescue => exc
+          handle_error("Something went wrong uploading symbols to Waldo: #{exc.inspect.to_s}")
+        ensure
+          request.body_stream.close if request && request.body_stream
+        end
+      end
+
       def self.validate_parameters(params)
         @apk_path = params[:apk_path]
         @app_path = params[:app_path]
+        @dsym_path = params[:dsym_path]
         @ipa_path = params[:ipa_path]
         @upload_token = params[:upload_token]
         @variant_name = params[:variant_name]
@@ -386,6 +473,20 @@ module Fastlane
               return false
             end
           end
+
+          if @dsym_path
+            unless File.exist?(@dsym_path)
+              handle_error("Unable to find symbols at path '#{@dsym_path.to_s}'")
+
+              return false
+            end
+
+            unless (File.directory?(@dsym_path) || File.file?(@dsym_path)) && File.readable?(@dsym_path)
+              handle_error("Unable to read symbols at path '#{@dsym_path.to_s}'")
+
+              return false
+            end
+          end
         else
             handle_error("Unsupported platform: '#{get_platform.to_s}'")
 
@@ -416,7 +517,7 @@ module Fastlane
           puts "#{cmd} => #{result}" if FastlaneCore::Globals.verbose?
 
           unless result.empty?
-            handle_error("Unable to zip app at path '#{src_path.to_s}' into '#{zip_path.to_s}'")
+            handle_error("Unable to zip folder at path '#{src_path.to_s}' into '#{zip_path.to_s}'")
 
             return false
           end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "1.3.0"
+    VERSION = "1.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - J. G. Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Upload build to Waldo