lhj-tools 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2210e536172e4943d1e39f4460cd715ef726e35b0859c348b24963a1f0ff433
-  data.tar.gz: c1e81cf0c82016ee20f57168c840780cd7127a28a1c2c92d409785f03a52dbe5
+  metadata.gz: 2d7427bf47063e690b70a09d1bf6987c387d7289ec0c4206fd7d6182372e463e
+  data.tar.gz: d43905b649b15c84de3120b966c42ebb684bdacfec57af0ac2c622fb57218c79
 SHA512:
-  metadata.gz: 8cd06e57308f22d90b13d330f21a6c198d873a5483ae604c044e3c0fbd76c8083550fb261e30fc40f43b8e1af8f891063b0ba7a7930a258de8cf1f8292855802
-  data.tar.gz: 2428331f080d48dac6ae877c179a900ddb2601a32c292062d2edbfa7febb1a202dda40fd7fe21f6d840dffad0335695ad1c306c6ea9903a99bd2895cead8edc4
+  metadata.gz: 5c3f50b5221b68bdec3d7257c31456a70f9fc04263fd48ce4007157b638ab96613a8077339ae016126c9abf0cb75bc2d35f5bb6ef98f70ca55d3310512e21171
+  data.tar.gz: 0bbff5886d4a5aace7ad8c2143db0fbfe7a7c52cf5809e62a6325a478f7c9c045aede8f74eea640e5a366b38cc6f203e87c372187a257452b65e557d5e87eec3

data/lib/lhj/command/init.rb

@@ -1,12 +1,21 @@
+require 'faraday'
+require 'faraday_middleware'
+require 'net/http'
+require 'uri'
+require 'lhj/config'
 
 module Lhj
   class Command
-    # init tools
+    # sync config
     class Init < Command
       self.summary = '初始化控件'
+      self.description = '使用工具前先执行`lhj init`'
 
       def run
-        p 'hello world'
+        auto_spin
+        FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
+        download_file
+        stop
       end
 
       def down_load_urls
@@ -16,11 +25,29 @@ module Lhj
            http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml]
       end
 
-      def down_load_file
-        ary = down_load_urls
-        ary.each do |key|
+      def target_folder
+        Lhj::Config.instance.home_dir
+      end
+
+      def save_file(url, target)
+        http_client = Faraday.new do |c|
+          c.adapter Faraday.default_adapter
+        end
+        response = http_client.get(url)
+        File.open(target, 'wb') { |fp| fp.write(response.body) }
+      end
+
+      def file_name_with_url(url)
+        url.scan(%r{/([^/]+)}).flatten.last
+      end
+
+      def download_file
+        down_load_urls.each do |url|
+          file_name = file_name_with_url(url)
+          file_path = File.join(target_folder, file_name)
+          save_file(url, file_path) unless File.exist?(file_path)
         end
-        puts "同步完成 \n"
+        puts "工具初始化完成 \n"
       end
     end
   end

data/lib/lhj/command/oss/del.rb

@@ -8,27 +8,40 @@ module Lhj
         self.summary = '删除OSS的key'
 
         self.arguments = [
-          CLAide::Argument.new('--key=XX', true)
+          CLAide::Argument.new('--key=XX', true),
+          CLAide::Argument.new('--type=XX', true)
         ]
 
         def self.options
           [
-            %w[--key OSS对应的key]
+            %w[--key OSS对应的key],
+            %w[--type OSS对应的类型]
           ]
         end
 
         def initialize(argv)
           @key = argv.option('key')
+          @type = argv.option('type')
           super
         end
 
         def validate!
-          help! '请输入key' unless @key
+          help! '请输入key或者类型' unless @key || @type
           super
         end
 
         def run
-          Lhj::OSS::Helper.instance.delete(@key)
+          if @type
+            objects = Lhj::OSS::Helper.instance.list
+            objects.each do |o|
+              if /#{@type}/ =~ o.key
+                puts "成功删除#{o.key}"
+                Lhj::OSS::Helper.instance.delete(o.key)
+              end
+            end
+          else
+            Lhj::OSS::Helper.instance.delete(@key)
+          end
         end
       end
     end

data/lib/lhj/command/oss/list.rb

@@ -1,15 +1,21 @@
 require 'lhj/helper/oss_helper'
+require 'terminal-table'
 
 module Lhj
   class Command
     class OSS < Command
       class List < OSS
+        self.summary = '查看oss列表'
+
         def run
           objects = Lhj::OSS::Helper.instance.list
+          rows = []
           objects.each do |o|
             path = "#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
-            puts path
+            rows << [path]
           end
+          table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows
+          puts table
         end
       end
     end

data/lib/lhj/command/oss/upload.rb

@@ -11,30 +11,33 @@ module Lhj
 
         self.arguments = [
           CLAide::Argument.new('type', false),
-          CLAide::Argument.new('name', false)
+          CLAide::Argument.new('name', false),
+          CLAide::Argument.new('tag', false)
         ]
 
         def self.options
           [
             %w[--type 文件类型],
-            %w[--name 文件名]
+            %w[--name 文件名],
+            %w[--tag 标签]
           ]
         end
 
         def validate!
           super
-          help! '类型或名字必须输入' unless @name && @type
+          help! '类型或名字必须输入' unless @name || @type
         end
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
           @type = argv.option('type')
           @name = argv.option('name')
+          @tag = argv.option('tag')
           super
         end
 
         def run
-          Dir.glob(@current_path).each do |f|
+          Dir.glob("#{@current_path}/*").each do |f|
             file_name = File.basename(f)
             if @name && /#{@name}/ =~ file_name
               upload(f, file_name)
@@ -48,6 +51,7 @@ module Lhj
 
         def upload(file, file_name)
           oss_key = file_name
+          oss_key = "#{@tag}/#{file_name}" if @tag
           Lhj::OSS::Helper.instance.upload(oss_key, file)
           url = Lhj::OSS::Helper.instance.object_url(oss_key)
           puts "云端上传成功：#{url}\n"

data/lib/lhj/command/oss.rb

@@ -0,0 +1,10 @@
+
+module Lhj
+  class Command
+    # sync config
+    class OSS < Command
+      self.summary = 'oss操作'
+      self.abstract_command = true
+    end
+  end
+end

data/lib/lhj/command/refactor_rename.rb

@@ -2,6 +2,7 @@
 
 require 'find'
 require 'fileutils'
+require 'terminal-table'
 
 module Lhj
   class Command
@@ -31,11 +32,13 @@ module Lhj
         @current_path = argv.shift_argument || Dir.pwd
         @key = argv.option('key')
         @other = argv.option('other')
+        @modify_files = []
         super
       end
 
       def run
         update_source_file
+        print_info
       end
 
       def update_source_file
@@ -69,9 +72,22 @@ module Lhj
 
       def format_string(file, line)
         result = line
-        result = result.gsub(/(\W)(#{@key})(\W)/, "\\1#{@other}\\3") if /(\W)(#{@key})(\W)/ =~ line
+        if /(\W)(#{@key})(\W)/ =~ line
+          result = result.gsub(/(\W)(#{@key})(\W)/, "\\1#{@other}\\3")
+          @modify_files << file unless @modify_files.include?(file)
+        end
         result
       end
+
+      def print_info
+        rows = []
+        @modify_files.each do |file|
+          rows << [File.basename(file), File.absolute_path(file)]
+        end
+        title = "修改了#{rows.count}个文件"
+        table = Terminal::Table.new title: title, headings: %w[文件 路径], rows: rows
+        puts table
+      end
     end
   end
 end

data/lib/lhj/command/rename_image.rb

@@ -1,17 +1,59 @@
-
 module Lhj
   class Command
-    class Rename < Command
+    class RenameImage < Command
+      self.summary = '重命名图片'
+
+      self.arguments = [
+        CLAide::Argument.new('--pre=xx', false),
+        CLAide::Argument.new('--name=xx', false),
+        CLAide::Argument.new('--other=xx', false)
+      ]
+
+      def self.options
+        [
+          %w[--pre 图片前缀],
+          %w[--name 图片名称],
+          %w[--other 图片变化后的名称]
+        ]
+      end
+
+      def validate!
+        super
+        help! '输入图片信息' unless @image_pre || @image_name || @image_other_name
+      end
+
+      def initialize(argv)
+        @current_path = argv.shift_argument || Dir.pwd
+        @image_pre = argv.option('pre')
+        @image_name = argv.option('name')
+        @image_other_name = argv.option('other')
+        super
+      end
+
       def run
-        rename
+        rename_image
       end
 
-      def rename
-        folder_path = "~/Downloads/ss"
-        Dir.glob("#{folder_path}/**/*.{png}").sort.each do |f|
+      def rename_image
+        Dir.glob("#{@current_path}/**/*.{png}").sort.each do |f|
           filename = File.basename(f, File.extname(f))
-          File.rename(f, "#{folder_path}/aomi_soldout_" + filename.capitalize + File.extname(f))
+          m_filename = modify_name(filename, File.extname(f))
+          target = File.join(@current_path, m_filename)
+          File.rename(f, target)
+        end
+      end
+
+      def modify_name(file_name, extname)
+        name = file_name.downcase + extname
+        if @image_pre
+          name = @image_pre + file_name.downcase + extname
+        elsif @image_name && @image_other_name
+          if file_name =~ /#{@image_name}/
+            other_name = file_name.gsub(/#{@image_name}/, @image_other_name)
+            name = other_name + extname
+          end
         end
+        name
       end
     end
   end

data/lib/lhj/command/trans.rb

@@ -5,6 +5,7 @@ module Lhj
   class Command
     class Trans < Command
       self.summary = '源码中的简繁体转换'
+      self.description = '当前目录简繁体转换 `lhj trans --zh-cn`'
 
       def self.options
         [

data/lib/lhj/command/view.rb

@@ -1,7 +1,8 @@
 module Lhj
   class Command
     class View < Command
-      self.summary = '生成源码'
+      self.summary = '生成iOS组件源码'
+      self.description = '使用`lhj view --type=UILabel --name=titleLabel`'
 
       def initialize(argv)
         @name = argv.option('name', 'titleLabel')
@@ -10,24 +11,25 @@ module Lhj
       end
 
       def names
-        @name.split(",").map(&:strip)
+        @name.split(',').map(&:strip)
       end
 
       def type
         @ele_type ||= begin
-                        if @type =~ /image/i
+                        case @type
+                        when /image/i
                           'UIImageView'
-                        elsif @type =~ /stack/i
+                        when /stack/i
                           'UIStackView'
-                        elsif @type =~ /label/i
+                        when /label/i
                           'UILabel'
-                        elsif @type =~ /table/i
+                        when /table/i
                           'UITableView'
-                        elsif @type =~ /text/i
+                        when /text/i
                           'UITextField'
-                        elsif @type =~ /button/i
+                        when /button/i
                           'UIButton'
-                        elsif @type =~ /view/i
+                        when /view/i
                           'UIView'
                         else
                           @type
@@ -47,7 +49,7 @@ module Lhj
 
       def print_declare
         names.each do |name|
-          puts "///"
+          puts '///'
           puts "@property (nonatomic, strong) #{type} *#{name};"
         end
       end
@@ -55,24 +57,25 @@ module Lhj
       def print_instance
         names.each do |name|
           puts "-(#{type} *)#{name}"
-          puts "{"
+          puts '{'
           puts "    if(!_#{name}){"
           print_alloc(name)
           puts "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
           print_property(name)
-          puts "    }"
+          puts '    }'
           puts "    return _#{name};"
-          puts "}"
+          puts '}'
           puts "\n"
         end
       end
 
       def print_alloc(name)
-        if type.eql?('UIImageView')
+        case type
+        when 'UIImageView'
           puts "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
-        elsif type.eql?('UIButton')
+        when 'UIButton'
           puts "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
-        elsif type.eql?('UITableView')
+        when 'UITableView'
           puts "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
         else
           puts "        _#{name} = [[#{type} alloc] init];"
@@ -80,34 +83,35 @@ module Lhj
       end
 
       def print_property(name)
-        if type.eql?('UILabel')
+        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;"
-        elsif type.eql?('UIImageView')
+        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;"
-        elsif type.eql?('UITextField')
+        when 'UITextField'
           puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
           puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
-        elsif type.eql?('UIView')
+        when 'UIView'
           puts "        _#{name}.backgroundColor = kBackgroundColor;"
-        elsif type.eql?('UIStackView')
+        when 'UIStackView'
           puts "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
           puts "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
-        elsif type.eql?('UITableView')
+        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;"
-        elsif type.eql?('UIButton')
+        when 'UIButton'
           puts "        _#{name}.backgroundColor = kBackgroundColor;"
           puts "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
           puts "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"

data/lib/lhj/command/yapi.rb

@@ -7,6 +7,7 @@ module Lhj
   class Command
     class Yapi < Command
       self.summary = '通过yapi接口生成请求'
+      self.description = '更新 ~/.lhj/yapi.yml 文件配置后执行`lhj api`生成接口模型'
 
       def self.options
         [
@@ -43,8 +44,8 @@ module Lhj
       def test_ding
         require 'net/http'
         require 'uri'
-        body = { "msgtype" => "text", "text" => { "content" => "error:上传蒲公英超时失败!" } }.to_json
-        Net::HTTP.post(URI('https://oapi.dingtalk.com/robot/send?access_token=6a3519057170cdb1b7274edfe43934c84a0062ffe2c9bcced434699296a7e26e'), body, "Content-Type" => "application/json")
+        body = { 'msgtype' => 'text', 'text' => { 'content' => 'error:上传蒲公英超时失败!' } }.to_json
+        Net::HTTP.post(URI('https://oapi.dingtalk.com/robot/send?access_token=6a3519057170cdb1b7274edfe43934c84a0062ffe2c9bcced434699296a7e26e'), body, 'Content-Type' => 'application/json')
       end
 
       def puts_h(str)
@@ -178,7 +179,8 @@ module Lhj
         p_model = { name: p_name }
 
         properties = []
-        if p_type.eql?('object')
+        case p_type
+        when 'object'
           p_properties.each do |k, v|
             c_type = @type_trans[v['type']] || v['type']
             c_model = { key: k, type: c_type, description: v['description'], default: '' }
@@ -186,7 +188,7 @@ module Lhj
               o = v['items'] || v
               o['name'] = gen_model_name(k)
               if v['type'].eql?('array') && v['items']['type'].eql?('string')
-                c_model[:type_name] = "NSString"
+                c_model[:type_name] = 'NSString'
               else
                 c_model[:type_name] = o['name']
                 handle_model(o)
@@ -196,7 +198,7 @@ module Lhj
           end
           p_model[:properties] = properties
           @models << p_model
-        elsif p_type.eql?('array')
+        when 'array'
           t = model['items']
           t['name'] = p_name
           handle_model(t)
@@ -220,9 +222,9 @@ module Lhj
           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 > 0
-            puts_m "+(NSDictionary *)modelContainerPropertyGenericClass {"
+            puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
             puts_m "  return @{#{str}};"
-            puts_m "}"
+            puts_m '}'
           end
           puts_m "@end\n"
           puts "\n\n"
@@ -237,27 +239,28 @@ module Lhj
         des.gsub!(/\n/, '  ')
         default = m[:default]
         puts_h "///#{des} #{default}"
-        if type.eql?('integer')
+        case type
+        when 'integer'
           puts_h "@property (nonatomic, assign) NSInteger #{key};"
           if des.include?('分')
-            puts_h "/////////==========删掉其中一个属性"
+            puts_h '/////////==========删掉其中一个属性'
             puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
           end
-        elsif type.eql?('cent')
+        when 'cent'
           puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
-        elsif type.eql?('string')
+        when 'string'
           puts_h "@property (nonatomic, copy) NSString *#{key};"
-        elsif type.eql?('number')
+        when 'number'
           puts_h "@property (nonatomic, strong) NSNumber *#{key};"
-        elsif type.eql?('float')
+        when 'float'
           puts_h "@property (nonatomic, assign) CGFloat #{key};"
-        elsif type.eql?('double')
+        when 'double'
           puts_h "@property (nonatomic, assign) double #{key};"
-        elsif type.eql?('boolean')
+        when 'boolean'
           puts_h "@property (nonatomic, assign) BOOL #{key};"
-        elsif type.eql?('object')
+        when 'object'
           puts_h "@property (nonatomic, strong) #{type_name} *#{key};"
-        elsif type.eql?('array')
+        when 'array'
           puts_h "@property (nonatomic, strong) NSArray<#{type_name} *> *#{key};"
         else
           puts_h "@property (nonatomic, copy) NSString *#{key};"
@@ -266,36 +269,36 @@ module Lhj
 
       def print_methods
         puts "\n<===============方法调用=====================>\n"
-        puts_m "/**"
+        puts_m '/**'
         puts_m " *  #{@data_json['title']} -- #{@data_json['username']}"
-        puts_m " */"
+        puts_m ' */'
         key_str = @data_json['path'].split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { $&.upcase } }.join('')
         key = "k#{key_str}URL"
         puts_m "static NSString * const #{key} = @\"#{@data_json['path']}\";"
         puts_m "\n\n"
-        puts_h "@interface MLParamModel : NSObject"
+        puts_h '@interface MLParamModel : NSObject'
         @data_json['req_query'].each do |h|
           des = h['desc']
           puts_h "///#{des}  #{h['example']}"
           puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
         end
-        puts_h "@end"
+        puts_h '@end'
         puts "\n\n"
         model = @models.last
         if @data_json['method'].eql?('GET')
           puts_m "    [MLNetworkingManager getWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-          puts_m "        if (response.resultCode == 0 && !response.error){"
-          puts_m "            NSDictionary *detailMsg = response.detailMsg"
+          puts_m '        if (response.resultCode == 0 && !response.error){'
+          puts_m '            NSDictionary *detailMsg = response.detailMsg'
           puts_m "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-          puts_m "        }"
-          puts_m "    }];"
+          puts_m '        }'
+          puts_m '    }];'
         else
           puts_m "    [MLNetworkingManager postWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-          puts_m "        if (response.resultCode == 0 && !response.error){"
-          puts_m "            NSDictionary *detailMsg = response.detailMsg"
+          puts_m '        if (response.resultCode == 0 && !response.error){'
+          puts_m '            NSDictionary *detailMsg = response.detailMsg'
           puts_m "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-          puts_m "        }"
-          puts_m "    }];"
+          puts_m '        }'
+          puts_m '    }];'
         end
       end
     end

data/lib/lhj/command.rb

@@ -1,6 +1,8 @@
 require 'claide'
+require "tty-spinner"
 
 module Lhj
+  # command plugin
   class Command < CLAide::Command
     require 'lhj/command/init'
     require 'lhj/command/head_import'
@@ -10,6 +12,7 @@ module Lhj
     require 'lhj/command/local/local'
     require 'lhj/command/local/micro_service'
     require 'lhj/command/local/local_upload'
+    require 'lhj/command/oss'
     require 'lhj/command/oss/del'
     require 'lhj/command/oss/upload'
     require 'lhj/command/oss/list'
@@ -20,5 +23,19 @@ module Lhj
 
     self.abstract_command = true
     self.command = 'lhj'
+
+    def spinner
+      @spinner ||= TTY::Spinner.new('[:spinner]正在处理...', output: $stdout, format: :dots)
+    end
+
+    def auto_spin
+      spinner.auto_spin
+      puts "\n"
+    end
+
+    def stop
+      spinner.stop('Done!')
+    end
+
   end
-end
+end