lhj-tools 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7b3a7e3757035f3306fd09213009b4558445763b02c74c40b86e7016a7088ef
-  data.tar.gz: 86c4e51a41826d0eca77d839bdb8735471737b94452a2e82688e4ca537162721
+  metadata.gz: ba3c81ae4e0b59daafc45266b2b3fea814b1a15547eb0501b3e2bba19b167240
+  data.tar.gz: 5c818f2bffe07c9e3f5ef50544f82ecc4303f2b020099ba0064cf93f12575723
 SHA512:
-  metadata.gz: 21efdee7795596ff21d051a36ed81d4a4828482ec35639832c08524eca2e9ca39b66d96b78f10c32b012ae4509744df493deecc01b823c3e1396f1806c03d572
-  data.tar.gz: a2a0d03aeb156b1a7bc4d12a4590dd45b8e595bb3fe5a8d17681b109140a2a7e34b9bd28aa1dea065e76951b01953a2f4753f842e8aa0974c6034db6b9b55c56
+  metadata.gz: a87a98b3150d9763a7e41f153a3af6ef8291e7ae1074c8c12fd6f51fafc4ed36557605bb484d13d2b3ae5e9a58b0ffac69b95af951f15023bc1a90e06ddd78a5
+  data.tar.gz: 20d3838363aa11ce08db7e18f5ff5efb24abcb627e2b3ab1b8c15c72bbf0d0555eda8d8a8742ddd892fda9ecbef387904480616173faccc011d57808bfe05ef5

data/lib/lhj/helper/app_version_info.rb

@@ -0,0 +1,66 @@
+require_relative 'log_helper'
+require_relative 'pgyer_shortcut_helper'
+
+module Lhj
+  # version info
+  class AppVersionInfo
+    # @param [Symbol] env
+    def initialize(env, build_number, work_path)
+      @env = env
+      @build_number = build_number
+      @work_path = work_path
+    end
+
+    # build_app_version (build_app_version_no) (build: build_version)
+    def build_info
+      "#{build_app_version} (#{build_app_version_no}) (build: #{build_version})"
+    end
+
+    def build_app_version
+      # app version '1.0.0'
+      vers = []
+      Dir.glob("#{@work_path}/*.xcodeproj/*.pbxproj").each do |file|
+        File.readlines(file).each do |l|
+          if /MARKETING_VERSION.*(\d+\.\d+\.\d+)/ =~ l
+            ma = l.match(/(\d+\.\d+\.\d+)/)
+            vers << ma[0]
+          end
+        end
+      end
+      vers[0]
+    end
+
+    def build_app_version_no
+      # xcode build version
+      # ${BUILD_NUMBER} of jenkins
+      @build_number || '1'
+    end
+
+    def build_version
+      # pu gong ying build number
+      client = Lhj::PgyerShortcut.new(@env)
+      version = 0
+      version = client.build_version.to_i if client.build_version
+      version += 1
+      version.to_s
+    end
+
+    def build_updated
+      time = Time.now
+      time.strftime('%Y-%m-%d %H:%M:%S')
+    end
+
+    def branch_name
+      Dir.chdir(@work_path) do
+        Lhj::LogHelper.instance.current_branch(@work_path)
+      end
+    end
+
+    def update_log
+      Dir.chdir(@work_path) do
+        Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 3, :exclude_merges, 'short', false)
+      end
+    end
+
+  end
+end

data/lib/lhj/helper/pgyer_helper.rb

@@ -64,11 +64,11 @@ module Lhj
         @result = response.body
         puts @result
         puts 'upload success'
-        # 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
-        # end
+        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
+        end
       rescue Faraday::TimeoutError
         puts 'upload fail'
       end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.53"
+    VERSION = "0.1.54"
   end
 end

data/lib/lhj/tools.rb

@@ -21,6 +21,7 @@ module Lhj
   require 'lhj/helper/git_helper'
   require 'lhj/helper/log_helper'
   require 'lhj/helper/vika_helper'
+  require 'lhj/helper/app_version_info'
 
   class Error < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -335,6 +335,7 @@ files:
 - lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
 - lib/lhj/env.rb
+- lib/lhj/helper/app_version_info.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/git_branch_feature_config.rb