lhj-tools 0.1.19 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705ada7bc27d0f1e46aa928ae8693dce2954ddb140159aac417f95347a5df1ae
-  data.tar.gz: 8163156750c3e67b6b846d99438d0832ebddf8683849fff31a6ec91d42434ec3
+  metadata.gz: fdb58f24fe8dec97319d3dc8e8bbadffe0c05d79ec2ce4092e1e8b6eeabed65a
+  data.tar.gz: 3fe9ae37c1087b85b5aa7d6fbdf7e4017665843a148c040c2fc3a58bbcd4c382
 SHA512:
-  metadata.gz: bc564c14c9b145457d14bb439fd6fd5d7455e4d6fbc46bc27e9017f87b94a37a508452c0b46d3cb4600419a47f131b136cf62a97148a6549b406cae1a16af4c8
-  data.tar.gz: b4c03b76aaa34b4e1c6e01d058ccf59f2eb269705c05be7fc6b4fc4dbb7ffed0a148453b165092da58deeb4b0092c84488766fe9c71138110958179073b521ed
+  metadata.gz: 125b3650d4d7195b5a07569df7678f976094591292c4d9e5d961e4ccef588f29c6f62e4f7ddaebcdafb558d2f287b00170a0606f72b34b0fedfa0dd2979996e5
+  data.tar.gz: 95cf649f1f6cf458822bc7d7a9143be7bcc8b24f4da4dfdcc7a10e291d58d4e85d24bfff6e3a84f1178e68e547e04fca744d45480cf02da43a1e54c3b0237292

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

@@ -24,7 +24,7 @@ module Lhj
       when :release
         'release'
       when :gray
-        'release'
+        'gray'
       else
         'uat'
       end
@@ -36,7 +36,9 @@ module Lhj
       changelog = Lhj::Actions.git_log_between(' %an, %ar - %s;', from, to, :exclude_merges, 'short', false)
       changelog ||= ''
       changelog&.gsub("\n\n", "\n")
-      changelog.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('days ', '天').gsub('ago ', '前')
+      changelog = changelog.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('days ', '天').gsub('ago ', '前')
+      changelog = '此次打包没代码更新' if changelog.empty?
+      changelog
     end
 
     def save_last_commit_hash
@@ -54,7 +56,8 @@ module Lhj
     end
 
     def last_commit_file
-      File.join(Lhj::Config.instance.home_dir, ".#{@branch}_last_commit")
+      file_name = @branch.gsub(%r{/}, '')
+      File.join(Lhj::Config.instance.home_dir, ".#{file_name}_last_commit")
     end
 
     def render_template

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.19"
+    VERSION = "0.1.23"
   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.19
+  version: 0.1.23
 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