fastlane-plugin-zealot 0.2.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5f18cd63670bef312a4ea8a7319b2b41d4eced542255400f29e80d7905b58a
-  data.tar.gz: fa337dec69d2ed89062a1eabea50f97727a205f213c0dcd1b9fc58f062195695
+  metadata.gz: 5a1b2f611786f8740b32f953adfbd42bbc5df33e4160f6e1490179200a4dfe4c
+  data.tar.gz: 5a03f7c7e0920c557892758244a1213ba9d4343b00cda48f2b2dfc05c3230039
 SHA512:
-  metadata.gz: 5c03886f620c6ae5e85dbab64a239f955b6599cff8ac14884afe6abdddaae830712a2a46182517fc3f8a2764f25fc48d8f6e8cb0fa66af76e2018b7b1f929897
-  data.tar.gz: 7817bba25d0b082474a419433c0d43f50806871fc8131a0b14d670d6cc1a8295fb77adbaf5929c5fad48e9963b00f05b1801e060cc8fe3f5089eea53c91fcdb5
+  metadata.gz: b4877a7954d4afb7a52e5ea78a2848bd9a3cb97c7c19c7f56cb6c07ddafd5e63b302a78c39c873d2486b4233c261b57183fc095922c8476b4b33c205da7078da
+  data.tar.gz: 057e2ce616687b74697fe2411e1d085a3af5a7b5ee77f42801c08e9bb0b6919bf17770f3fc82eb49f2d48d77a0da0fb81c0eb690425230002bbc81d6add0efc8

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

@@ -31,10 +31,9 @@ module Fastlane
       end
 
       def self.parse_response(response, upload_url, fail_on_error)
-        return show_error("Error uploading to Zealot: empty response", fail_on_error) unless response
+        return unless response
 
         UI.verbose response.body.to_s
-
         if response.status != 201
           return show_error("Error uploading to Zealot [#{response.status}]: #{response.body}", fail_on_error)
         end
@@ -137,6 +136,11 @@ module Fastlane
                                        optional: true,
                                        default_value: 'fastlane',
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :ci_url,
+                                       env_name: 'ZEALOT_CI_CURL',
+                                       description: 'The name of upload source',
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :timeout,
                                        env_name: 'ZEALOT_TIMEOUT',
                                        description: 'Request timeout in seconds',

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

@@ -6,9 +6,6 @@ require 'fastlane/plugin/debug_file'
 
 module Fastlane
   module Actions
-    module SharedValues
-      ZEAALOT_ERROR_MESSAGE = :ZEAALOT_ERROR_MESSAGE
-    end
 
     class ZealotDebugFileAction < Action
       extend Fastlane::Helper::ZealotHelper
@@ -62,10 +59,9 @@ module Fastlane
       end
 
       def self.parse_response(response, upload_url, fail_on_error)
-        return show_error("Error uploading to Zealot: empty response", fail_on_error) unless response
+        return unless response
 
         UI.verbose response.body.to_s
-
         if (body = response.body) && (error = body['error'])
           return show_error("Error uploading to Zealot: #{response.body}", fail_on_error)
         end

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

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+require 'credentials_manager'
+require 'fastlane/action'
+require_relative '../helper/zealot_helper'
+
+module Fastlane
+  module Actions
+
+    class ZealotSyncDevicesAction < Action
+      extend Fastlane::Helper::ZealotHelper
+
+      def self.run(params)
+        require 'spaceship'
+
+        credentials = CredentialsManager::AccountManager.new(user: params[:username])
+        Spaceship.login(credentials.user, credentials.password)
+        Spaceship.select_team
+
+        UI.message('Fetching list of currently registered devices...')
+        all_platforms = Set[params[:platform]]
+        supported_platforms = all_platforms.select { |platform| self.is_supported?(platform.to_sym) }
+
+        devices = supported_platforms.flat_map { |platform| Spaceship::Device.all(mac: platform == "mac") }
+
+        print_table(build_table_data(params, devices), title: 'zealot_sync_devices')
+
+        UI.verbose("Syncing devices to #{params[:endpoint]} ...")
+        failed_devices = []
+        devices.each do |device|
+          begin
+            sync_deivce(params, device)
+          rescue Faraday::ConnectionFailed
+            failed_devices << {udid: device.udid, error: 'Can not connecting to Zealot'}
+          rescue Faraday::TimeoutError
+            failed_devices << {udid: device.udid, error: 'Timed out to Zealot'}
+          end
+        end
+
+        failed = failed_devices.size
+        successed = devices.size - failed
+        UI.success "Successful Synced devices. success: #{successed}, failed: #{failed}"
+        UI.verbose "Failed devices: #{failed_devices}"
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        'Check app version exists from Zealot'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :endpoint,
+                                       env_name: 'ZEALOT_ENDPOINT',
+                                       description: 'The endpoint of zealot',
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :token,
+                                       env_name: 'ZEALOT_TOKEN',
+                                       description: 'The token of user',
+                                       sensitive: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("No user token for Zealot given, pass using `token: 'token'`") if value.nil? || value.empty?
+                                       end,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :username,
+                                       env_name: 'DELIVER_USER',
+                                       description: 'The apple id (username) of Apple Developer Portal',
+                                       default_value_dynamic: true,
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :team_id,
+                                       env_name: 'ZEALOT_APPLE_TEAM_ID',
+                                       description: 'The ID of your Developer Portal team if you\'re in multiple teams',
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id),
+                                       default_value_dynamic: true,
+                                       optional: true,
+                                       type: String,
+                                       verify_block: proc do |value|
+                                         ENV["FASTLANE_TEAM_ID"] = value.to_s
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :team_name,
+                                       env_name: 'ZEALOT_APPLE_TEAM_NAME',
+                                       description: 'The name of your Developer Portal team if you\'re in multiple teams',
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id),
+                                       default_value_dynamic: true,
+                                       optional: true,
+                                       type: String,
+                                       verify_block: proc do |value|
+                                         ENV["FASTLANE_TEAM_NAME"] = value.to_s
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :platform,
+                                       env_name: 'ZEALOT_APPLE_PLATFORM',
+                                       description: 'The platform to use (optional)',
+                                       optional: true,
+                                       default_value: 'ios',
+                                       verify_block: proc do |value|
+                                         UI.user_error!('The platform can only be ios or mac') unless %('ios', 'mac').include?(value)
+                                       end),
+          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: :timeout,
+                                       env_name: 'ZEALOT_TIMEOUT',
+                                       description: 'Request timeout in seconds',
+                                       type: Integer,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :fail_on_error,
+                                       env_name: 'ZEALOT_FAIL_ON_ERROR',
+                                       description: 'Should an error http request cause a failure? (true/false)',
+                                       optional: true,
+                                       default_value: false,
+                                       type: Boolean)
+        ]
+      end
+
+      def self.example_code
+        [
+          'zealot_sync_devices(
+            endpoint: "...",
+            token: "...",
+            username: "...",
+            team_id: "..."
+          )'
+        ]
+      end
+
+      def self.category
+        :beta
+      end
+
+      def self.authors
+        ['icyleaf']
+      end
+
+      def self.is_supported?(_)
+        true
+      end
+    end
+  end
+end

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

@@ -7,7 +7,14 @@ module Fastlane
   module Actions
     module SharedValues
       ZEALOT_VERSION_EXISTED = :ZEALOT_VERSION_EXISTED
-      ZEAALOT_ERROR_MESSAGE = :ZEAALOT_ERROR_MESSAGE
+      ZEALOT_LATEST_RELEASE_ID = :ZEALOT_LATEST_RELEASE_ID
+      ZEALOT_LATEST_RELEASE_VERSION = :ZEALOT_LATEST_RELEASE_VERSION
+      ZEALOT_LATEST_BUILD_VERSION = :ZEALOT_LATEST_VERSION
+      ZEALOT_LATEST_VERSION = :ZEALOT_LATEST_VERSION
+      ZEALOT_LATEST_RELEASE_URL = :ZEALOT_LATEST_RELEASE_URL
+      ZEALOT_LATEST_QRCODE_URL = :ZEALOT_LATEST_QRCODE_URL
+      ZEALOT_LATEST_INSTALL_URL = :ZEALOT_LATEST_INSTALL_URL
+      ZEALOT_LATEST_CONTEXT = :ZEALOT_LATEST_CONTEXT
     end
 
     class ZealotVersionCheckAction < Action
@@ -32,6 +39,17 @@ module Fastlane
         Actions.lane_context[SharedValues::ZEALOT_VERSION_EXISTED] = is_existed
 
         if is_existed
+          context = response.body
+
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_RELEASE_ID] = context['id']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_RELEASE_VERSION] = context['release_version']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_BUILD_VERSION] = context['build_version']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_VERSION] = context['version']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_RELEASE_URL] = context['release_url']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_INSTALL_URL] = context['install_url']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_QRCODE_URL] = context['qrcode_url']
+          Actions.lane_context[SharedValues::ZEALOT_LATEST_CONTEXT] = context
+
           UI.important 'Found app version, you can skip upload it'
         else
           UI.success 'Not found app version, you can upload it'
@@ -93,6 +111,12 @@ module Fastlane
                                        optional: true,
                                        default_value: true,
                                        type: Boolean),
+          FastlaneCore::ConfigItem.new(key: :hide_user_token,
+                                       env_name: 'ZEALOT_HIDE_USER_TOKEN',
+                                       description: 'replase user token to *** to keep secret',
+                                       optional: true,
+                                       default_value: true,
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :fail_on_error,
                                        env_name: 'ZEALOT_FAIL_ON_ERROR',
                                        description: 'Should an error http request cause a failure? (true/false)',

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

@@ -57,7 +57,7 @@ module Fastlane
       rescue Faraday::ConnectionFailed
         show_error('Can not connecting to Zealot', params[:fail_on_error])
       rescue Faraday::TimeoutError
-        show_error('Uploading build to Apphost timed out ⏳', params[:fail_on_error])
+        show_error('Uploading build to Zealot timed out ⏳', params[:fail_on_error])
       end
 
       def upload_app_params(params)
@@ -71,14 +71,16 @@ module Fastlane
       end
 
       UPLOAD_APP_PARAMS_KEYS = %w[
-        name changelog release_type slug branch
-        source git_commit password custom_fields
+        name changelog release_type slug branch password
+        git_commit custom_fields source ci_url
       ].freeze
 
       def avialable_upload_app_params(params)
         UPLOAD_APP_PARAMS_KEYS.each_with_object({}) do |key, obj|
           value = params.fetch(key.to_sym, ask: false)
           value = JSON.dump(value) if key == 'custom_fields' && value
+          value = detect_ci_url(params) if key == 'ci_url'
+          value = detect_source(params) if key == 'source'
           obj[key.to_sym] = value if value && !value.empty?
         end
       end
@@ -133,8 +135,30 @@ module Fastlane
         end
       end
 
+      #######################################
+
+      def sync_deivce(params, device)
+        body = { token: params[:token], name: device.name, model: device.model }
+        http_request(:put, "/api/devices/#{device.udid}", body, params)
+      end
+
+      def build_table_data(params, devices)
+        data = {
+          'Endpoint' => params[:endpoint],
+          'Token' => params[:token],
+          "Devices (#{devices.size})" => devices.map {|d| "#{d.name}: #{d.udid}"}.join("\n")
+        }
+      end
+
       #####################################
 
+      def http_request(method, uri, body, params)
+        connection = make_connection(params[:endpoint], params[:verify_ssl])
+        connection.run_request(method, uri, body, nil) do |req|
+          req.options.timeout = params[:timeout] if params[:timeout]
+        end
+      end
+
       def make_connection(endpoint, verify_ssl = true)
         require 'faraday'
         require 'faraday_middleware'
@@ -155,6 +179,7 @@ module Fastlane
           rows.delete(k) if hidden_keys.include?(k.to_sym)
           rows[k] = rows[k].path if rows[k].is_a?(UploadIO)
         end
+
         puts Terminal::Table.new(
           title: "Summary for #{title} #{Fastlane::Zealot::VERSION}".green,
           rows: rows
@@ -178,6 +203,40 @@ module Fastlane
 
         [:token]
       end
+
+      def detect_source(params)
+        return 'jenkins' if jenkins?
+        return 'gitlab-ci' if gitlab?
+
+        params[:source]
+      end
+
+      def detect_ci_url(params)
+        return params[:ci_url] if params[:ci_url]
+
+        if ENV['BUILD_URL']
+          # Jenkins
+          return ENV['BUILD_URL']
+        elsif ENV['CI_JOB_URL']
+          # Gitlab >= 11.1, Runner 0.5
+          return ENV['CI_JOB_URL']
+        elsif ENV['CI_PROJECT_URL']
+          # Gitlab >= 8.10, Runner 0.5
+          return "#{ENV['CI_PROJECT_URL']}/-/jobs/#{ENV['CI_BUILD_ID']}"
+        end
+      end
+
+      def jenkins?
+        %w(JENKINS_URL JENKINS_HOME).each do |current|
+          return true if ENV.key?(current)
+        end
+
+        return false
+      end
+
+      def gitlab?
+        ENV.key?('GITLAB_CI')
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Zealot
-    VERSION = "0.2.3"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-zealot
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.6.0
 platform: ruby
 authors:
 - icyleaf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.137.0
-description: 
+description:
 email: icyleaf.cn@gmail.com
 executables: []
 extensions: []
@@ -175,6 +175,7 @@ files:
 - lib/fastlane/plugin/zealot.rb
 - lib/fastlane/plugin/zealot/actions/zealot_action.rb
 - lib/fastlane/plugin/zealot/actions/zealot_debug_file.rb
+- lib/fastlane/plugin/zealot/actions/zealot_sync_devices.rb
 - lib/fastlane/plugin/zealot/actions/zealot_version_check.rb
 - lib/fastlane/plugin/zealot/helper/zealot_helper.rb
 - lib/fastlane/plugin/zealot/version.rb
@@ -182,7 +183,7 @@ homepage: https://github.com/getzealot/fastlane-plugin-zealot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,8 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Upload a new build to Zealot
 test_files: []