cocoapods-aomi-bin 0.1.20 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ab50139a50285ba68913f933fc41b22f44d14a6121ca60262a0ff927b92d95
-  data.tar.gz: 45db5d44f8db5ced6c5fd7b3233f3b6c9fb63c7e10dffc58cec720b66ea8e98c
+  metadata.gz: 72a18bc0c3ba9a0e31de6af984a1d07c7def7f70249941dd6a925dfe71d1fe6d
+  data.tar.gz: f1fea909529eab507e62af72b609d2d583f553d4d10983868a98e9e1c1b98b12
 SHA512:
-  metadata.gz: aeca9253e58a3e53e3678fa9b40d8a57a5090c4d3f9a226d51c7676d352a94a9de0dff05370f4733eacbb36bd87ba124b1db29d49efefa9294e482f7c6959b58
-  data.tar.gz: 2001007fa825622887c068d97b901a29d094523442a743471a939b7c807042400fb8361d77be41725559aee1261844ecb910408f4a92632c536763b20e7156d6
+  metadata.gz: 3dd64cd26ca405e69ab574db311279bf03f1790459ee585345cc562caddce8c2f0d0b8cd237891bc79475cb4d8c9377f5c13672c25eab71539c7661cd9d91672
+  data.tar.gz: 83cd6c1b564ceb748ec102d23c981bf941dada6bc47c3e3ef955a7eb2c84e271ec4a36f484ea153b1dae213b3c11a55028b56f68a45c6d5f73af3d36cf0427fd

data/lib/cocoapods-lhj-bin/command/bin.rb

@@ -59,7 +59,7 @@ module Pod
       end
 
       def validate!
-        # super
+        super
         # 这里由于 --help 是在 validate! 方法中提取的，会导致 --help 失效
         # pod lib create 也有这个问题
         banner! if @help

data/lib/cocoapods-lhj-bin/command/bin/model.rb

@@ -1,6 +1,7 @@
 require 'net/https'
 require 'uri'
 require 'json'
+require 'plist'
 
 module Pod
   class Command
@@ -15,6 +16,20 @@ module Pod
         end
 
         def run
+          gen_model
+          # handle_plist
+        end
+
+        def handle_plist
+          entitlements_file = File.expand_path('~/config.plist')
+          result = Plist.parse_xml(entitlements_file)
+          result.delete('com.apple.security.application-groups')
+          result['type'] = '0'
+          result.delete('version')
+          result.save_plist(entitlements_file)
+        end
+
+        def gen_model
           model = fetch_model
           fetch_models(nil, model) if model
           print_models

data/lib/cocoapods-lhj-bin/command/bin/view.rb

@@ -7,6 +7,7 @@ module Pod
         def initialize(argv)
           @name = argv.option('name', 'titleLabel')
           @type = argv.option('type', 'UILabel')
+          super
         end
 
         def names
@@ -50,6 +51,8 @@ module Pod
             puts "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
           elsif @type.eql?('UIButton')
             puts "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
+          elsif @type.eql?('UITableView')
+            puts "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
           else
             puts "        _#{name} = [[#{@type} alloc] init];"
           end
@@ -73,6 +76,13 @@ module Pod
             puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
           elsif @type.eql?('UIView')
             puts "        _#{name}.backgroundColor = kBackgroundColor;"
+          elsif @type.eql?('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')
             puts "        _#{name}.backgroundColor = kBackgroundColor;"
             puts "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"

data/lib/cocoapods-lhj-bin/command/bin/yapi.rb

@@ -8,9 +8,18 @@ module Pod
       class Yapi < Bin
         self.summary = '通过yapi接口生成请求'
 
+        def self.options
+          [
+            %w[--id api的id],
+            %w[--model-pre 模型的前缀],
+            %w[--save 保存生成文件]
+          ]
+        end
+
         def initialize(argv)
           @id = argv.option('id')
           @model_pre_name = argv.option('model-pre')
+          @save = argv.flag?('save', false)
           @http_url = ''
           @http_headers = []
           @data_json = {}
@@ -20,14 +29,43 @@ module Pod
           @type_trans = {}
           @config_model_names = []
           @model_names = []
+          super
         end
 
         def run
           load_config
           fetch_model
-          print_models
-          print_models_implementation
           print_methods
+          save_to_file if @save
+        end
+
+        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")
+        end
+
+        def puts_h(str)
+          puts str
+          @h_file_array ||= []
+          @h_file_array << str
+        end
+
+        def puts_m(str)
+          puts str
+          @m_file_array ||= []
+          @m_file_array << str
+        end
+
+        def save_to_file
+          @model_names = []
+          file_name = gen_model_name('')
+          h_file = File.join('.', "#{file_name}.h")
+          m_file = File.join('.', "#{file_name}.m")
+          File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count > 0
+          File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count > 0
+          puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}"
         end
 
         def url_str
@@ -68,6 +106,25 @@ module Pod
 
         def fetch_model
           res_json = req_model
+          begin
+            puts "\n<===============打印返回数据模型-Begin=====================>\n"
+            fetch_res_boy(res_json)
+            print_models
+            print_models_implementation
+            puts "\n<===============打印返回数据模型-End=====================>\n"
+          end
+          begin
+            puts "\n<===============打印请求模型-Begin=====================>\n"
+            @models = []
+            @model_names = []
+            fetch_req_body(res_json)
+            print_models
+            print_models_implementation
+            puts "\n<===============打印请求模型-End=====================>\n"
+          end
+        end
+
+        def fetch_res_boy(res_json)
           if res_json && res_json['data']
             @data_json = res_json['data']
             if @data_json['res_body']
@@ -83,6 +140,21 @@ module Pod
           end
         end
 
+        def fetch_req_body(res_json)
+          if res_json && res_json['data']
+            @data_json = res_json['data']
+            if @data_json['req_body_other']
+              begin
+                res_body = JSON.parse(@data_json['req_body_other'])
+                res_body['name'] = gen_model_name('')
+                handle_model(res_body)
+              rescue => ex
+                puts ex
+              end
+            end
+          end
+        end
+
         def gen_model_name(name)
           n = name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { $&.upcase }
           if n.length <= 0
@@ -126,28 +198,28 @@ module Pod
         end
 
         def print_models
-          puts "\n<===============打印模型=====================>\n"
           @models.each do |model|
             model_name = model[:name] || ''
             model_properties = model[:properties]
-            puts "@interface #{model_name} : NSObject"
+            puts_h "@interface #{model_name} : NSObject"
             model_properties.each do |m|
               print_model(m)
             end
-            puts "@end\n\n\n"
+            puts_h "@end\n\n\n"
           end
         end
 
         def print_models_implementation
           @models.each do |model|
-            puts "@implementation #{model[:name]}"
+            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 "+(NSDictionary *)modelContainerPropertyGenericClass {"
-              puts "  return @{#{str}};"
-              puts "}"
+              puts_m "+(NSDictionary *)modelContainerPropertyGenericClass {"
+              puts_m "  return @{#{str}};"
+              puts_m "}"
             end
-            puts "@end\n\n\n"
+            puts_m "@end\n"
+            puts "\n\n"
           end
         end
 
@@ -156,63 +228,68 @@ module Pod
           type_name = m[:type_name]
           type = m[:type]
           des = m[:description] || ''
-          des.gsub!(/\n/, '')
+          des.gsub!(/\n/, '  ')
           default = m[:default]
-          puts "///#{des} #{default}"
+          puts_h "///#{des} #{default}"
           if type.eql?('integer')
-            puts "@property (nonatomic, assign) NSInteger #{key};"
+            puts_h "@property (nonatomic, assign) NSInteger #{key};"
+            if des.include?('分')
+              puts_h "/////////==========删掉其中一个属性"
+              puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
+            end
           elsif type.eql?('cent')
-            puts "@property (nonatomic, strong) MLCentNumber *#{key};"
+            puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
           elsif type.eql?('string')
-            puts "@property (nonatomic, copy) NSString *#{key};"
+            puts_h "@property (nonatomic, copy) NSString *#{key};"
           elsif type.eql?('number')
-            puts "@property (nonatomic, strong) NSNumber *#{key};"
+            puts_h "@property (nonatomic, strong) NSNumber *#{key};"
           elsif type.eql?('float')
-            puts "@property (nonatomic, assign) CGFloat #{key};"
+            puts_h "@property (nonatomic, assign) CGFloat #{key};"
           elsif type.eql?('double')
-            puts "@property (nonatomic, assign) double #{key};"
+            puts_h "@property (nonatomic, assign) double #{key};"
           elsif type.eql?('boolean')
-            puts "@property (nonatomic, assign) BOOL #{key};"
+            puts_h "@property (nonatomic, assign) BOOL #{key};"
           elsif type.eql?('object')
-            puts "@property (nonatomic, strong) #{type_name} *#{key};"
+            puts_h "@property (nonatomic, strong) #{type_name} *#{key};"
           elsif type.eql?('array')
-            puts "@property (nonatomic, strong) NSArray<#{type_name} *> *#{key};"
+            puts_h "@property (nonatomic, strong) NSArray<#{type_name} *> *#{key};"
           else
-            puts "@property (nonatomic, copy) NSString *#{key};"
+            puts_h "@property (nonatomic, copy) NSString *#{key};"
           end
         end
 
         def print_methods
           puts "\n<===============方法调用=====================>\n"
-          puts "/**"
-          puts " *  #{@data_json['title']} -- #{@data_json['username']}"
-          puts " */"
+          puts_m "/**"
+          puts_m " *  #{@data_json['title']} -- #{@data_json['username']}"
+          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 "static NSString * const #{key} = @\"#{@data_json['path']}\";"
-          puts "\n\n"
-          puts "@interface MLParamModel : NSObject"
+          puts_m "static NSString * const #{key} = @\"#{@data_json['path']}\";"
+          puts_m "\n\n"
+          puts_h "@interface MLParamModel : NSObject"
           @data_json['req_query'].each do |h|
-            puts "///#{h['desc']}  #{h['example']}"
-            puts "@property (nonatomic, copy) NSString *#{h['name']};"
+            des = h['desc'].gsub(/\n/, '  ')
+            puts_h "///#{des}  #{h['example']}"
+            puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
           end
-          puts "@end"
+          puts_h "@end"
           puts "\n\n"
           model = @models.last
           if @data_json['method'].eql?('GET')
-            puts "    [MLNetworkingManager getWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-            puts "        if (response.resultCode == 0 && !response.error){"
-            puts "            NSDictionary *detailMsg = response.detailMsg"
-            puts "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-            puts "        }"
-            puts "    }];"
+            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 "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
+            puts_m "        }"
+            puts_m "    }];"
           else
-            puts "    [MLNetworkingManager postWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-            puts "        if (response.resultCode == 0 && !response.error){"
-            puts "            NSDictionary *detailMsg = response.detailMsg"
-            puts "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-            puts "        }"
-            puts "    }];"
+            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 "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
+            puts_m "        }"
+            puts_m "    }];"
           end
         end
       end

data/lib/cocoapods-lhj-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.20'
+  VERSION = '0.1.25'
 end
 
 module Pod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.25
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement