lhj-tools 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51282e5a210a73525c73ce6c187cb89c7e1974383ab85d3f819a2d879b04ba1
-  data.tar.gz: b9e415c288460cfa16735e64feae9202d347a54070caf581ae4a3c7099de6f6c
+  metadata.gz: d53d84a79a0bde89e0f6f4299cd74bec6f34b50bb4ae9534047a1981e8ecf481
+  data.tar.gz: 5c11e01ef959b491a5bd03e8f737de5a68cd0b6dffba586015291717c71a1b39
 SHA512:
-  metadata.gz: 7a9a85100ae545826bd9cc332bd592e1f45e5958f58a4e24527b162da5f446d95d56a54cfa067a05aa05ef20254519f23cb2d15e287f5bc7a63e80792f52b8ed
-  data.tar.gz: 5ed2fb7fbc378ac89c21ac61588d5372c8006a39428a4aa09ed46c2284ab4bd61d72d5589f5f674279629e2d0d75effc2931850ed17398a1ff236c08715f0231
+  metadata.gz: 60619bab6cafe45d4717c97d70fba34921dd79f2e21327bcfcdc155a76cc86a2341cef50c7506ed65980c610a2d97eb1b8d79c82641dd01faf077f581ac2d2e5
+  data.tar.gz: 95b1acbb95b7342da7bb4c946b7506c7572d619374f39906b0c6804e691f38e2388ed567c37b06b4c451e4aeb382d48fd13c5a90ae1fa6bcde9253104b092e94

data/lib/lhj/command/config/info.rb

@@ -3,29 +3,44 @@ require 'lhj/config'
 
 module Lhj
   class Command
+    # config
     class Config < Command
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def show_config
+        config_arr = Dir.glob("#{config_dir}/**/*.yml")
+        config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
+        idx = ask_which_one
+        config_file = config_arr[idx]
+        handle_yaml(config_file)
+      end
+
+      def handle_yaml(file)
+        '子类实现'
+      end
+
+      def handle
+        show_config
+      end
+
+      def config_dir
+        Lhj::Config.instance.home_dir
+      end
+
+      def print_table(title, table_rows)
+        table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
+        puts table
+      end
+
       # show config info
       class Info < Config
         self.summary = '查看配置信息'
 
-        def initialize(argv)
-          @cli = HighLine.new
-          super
-        end
-
-        def handle
-          show_config
-        end
-
-        def show_config
-          config_arr = Dir.glob("#{config_dir}/**/*.yml")
-          config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
-          idx = ask_which_one
-          config_file = config_arr[idx]
-          show_yaml(config_file)
-        end
 
-        def show_yaml(file)
+        def handle_yaml(file)
           table_rows = []
           content = YAML.load_file(file)
 
@@ -49,17 +64,33 @@ module Lhj
           print_table(title, table_rows) if table_rows.count.positive?
         end
 
-        def print_table(title, table_rows)
-          table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
-          puts table
+        def ask_which_one
+          @cli.ask('查看哪个配置: '.green).strip.to_i
         end
+      end
+
+      class Update < Config
 
         def ask_which_one
-          @cli.ask('查看哪个配置: '.green).strip.to_i
+          @cli.ask('更新哪个配置: '.green).strip.to_i
         end
 
-        def config_dir
-          Lhj::Config.instance.home_dir
+        def handle_yaml(file)
+          table_rows = []
+          content = YAML.load_file(file)
+
+          if content.is_a?(Hash)
+            content.each do |key, value|
+              table_rows << [key, value]
+            end
+          end
+
+          title = File.basename(file).to_s
+          print_table(title, table_rows) if table_rows.count.positive?
+
+          cmd = ['open']
+          cmd << file
+          Actions.sh(cmd.join(' '))
         end
       end
     end

data/lib/lhj/command/init.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'faraday'
 require 'faraday_middleware'
 require 'net/http'
@@ -23,7 +24,10 @@ module Lhj
 
       def validate!
         super
-        help! '配置url必须输入' unless @url
+        unless @url
+          path = File.join(target_folder, 'config_file.yml')
+          help! '配置url必须输入' unless File.exist?(path)
+        end
       end
 
       def initialize(argv)
@@ -33,8 +37,12 @@ module Lhj
 
       def handle
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
-        file_path = file_name_from_url(@url)
-        save_url_to_file(@url, file_path)
+        if @url
+          file_path = file_name_from_url(@url)
+          save_url_to_file(@url, file_path)
+        else
+          file_path = File.join(target_folder, 'config_file.yml')
+        end
         content = YAML.load_file(file_path)
         download_file(content) if content.is_a?(Array)
       end

data/lib/lhj/command/view.rb

@@ -47,102 +47,118 @@ module Lhj
         print_value
       end
 
+      def puts_d(str)
+        puts str.blue
+      end
+
+      def puts_i(str)
+        puts str.blue
+      end
+
+      def puts_l(str)
+        puts str.blue
+      end
+
+      def puts_v(str)
+        puts str.blue
+      end
+
       def print_declare
         names.each do |name|
-          puts '///'
-          puts "@property (nonatomic, strong) #{type} *#{name};"
+          puts_d '///'
+          puts_d "@property (nonatomic, strong) #{type} *#{name};"
         end
       end
 
       def print_instance
         names.each do |name|
-          puts "-(#{type} *)#{name}"
-          puts '{'
-          puts "    if(!_#{name}){"
+          puts_i "-(#{type} *)#{name}"
+          puts_i '{'
+          puts_i "    if(!_#{name}){"
           print_alloc(name)
-          puts "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
+          puts_i "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
           print_property(name)
-          puts '    }'
-          puts "    return _#{name};"
-          puts '}'
-          puts "\n"
+          puts_i '    }'
+          puts_i "    return _#{name};"
+          puts_i '}'
+          puts_i "\n"
         end
       end
 
       def print_alloc(name)
         case type
         when 'UIImageView'
-          puts "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
+          puts_i "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
         when 'UIButton'
-          puts "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
+          puts_i "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
         when 'UITableView'
-          puts "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
+          puts_i "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
         else
-          puts "        _#{name} = [[#{type} alloc] init];"
+          puts_i "        _#{name} = [[#{type} alloc] init];"
         end
       end
 
       def print_property(name)
         case type
         when 'UILabel'
-          puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
-          puts "        _#{name}.text = @\"xxxxxxxx\";"
-          puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
-          puts "        _#{name}.textAlignment = NSTextAlignmentCenter;"
+          puts_i "        _#{name}.textColor = kSetCOLOR(0x333333);"
+          puts_i "        _#{name}.text = @\"xxxxxxxx\";"
+          puts_i "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
+          puts_i "        _#{name}.textAlignment = NSTextAlignmentCenter;"
         when 'UIImageView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
-          puts "        _#{name}.clipsToBounds = YES;"
-          puts "        _#{name}.layer.cornerRadius = 6.0f;"
-          puts "        _#{name}.layer.borderColor = kLineColor.CGColor;"
-          puts "        _#{name}.layer.borderWidth = 0.5;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
+          puts_i "        _#{name}.clipsToBounds = YES;"
+          puts_i "        _#{name}.layer.cornerRadius = 6.0f;"
+          puts_i "        _#{name}.layer.borderColor = kLineColor.CGColor;"
+          puts_i "        _#{name}.layer.borderWidth = 0.5;"
         when 'UITextField'
-          puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
-          puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
+          puts_i "        _#{name}.textColor = kSetCOLOR(0x333333);"
+          puts_i "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
         when 'UIView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
         when 'UIStackView'
-          puts "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
-          puts "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
+          puts_i "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
+          puts_i "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
         when 'UITableView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        _#{name}.delegate = self;"
-          puts "        _#{name}.delegate = self;"
-          puts "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
-          puts "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
-          puts "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.delegate = self;"
+          puts_i "        _#{name}.delegate = self;"
+          puts_i "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+          puts_i "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+          puts_i "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
         when 'UIButton'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
-          puts "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
-          puts "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
-          puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
-          puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
-          puts "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
+          puts_i "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
+          puts_i "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
+          puts_i "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
+          puts_i "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
+          puts_i "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
         end
       end
 
       def print_layout
         names.each do |name|
-          puts "[contentView addSubview:self.#{name}];"
-          puts "[self.#{name}.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor constant:0].active = YES;"
-          puts "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
-          puts "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
-          puts "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
-          puts "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
-          puts "[self.#{name}.heightAnchor constraintEqualToConstant:80].active = YES;"
+          puts_l "[contentView addSubview:self.#{name}];"
+          puts_l "[self.#{name}.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor constant:0].active = YES;"
+          puts_l "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
+          puts_l "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
+          puts_l "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
+          puts_l "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
+          puts_l "[self.#{name}.heightAnchor constraintEqualToConstant:80].active = YES;"
           if type.eql?('UILabel')
-            puts "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
-            puts "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            puts_l "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            puts_l "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
           end
-          puts "\n\n"
+          puts_l "\n\n"
         end
       end
 
       def print_value
         names.each do |name|
           if type.eql?('UILabel')
-            puts "self.#{name}.text = @\"xxxxx\";"
+            puts_v "self.#{name}.text = @\"xxxxx\";"
           end
         end
       end

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

@@ -5,21 +5,21 @@
 static NSString * const <%= @path_key %> = @"<%= @path %>";
 
 <% if @method == 'GET' -%>
-+(void)get<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<%= @result_model_name %> *model, MLResponseMessage *response))callback
++(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 (^)(<%= @result_model_name %> *model, MLResponseMessage *response))callback
++(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)postJson<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<%= @result_model_name %> *model, MLResponseMessage *response))callback
++(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 %>

data/lib/lhj/command/yapi.rb

@@ -59,7 +59,11 @@ module Lhj
       def process(config_file)
         load_config(config_file)
         res_body = req_api_model
-        return unless res_body && res_body['errcode'].to_i.zero? && !res_body.empty?
+        unless res_body['errcode'].to_i.zero?
+          puts '请修改 ~/.lhj/yapi.yml文件的对应的__wpkreporterwid_,_yapi_token,_yapi_uid这三个值'.red
+          return
+        end
+        return unless res_body && !res_body.empty?
 
         # 1.print request result
         print_res_body_model(res_body)
@@ -322,6 +326,8 @@ module Lhj
         end
         puts_h '@end'
         puts "\n\n"
+
+        @param_model_name = 'MLParamModel' if @param_model_name.empty?
       end
 
       def print_http_method(data)

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide