lhj-tools 0.1.13 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9899645c85f8e5b8b2163954f95949dafaa7be4730ae80cf8db25a9a9a1523a3
-  data.tar.gz: bdbb99bb2a141216e287f856d54c8f812e29fa45133ffd0af54374f48dada496
+  metadata.gz: 17511d36f2ccbd99a885442c54373a7a032cc014552855a33b2c326dccf34688
+  data.tar.gz: ba65a5faa5f83e351935bdb7a7f0b221bd8ea405f1788acd2c29e85d2d0d6fe6
 SHA512:
-  metadata.gz: 145eecc8706741b98073e87390c56a818e718f13e7ea6cd7f8b0aafc2c346f5b219ca075c1516db22cb438cb52cf5c2210f5ebd5c51f12ae9dabdc5db979c6aa
-  data.tar.gz: 83d61d33a01c96d897227e692b60ef2c56d920172193f8d9754daa2db47b7a0edc5ea8f4ea1bf26a623d110e4066b11509b7676075b4d03dd100895246eb43d3
+  metadata.gz: 4396cb85f10adeb732be7038d061b3188536e4a47113d5426ee9e2c02a35f4271562a2c6655c3c8773ec7633a976c9f51310a9640fca0a37b79848749cc9cf7a
+  data.tar.gz: b401b9f5e196b7ed835bce7bb363876203b3f987b6314517b5f168b15d20d25cf64082b7b18ab3c2c1c10bffd12fa45100678234975a07f4160c1b5bbd476ed3

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/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

@@ -26,6 +26,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/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/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,62 @@
+require 'faraday'
+require 'faraday_middleware'
+require 'lhj/helper/pgyer_config'
+require 'lhj/command/yapi/formatters/service'
+require 'lhj/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)
+      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 ''
+      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,7 @@
+require 'lhj/helper/tb_config'
+
+module Lhj
+  # pgyer upload
+  class Tb
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.13"
+    VERSION = "0.1.16"
   end
 end

data/lib/lhj/tools.rb

@@ -4,6 +4,9 @@ require 'colored'
 
 module Lhj
   require 'lhj/config'
+  require 'lhj/helper/pgyer_helper'
+  require 'lhj/helper/dingtalk_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.16
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -289,6 +289,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
@@ -301,11 +302,18 @@ files:
 - lib/lhj/command/yapi/formatters/command_context.rb
 - lib/lhj/command/yapi/formatters/service.rb
 - 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/local_config.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