cocoapods-aomi-bin 0.1.18 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8c44d20bbf16495837fc21e0473aaf2060431d581740e4890d8430c2dde61a
-  data.tar.gz: 90329076ca43ca7b8636a25fa13313a3af1e1d923995313a58c2246d8f256ab6
+  metadata.gz: cb55502492ac052c7d2663e4b045a0b1f6662194621c1f3062a48967d8d0f4e5
+  data.tar.gz: 9825c8ee973005e7a441f2a7e43868de023c9342ef1c250bdca64c67fb8c3d76
 SHA512:
-  metadata.gz: ec55a2ad458dd66862271722a285e4bdffc774f9ef66a981834c54b0c00c61e60e136c6f6a25c933caf1fe40307635b02be6c31660760325389972a201316abf
-  data.tar.gz: 707d281f506be358883240885a13a81de2574f03276440aab7d517e657a8fa05f5580f7236c7f564f508353627e6c4b3f9ca1089ba76689508e986aa89f6b731
+  metadata.gz: 73475f03e293309adf3cb1e639a0dfba8f626d8eda56b5f95b29b39d5df8a7c372b2b3d638b4e9cc106d94f52c542addbf481ce2955ff2d3a291b3dc02621ed6
+  data.tar.gz: 7dc7519922409b00dca459d9c479050324d5bf2265677b56c29f59914fd9935eec1797587dfcc14385498254a543eaa21b4ac403986fd325bf059af3e83c993f

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

@@ -50,6 +50,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 +75,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,6 +8,13 @@ module Pod
       class Yapi < Bin
         self.summary = '通过yapi接口生成请求'
 
+        def self.options
+          [
+            %w[--id api的id],
+            %w[--model-pre 模型的前缀]
+          ]
+        end
+
         def initialize(argv)
           @id = argv.option('id')
           @model_pre_name = argv.option('model-pre')
@@ -20,16 +27,22 @@ module Pod
           @type_trans = {}
           @config_model_names = []
           @model_names = []
+          super
         end
 
         def run
           load_config
           fetch_model
-          print_models
-          print_models_implementation
           print_methods
         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 url_str
           "#{@http_url}#{api_id}"
         end
@@ -68,6 +81,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 +115,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,7 +173,6 @@ module Pod
         end
 
         def print_models
-          puts "\n<===============打印模型=====================>\n"
           @models.each do |model|
             model_name = model[:name] || ''
             model_properties = model[:properties]
@@ -156,11 +202,15 @@ 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}"
           if type.eql?('integer')
             puts "@property (nonatomic, assign) NSInteger #{key};"
+            if des.include?('分')
+              puts "/////////==========删掉其中一个属性"
+              puts "@property (nonatomic, strong) MLCentNumber *#{key};"
+            end
           elsif type.eql?('cent')
             puts "@property (nonatomic, strong) MLCentNumber *#{key};"
           elsif type.eql?('string')
@@ -192,9 +242,10 @@ module Pod
           puts "static NSString * const #{key} = @\"#{@data_json['path']}\";"
           puts "\n\n"
           puts "@interface MLParamModel : NSObject"
-          @data_json['req_headers'].each do |h|
-            puts "///#{h['desc']}  #{h['value']}"
-            puts "@property (nonatomic, copy) NSString *#{h['name']}"
+          @data_json['req_query'].each do |h|
+            des = h['desc'].gsub(/\n/, '  ')
+            puts "///#{des}  #{h['example']}"
+            puts "@property (nonatomic, copy) NSString *#{h['name']};"
           end
           puts "@end"
           puts "\n\n"
@@ -203,14 +254,14 @@ module Pod
             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];"
+            puts "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
             puts "        }"
             puts "    }];"
           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];"
+            puts "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
             puts "        }"
             puts "    }];"
           end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.18'
+  VERSION = '0.1.23'
 end
 
 module Pod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.23
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-07-02 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