lhj-tools 0.1.82 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b840e72d6367a3e47816df1a74069a09c8e9585ab184faff15d76af260dd2dea
-  data.tar.gz: 22c2dd46268522f60c4afeabcb9290e838616a9247b50b629c9b311468d4c878
+  metadata.gz: ecd3e4d21f8dbd807a46255e7c0994147958c2bb66d66f6d2b99a98f0c0e55ff
+  data.tar.gz: 8cc85cd5f91d369a8075db2a1a979cbbe34d9df7cedf3f48f3afdc634428e127
 SHA512:
-  metadata.gz: ae1a1863e44a12009f85a03e3b5ef3277a0457cbd6ea8777f794ff2e506b19eb2a869827502435548a17fc16f96fe920f1beff62cd04c63dd75b41a05b9f33f5
-  data.tar.gz: 13da139775c5ebc3fa478f6789969c6bc857b07bbff38ac78384bae8cecb799c309e0c8135f8e4d64eab17eb2c5dd85a2407731feb37df727321fba722099a51
+  metadata.gz: 8847909651378802dc7dd96fe0b6fec13af17e8f699597b1da66a1ecef81f3bfca2636098385ab665e936d81c34f724140839282db797babf78788c573e550dc
+  data.tar.gz: 5a206f45dd6af27cc47d35c1240e6a05f173dc22ae27bf932a73bbcaf86cfc71a26679ddd45d8d67fa36d2e329c3016f96be150a6596958b0355a0c9e0baaaed

data/lib/lhj/helper/log_helper.rb

@@ -16,7 +16,7 @@ module Lhj
       @log = fetch_log
       @feature = fetch_feature
       save_last_commit_hash
-      render_template
+      render_with_template('git_commit_log')
     end
 
     def fetch_branch
@@ -88,9 +88,13 @@ module Lhj
       File.join(Lhj::Config.instance.home_dir, ".#{@env}_#{branch_name}_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)
+    def render_with_template(template_name = 'git')
+      temp = Lhj::ErbTemplateHelper.load(template_name)
+      vars = { branch: @branch,
+               env: @env,
+               feature: @feature,
+               log: @log }
+      Lhj::ErbTemplateHelper.render(temp, vars, '-')
     end
 
   end

data/lib/lhj/helper/pgyer_helper.rb

@@ -101,15 +101,6 @@ module Lhj
       Actions.sh(update_cmd.join(' '), log: false, error_callback: nil)
     end
 
-    def render_template
-      if @result.is_a? Hash
-        temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
-        Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
-      else
-        @result
-      end
-    end
-
     def render_with_template(template_name = 'pgyer')
       if @result.is_a? Hash
         temp = Lhj::ErbTemplateHelper.load(template_name)

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.82"
+    VERSION = "0.1.83"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.82
+  version: 0.1.83
 platform: ruby
 authors:
 - lihaijian
@@ -360,13 +360,6 @@ files:
 - lib/lhj/command/template.rb
 - lib/lhj/command/trans.rb
 - lib/lhj/command/yapi.rb
-- 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/command/yapi/yapi_init.rb
 - lib/lhj/config.rb
 - lib/lhj/env.rb

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

@@ -1,15 +0,0 @@
-module Lhj
-  # format
-  module ErbFormatter
-    # base
-    class Base
-      def initialize(runner)
-        @runner = runner
-      end
-
-      def render
-        'Implement global help here'
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Lhj
-  module ErbFormatter
-    # context
-    class Context
-      def initialize(target)
-        @target = target
-      end
-
-      def fetch_binding
-        @target.instance_eval { binding }.tap do |bind|
-          decorate_binding(bind)
-        end
-      end
-
-      # 空方法
-      def decorate_binding(bind)
-        bind.eval('save = 1')
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-require 'erb'
-require_relative 'base'
-require_relative 'command_context'
-
-module Lhj
-  module ErbFormatter
-    # service
-    class Service < Base
-      # @param [String] name
-      def render(name = 'yapi')
-        temp_str = template_str(name)
-        render_template(temp_str)
-      end
-
-      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(template_str, nil, '-')
-        else
-          ERB.new(template_str, trim_mode: '-')
-        end
-      end
-    end
-  end
-end

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

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

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

@@ -1,10 +0,0 @@
-<% if @result_model_name %>
-          if (responseMessage.resultCode == 0 && responseMessage.error == nil) {
-              if ([responseMessage.detailMsg isKindOfClass:[NSDictionary class]]) {
-                  <%= @result_model_name %> *info = <%= @result_model_name %> yy_modelWithDictionary:responseMessage.detailMsg];
-                  callback(info,responseMessage);
-              }
-          } else {
-              callback(nil,responseMessage);
-          }
-<% end %>

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

@@ -1,6 +0,0 @@
-#### 应用名称：<%= @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/formatters/template/yapi.erb

@@ -1,28 +0,0 @@
-/**
-*  <%= @title %> -- <%= @username %>
-*  <%= @desc %>
-*/
-static NSString * const <%= @path_key %> = @"<%= @path %>";
-
-<% if @method == 'GET' -%>
-+(void)get<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
-{
-    [MLNetworkingManager getWithUrl:<%= @path_key %> params:params response:^(MLResponseMessage *responseMessage) {
-          <%= @model_template %>
-    }];
-}
-<% elsif @method == 'JSON' -%>
-+(void)postJson<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
-{
-    [MLNetworkingManager requestJsonWithUrl:<%= @path_key %> httpMedth:kRequestMethodPOST params:param response:^(MLResponseMessage *responseMessage) {
-          <%= @model_template %>
-    }];
-}
-<% else -%>
-+(void)post<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
-{
-    [MLNetworkingManager postWithUrl:<%= @path_key %> params:params response:^(MLResponseMessage *response) {
-          <%= @model_template %>
-    }];
-}
-<% end -%>