lhj-tools 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d54687e0ef1aa1c34630063f84c35e517de500cedf0f33f28029e0c7f025d59
-  data.tar.gz: eb96a26b4f8ade67457eee980d7f5c0f0c0dc0c3bc881b970898fb8e5c864cca
+  metadata.gz: 5d0b9e563d0ebfe15b800560545a987a274f9787522297f7721b2012ff132594
+  data.tar.gz: 61655a300019b6dc713a71053482ba03c5ac2bee09ccc4be8c3926217a38dada
 SHA512:
-  metadata.gz: b281d02e9d3aa94b134dd1f11b7073c5e340d618c512e136eb53a94e14e151a716b68d4bc9117194688624d3c8bdf4d1604d17fa175b9f2b29fb09951f0a31bf
-  data.tar.gz: 12b78a7a8bab022741a0f756858dab5230de0d0f9bf7f09d4e1f4c765096b150e53a8ead7df8c0052d9de68758510d12fcade268bfa0e3d8ecae642ff746f0a5
+  metadata.gz: 8e56808aae097aa5aaab4204aae1ea2bce2306c0aa8607be0d0ec57046c44c98576aa3d1a4c8313792f0764e37dfa0c7dd6d70f02a084fd7ea4eb3ef79ecd82d
+  data.tar.gz: 88c51758d568b44ad2ea8bcd4bae0572ade581ee87a146100afa9cfce6f53665dd2bd9a864e531f4b50b9d3b8af2c89236d2c406a142ac1dd1935b61339d08fa

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/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.21"
+    VERSION = "0.1.22"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - lihaijian
@@ -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