lhj-tools 0.1.17 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d279af86ce6121812a429c8a66a5ed03aedbcd73920ced2ebe44626faf93874b
-  data.tar.gz: 9ac889862bddcf8a55fc8798baf6c7e4a5f8a88d4bdd22d3a14f7212b8826331
+  metadata.gz: 5d54687e0ef1aa1c34630063f84c35e517de500cedf0f33f28029e0c7f025d59
+  data.tar.gz: eb96a26b4f8ade67457eee980d7f5c0f0c0dc0c3bc881b970898fb8e5c864cca
 SHA512:
-  metadata.gz: f4b04462de1a18640901b53f7ead9047ed7f2013e2cdc52682369bbd6a176426886d9f314b0caa6efcbb047ef41502a68751ba61459f263060c12ac8bfc9a983
-  data.tar.gz: d4f4c30604e837e07c374e491f9416db1f41bada18a62c6090c993a606953826a1f16051e8a9e32fd053e8ee29cc6f1db1b76cd22775520ce5cc25afd3d96bd8
+  metadata.gz: b281d02e9d3aa94b134dd1f11b7073c5e340d618c512e136eb53a94e14e151a716b68d4bc9117194688624d3c8bdf4d1604d17fa175b9f2b29fb09951f0a31bf
+  data.tar.gz: 12b78a7a8bab022741a0f756858dab5230de0d0f9bf7f09d4e1f4c765096b150e53a8ead7df8c0052d9de68758510d12fcade268bfa0e3d8ecae642ff746f0a5

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,68 @@
+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
+        'gray'
+      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 = changelog.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('days ', '天').gsub('ago ', '前')
+      changelog = '此次打包没代码更新' if changelog.empty?
+      changelog
+    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

@@ -3,6 +3,7 @@ require 'faraday_middleware'
 require 'lhj/helper/pgyer_config'
 require 'lhj/command/yapi/formatters/service'
 require 'lhj/config'
+require_relative 'tb_config'
 
 module Lhj
   # pgyer upload
@@ -36,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,
@@ -48,7 +52,10 @@ module Lhj
         puts 'begin upload'
         response = http_client.post API_HOST, params
         @result = response.body
-        puts ''
+        puts @result
+        if @result['data'] && @result['data']['appUpdateDescription']
+          @result['data']['appUpdateDescription'] = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
+        end
       rescue Faraday::TimeoutError
         puts 'upload fail'
       end

data/lib/lhj/helper/tb_helper.rb

@@ -1,7 +1,54 @@
 require 'lhj/helper/tb_config'
+require 'jwt'
+require 'net/http'
+require 'uri'
+require 'json'
 
 module Lhj
-  # pgyer upload
-  class Tb
+  # tb upload
+  class TbHelper
+
+    SEARCH_API_URL = 'https://open.teambition.com/api/task/tqlsearch'.freeze
+
+    def self.trans_tb(note)
+      str = note
+      if /#.+#/ =~ note
+        note.scan(/#[^#]+#/) do |m|
+          res_body = req_with_task(m.match(/\d+/)[0])
+          if res_body['code'].to_i == 200
+            url_str = "[#{res_body['result'][0]['content']}](https://www.teambition.com/task/#{res_body['result'][0]['taskId']})"
+            str = str.gsub(m, url_str)
+          end
+        end
+      end
+      str
+    end
+
+    def self.req_with_task(id)
+      now = Time.now.to_i
+      payload = {
+        _appId: Lhj::TBConfig.tb_app_id,
+        iat: now,
+        exp: now + 3600
+      }
+      token = JWT.encode(payload, Lhj::TBConfig.tb_app_key)
+
+      url = URI(SEARCH_API_URL)
+      https = Net::HTTP.new(url.host, url.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Post.new(url)
+      request['authorization'] = "Bearer #{token}"
+      request['x-tenant-id'] = Lhj::TBConfig.tb_tenant_id
+      request['x-tenant-type'] = 'organization'
+      request['Content-Type'] = 'application/json'
+      req_body = {
+        "tql": "projectId=#{Lhj::TBConfig.projectId} AND uniqueId=#{id}"
+      }
+      request.body = JSON.dump(req_body)
+
+      response = https.request(request)
+      JSON.parse(response.read_body)
+    end
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.17"
+    VERSION = "0.1.21"
   end
 end

data/lib/lhj/tools.rb

@@ -3,9 +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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.21
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -262,6 +262,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: lhj tools.
 email:
 - sanan.li@qq.com
@@ -301,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