fastlane-plugin-pgyer_jvtd 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f8c587ccbfc7dcee745819c50522cb8e737ba7542215a463f9f4f8d8c183725
-  data.tar.gz: 31a78ee038877db925778cae0bf38277dd06e912e3194c043f99169238316cd3
+  metadata.gz: 46c1860890a0a9b95e9244dfd105dcfd0ba618117050f6504ca96b318d6e9d13
+  data.tar.gz: 9534c55c8abaf7b7239450b66026700ed9a54a5dc24a775b781820829ba5dfb9
 SHA512:
-  metadata.gz: bae10a3f5e5241dd9da70e6b4a55d3c92a588fdef728148878a553c4af2ae9192f23b83846469e834f91c963f26d505b9072d294418c01b41b94a5da91aae9c9
-  data.tar.gz: 7b03d02f7f18b23ca85b80b06e19947e6f23425bfbcc7f81666eff28dd831fb7765fe71c1de8097c6f9c4c29cf12f2754d6bc8a69fc5936152e89589cf79a0e8
+  metadata.gz: b859df1e456ae380e4749a6894c82ea011c57668916d45de35621bcd41f951da8ea0c6da2e6cfd59c105782c24c5cb1e7f114d990f68013fbd0d0c526c31990c
+  data.tar.gz: 40ad9e907d84af31a1b65300c46753e4d35f4087e81b7549465a7390825b0e22f18020dbc3758a78be40f77dea37154e7fd727ca96335dff8562a11ae6572328

data/lib/fastlane/plugin/pgyer_jvtd/actions/pgyer_jvtd_action.rb

@@ -17,75 +17,78 @@ module Fastlane
           is_at_all = "0"
         end
 
-        build_file = [
-            params[:ipa],
-            params[:apk]
-        ].detect { |e| !e.to_s.empty? }
+        info = nil
 
-        if build_file.nil?
-          UI.user_error!("You have to provide a build file")
-        end
+        if api_key.nil?
+          build_file = [
+              params[:ipa],
+              params[:apk]
+          ].detect { |e| !e.to_s.empty? }
 
-        UI.message "build_file: #{build_file}"
+          if build_file.nil?
+            UI.user_error!("You have to provide a build file")
+          end
 
-        password = params[:password]
-        if password.nil?
-          password = ""
-        end
+          UI.message "build_file: #{build_file}"
 
-        update_description = params[:update_description]
-        if update_description.nil?
-          update_description = ""
-        end
+          password = params[:password]
+          if password.nil?
+            password = ""
+          end
 
-        install_type = params[:install_type]
-        if install_type.nil?
-          install_type = "1"
-        end
+          update_description = params[:update_description]
+          if update_description.nil?
+            update_description = ""
+          end
 
-        channel_shortcut = params[:channel_shortcut]
-        if channel_shortcut.nil?
-          channel_shortcut = ""
-        end
+          install_type = params[:install_type]
+          if install_type.nil?
+            install_type = "1"
+          end
 
-        # start upload
-        conn_options = {
-            request: {
-                timeout: 1000,
-                open_timeout: 300
-            }
-        }
-
-        pgyer_client = Faraday.new(nil, conn_options) do |c|
-          c.request :multipart
-          c.request :url_encoded
-          c.response :json, content_type: /\bjson$/
-          c.adapter :net_http
-        end
+          channel_shortcut = params[:channel_shortcut]
+          if channel_shortcut.nil?
+            channel_shortcut = ""
+          end
 
-        params = {
-            '_api_key' => api_key,
-            'uKey' => user_key,
-            'password' => password,
-            'updateDescription' => update_description,
-            'installType' => install_type,
-            'channelShortcut' => channel_shortcut,
-            'file' => Faraday::UploadIO.new(build_file, 'application/octet-stream')
-        }
+          # start upload
+          conn_options = {
+              request: {
+                  timeout: 1000,
+                  open_timeout: 300
+              }
+          }
 
-        UI.message "Start upload #{build_file} to pgyer..."
+          pgyer_client = Faraday.new(nil, conn_options) do |c|
+            c.request :multipart
+            c.request :url_encoded
+            c.response :json, content_type: /\bjson$/
+            c.adapter :net_http
+          end
 
-        response = pgyer_client.post api_host, params
-        info = response.body
+          params = {
+              '_api_key' => api_key,
+              'uKey' => user_key,
+              'password' => password,
+              'updateDescription' => update_description,
+              'installType' => install_type,
+              'channelShortcut' => channel_shortcut,
+              'file' => Faraday::UploadIO.new(build_file, 'application/octet-stream')
+          }
 
-        if info['code'] != 0
-          UI.user_error!("PGYER Plugin Error: #{info['message']}")
-          return
-        end
+          UI.message "Start upload #{build_file} to pgyer..."
 
-        UI.success "Upload success. Visit this URL to see: https://www.pgyer.com/#{info['data']['appShortcutUrl']}"
+          response = pgyer_client.post api_host, params
+          info = response.body
 
+          if info['code'] != 0
+            UI.user_error!("PGYER Plugin Error: #{info['message']}")
+            return
+          end
 
+          UI.success "Upload success. Visit this URL to see: https://www.pgyer.com/#{info['data']['appShortcutUrl']}"
+        else
+        end
         # 应用类型
         appType = "Android";
         if info['data']['appType'] == 1
@@ -94,22 +97,37 @@ module Fastlane
 
         # 应用名称
         appName = info['data']['appName']
+        if appName.nil?
+          appName = "测试应用"
+        end
         # 应用版本信息
         appVersion = info['data']['appVersion']
+        if appVersion.nil?
+          appVersion = "1.0.0"
+        end
         # 应用蒲公英版本
         appBuildVersion = info['data']['appBuildVersion']
+        if appBuildVersion.nil?
+          appBuildVersion = 1
+        end
         # 图标
         appIcon = "https://appicon.pgyer.com/image/view/app_icons/#{info['data']['appIcon']}"
+        if appIcon.nil?
+          appIcon = ""
+        end
         # 地址
         appUrl = "https://www.pgyer.com/#{info['data']['appShortcutUrl']}"
+        if appUrl.nil?
+          appUrl = "https://www.pgyer.com"
+        end
 
         unless access_token.nil?
-          uri = URI.parse("https://oapi.dingtalk.com/robot/send?access_token=#{access_token}")
-          #https://oapi.dingtalk.com/robot/send?access_token=e3a3fc0e5a8c95bcc4e910b8939beb100db190752fef3756e86efa46578cd869
+          uriStr = "https://oapi.dingtalk.com/robot/send?access_token=#{access_token}";
+          uri = URI.parse(uriStr)
+          UI.success uriStr
           dingtalk_client = Faraday.new(nil, conn_options) do |c|
             c.request :url_encoded
             c.response :json, content_type: /\bjson$/
-            c.adapter :net_http
           end
 
           params = {
@@ -132,7 +150,6 @@ module Fastlane
           dingtalk2_client = Faraday.new(nil, conn_options) do |c|
             c.request :url_encoded
             c.response :json, content_type: /\bjson$/
-            c.adapter :net_http
           end
 
           params = {

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

@@ -1,5 +1,5 @@
 module Fastlane
   module PgyerJvtd
-    VERSION = "0.1.9"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-pgyer_jvtd
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - 陈磊的MacBook Pro