fastlane-plugin-upload_dsym_to_bugly 1.1.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6890daf60a91eca16e505063e9e6e599d79680307e9e23d21a16ede772960c7
-  data.tar.gz: 639cd70717796f3ca31bae1da71fe45fa0fd817d0d6b1edd0833c324aaf26d8b
+  metadata.gz: cddfdc1f35e8ad90b1efbccd243c89783cd9884caed380f7a8ef684b9f0a3932
+  data.tar.gz: 00e8d6921899d9f71580ffea34b780f976da1664904cefe575c8a5ba4a1e5c0a
 SHA512:
-  metadata.gz: 1af9141f0defc121b425d75e1d31a67c04d5c653d9445d9c9b912ad34f9a945704b5008aad066c35ccf7382075b9ad1d6b0c5899eb00c047eb94fcd5e24d6585
-  data.tar.gz: 7b5c79bfa3249f5f786b6efd77af7b9390cb59606ecdf80395ca9123ada0495ae49876eeda2ac3d462dc0ca67cea2010d5c84ba7f6e1e6ee0386a7f08752e023
+  metadata.gz: f59a362195d3b9a938e9e915f3afb8e90c8f4cbe0c1c3b6b018a89ec8c7d6b29e6d9e8122374c8846a13c74cf9ca62735761847b4ea8674f7800d1cb6108c0a7
+  data.tar.gz: ea2e7b25a331c685313bd25db9ed502ce490f46ab64ea7fcd05e589159e4f1651b936c3eb4e12e562cd9f742dd202e5536d775fe8179e0eaded4bc0e3de1095c

data/README.md

@@ -2,6 +2,17 @@
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-upload_dsym_to_bugly)
 
+
+## Note
+2021 年 6 月 28 日 开始，bugly 不再支持使用 openApi 的方式上传符号表，需要使用官方提供的命令行上传工具进行上传。
+本插件当前使用的工具版本为：__3.3.4__
+
+另
+- upload_dsym_to_bugly action 的方法参数有变化，请注意。请参照 Getting Start 部分
+- 去除了上传 ipa 到 bugly 的 action。
+
+
+
 ## Getting Started
 
 This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `fastlane-plugin-upload_dsym_to_bugly`, add it to your project by running:
@@ -14,35 +25,14 @@ add the following to your `fastfile`
 ```ruby
 lane :upload_dysm do
     upload_dsym_to_bugly(
-      file_path: "<your dSYM.zip path>/<your dSYM.zip name>",
-      file_name: "<your dSYM.zip name>",
+      file_path: "<path/to/your/x.app.dSYM.zip",
       app_key: "<your app_key>",
       app_id:"<your app_id>",
-      api_version: 1,
-      symbol_type: 2, # iOS => 2, Android => 1
       bundle_id: '<your bundle id>',
-      product_version: get_version_number
-    )
-end
-```
-
-if you want to upload your ipa to bugly, add the following to your `fastfile`
-```ruby
-lane :upload_app do
-    upload_app_to_bugly(
-      file_path:"<your *.ipa filepath>",
-      app_key:"<your app_key>",
-      app_id:"<your app_id>",
-      pid:"2",
-      title:"<title>",
-      desc:"<description>",
-      secret:"<secret>",
-      users:"<users>",
-      password:"<password>",
-      download_limit:download_limit
+      version: get_version_number,
+      raise_if_error: false
     )
 end
-
 ```
 
 ## About upload_dsym_to_bugly

data/lib/fastlane/plugin/upload_dsym_to_bugly/actions/upload_dsym_to_bugly_action.rb

@@ -1,5 +1,6 @@
 require "fastlane/action"
 require_relative "../helper/upload_dsym_to_bugly_helper"
+require 'fileutils'
 
 module Fastlane
   module Actions
@@ -8,48 +9,49 @@ module Fastlane
     end
     class UploadDsymToBuglyAction < Action
       def self.run(params)
-        require "json"
-        # fastlane will take care of reading in the parameter and fetching the environment variable:
-        UI.message "file path: #{params[:file_path]}"
 
-        json_file = "upload_dsym_to_bugly_result.json"
+        jar_path = File.expand_path('../../jars/buglyqq-upload-symbol-3.3.4.jar', __FILE__)
+        UI.message "jar path: #{jar_path}"
 
-        begin
-          api_version = ""
-          if !params[:api_version].nil? && params[:api_version] > 0
-            api_version = " --form \"api_version=#{params[:api_version]}\" "
-            UI.message "api_version: #{api_version}"
-          end
-        rescue Exception => e
-          UI.message "error at checking api version, caused by #{e}"
+        file_path = File.expand_path("#{params[:file_path]}")
+        UI.message "file path: #{file_path}"
+
+        unzip_path = File.expand_path(".upload_dsym_to_bugly_tmp", "#{File.dirname("#{file_path}")}") 
+        UI.message "unzip path: #{unzip_path}"
+
+        if Dir.exist?(unzip_path)
+          FileUtils.rm_r(unzip_path, force: true)
         end
 
-        begin
-          channel = ""
-          if !params[:channel].nil? && !params[:channel].empty?
-            channel = " --form \"channel=#{params[:channel]}\" "
-            UI.message "channel: #{channel}"
-          end
-        rescue Exception => e
-          UI.message "error at checking api version, caused by #{e}"
+        if !Dir.glob(file_path).empty?
+            sh("unzip -o \"#{file_path}\" -d \"#{unzip_path}\"")
+        else
+          UI.message "dSYM zip File don't exist"
+          Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = false
+          raise if params[:raise_if_error]
         end
 
-        cmd = "curl -k \"https://api.bugly.qq.com/openapi/file/upload/symbol?app_key=#{params[:app_key]}&app_id=#{params[:app_id]}\"" + api_version + " --form \"app_id=#{params[:app_id]}\"" + " --form \"app_key=#{params[:app_key]}\"" + " --form \"symbolType=#{params[:symbol_type]}\"" + " --form \"bundleId=#{params[:bundle_id]}\"" + " --form \"productVersion=#{params[:product_version]}\"" + channel + " --form \"fileName=#{params[:file_name]}\"" + " --form \"file=@#{params[:file_path]}\"" + " -o " + json_file
+        java_path = params[:java_path] || 'java'
+        cmd = "#{java_path} -jar \"#{jar_path}\" -appid \"#{params[:app_id]}\" -appkey \"#{params[:app_key]}\" -bundleid \"#{params[:bundle_id]}\" -version \"#{params[:version]}\" -platform \"#{params[:platform]}\" -inputSymbol \"#{unzip_path}\""
+
+        log_file = "dSYM_upload_result.log"
+
         begin
-          sh(cmd)
-          obj = JSON.parse(File.read(json_file))
-          `rm upload_dsym_to_bugly_result.json`
-          ret = obj["rtcode"]
-          if ret == 0
-            UI.message "dSYM upload success"
+          sh("#{cmd} > #{log_file}")
+          last_line = sh("tail -n 1 \"#{log_file}\"")
+
+          success = last_line.include?("retCode: 200") and last_line.include?("\"msg\":\"success\"")
+          if success
+            UI.message "dSYM upload successfully 🎉 "            
             Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = true
           else
-            UI.message "dSYM upload failed, result is #{obj}"
+            UI.message "dSYM upload failed: #{last_line}"
             Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = false
-            raise if params[:raise_if_error]
+            raise if params[:raise_if_error]        
           end
-        rescue
-          UI.message "dSYM upload failed"
+
+        rescue => exception
+          UI.message "dSYM upload failed, See log output above"
           Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = false
           raise if params[:raise_if_error]
         end
@@ -74,65 +76,49 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :api_version,
-                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_API_VERSION",
-                                       description: "api version for UploadDsymToBuglyAction",
-                                       is_string: false,
-                                       default_value: 1),
           FastlaneCore::ConfigItem.new(key: :app_id,
                                        env_name: "FL_UPLOAD_DSYM_TO_BUGLY_APP_ID",
-                                       description: "app id for UploadDsymToBuglyAction",
+                                       description: "app id",
                                        is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No APP id for UploadDsymToBuglyAction given, pass using `app_id: 'app_id'`") unless (value and not value.empty?)
                                        end),
           FastlaneCore::ConfigItem.new(key: :app_key,
                                        env_name: "FL_UPLOAD_DSYM_TO_BUGLY_APP_KEY",
-                                       description: "app key for UploadDsymToBuglyAction",
+                                       description: "app key",
                                        is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No APP key for UploadDsymToBuglyAction given, pass using `api_key: 'app_key'`") unless (value and not value.empty?)
                                        end),
-          FastlaneCore::ConfigItem.new(key: :symbol_type,
-                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_SYMBOL_TYPE",
-                                       description: "symbol type for UploadDsymToBuglyAction",
-                                       is_string: false,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No symbol type for UploadDsymToBuglyAction given, pass using `symbol_type: 'symbol_type'`") unless (value and not value.to_s.empty?)
-                                       end),
           FastlaneCore::ConfigItem.new(key: :bundle_id,
                                        env_name: "FL_UPLOAD_DSYM_TO_BUGLY_BUNDLE_ID",
-                                       description: "bundle id for UploadDsymToBuglyAction",
+                                       description: "bundle id",
                                        is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No symbol type for UploadDsymToBuglyAction given, pass using `bundle_id: 'bundle_id'`") unless (value and not value.empty?)
                                        end),
-          FastlaneCore::ConfigItem.new(key: :product_version,
-                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_PRODEUCT_VERSION",
-                                       description: "product version for UploadDsymToBuglyAction",
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No symbol type for UploadDsymToBuglyAction given, pass using `product_version: 'product_version'`") unless (value and not value.empty?)
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :channel,
-                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_CHANNEL",
-                                       description: "channel for UploadDsymToBuglyAction",
-                                       is_string: true,
-                                       default_value: "fastlane"),
-          FastlaneCore::ConfigItem.new(key: :file_name,
-                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_FILE_NAME",
-                                       description: "file name for UploadDsymToBuglyAction",
+          FastlaneCore::ConfigItem.new(key: :version,
+                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_VERSION",
+                                       description: "app version",
                                        is_string: true,
                                        verify_block: proc do |value|
-                                         UI.user_error!("No symbol type for UploadDsymToBuglyAction given, pass using `file_name: 'file_name'`") unless (value and not value.empty?)
+                                         UI.user_error!("No symbol type for UploadDsymToBuglyAction given, pass using `version: 'version'`") unless (value and not value.empty?)
                                        end),
           FastlaneCore::ConfigItem.new(key: :file_path,
                                        env_name: "FL_UPLOAD_DSYM_TO_BUGLY_FILE",
-                                       description: "file for UploadDsymToBuglyAction",
+                                       description: "file path",
                                        is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No symbol type for UploadDsymToBuglyAction given, pass using `file_path: 'file_path'`") unless (value and not value.empty?)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :platform,
+                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_FILE",
+                                       description: "platform",
+                                       is_string: true,
+                                       default_value: "IOS",
+                                       verify_block: proc do |value|
+                                         UI.user_error!("platform value error, available values: IOS, Android") unless (value == "IOS" or value == "Android")
+                                      end),
           FastlaneCore::ConfigItem.new(key: :raise_if_error,
                                        env_name: "FL_UPLOAD_DSYM_TO_BUGLY_RAISE_IF_ERROR",
                                        description: "Raises an error if fails, so you can fail CI/CD jobs if necessary \(true/false)",
@@ -140,11 +126,16 @@ module Fastlane
                                        is_string: false,
                                        type: Boolean,
                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :java_path,
+                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_JAVA_PATH",
+                                       description: "Use specific Java, instead of system one",
+                                       default_value: nil,
+                                       is_string: true,
+                                       optional: true),
         ]
       end
 
       def self.output
-        # Define the shared values you are going to provide
         [
           ["UPLOAD_DSYM_TO_BUGLY_RESULT", "upload result"],
         ]

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

@@ -1,5 +1,5 @@
 module Fastlane
   module UploadDsymToBugly
-    VERSION = "1.1.2"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-upload_dsym_to_bugly
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.1.0
 platform: ruby
 authors:
 - liubo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.108.0
-description: 
+description:
 email: liubo004@126.com
 executables: []
 extensions: []
@@ -145,15 +145,15 @@ files:
 - LICENSE
 - README.md
 - lib/fastlane/plugin/upload_dsym_to_bugly.rb
-- lib/fastlane/plugin/upload_dsym_to_bugly/actions/upload_app_to_bugly_action.rb
 - lib/fastlane/plugin/upload_dsym_to_bugly/actions/upload_dsym_to_bugly_action.rb
 - lib/fastlane/plugin/upload_dsym_to_bugly/helper/upload_dsym_to_bugly_helper.rb
+- lib/fastlane/plugin/upload_dsym_to_bugly/jars/buglyqq-upload-symbol-3.3.4.jar
 - lib/fastlane/plugin/upload_dsym_to_bugly/version.rb
 homepage: https://github.com/srv7/fastlane-plugin-upload_dsym_to_bugly
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.30
+signing_key:
 specification_version: 4
 summary: upload_dsym_to_bugly
 test_files: []

data/lib/fastlane/plugin/upload_dsym_to_bugly/actions/upload_app_to_bugly_action.rb

@@ -1,201 +0,0 @@
-require "fastlane/action"
-require_relative "../helper/upload_dsym_to_bugly_helper"
-
-module Fastlane
-  module Actions
-    module SharedValues
-      UPLOAD_APP_TO_BUGLY_DOWNLOAD_URL = :UPLOAD_APP_TO_BUGLY_DOWNLOAD_URL
-    end
-
-    # To share this integration with the other fastlane users:
-    # - Fork https://github.com/fastlane/fastlane/tree/master/fastlane
-    # - Clone the forked repository
-    # - Move this integration into lib/fastlane/actions
-    # - Commit, push and submit the pull request
-
-    class UploadAppToBuglyAction < Action
-      def self.run(params)
-        require "json"
-        # fastlane will take care of reading in the parameter and fetching the environment variable:
-        UI.message "file path: #{params[:file_path]}"
-
-        json_file = "upload_app_to_bugly_result.json"
-
-        begin
-          secret = ""
-          if !params[:secret].to_s.nil? && !params[:secret].empty?
-            secret = " -F \"secret=#{params[:secret]}\" "
-            UI.message "secret:#{secret}"
-          end
-        rescue Exception => e
-          UI.message "error at checking secret,caused by #{e}"
-          return
-        end
-
-        begin
-          users = ""
-          if !params[:users].nil? && !params[:users].empty?
-            users = " -F \"users=#{params[:users]}\" "
-            UI.message "users:#{users}"
-          end
-        rescue Exception => e
-          UI.message "error at checking users,caused by #{e}"
-          return
-        end
-
-        begin
-          password = ""
-          if !params[:password].nil? && !params[:password].empty?
-            password = " -F \"password=#{params[:password]}\" "
-            UI.message "password:#{password}"
-          end
-        rescue Exception => e
-          UI.message "error at checking password,caused by #{e}"
-          return
-        end
-
-        begin
-          download_limit = ""
-          if !params[:download_limit].nil? && params[:download_limit] > 0
-            download_limit = " -F \"download_limit=#{params[:download_limit]}\" "
-            UI.message "download_limit:#{download_limit}"
-          end
-        rescue Exception => e
-          UI.message "error at checking download_limit,caused by #{e}"
-          return
-        end
-
-        cmd = "curl --insecure -F \"file=@#{params[:file_path]}\" -F \"app_id=#{params[:app_id]}\" -F \"pid=#{params[:pid]}\" -F \"title=#{params[:title]}\" -F \"description=#{params[:desc]}\"" + secret + users + password + download_limit + " https://api.bugly.qq.com/beta/apiv1/exp?app_key=#{params[:app_key]} -o " + json_file
-        begin
-          sh(cmd)
-          obj = JSON.parse(File.read(json_file))
-          `rm upload_dsym_to_bugly_result.json`
-          ret = obj["rtcode"]
-          if ret == 0
-            UI.message "upload success"
-            url = obj["data"]["url"]
-            Actions.lane_context[SharedValues::UPLOAD_APP_TO_BUGLY_DOWNLOAD_URL] = url
-            UI.message "upload success, link: #{url}"
-          else
-            UI.message "upload failed,result is #{obj}"
-            raise if params[:raise_if_error]
-          end
-        rescue
-          UI.message "upload failed"
-          raise if params[:raise_if_error]
-        end
-      end
-
-      #####################################################
-      # @!group Documentation
-      #####################################################
-
-      def self.description
-        "upload_app_to_bugly"
-      end
-
-      def self.details
-        # Optional:
-        # this is your chance to provide a more detailed description of this action
-        "You can use this action to do cool things..."
-      end
-
-      def self.available_options
-        # Define all options your action supports.
-
-        # Below a few examples
-        [
-          FastlaneCore::ConfigItem.new(key: :file_path,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_FILE_PATH",
-                                       description: "file path for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No file path for UploadAppToBuglyAction given, pass using `file_path: 'path'`") unless value && !value.empty?
-                                         UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :app_key,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_APP_KEY",
-                                       description: "app key for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("NO app_key for UploadAppToBuglyAction given, pass using `app_key: 'app_key'`") unless value && !value.empty?
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :app_id,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_APP_ID",
-                                       description: "app id for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No app_id for UploadAppToBuglyAction given, pass using `app_id: 'app_id'`") unless value && !value.empty?
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :pid,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_PID",
-                                       description: "pid for UploadToBuglyAction",
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No pid for UploadAppToBuglyAction given, pass using `pid: 'pid'`") unless value && !value.empty?
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :title,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_TITLE",
-                                       description: "title for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       default_value: "title",
-                                       verify_block: proc do |value|
-                                         UI.user_error!("No title for UploadAppToBuglyAction given, pass using `title: 'title'`") unless value && !value.empty?
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :desc,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_DESC",
-                                       description: "desc for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       default_value: "desc"),
-          FastlaneCore::ConfigItem.new(key: :secret,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_SECRET",
-                                       description: "secret for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       default_value: ""),
-          FastlaneCore::ConfigItem.new(key: :users,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_USERS",
-                                       description: "users for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       default_value: ""),
-          FastlaneCore::ConfigItem.new(key: :password,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_PASSWORD",
-                                       description: "password for UploadAppToBuglyAction",
-                                       is_string: true,
-                                       default_value: ""),
-          FastlaneCore::ConfigItem.new(key: :download_limit,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_DOWNLOAD_LIMIT",
-                                       description: "download_limit for UploadAppToBuglyAction",
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
-                                       default_value: 10_000),
-          FastlaneCore::ConfigItem.new(key: :raise_if_error,
-                                       env_name: "FL_UPLOAD_APP_TO_BUGLY_RAISE_IF_ERROR",
-                                       description: "Raises an error if fails, so you can fail CI/CD jobs if necessary \(true/false)",
-                                       default_value: true,
-                                       is_string: false,
-                                       type: Boolean,
-                                       optional: false),
-        ]
-      end
-
-      def self.output
-        # Define the shared values you are going to provide
-        [
-          ["UPLOAD_APP_TO_BUGLY_DOWNLOAD_URL", "download url"],
-        ]
-      end
-
-      def self.return_value
-        # If you method provides a return value, you can describe here what it does
-      end
-
-      def self.authors
-        # So no one will ever forget your contribution to fastlane :) You are awesome btw!
-        ["liubo"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :ios
-      end
-    end
-  end
-end