lhj-tools 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d246c747ed42f7359b79c279b864539a2d318b744f68994a015960d9abff5d20
-  data.tar.gz: 58f16be0521a715eb2c8d16928f3f7818009272b1150e58fbad3ee56ca62388b
+  metadata.gz: 705ada7bc27d0f1e46aa928ae8693dce2954ddb140159aac417f95347a5df1ae
+  data.tar.gz: 8163156750c3e67b6b846d99438d0832ebddf8683849fff31a6ec91d42434ec3
 SHA512:
-  metadata.gz: 8e71dbbe12bd70a4a42323d30ef9c40cee0c7cab5834273ca1359241df01fd3875a63a06419a398e91625184e93cb62893567fc5ecdbbb9f021acb95536eef62
-  data.tar.gz: 5f6514ecff7d90d4e4e0d5132abde517fdcd8bb36dc800fcd9eda7ea74e5da5ac0be6f1b04cd97321fc62974a3bc27079b2eaaaad0d55e9ba041294953b2d2f2
+  metadata.gz: bc564c14c9b145457d14bb439fd6fd5d7455e4d6fbc46bc27e9017f87b94a37a508452c0b46d3cb4600419a47f131b136cf62a97148a6549b406cae1a16af4c8
+  data.tar.gz: b4c03b76aaa34b4e1c6e01d058ccf59f2eb269705c05be7fc6b4fc4dbb7ffed0a148453b165092da58deeb4b0092c84488766fe9c71138110958179073b521ed

data/lib/lhj/action/sh_helper.rb

@@ -119,17 +119,17 @@ module Lhj
 
       # Optional initial environment Hash
       if args.first.kind_of?(Hash)
-        command = args.shift.map { |k, v| "#{k}=#{v.shellescape}" }.join(" ") + " "
+        command = args.shift.map { |k, v| "#{k}=#{v.to_s}" }.join(" ") + " "
       end
 
       # Support [ "/usr/local/bin/foo", "foo" ], "-x", ...
       if args.first.kind_of?(Array)
-        command += args.shift.first.shellescape + " " + args.shelljoin
+        command += args.shift.first.to_s + " " + args.join(' ')
         command.chomp!(" ")
       elsif args.count == 1 && args.first.kind_of?(String)
         command += args.first
       else
-        command += args.shelljoin
+        command += args.join(' ')
       end
 
       command

data/lib/lhj/command/yapi/formatters/template/git.erb

@@ -0,0 +1 @@
+【代码分支:<%= @branch %>】【服务环境:<%= @env %>】-【最近更新日志】<%= @log %>

data/lib/lhj/command.rb

@@ -1,7 +1,5 @@
 require 'claide'
 require "tty-spinner"
-require 'lhj/action/sh_helper'
-require 'lhj/ui/ui'
 
 module Lhj
   # command plugin

data/lib/lhj/helper/git_helper.rb

@@ -0,0 +1,140 @@
+module Lhj
+  module Actions
+    GIT_MERGE_COMMIT_FILTERING_OPTIONS = [:include_merges, :exclude_merges, :only_include_merges].freeze
+
+    module SharedValues
+      GIT_BRANCH_ENV_VARS = %w(GIT_BRANCH BRANCH_NAME TRAVIS_BRANCH BITRISE_GIT_BRANCH CI_BUILD_REF_NAME CI_COMMIT_REF_NAME WERCKER_GIT_BRANCH BUILDKITE_BRANCH APPCENTER_BRANCH).freeze
+    end
+
+    def self.git_log_between(pretty_format, from, to, merge_commit_filtering, date_format = nil, ancestry_path)
+      command = %w(git log)
+      command << "--pretty=#{pretty_format}"
+      command << "--date=#{date_format}" if date_format
+      command << '--ancestry-path' if ancestry_path
+      command << "#{from}...#{to}"
+      command << git_log_merge_commit_filtering_option(merge_commit_filtering)
+      # "*command" syntax expands "command" array into variable arguments, which
+      # will then be individually shell-escaped by Actions.sh.
+      Actions.sh(*command.compact, log: false).chomp
+    rescue
+      nil
+    end
+
+    def self.git_log_last_commits(pretty_format, commit_count, merge_commit_filtering, date_format = nil, ancestry_path)
+      command = %w(git log)
+      command << "--pretty=#{pretty_format}"
+      command << "--date=#{date_format}" if date_format
+      command << '--ancestry-path' if ancestry_path
+      command << '-n' << commit_count.to_s
+      command << git_log_merge_commit_filtering_option(merge_commit_filtering)
+      Actions.sh(*command.compact, log: false).chomp
+    rescue
+      nil
+    end
+
+    def self.last_git_tag_hash(tag_match_pattern = nil)
+      tag_pattern_param = tag_match_pattern ? "=#{tag_match_pattern}" : ''
+      Actions.sh('git', 'rev-list', "--tags#{tag_pattern_param}", '--max-count=1').chomp
+    rescue
+      nil
+    end
+
+    def self.last_git_tag_name(match_lightweight = true, tag_match_pattern = nil)
+      hash = last_git_tag_hash(tag_match_pattern)
+      # If hash is nil (command fails), "git describe" command below will still
+      # run and provide some output, although it's definitely not going to be
+      # anything reasonably expected. Bail out early.
+      return unless hash
+
+      command = %w(git describe)
+      command << '--tags' if match_lightweight
+      command << hash
+      command << '--match' if tag_match_pattern
+      command << tag_match_pattern if tag_match_pattern
+      Actions.sh(*command.compact, log: false).chomp
+    rescue
+      nil
+    end
+
+    def self.last_git_commit_dict
+      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')
+      }
+    end
+
+    # Gets the last git commit information formatted into a String by the provided
+    # pretty format String. See the git-log documentation for valid format placeholders
+    def self.last_git_commit_formatted_with(pretty_format, date_format = nil)
+      command = %w(git log -1)
+      command << "--pretty=#{pretty_format}"
+      command << "--date=#{date_format}" if date_format
+      Actions.sh(*command.compact, log: false).chomp
+    rescue
+      nil
+    end
+
+    # @deprecated Use <tt>git_author_email</tt> instead
+    # Get the author email of the last git commit
+    # <b>DEPRECATED:</b> Use <tt>git_author_email</tt> instead.
+    def self.git_author
+      UI.deprecated('`git_author` is deprecated. Please use `git_author_email` instead.')
+      git_author_email
+    end
+
+    # Get the author email of the last git commit
+    def self.git_author_email
+      s = last_git_commit_formatted_with('%ae')
+      return s if s.to_s.length > 0
+      return nil
+    end
+
+    # Returns the unwrapped subject and body of the last commit
+    # <b>DEPRECATED:</b> Use <tt>last_git_commit_message</tt> instead.
+    def self.last_git_commit
+      last_git_commit_message
+    end
+
+    # Returns the unwrapped subject and body of the last commit
+    def self.last_git_commit_message
+      s = (last_git_commit_formatted_with('%B') || "").strip
+      return s if s.to_s.length > 0
+      nil
+    end
+
+    # Get the hash of the last commit
+    def self.last_git_commit_hash(short)
+      format_specifier = short ? '%h' : '%H'
+      string = last_git_commit_formatted_with(format_specifier).to_s
+      return string unless string.empty?
+      return nil
+    end
+
+    # 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
+      end
+    end
+
+    private_class_method
+    def self.git_log_merge_commit_filtering_option(merge_commit_filtering)
+      case merge_commit_filtering
+      when :exclude_merges
+        "--no-merges"
+      when :only_include_merges
+        "--merges"
+      when :include_merges
+        nil
+      end
+    end
+  end
+end

data/lib/lhj/helper/log_helper.rb

@@ -0,0 +1,66 @@
+module Lhj
+  # log helper
+  class LogHelper
+    attr_reader :branch, :env, :log
+
+    def self.instance
+      @instance ||= new
+    end
+
+    def commit_log(env)
+      @branch = fetch_branch
+      @env = fetch_env(env)
+      @log = fetch_log
+      save_last_commit_hash
+      render_template
+    end
+
+    def fetch_branch
+      Lhj::Actions.git_branch || ''
+    end
+
+    def fetch_env(env)
+      case env
+      when :release
+        'release'
+      when :gray
+        'release'
+      else
+        'uat'
+      end
+    end
+
+    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.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('days ', '天').gsub('ago ', '前')
+    end
+
+    def save_last_commit_hash
+      last_commit_hash = Lhj::Actions.last_git_commit_hash(true)
+      File.delete(last_commit_file) if File.exist?(last_commit_file)
+      File.write(last_commit_file, last_commit_hash)
+    end
+
+    def last_commit_hash
+      if File.exist?(last_commit_file)
+        File.read(last_commit_file)
+      else
+        'HEAD~3'
+      end
+    end
+
+    def last_commit_file
+      File.join(Lhj::Config.instance.home_dir, ".#{@branch}_last_commit")
+    end
+
+    def render_template
+      temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'git.erb'))
+      Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+    end
+
+  end
+end

data/lib/lhj/helper/pgyer_helper.rb

@@ -37,6 +37,9 @@ module Lhj
     end
 
     def upload_file(file, des)
+
+      update_description = @result[:update_description]
+      update_description = "" if update_description.nil?
       params = {
         '_api_key' => @api_key,
         'uKey' => @user_key,

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.18"
+    VERSION = "0.1.19"
   end
 end

data/lib/lhj/tools.rb

@@ -3,10 +3,14 @@ require_relative "tools/version"
 require 'colored'
 
 module Lhj
+  require 'lhj/ui/ui'
   require 'lhj/config'
   require 'lhj/helper/pgyer_helper'
   require 'lhj/helper/dingtalk_helper'
   require 'lhj/helper/tb_helper'
+  require 'lhj/action/sh_helper'
+  require 'lhj/helper/git_helper'
+  require 'lhj/helper/log_helper'
 
   class Error < StandardError; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - lihaijian
@@ -321,13 +321,16 @@ files:
 - lib/lhj/command/yapi/formatters/base.rb
 - lib/lhj/command/yapi/formatters/command_context.rb
 - lib/lhj/command/yapi/formatters/service.rb
+- lib/lhj/command/yapi/formatters/template/git.erb
 - lib/lhj/command/yapi/formatters/template/model.erb
 - lib/lhj/command/yapi/formatters/template/pgyer.erb
 - lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
+- lib/lhj/helper/git_helper.rb
 - lib/lhj/helper/local_config.rb
+- lib/lhj/helper/log_helper.rb
 - lib/lhj/helper/oss_config.rb
 - lib/lhj/helper/oss_helper.rb
 - lib/lhj/helper/pgyer_config.rb