lhj-tools 0.1.62 → 0.1.64
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/lhj/command/yapi/yapi_init.rb +83 -0
- data/lib/lhj/command/yapi.rb +1 -9
- data/lib/lhj/command.rb +1 -0
- data/lib/lhj/helper/app_version_info.rb +18 -1
- data/lib/lhj/tools/version.rb +1 -1
- metadata +17 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9d368ea2cf5928005086cd6dba1f5d66446a4815c6367efd015295d2363a5f8e
|
4
|
+
data.tar.gz: e1242e6281d858b5f872224ffa002f3445c891ebe0ffd2188ce477ce25aa0d53
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 523743a35a0fcb52957788287576b6d7833e5ba9112b55ad003382c61e0ddc17b6ea30a97e41d9fcb8f5d41a2b051f6cbeb37942a4aa38d635946d69c2408608
|
7
|
+
data.tar.gz: 7a2c91ada15b17c4b6ef40923f146cc9977c41874441213e52484c3e13d0d29c5b1e4b7d2f364af28cbcda0719cfd668b61660c0bb8d676bc9d4c6e0c09b80e3
|
@@ -0,0 +1,83 @@
|
|
1
|
+
require 'selenium-webdriver'
|
2
|
+
|
3
|
+
module Lhj
|
4
|
+
class Command
|
5
|
+
# generate model from yapi
|
6
|
+
class YapiInit < Command
|
7
|
+
self.summary = '更新yapi请求cookie'
|
8
|
+
self.description = '更新 ~/.lhj/yapi.yml 文件配置'
|
9
|
+
|
10
|
+
# @return [String]
|
11
|
+
def interface_url
|
12
|
+
url = []
|
13
|
+
url << 'h'
|
14
|
+
url << 't'
|
15
|
+
url << 't'
|
16
|
+
url << 'p'
|
17
|
+
url << ':'
|
18
|
+
url << '/'
|
19
|
+
url << '/'
|
20
|
+
url << 'y'
|
21
|
+
url << 'a'
|
22
|
+
url << 'p'
|
23
|
+
url << 'i'
|
24
|
+
url << '.'
|
25
|
+
url << 'm'
|
26
|
+
url << 'i'
|
27
|
+
url << 'g'
|
28
|
+
url << 'u'
|
29
|
+
url << 'a'
|
30
|
+
url << 't'
|
31
|
+
url << 'e'
|
32
|
+
url << 'c'
|
33
|
+
url << 'h'
|
34
|
+
url << '.'
|
35
|
+
url << 'c'
|
36
|
+
url << 'o'
|
37
|
+
url << 'm'
|
38
|
+
url.join('')
|
39
|
+
end
|
40
|
+
|
41
|
+
def request_cookie
|
42
|
+
options = Selenium::WebDriver::Chrome::Options.new(args: %w[start-maximized])
|
43
|
+
driver = Selenium::WebDriver.for(:chrome, capabilities: options)
|
44
|
+
driver.get interface_url
|
45
|
+
manage = driver.manage
|
46
|
+
manage.timeouts.implicit_wait = 10
|
47
|
+
manage.timeouts.page_load = 10
|
48
|
+
# 1.登录
|
49
|
+
all_btn = driver.all(tag_name: 'button')
|
50
|
+
login_btn = all_btn.find { |ele| ele.text =~ /钉钉登录/ } if all_btn
|
51
|
+
login_btn&.click
|
52
|
+
# 2.获取cookies
|
53
|
+
wait = Selenium::WebDriver::Wait.new(timeout: 60)
|
54
|
+
wait.until do
|
55
|
+
res = {}
|
56
|
+
manage.all_cookies.each do |cookie|
|
57
|
+
res[:wid] = cookie[:value] if cookie[:name] == '__wpkreporterwid_'
|
58
|
+
res[:uid] = cookie[:value] if cookie[:name] == '_yapi_uid'
|
59
|
+
res[:token] = cookie[:value] if cookie[:name] == '_yapi_token'
|
60
|
+
end
|
61
|
+
return res if res.values.count == 3
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
def config_file
|
66
|
+
File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
|
67
|
+
end
|
68
|
+
|
69
|
+
def handle
|
70
|
+
cookie = request_cookie
|
71
|
+
config = YAML.load_file(config_file) if File.exist?(config_file)
|
72
|
+
if cookie && config
|
73
|
+
config['__wpkreporterwid_'] = cookie[:wid]
|
74
|
+
config['_yapi_uid'] = cookie[:uid].to_i
|
75
|
+
config['_yapi_token'] = cookie[:token]
|
76
|
+
file_to_save = File.open(config_file, 'w+')
|
77
|
+
YAML.dump(config, file_to_save)
|
78
|
+
file_to_save.close
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
data/lib/lhj/command/yapi.rb
CHANGED
@@ -61,7 +61,7 @@ module Lhj
|
|
61
61
|
load_config(config_file)
|
62
62
|
res_body = req_api_model
|
63
63
|
unless res_body['errcode'].to_i.zero?
|
64
|
-
puts '
|
64
|
+
puts '请执行 lhj yapi-init 初始化配置'.red
|
65
65
|
return
|
66
66
|
end
|
67
67
|
return unless res_body && !res_body.empty?
|
@@ -312,12 +312,6 @@ module Lhj
|
|
312
312
|
case type
|
313
313
|
when 'integer'
|
314
314
|
puts_h "@property (nonatomic, assign) NSInteger #{key};"
|
315
|
-
if des.include?('分') || des.include?('0.01')
|
316
|
-
puts_h_red '/////////==========删掉其中一个属性'
|
317
|
-
puts_h_red "@property (nonatomic, strong) MLCentNumber *#{key};"
|
318
|
-
end
|
319
|
-
when 'cent'
|
320
|
-
puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
|
321
315
|
when 'string'
|
322
316
|
puts_h "@property (nonatomic, copy) NSString *#{key};"
|
323
317
|
when 'number'
|
@@ -347,8 +341,6 @@ module Lhj
|
|
347
341
|
case type
|
348
342
|
when 'integer'
|
349
343
|
puts_h "int #{key};//#{des} #{default}"
|
350
|
-
when 'cent'
|
351
|
-
puts_h "int #{key};//#{des} #{default}"
|
352
344
|
when 'string'
|
353
345
|
puts_h "String #{key};//#{des} #{default}"
|
354
346
|
when 'number'
|
data/lib/lhj/command.rb
CHANGED
@@ -98,7 +98,7 @@ module Lhj
|
|
98
98
|
|
99
99
|
def update_log
|
100
100
|
Dir.chdir(@work_path) do
|
101
|
-
message = Lhj::Actions.git_log_last_commits(' %an %ar - %s;',
|
101
|
+
message = Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 6, :exclude_merges, 'short', false)
|
102
102
|
handle_message(message)
|
103
103
|
end
|
104
104
|
end
|
@@ -114,5 +114,22 @@ module Lhj
|
|
114
114
|
message
|
115
115
|
end
|
116
116
|
|
117
|
+
def custom_modify
|
118
|
+
return if @env != :release
|
119
|
+
|
120
|
+
Dir["#{@work_path}/**/*.m"].each do |file|
|
121
|
+
str = ''
|
122
|
+
File.open(file) do |f|
|
123
|
+
f.each_line do |line|
|
124
|
+
next if line =~ /todo/
|
125
|
+
|
126
|
+
str += line
|
127
|
+
end
|
128
|
+
end
|
129
|
+
File.open(file, 'w+') do |f|
|
130
|
+
f.write(str)
|
131
|
+
end
|
132
|
+
end
|
133
|
+
end
|
117
134
|
end
|
118
135
|
end
|
data/lib/lhj/tools/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lhj-tools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.64
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- lihaijian
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-12-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: xcodeproj
|
@@ -302,6 +302,20 @@ dependencies:
|
|
302
302
|
- - "<"
|
303
303
|
- !ruby/object:Gem::Version
|
304
304
|
version: '3'
|
305
|
+
- !ruby/object:Gem::Dependency
|
306
|
+
name: selenium-webdriver
|
307
|
+
requirement: !ruby/object:Gem::Requirement
|
308
|
+
requirements:
|
309
|
+
- - "~>"
|
310
|
+
- !ruby/object:Gem::Version
|
311
|
+
version: 4.7.1
|
312
|
+
type: :runtime
|
313
|
+
prerelease: false
|
314
|
+
version_requirements: !ruby/object:Gem::Requirement
|
315
|
+
requirements:
|
316
|
+
- - "~>"
|
317
|
+
- !ruby/object:Gem::Version
|
318
|
+
version: 4.7.1
|
305
319
|
description: lhj tools.
|
306
320
|
email:
|
307
321
|
- sanan.li@qq.com
|
@@ -353,6 +367,7 @@ files:
|
|
353
367
|
- lib/lhj/command/yapi/formatters/template/model.erb
|
354
368
|
- lib/lhj/command/yapi/formatters/template/pgyer.erb
|
355
369
|
- lib/lhj/command/yapi/formatters/template/yapi.erb
|
370
|
+
- lib/lhj/command/yapi/yapi_init.rb
|
356
371
|
- lib/lhj/config.rb
|
357
372
|
- lib/lhj/env.rb
|
358
373
|
- lib/lhj/helper/app_version_info.rb
|