lhj-tools 0.1.70 → 0.1.72

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 016612e3ae63d122d623c3edf0d3d7c2d299c168b65fc00277c21893afb89b69
4
- data.tar.gz: 262a3bca5cc53615347fdfd26d8805566ecc2b49fbd2021515448cd0806e4938
3
+ metadata.gz: 1414ebd1811cbc9f773ed21506171acd5aa5399a5b9a9d3a74634ff8ef93e882
4
+ data.tar.gz: e0b5c1dab6b128c8e8a8518f8b38c4d0e3c3b4de8cd4c61746591fc602878c5d
5
5
  SHA512:
6
- metadata.gz: 2008b246e8158d34b44db6bdc8fa02a84279c6d387006ebc1df6424ca79de7a664abd1c2788e9647a9a27f8f5fa4a43b45e78d45105eee7e6be435e162d597ed
7
- data.tar.gz: 57b1908b366a81aca0e928bf9a57801f1e13673039c75807f3c8256424637c067155d8fceffe60cf6620e6daf17e8ad5735db45d837721ae9e0470abc98a7883
6
+ metadata.gz: d0c41abe42ed5812635dc7c9a235efb9c2bce06054aba7c977ab82f7693d04e38151e91f68b8e78f22efb1d7d69ba502cca7c5024a74ca1f3364e089d4e1cf0d
7
+ data.tar.gz: 989dd03e74941a8b10623179c785367db74d8b615bac7e84d564718c0cacffb5b545ceb8d565a63687c440153e5a5493c0f8e6e1821b19e959f97da0b1f8f65e
@@ -11,12 +11,13 @@ module Lhj
11
11
  # generate model from yapi
12
12
  class Yapi < Command
13
13
  self.summary = '通过yapi接口生成请求'
14
- self.description = '更新 ~/.lhj/yapi.yml 文件配置后执行`lhj api`生成接口模型'
14
+ self.description = '执行`lhj api`生成接口模型'
15
15
 
16
16
  def self.options
17
17
  [
18
18
  %w[--id api的id],
19
19
  %w[--model-pre 模型的前缀],
20
+ %w[--model-name 模型的名称],
20
21
  %w[--save 保存生成文件]
21
22
  ]
22
23
  end
@@ -65,6 +66,7 @@ module Lhj
65
66
  service_code = print_http_method(res_body['data'], result_model_name, param_model_name)
66
67
  # 5.save to file
67
68
  file_map = save_to_file(service_code) if @save
69
+ puts file_map
68
70
  # 6.push to git
69
71
  push_to_git if @sync
70
72
  # 7.notify robot
@@ -98,18 +100,19 @@ module Lhj
98
100
  end
99
101
 
100
102
  def save_to_file(service_code)
103
+ name = model_name
101
104
  file_name = gen_model_name('')
102
105
  unless File.exist?(File.expand_path(sub_folder_name, '.'))
103
106
  FileUtils.mkdir_p(File.expand_path(sub_folder_name, '.'))
104
107
  end
105
- h_file = File.join('.', api_id, sub_folder_name, "#{file_name}.h")
106
- m_file = File.join('.', api_id, sub_folder_name, "#{file_name}.m")
107
- service_file = File.join('.', api_id, sub_folder_name, "#{model_pre}#{model_name}Service.m")
108
+ h_file = File.join('.', sub_folder_name, "#{file_name}.h")
109
+ m_file = File.join('.', sub_folder_name, "#{file_name}.m")
110
+ service_file = File.join('.', sub_folder_name, "#{model_pre}#{name}Service.m")
108
111
  File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count.positive?
109
112
  File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count.positive?
110
113
  File.write(service_file, service_code) if service_code
111
114
  puts "\n\n生成文件成功!所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green
112
- { h_file: h_file, m_file: m_file, s_file: service_file }
115
+ { h_file: h_file, m_file: m_file, s_file: service_file, api_id: api_id }
113
116
  end
114
117
 
115
118
  def push_to_git
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Lhj
4
4
  module Tools
5
- VERSION = "0.1.70"
5
+ VERSION = "0.1.72"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lhj-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.70
4
+ version: 0.1.72
5
5
  platform: ruby
6
6
  authors:
7
7
  - lihaijian