lhj-tools 0.1.13 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9899645c85f8e5b8b2163954f95949dafaa7be4730ae80cf8db25a9a9a1523a3
-  data.tar.gz: bdbb99bb2a141216e287f856d54c8f812e29fa45133ffd0af54374f48dada496
+  metadata.gz: 705ada7bc27d0f1e46aa928ae8693dce2954ddb140159aac417f95347a5df1ae
+  data.tar.gz: 8163156750c3e67b6b846d99438d0832ebddf8683849fff31a6ec91d42434ec3
 SHA512:
-  metadata.gz: 145eecc8706741b98073e87390c56a818e718f13e7ea6cd7f8b0aafc2c346f5b219ca075c1516db22cb438cb52cf5c2210f5ebd5c51f12ae9dabdc5db979c6aa
-  data.tar.gz: 83d61d33a01c96d897227e692b60ef2c56d920172193f8d9754daa2db47b7a0edc5ea8f4ea1bf26a623d110e4066b11509b7676075b4d03dd100895246eb43d3
+  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/init.rb

@@ -39,6 +39,7 @@ module Lhj
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
         if @url
           file_path = file_name_from_url(@url)
+          File.delete(file_path) if File.exist?(file_path)
           save_url_to_file(@url, file_path)
         else
           file_path = File.join(target_folder, 'config_file.yml')

data/lib/lhj/command/pgyer_upload.rb

@@ -0,0 +1,20 @@
+require 'lhj/helper/pgyer_helper'
+require 'lhj/helper/dingtalk_config'
+require 'lhj/helper/pgyer_config'
+require 'lhj/helper/tb_config'
+
+
+module Lhj
+  class Command
+    class Pgyer < Command
+
+      def handle
+        client = Lhj::Pgyer.new
+        file = File.expand_path('/Users/lihaijian/**/*.ipa')
+        client.upload_file(file, 'test....')
+        output = client.render_template
+        puts output.blue
+      end
+    end
+  end
+end

data/lib/lhj/command/yapi/formatters/service.rb

@@ -8,14 +8,23 @@ module Lhj
     class Service < Base
       # @param [String] name
       def render(name = 'yapi')
-        template(name).result(Context.new(@runner).fetch_binding)
+        temp_str = template_str(name)
+        render_template(temp_str)
       end
 
-      def template(name)
+      def render_template(temp_str)
+        template(temp_str).result(Context.new(@runner).fetch_binding)
+      end
+
+      def template_str(name)
+        File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb"))
+      end
+
+      def template(template_str)
         if RUBY_VERSION < '2.6'
-          ERB.new(File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb")), nil, '-')
+          ERB.new(template_str, nil, '-')
         else
-          ERB.new(File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb")), trim_mode: '-')
+          ERB.new(template_str, trim_mode: '-')
         end
       end
     end

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

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

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

@@ -0,0 +1,6 @@
+#### 应用名称：<%= @result['data']['appName'] %>
+#### 版本信息：<%= @result['data']['appVersion'] %>(Build <%= @result['data']['appBuildVersion'] %>)
+#### 更新时间：<%= @result['data']['appCreated'] %>
+#### 更新内容：<%= @result['data']['appUpdateDescription'] %>
+> ![screenshot](<%= @result['data']['appQRCodeURL'] %>)
+> [下载](https://www.pgyer.com/<%= @result['data']['appShortcutUrl'] %>)

data/lib/lhj/command/yapi.rb

@@ -279,7 +279,7 @@ module Lhj
         models.each do |model|
           model_name = model[:name] || ''
           model_properties = model[:properties]
-          puts_h "public class #{model_name} extends BaseModel implements BusinessEvent.PorductDataCollect {"
+          puts_h "public class #{model_name} extends BaseModel implements BusinessEvent.ProductDataCollect {"
           model_properties.each do |m|
             print_model_for_java(m)
           end
@@ -291,7 +291,7 @@ module Lhj
         models.each do |model|
           puts_m "@implementation #{model[:name]}"
           str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
-          if str && str.length.positive?
+          if str&.length&.positive?
             puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
             puts_m "  return @{#{str}};"
             puts_m '}'
@@ -364,7 +364,7 @@ module Lhj
         when 'array'
           puts_h "#{type_name}[] #{key};//#{des} #{default}"
         else
-          puts_h "@property (nonatomic, copy) NSString *#{key};//#{des} #{default}"
+          puts_h "String #{key};//#{des} #{default}"
         end
       end
 

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
@@ -26,6 +24,7 @@ module Lhj
     require 'lhj/command/file_path'
     require 'lhj/command/http'
     require 'lhj/command/sync_pod_repo'
+    require 'lhj/command/pgyer_upload'
 
     self.abstract_command = true
     self.command = 'lhj'

data/lib/lhj/config.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Lhj
   # config
   class Config

data/lib/lhj/helper/dingtalk_config.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # Ding Talk Config
+  class DingTalkConfig
+
+    CONFIG_NAME = 'dingtalk_config.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
+
+    def self.dingtalk_robot
+      config['dingtalk_robot']
+    end
+  end
+end

data/lib/lhj/helper/dingtalk_helper.rb

@@ -0,0 +1,14 @@
+require 'lhj/helper/dingtalk_config'
+require 'json'
+
+module Lhj
+  # pgyer upload
+  class Dingtalk
+
+    def self.post_message(title, message)
+      robot_url = Lhj::DingTalkConfig.dingtalk_robot
+      http_body = { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    end
+  end
+end

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_config.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # pgyer config
+  class PgyerConfig
+
+    CONFIG_NAME = 'pgyer_config.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
+
+    def self.api_key
+      config['api_key']
+    end
+
+    def self.user_key
+      config['user_key']
+    end
+
+    def self.password
+      config['password']
+    end
+  end
+end

data/lib/lhj/helper/pgyer_helper.rb

@@ -0,0 +1,69 @@
+require 'faraday'
+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
+  class Pgyer
+
+    API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'.freeze
+
+    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
+      @result = { 'data' => {} }
+    end
+
+    # @return [Faraday::Connection]
+    def http_client
+      conn_options = {
+        request: {
+          timeout: 1000,
+          open_timeout: 300
+        }
+      }
+      Faraday.new(nil, conn_options) do |builder|
+        builder.request :multipart
+        builder.request :url_encoded
+        builder.response :json, content_type: /\bjson$/
+        builder.adapter :net_http
+      end
+    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,
+        'password' => @password,
+        'updateDescription' => des,
+        'installType' => 2,
+        'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
+      }
+      begin
+        puts 'begin upload'
+        response = http_client.post API_HOST, params
+        @result = response.body
+        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
+    end
+
+    def render_template
+      temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
+      Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+    end
+  end
+end

data/lib/lhj/helper/tb_config.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # tb config
+  class TBConfig
+
+    CONFIG_NAME = 'tb_config.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
+
+    def self.tb_app_id
+      config['tb_app_id']
+    end
+
+    def self.tb_app_key
+      config['tb_app_key']
+    end
+
+    def self.tb_tenant_id
+      config['tb_tenant_id']
+    end
+
+    def self.projectId
+      config['projectId']
+    end
+
+  end
+end

data/lib/lhj/helper/tb_helper.rb

@@ -0,0 +1,54 @@
+require 'lhj/helper/tb_config'
+require 'jwt'
+require 'net/http'
+require 'uri'
+require 'json'
+
+module Lhj
+  # 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.13"
+    VERSION = "0.1.19"
   end
 end

data/lib/lhj/tools.rb

@@ -3,7 +3,15 @@ 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
 
   autoload :Command, 'lhj/command'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.19
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 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
@@ -289,6 +309,7 @@ files:
 - lib/lhj/command/oss/del.rb
 - lib/lhj/command/oss/list.rb
 - lib/lhj/command/oss/upload.rb
+- lib/lhj/command/pgyer_upload.rb
 - lib/lhj/command/refactor_rename.rb
 - lib/lhj/command/rename_image.rb
 - lib/lhj/command/reverse_import.rb
@@ -300,12 +321,22 @@ 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
+- lib/lhj/helper/pgyer_helper.rb
+- lib/lhj/helper/tb_config.rb
+- lib/lhj/helper/tb_helper.rb
 - lib/lhj/helper/trans_helper.rb
 - lib/lhj/tools.rb
 - lib/lhj/tools/version.rb