lhj-tools 0.1.20 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfdd1c9835fbe98c0fb04ff0e7568fc8092afbb22561e80c8e7f4098be4a335
-  data.tar.gz: cd973dbfdc90b223f5b281ef3e5979c83b7955b05c85414dc2fa6e68a5e83aab
+  metadata.gz: f8a3955d41955a54ce3ca861519c4333245dacd4c4b14477f73fc7061707c1f3
+  data.tar.gz: 630fc37529847a893022bd49226e2bd1bd44794f71618458d7e7620d3ad3f265
 SHA512:
-  metadata.gz: a265f292ec0d52c699c53f5be1a3c757a3beeb5b827fd98ea102d2c80941cfbdef005e5fd04080130deca32ee6010d402f5b23f5042c8223079ce86cea132b7c
-  data.tar.gz: d6a3dc3da4e9f486cc3c587938313dfdb0ead5cee8655c58ea142e8e021338dbb167803734373856617519ab3d88ad4e899c36190b5971757c24f13cbf27ecef
+  metadata.gz: 0e3c30af417e17bd237c0bc114ed48d8e9fd46e39263085ef1743398e702c510ee9bd5212eaa2e06446a659a33d47089fbdc865dfcf284307538b9b6edb5abc4
+  data.tar.gz: e0d7853fb9f18c5785fa570c3e23c212f29e5aa935fcf437224f0f9db24c03221e3ff88efa91c8a63eb6eac8057cba5bc4ef4a0d3c798057754482c50a2e6642

data/lib/lhj/env.rb

@@ -0,0 +1,9 @@
+module Lhj
+  class Env
+    def self.truthy?(env)
+      return false unless ENV[env]
+      return false if ["no", "false", "off", "0"].include?(ENV[env].to_s)
+      return true
+    end
+  end
+end

data/lib/lhj/helper/git_helper.rb

@@ -60,11 +60,11 @@ module Lhj
       return nil if last_git_commit_formatted_with('%an').nil?
 
       {
-          author: last_git_commit_formatted_with('%an'),
-          author_email: last_git_commit_formatted_with('%ae'),
-          message: last_git_commit_formatted_with('%B'),
-          commit_hash: last_git_commit_formatted_with('%H'),
-          abbreviated_commit_hash: last_git_commit_formatted_with('%h')
+        author: last_git_commit_formatted_with('%an'),
+        author_email: last_git_commit_formatted_with('%ae'),
+        message: last_git_commit_formatted_with('%B'),
+        commit_hash: last_git_commit_formatted_with('%H'),
+        abbreviated_commit_hash: last_git_commit_formatted_with('%h')
       }
     end
 
@@ -118,10 +118,15 @@ module Lhj
     # Returns the current git branch, or "HEAD" if it's not checked out to any branch
     # Can be replaced using the environment variable `GIT_BRANCH`
     def self.git_branch
-      begin
-        Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
-      rescue => err
-        nil
+      env_name = SharedValues::GIT_BRANCH_ENV_VARS.find { |env_var| Lhj::Env.truthy?(env_var) }
+      ENV.fetch(env_name.to_s) do
+        # Rescues if not a git repo or no commits in a git repo
+        begin
+          Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
+        rescue => err
+          UI.verbose("Error getting git branch: #{err.message}")
+          nil
+        end
       end
     end
 

data/lib/lhj/helper/log_helper.rb

@@ -1,3 +1,5 @@
+require 'lhj/helper/team_member_config'
+
 module Lhj
   # log helper
   class LogHelper
@@ -16,7 +18,8 @@ module Lhj
     end
 
     def fetch_branch
-      Lhj::Actions.git_branch || ''
+      name = Lhj::Actions.git_branch || ''
+      name.split('/').last
     end
 
     def fetch_env(env)
@@ -24,7 +27,7 @@ module Lhj
       when :release
         'release'
       when :gray
-        'release'
+        'gray'
       else
         'uat'
       end
@@ -33,12 +36,25 @@ module Lhj
     def fetch_log
       from = last_commit_hash
       to = 'HEAD'
-      changelog = Lhj::Actions.git_log_between(' %an, %ar - %s;', from, to, :exclude_merges, 'short', false)
-      changelog ||= ''
-      changelog&.gsub("\n\n", "\n")
-      changelog = changelog.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('days ', '天').gsub('ago ', '前')
-      changelog = '此次打包没代码更新' if changelog.empty?
-      changelog
+      message = Lhj::Actions.git_log_between(' %an %ar - %s;', from, to, :exclude_merges, 'short', false)
+      handle_message(message)
+    end
+
+    def handle_message(m)
+      message = m
+      if !message.nil? && !message.empty?
+        message = message.gsub('seconds ', '秒')
+        message = message.gsub('minutes ', '分钟')
+        message = message.gsub('hours ', '小时')
+        message = message.gsub('days ', '天')
+        message = message.gsub('ago ', '前')
+        Lhj::TeamMemberConfig.config.each do |key, value|
+          message = message.gsub(key, value) if message =~ /#{key}/
+        end
+      else
+        message = '此次打包没代码更新'
+      end
+      message
     end
 
     def save_last_commit_hash
@@ -56,7 +72,8 @@ module Lhj
     end
 
     def last_commit_file
-      File.join(Lhj::Config.instance.home_dir, ".#{@branch}_last_commit")
+      branch_name = @branch.gsub(%r{/}, '')
+      File.join(Lhj::Config.instance.home_dir, ".#{@env}_#{branch_name}_last_commit")
     end
 
     def render_template

data/lib/lhj/helper/pgyer_config.rb

@@ -16,16 +16,37 @@ module Lhj
       @yaml ||= YAML.load_file(config_file)
     end
 
-    def self.api_key
-      config['api_key']
+    def self.api_key(env = :uat)
+      case env
+      when :release
+        'release.....'
+      when :gray
+        'gray.....'
+      else
+        config['api_key']
+      end
     end
 
-    def self.user_key
-      config['user_key']
+    def self.user_key(env = :uat)
+      case env
+      when :release
+        config['user_key']
+      when :gray
+        config['user_key']
+      else
+        config['user_key']
+      end
     end
 
-    def self.password
-      config['password']
+    def self.password(env = :uat)
+      case env
+      when :release
+        config['password']
+      when :gray
+        config['password']
+      else
+        config['password']
+      end
     end
   end
 end

data/lib/lhj/helper/pgyer_helper.rb

@@ -13,10 +13,10 @@ module Lhj
 
     attr_reader :api_key, :user_key, :password, :result
 
-    def initialize
-      @api_key = Lhj::PgyerConfig.api_key
-      @user_key = Lhj::PgyerConfig.user_key
-      @password = Lhj::PgyerConfig.password
+    def initialize(env = :uat)
+      @api_key = Lhj::PgyerConfig.api_key(env)
+      @user_key = Lhj::PgyerConfig.user_key(env)
+      @password = Lhj::PgyerConfig.password(env)
       @result = { 'data' => {} }
     end
 
@@ -39,7 +39,7 @@ module Lhj
     def upload_file(file, des)
 
       update_description = @result[:update_description]
-      update_description = "" if update_description.nil?
+      update_description = '' if update_description.nil?
       params = {
         '_api_key' => @api_key,
         'uKey' => @user_key,

data/lib/lhj/helper/team_member_config.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # team member config
+  class TeamMemberConfig
+
+    CONFIG_NAME = 'team_member.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.20"
+    VERSION = "0.1.24"
   end
 end

data/lib/lhj/tools.rb

@@ -3,6 +3,7 @@ require_relative "tools/version"
 require 'colored'
 
 module Lhj
+  require 'lhj/env'
   require 'lhj/ui/ui'
   require 'lhj/config'
   require 'lhj/helper/pgyer_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.24
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -326,6 +326,7 @@ files:
 - lib/lhj/command/yapi/formatters/template/pgyer.erb
 - lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
+- lib/lhj/env.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/git_helper.rb
@@ -337,6 +338,7 @@ files:
 - lib/lhj/helper/pgyer_helper.rb
 - lib/lhj/helper/tb_config.rb
 - lib/lhj/helper/tb_helper.rb
+- lib/lhj/helper/team_member_config.rb
 - lib/lhj/helper/trans_helper.rb
 - lib/lhj/tools.rb
 - lib/lhj/tools/version.rb