fastlane-plugin-pgyer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3168d388cca58506137723c74a12cd472e84e6b5c5d01ae72a3dde55aa9cee
-  data.tar.gz: f6f898ceb67bcc0491b0495743f7a86c9a7cafcdccc20be17a95e1f735c3501a
+  metadata.gz: 8d3c45e770d204ec7bc1f613a1b27dc11db4f25043a8975e9bd63b6bcb10abf8
+  data.tar.gz: 71e8f65496c95cf9168f09ae2c81880666d88ed59b2d2a9e21f2c034a98b53d0
 SHA512:
-  metadata.gz: 6dd499a1f68dcddb5dccbd8199d7fe3c8b4a8f24b37143f77b0dae49442b9f084bab07e925a97650d7e45127578e39107c1e1c40210b3c0fcf0ffb3436b893da
-  data.tar.gz: 82bb3f9e4281e6f285c5ede18c7c5f26bbebac39de87801c3da0a2b6c3817f2cffa60689f6291895a749678c2059ccb76698f09971297055143275b36f353d84
+  metadata.gz: 1382bcc6d2cf7b41c5fb0f2ac5a52a1fa451ebab5bddfcd43ac03cab5728a2f3f7459c0524c18f19c6887b54e2e327448190cfa30fb08e6c2dfa9d8eaa71fe16
+  data.tar.gz: 313861f4d385c8bb2c3964839ce6807a7ba9a6b3dc47aac75c262fe637ae197236e96fa0734b206821e6800cbcaa9367a1a02f52c2dfbc5302228e0af7540c4d

data/README.md

@@ -18,12 +18,12 @@ This pluginin allow you distribute app automatically to [pgyer beta testing serv
 
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.
 
-Just specify the `api_key` and `user_key` associated with your pgyer account.
+Just specify the `api_key` associated with your pgyer account.
 
 ```
 lane :beta do
   gym
-  pgyer(api_key: "7f15xxxxxxxxxxxxxxxxxx141", user_key: "4a5bcxxxxxxxxxxxxxxx3a9e")
+  pgyer(api_key: "7f15xxxxxxxxxxxxxxxxxx141")
 end
 ```
 
@@ -32,7 +32,7 @@ You can also set a password to protect the App from being downloaded publicly:
 ```
 lane :beta do
   gym
-  pgyer(api_key: "7f15xxxxxxxxxxxxxxxxxx141", user_key: "4a5bcxxxxxxxxxxxxxxx3a9e", password: "123456", install_type: "2")
+  pgyer(api_key: "7f15xxxxxxxxxxxxxxxxxx141", password: "123456", install_type: "2")
 end
 ```
 
@@ -41,10 +41,29 @@ Set a version update description for App:
 ```
 lane :beta do
   gym
-  pgyer(api_key: "7f15xxxxxxxxxxxxxxxxxx141", user_key: "4a5bcxxxxxxxxxxxxxxx3a9e", update_description: "update by fastlane")
+  pgyer(api_key: "7f15xxxxxxxxxxxxxxxxxx141", update_description: "update by fastlane")
 end
 ```
 
+And more params
+
+```
+
+password: Set password to protect app.
+
+update_description: Set update description for app.
+
+install_type: Set install type for app (1=public, 2=password, 3=invite), Please set as a string.
+
+install_date: Set install type for app (1=Set valid time, 2=Long-term effective, other=Do not modify the last setting), Please set as a string.
+
+install_start_date: The value is a string of characters, for example, 2018-01-01.
+
+install_end_date: The value is a string of characters, such as 2018-12-31.
+
+channel: Need to update the specified channel of the download short link, can specify only one channel, string type, such as: ABCD. Specifies channel uploads. If you do not have one, do not use this parameter.
+
+```
 ## Run tests for this plugin
 
 To run both the tests, and code style validation, run

data/lib/fastlane/plugin/pgyer/actions/pgyer_action.rb

@@ -1,5 +1,5 @@
-require 'faraday'
-require 'faraday_middleware'
+require "faraday"
+require "faraday_middleware"
 
 module Fastlane
   module Actions
@@ -7,44 +7,73 @@ module Fastlane
       def self.run(params)
         UI.message("The pgyer plugin is working.")
 
-        api_host = "http://qiniu-storage.pgyer.com/apiv1/app/upload"
         api_key = params[:api_key]
-        user_key = params[:user_key]
 
         build_file = [
           params[:ipa],
-          params[:apk]
+          params[:apk],
         ].detect { |e| !e.to_s.empty? }
 
         if build_file.nil?
           UI.user_error!("You have to provide a build file")
         end
 
-        UI.message "build_file: #{build_file}"
+        type = params[:ipa].nil? ? "android" : "ios"
+
+        UI.message "build_file: #{build_file}, type: #{type}"
+
+        install_type = params[:install_type]
+        if install_type.nil?
+          install_type = "1"
+        end
 
         password = params[:password]
         if password.nil?
           password = ""
         end
 
+        request_params = {
+          "_api_key" => api_key,
+          "buildType" => type,
+          "buildInstallType" => install_type,
+          "buildPassword" => password,
+        }
+
         update_description = params[:update_description]
-        if update_description.nil?
-          update_description = ""
+
+        if update_description != nil
+          request_params["buildUpdateDescription"] = update_description
         end
 
-        install_type = params[:install_type]
-        if install_type.nil?
-          install_type = "1"
+        install_date = params[:install_date]
+
+        if install_date != nil
+          if install_date == "1"
+            request_params["buildInstallDate"] = install_date
+            install_start_date = params[:install_start_date]
+            request_params["buildInstallStartDate"] = install_start_date
+            install_end_date = params[:install_end_date]
+            request_params["buildInstallEndDate"] = install_end_date
+          elsif install_date == "2"
+            request_params["buildInstallDate"] = install_date
+          end
+        end
+
+        channel = params[:channel]
+        if channel != nil
+          request_params["buildChannelShortcut"] = channel
         end
 
         # start upload
         conn_options = {
           request: {
-            timeout:       1000,
-            open_timeout:  300
-          }
+            timeout: 1000,
+            open_timeout: 300,
+          },
         }
 
+        api_host = "https://www.pgyer.com/apiv2/app"
+
         pgyer_client = Faraday.new(nil, conn_options) do |c|
           c.request :multipart
           c.request :url_encoded
@@ -52,25 +81,35 @@ module Fastlane
           c.adapter :net_http
         end
 
-        params = {
-            '_api_key' => api_key,
-            'uKey' => user_key,
-            'password' => password,
-            'updateDescription' => update_description,
-            'installType' => install_type,
-            'file' => Faraday::UploadIO.new(build_file, 'application/octet-stream')
-        }
+        response = pgyer_client.post "#{api_host}/getCOSToken", request_params
+
+        info = response.body
+
+        if info["code"] != 0
+          UI.user_error!("Get token is failed, info: #{info}")
+        end
+
+        key = info["data"]["key"]
+
+        endpoint = info["data"]["endpoint"]
+
+        request_params = info["data"]["params"]
+
+        if key.nil? || endpoint.nil? || request_params.nil?
+          UI.user_error!("Get token is failed")
+        end
+        content_type = type == 'android' ? 'application/vnd.android.package-archive' : 'application/octet-stream'
+        request_params["file"] = Faraday::UploadIO.new(build_file, content_type)
 
         UI.message "Start upload #{build_file} to pgyer..."
 
-        response = pgyer_client.post api_host, params
-        info = response.body
+        response = pgyer_client.post endpoint, request_params
 
-        if info['code'] != 0
-          UI.user_error!("PGYER Plugin Error: #{info['message']}")
+        if response.status != 204
+          UI.user_error!("PGYER Plugin Upload Error: #{response.body}")
         end
 
-        UI.success "Upload success. Visit this URL to see: https://www.pgyer.com/#{info['data']['appShortcutUrl']}"
+        self.checkPublishStatus(pgyer_client, api_host, api_key, key)
       end
 
       def self.description
@@ -93,15 +132,10 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :api_key,
-                                  env_name: "PGYER_API_KEY",
-                               description: "api_key in your pgyer account",
-                                  optional: false,
-                                      type: String),
-          FastlaneCore::ConfigItem.new(key: :user_key,
-                                  env_name: "PGYER_USER_KEY",
-                               description: "user_key in your pgyer account",
-                                  optional: false,
-                                      type: String),
+                                       env_name: "PGYER_API_KEY",
+                                       description: "api_key in your pgyer account",
+                                       optional: false,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :apk,
                                        env_name: "PGYER_APK",
                                        description: "Path to your APK file",
@@ -127,20 +161,40 @@ module Fastlane
                                          UI.user_error!("You can't use 'ipa' and '#{value.key}' options in one run")
                                        end),
           FastlaneCore::ConfigItem.new(key: :password,
-                                  env_name: "PGYER_PASSWORD",
-                               description: "set password to protect app",
-                                  optional: true,
-                                      type: String),
+                                       env_name: "PGYER_PASSWORD",
+                                       description: "Set password to protect app",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :update_description,
-                                  env_name: "PGYER_UPDATE_DESCRIPTION",
-                               description: "set update description for app",
-                                  optional: true,
-                                      type: String),
+                                       env_name: "PGYER_UPDATE_DESCRIPTION",
+                                       description: "Set update description for app",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :install_type,
-                                  env_name: "PGYER_INSTALL_TYPE",
-                               description: "set install type for app (1=public, 2=password, 3=invite). Please set as a string",
-                                  optional: true,
-                                      type: String)
+                                       env_name: "PGYER_INSTALL_TYPE",
+                                       description: "Set install type for app (1=public, 2=password, 3=invite). Please set as a string",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :install_date,
+                                       env_name: "PGYER_INSTALL_DATE",
+                                       description: "Set install type for app (1=Set valid time, 2=Long-term effective, other=Do not modify the last setting). Please set as a string",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :install_start_date,
+                                       env_name: "PGYER_INSTALL_START_DATE",
+                                       description: "The value is a string of characters, for example, 2018-01-01",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :install_end_date,
+                                       env_name: "PGYER_INSTALL_END_DATE",
+                                       description: "The value is a string of characters, such as 2018-12-31",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :channel,
+                                       env_name: "PGYER_INSTALL_TYPE",
+                                       description: "Need to update the specified channel of the download short link, can specify only one channel, string type, such as: ABCD",
+                                       optional: true,
+                                       type: String),
         ]
       end
 
@@ -151,6 +205,27 @@ module Fastlane
         [:ios, :mac, :android].include?(platform)
         true
       end
+
+      private
+
+      def self.checkPublishStatus(client, api_host, api_key, buildKey)
+        response = client.post "#{api_host}/buildInfo", { :_api_key => api_key, :buildKey => buildKey }
+        info = response.body
+        code = info["code"]
+        if code == 0
+          UI.success "Upload success. BuildInfo is #{info["data"]}."
+          shortUrl = info["data"]["buildShortcutUrl"]
+          if shortUrl.nil? || shortUrl == ""
+            shortUrl = info["data"]["buildKey"]
+          end
+          UI.success "Upload success. Visit this URL to see: https://www.pgyer.com/#{shortUrl}"
+        elsif code == 1246 || code == 1247
+          sleep 3
+          self.checkPublishStatus(client, api_host, api_key, buildKey)
+        else
+          UI.user_error!("PGYER Plugin Published Error: #{info} buildKey: #{buildKey}")
+        end
+      end
     end
   end
 end

data/lib/fastlane/plugin/pgyer/helper/pgyer_helper.rb

@@ -1,4 +1,8 @@
+require "fastlane_core/ui/ui"
+
 module Fastlane
+  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
+
   module Helper
     class PgyerHelper
       # class methods that you define here become available in your action

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Pgyer
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-pgyer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - rexshi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fastlane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.208.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.208.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,6 +96,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.12.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,20 +123,34 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fastlane
+  name: rubocop-require_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
-description: 
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email: rexshi@pgyer.com
 executables: []
 extensions: []
@@ -110,7 +166,7 @@ homepage: https://github.com/shishirui/fastlane-plugin-pgyer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,16 +174,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: distribute app to pgyer beta testing service
 test_files: []