lhj-tools 0.1.48 → 0.1.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c79bee846ee40347cbf2c34c2315574cc66d9f7745e0f9668be75cb2cbe6bb
-  data.tar.gz: e86ccbb315e7d6e8e9b0b07e468bc25fc3efa9fcd688deb0ec903e411de1ba60
+  metadata.gz: de06842336189852e95b075ad1453d775ba3c6772d4a65992137231184d4fbb3
+  data.tar.gz: 39afffe676c83d5813cfa161fe9973099783198452695e84441a15caaad9cd26
 SHA512:
-  metadata.gz: f6f529d7ccc9a3e3999e9cceca6b4b92b779249bffe537807ebf313e5e74c3063231db450a0b88737144a80babd6f69b079d70ce7fe7f4bbc15a3fff5dbbf621
-  data.tar.gz: f32d8f5ec2800d52352aa78e6a729032a62484e8e8306a53f2dd22cd37a4765b41f17588c16ce07d0e8f5402ef8a4ec9f0f3419c83780071b12f838809cc352f
+  metadata.gz: d8f6b7401acebd536537b2230222a67bb2f35ff544a5b5a6c23732176a1d221617e4ddf7eefe1f17d0a8195230722b708581b350cab33c3e2027badf4406cd30
+  data.tar.gz: 7957577a7f52e83aca575f09300e01b78e2737db0844c72ace6d4103546386c40e967ecb2cef7d4b5f758b81cac11892b5db77f26cdf7690f75edd682e915424

data/lib/lhj/command/reverse_import.rb

@@ -39,7 +39,7 @@ module Lhj
       end
 
       def pod_folder_name
-        File.join(@current_path, 'MacauLife', 'CustomPods')
+        File.join(@current_path, 'CustomPods')
       end
 
       def child_dir

data/lib/lhj/helper/log_helper.rb

@@ -24,6 +24,11 @@ module Lhj
       name.split('/').last
     end
 
+    def current_branch(path)
+      name = Lhj::Actions.git_branch || ''
+      name.split('/').last
+    end
+
     def fetch_feature
       Lhj::GitBranchFeatureConfig.feature(@branch)
     end

data/lib/lhj/helper/pgyer_helper.rb

@@ -64,7 +64,7 @@ module Lhj
         @result = response.body
         puts @result
         puts 'upload success'
-        if @result['data'] && @result['data']['appUpdateDescription']
+        if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
           str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
           str = Lhj::VikaHelper.trans_vika(str)
           @result['data']['appUpdateDescription'] = str
@@ -76,18 +76,18 @@ module Lhj
 
     def upload_with_type(path, file)
       return unless @env == :release
+      return unless /hai/ =~ path
 
       # step 1
       folder_path_dir = path
       rand_key = rand(100) % 3
-      zipped_path = "Life_i_#{rand_key}.zip"
-      zipped_path = "Life_a_#{rand_key}.zip" unless file.end_with?('.ipa')
-      # Actions.sh(%(cd "#{folder_path_dir}" && zip -r "#{zipped_path}" "#{folder_path_dir}"/*), log: false)
-      Actions.sh(%(cd "#{folder_path_dir}" && zip -r "#{zipped_path}" "#{folder_path_dir}"/* -x="#{folder_path_dir}"/Code/MacauLife.ipa), log: false)
-
+      zipped_name = "archive_#{rand_key}.zip"
+      zipped_name = "archive_a_#{rand_key}.zip" unless file.end_with?('.ipa')
+      command = %(cd #{folder_path_dir} && zip -r #{zipped_name} #{folder_path_dir}/* -x "*.ipa" -x "*.dSYM.zip")
+      Actions.sh(command, log: false)
       # step 2
-      oss_key = "code/#{zipped_path}"
-      oss_file = File.join(folder_path_dir, zipped_path)
+      oss_key = "code/#{zipped_name}"
+      oss_file = File.join(folder_path_dir, zipped_name)
       file_exists = File.exist?(oss_file)
       return unless file_exists
 

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.48"
+    VERSION = "0.1.51"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.51
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide