lhj-tools 0.1.52 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52642dc28c1e253b4e66114c555044eea53f1348042f40287e3e266103ec44cd
-  data.tar.gz: 2e57e34a865622c0471ceddbd182889272ec7bc1c2b171cb82c4456d423e1375
+  metadata.gz: b66a2c394691aa23ab4da26a83f5f9623e68c4355cb7f782916568f969a17b6d
+  data.tar.gz: 9b41f62a7770b26363f9db7b434f1e56b3fb3d72de4e5c78cd10f3f9478d5018
 SHA512:
-  metadata.gz: cae2f12158dbed0c61a72abc83d17d4e59798a917e07df66bf9899a39316febac8a0a1afbc179265124c48fef6cbcf688e6140da4a1ae775d21cf2aa65dd2fa4
-  data.tar.gz: 4aedf6a244a7a1628d9638b10851d3b3a4864a0841ac79d8574b18e404a1f38e1b4e584a4737e7a5bd3cd821e612264f97f2f1d95789b56b1921b51b23d3778f
+  metadata.gz: 5f1fcb3e75bf22881735c6e768d3c95cc0d506f89641edf52695565b700b7e7e92cebecaa7bef7a000f19279d487389597a1581b8e82e9146f5eb1e9ded789ee
+  data.tar.gz: 8b3900e23599f314e11205b488b0804e31e90f7080527c1f3635da9258ee1f13c8ee45b19e62657a7d9701edff2dc19b0fa2e657dbf137d9897a3c0d9cf01cb3

data/lib/lhj/helper/app_version_info.rb

@@ -0,0 +1,75 @@
+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
+      setup_config
+    end
+
+    def setup_config
+      number = build_app_version_no
+      Dir.chdir(@work_path) do
+        command = %(xcrun agvtool new-version -all #{number})
+        Actions.sh(command, log: false)
+      end
+    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.52"
+    VERSION = "0.1.55"
   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.52
+  version: 0.1.55
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-07-18 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