fastlane-plugin-zealot 0.1.0 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53f65df107be1d1cd79b0cf84f2841791357c7e6efecbdd59399b899976ddde
-  data.tar.gz: 586e7f0e8821806b988a20e0aa348407ce31ffaa4c816ff0ccf8abc91c3f630b
+  metadata.gz: 264233b0c85829d6ca9f3ca44b10ac52034e746b06551d6ae3aeca63c831d906
+  data.tar.gz: 930c4c1af6719fad749f079a931ecf8b84b4764811802a5c08eba8634a4a40d6
 SHA512:
-  metadata.gz: 1bf42c92ab17668d7f1186a97239aa846684b6f2b4348d779e8b8c55b34c93f101835c269126836001ea05e65657eeda7292f57636795533d48d37fccbc7e65e
-  data.tar.gz: 6fbb5b8cca9ff25e47672980293d900b77a33d4b1a997ab8bd49a0a03638dd3fc568f61c1d50a1393d5ddd6edd129bc5cd31babde6fec73e18d69c62677799f5
+  metadata.gz: '041509054ac5119b97e271fd1910163d567eeb49b029a5b93bf8bc6ec777e32503b34fee1cb872498db282c3e0294fe200a01a164267b52c6227560529166cee'
+  data.tar.gz: c8f1c527d2e7272567f1fbcc10ddd21e7e0e5d9dcfaf85f79a30372ad96279eea947708c42437b317d06adfb98178b28417db0410ca305140888af8ea698f81f

data/lib/fastlane/plugin/zealot/actions/zealot_action.rb

@@ -109,6 +109,7 @@ module Fastlane
                                        env_name: 'ZEALOT_GIT_COMMIT',
                                        description: 'The hash of git commit',
                                        optional: true,
+                                       default_value: ENV['GIT_COMMIT'] || ENV['CI_COMMIT_SHA'],
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :password,
                                        env_name: 'ZEALOT_PASSWORD',

data/lib/fastlane/plugin/zealot/actions/zealot_debug_file.rb

@@ -2,49 +2,63 @@
 
 require 'fastlane/action'
 require_relative '../helper/zealot_helper'
-# require 'fastlane-plugin-debug_file'
+require 'fastlane/plugin/debug_file'
 
 module Fastlane
   module Actions
     class ZealotDebugFileAction < Action
       extend Fastlane::Helper::ZealotHelper
 
-      PLATFORM = %I[ios mac android].freeze
+      PLATFORM = %I[ios mac macos osx android].freeze
 
       def self.run(params)
-        endpoint = params[:endpoint]
-        platform = params[:platform]
-        path = params[:path]
-        fail_on_error = params[:fail_on_error]
+        file = generate_zip_file(params)
+        UI.user_error! "Something wrong with compress debug file" unless file
 
-        # UI.user_error! "Not found path: #{path}" unless Dir.exist?(path)
+        response = upload_debug_file(params, file)
+        if parse_response(response, params[:endpoint], params[:fail_on_error])
+          UI.success('Build successfully uploaded to Zealot.')
+          # UI.success("Release URL: #{Actions.lane_context[SharedValues::ZEALOT_RELEASE_URL]}")
+          # UI.success("QRCode URL: #{Actions.lane_context[SharedValues::ZEALOT_QRCODE_URL]}")
+          # UI.success("Download URL: #{Actions.lane_context[SharedValues::ZEALOT_INSTALL_URL]}")
+        end
+      end
+
+      def self.generate_zip_file(params)
+        new_params = params.all_keys.each_with_object({}) do |key, obj|
+          next unless value = params[key]
+          obj[key] = value
+        end
+        path = new_params.delete(:path)
+        platform = new_params[:platform]
 
         case platform
-        when :ios, :mac
-          params.set(archive_path, path) unless path.empty?
-          file = Fastlane::Actions::DsymAction.run(params)
+        when :ios, :mac, :macos, :osx
+          generate_dsym_zip(new_params, path)
         when :android
-          params.set(app_path, path) unless path.empty?
-          file = Fastlane::Actions::ProguardAction.run(params)
+          generate_proguard_zip(new_params, path)
         else
           UI.user_error!("No match value of platform: #{value}, avaiable value are #{PLATFORM.join(',')}.")
         end
-
-        UI.user_error! "Something wrong with compress debug file" unless file
       end
 
-      def self.upload(upload_url, form, timeout, fail_on_error)
-        begin
-          connection.post do |req|
-            req.url('/api/debug_files/upload')
-            req.options.timeout = timeout
-            req.body = form
-          end
-        rescue Faraday::Error::TimeoutError
-          show_error('Uploading build to Zealot timed out ⏳', fail_on_error)
+      def self.generate_dsym_zip(params, path)
+        params[:archive_path] = if path
+          path
+        else
+          Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE] || Fastlane::Actions::DsymAction::ARCHIVE_PATH
         end
+
+        params[:scheme] = params.delete(:xcode_scheme)
+        Fastlane::Actions::DsymAction.run(params)
+      end
+
+      def self.generate_proguard_zip(params, path)
+        params[:app_path] = path if path && !path.empty?
+        params[:build_type] = params.delete(:android_build_type)
+        params[:flavor] = params.delete(:android_flavor)
+        Fastlane::Actions::ProguardAction.run(params)
       end
-      private_class_method :upload
 
       def self.parse_response(response, upload_url, fail_on_error)
         return show_error("Error uploading to Zealot: empty response", fail_on_error) unless response
@@ -55,9 +69,9 @@ module Fastlane
           return show_error("Error uploading to Zealot: #{response.body}", fail_on_error)
         end
 
-        Actions.lane_context[SharedValues::ZEALOT_RELEASE_URL] = body['release_url']
-        Actions.lane_context[SharedValues::ZEALOT_INSTALL_URL] = body['install_url']
-        Actions.lane_context[SharedValues::ZEALOT_QRCODE_URL] = body['qrcode_url']
+        # Actions.lane_context[SharedValues::ZEALOT_RELEASE_URL] = body['release_url']
+        # Actions.lane_context[SharedValues::ZEALOT_INSTALL_URL] = body['install_url']
+        # Actions.lane_context[SharedValues::ZEALOT_QRCODE_URL] = body['qrcode_url']
 
         true
       end
@@ -99,6 +113,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: 'ZEALOT_PATH',
                                        description: 'The path of debug file (iOS/macOS is archive path for Xcode, Android is path for app project)',
+                                       optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :xcode_scheme,
                                        env_name: 'ZEALOT_XCODE_SCHEME',
@@ -125,7 +140,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :output_path,
                                        env_name: 'DF_DSYM_OUTPUT_PATH',
                                        description: "The output path of compressed dSYM file",
-                                       default_value: OUTPUT_PATH,
+                                       default_value: '.',
                                        optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :release_version,
@@ -138,11 +153,22 @@ module Fastlane
                                        description: 'The build version of app',
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :overwrite,
+                                       env_name: 'DF_DSYM_OVERWRITE',
+                                       description: "Overwrite output compressed file if it existed",
+                                       default_value: false,
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :timeout,
                                        env_name: 'ZEALOT_TIMEOUT',
                                        description: 'Request timeout in seconds',
                                        type: Integer,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :verify_ssl,
+                                       env_name: 'ZEALOT_VERIFY_SSL',
+                                       description: 'Should verify SSL of zealot service',
+                                       optional: true,
+                                       default_value: true,
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :fail_on_error,
                                        env_name: 'ZEALOT_FAIL_ON_ERROR',
                                        description: 'Should an error uploading app cause a failure? (true/false)',

data/lib/fastlane/plugin/zealot/helper/zealot_helper.rb

@@ -7,8 +7,41 @@ module Fastlane
 
   module Helper
     module ZealotHelper
+      def upload_debug_file(params, file)
+        form = upload_debug_file_params(params, file)
+        print_table(form, title: 'zealot_debug_file')
+
+        endpoint = params[:endpoint]
+        UI.success("Uploading to #{endpoint} ...")
+        connection = make_connection(params[:endpoint], params[:verify_ssl])
+        begin
+          connection.post do |req|
+            req.url('/api/debug_files/upload')
+            req.options.timeout = params[:timeout]
+            req.body = form
+          end
+        rescue Faraday::Error::TimeoutError
+          show_error('Uploading build to Zealot timed out ⏳', params[:fail_on_error])
+        end
+      end
+
+      def upload_debug_file_params(params, file)
+        {
+          token: params[:token],
+          channel_key: params[:channel_key],
+          release_version: params[:release_version],
+          build_version: params[:build_version],
+          file: Faraday::UploadIO.new(file, 'application/octet-stream')
+        }
+      end
+
+      #######################################
+
       def upload_app(params)
         form = upload_app_params(params)
+        # recommand generate collect changelog plugin: https://github.com/icyleaf/fastlane-plugin-ci_changelog
+        form[:changelog] = changelog_raw if changelog_raw = ENV['CICL_CHANGLOG']
+
         print_table(form, title: 'zealot', hidden_keys: [:token])
 
         endpoint = params[:endpoint]

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Zealot
-    VERSION = "0.1.0"
+    VERSION = "0.2.0.beta1"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-zealot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fastlane-plugin-debug_file
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -165,11 +179,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Upload a new build to Zealot