fast_pack 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a7b17734ab4cd9252fb7e2b407ff24c0039b5c91235db96f511e581d25ce96
-  data.tar.gz: 4a5800e6ae41b12cfd92b3c20b0a21039a82dbfa34c9c8760459327caae98072
+  metadata.gz: 734b3ae32fd526e24552fac22caf236cf650d1a3752d86553c5145def372e684
+  data.tar.gz: 2be8b220264459dfe376d9618d0ef56dd2db2dc4f15cea394d74f4270b877e98
 SHA512:
-  metadata.gz: 473e6dcef126f0a452c9cfec43c2a7cba7b4aaa3f0d7cf986ee67d0cf5dac67c8bd1953914ee4e526d4a195002bbfbbe772dd10e349a383f5c9136ac62db023e
-  data.tar.gz: 2c11fea41576a43e5048c063e19407d8855eac92d6b826f7b47c5540148425df6b43ac0f7db65d4f308256aed0605b9800e2a62fe804731b6acb9a9716cb5d2f
+  metadata.gz: baf435dea6e0ff6565dc20a8f52b11e1ff95d0db3fce3772a0bfab95bc1975c6776ed39c816286fcc2afc6065408ec5e38d986d3b2a64c336dd4d67f0157f3c0
+  data.tar.gz: a1ed308ef7ee67cd8e5c88968b09a0ba2919abb61286eaf9bc022b3d4233ffd6f1325a4e99d023bb5885cc2a487f0413e44a0e25319f89ce7b6e23b73e3050e7

data/lib/cocoapods-uki-packager/Test.rb

@@ -0,0 +1,5 @@
+url = "http://appsmanager.neoclub.cn/p/code/2c94808382abb5a801830d4825fd0243"
+
+dir = Dir.new(url)
+
+p dir.path

data/lib/cocoapods-uki-packager/shell.rb

@@ -77,7 +77,7 @@ class Shell_Command
             exit
         end
 
-        puts %x{echo "*********************************************************  开始导出ipa"}
+        puts("*********************************************************开始导出ipa")
 
         log = %x{
             product_path=#{uki_config.build_exe_path}
@@ -104,62 +104,60 @@ class Shell_Command
             zip -r -q "$APP.ipa" ./Payload;
             rm -rf ./Payload;
 
-            # echo "===生成ipa开始上传 ==="
-
-            #计时
-            SECONDS=0
-
-            # fir_token="207c7aad886da8009a73486d5154a7a6"
-            # fir publish "$APP.ipa" -T $fir_token -c "$fir_log" -R
-
-            apiKey="2b73b132408ae0145c5e7cb871c37036"
-            uKey="3bd6eb4f50db762b0d83fabb6692713f"
-
-            curl -F "file=@$APP.ipa" -F "uKey=$uKey" -F "_api_key=$apiKey" -F "updateDescription=$log" https://www.pgyer.com/apiv1/app/upload
-
             size=$(ls -l $APP.ipa | awk '{ print $5 }')
-
             sizeM=`echo "scale=2; ${size}/1024.0/1024" | bc`
             #sizeM="$((${size}/1000.0))
 
-            echo -e "包体积=${sizeM}m\n"
-
-            notification="Did uploaded to fir caost time:${SECONDS}s"
-            echo "===$notification===%" 
-
-            osascript -e 'display notification "size:'$sizeM'm\ncaost:'$SECONDS's" with title "Uploaded to fir!" sound name "default" '
-
-            echo "upload_time=${SECONDS}"
+            echo -e "包体积=${sizeM}m\n"  
         }
 
-        ipa_size = log[/包体积.*$/].split('=').last
-        
-        # url = log[/http:.*$/].to_s
 
-        url = if uki_config.workspace == "miaohong.xcworkspace"
-          "https://www.pgyer.com/K70I"
-        else
-          "https://www.pgyer.com/uGp4"
+        if !File.exist?(uki_config.ipa_path)
+          puts("*********************************************************导出失败")
+          exit
         end
 
-        array = log.split('%')
-        uki_config.upload_time = array.last.split("=").last.to_i
-        uki_config.build_time = Time.now.to_i - uki_config.build_time - uki_config.upload_time
-        uki_config.fir_url = url
-        uki_config.ipa_size = ipa_size
-
-        unless !url.empty?
-            puts("导出失败")
-            exit
-        end
+        ipa_size = log[/包体积.*$/].split('=').last
 
-        puts("恭喜打包完成")
+        uki_config.build_time = Time.now.to_i - uki_config.build_time
+        uki_config.ipa_size = ipa_size
 
         if uki_config.verbose?
             puts(log)
         end
+
+        upload_ipa
         
-        send_notifi
+    end
+
+    def upload_ipa
+
+      puts("*********************************************************  开始上传")
+
+      # 开始上传时间
+      s_time = Time.now.to_i
+
+      myshort = if uki_config.scheme == "miaohong"
+        "lZ2S" # 国内
+      else
+        "sxLo" # 海外
+      end
+
+      log = %x{
+        ipa_dir=#{uki_config.ipa_path}
+        myshort=#{myshort}
+        appsmanager_token="dc5ac8b409cade4c2a99176e09825a83"
+        result=$(curl -F "file=@${ipa_dir}" -F "token=$appsmanager_token" https://appsmanager.neoclub.cn/app/upload)
+        echo $result
+      }
+
+      data =  JSON.parse(log)
+      url = data["data"]
+      url_code = url.split('code/').last.to_s
+      uki_config.fir_url = "https://appsmanager.neoclub.cn/s/#{myshort}?id=#{url_code}"
+      uki_config.upload_time = Time.now.to_i - s_time
+
+      send_notifi
     end
 
     def send_notifi
@@ -274,6 +272,7 @@ class Shell_Command
         # https://open.feishu.cn/open-apis/bot/v2/hook/68c47d38-fc65-4cc5-a386-885a1fbff11b 测试机器人
         # https://open.feishu.cn/open-apis/bot/v2/hook/71ee99db-27fa-45ee-8cba-3004037f34ea 打包群机器人
 
+        
         log = %x{
             curl -X POST -H "Content-Type: application/json" -d '#{message.to_json}' "https://open.feishu.cn/open-apis/bot/v2/hook/71ee99db-27fa-45ee-8cba-3004037f34ea"
         }
@@ -282,6 +281,11 @@ class Shell_Command
             puts(log)
         end
 
+        local_notfi = %x{
+          notification="Did uploaded to fir caost time:#{uki_config.upload_time}s"
+          osascript -e 'display notification "size:'#{uki_config.ipa_size}'m\ncaost:'#{uki_config.upload_time}'s" with title "Uploaded Success" sound name "default" '
+        }
+
         exit
 
     end

data/lib/cocoapods-uki-packager/uki_config.rb

@@ -66,7 +66,7 @@ class Uki_config
     end
 
     def ipa_path 
-        return File.join(@installation_root.to_s, "ipa")
+        return  File.join(build_exe_path, "#{scheme}.ipa")
     end
 
     def verbose(v)
@@ -111,7 +111,7 @@ class Uki_config
 
      # 产物路径
      def build_exe_path
-        return IO.readlines(app_file_path).first      
+        return IO.readlines(app_file_path).first.chomp     
     end
 
     def group_name

data/lib/cocoapods-uki-packager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Packager
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_pack
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - 耿磊
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -54,6 +54,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/uki
+- lib/cocoapods-uki-packager/Test.rb
 - lib/cocoapods-uki-packager/command/pack.rb
 - lib/cocoapods-uki-packager/shell.rb
 - lib/cocoapods-uki-packager/uki_config.rb