cocoapods-mars 0.0.16 → 0.0.20
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -0
- data/Gemfile.lock +5 -1
- data/cocoapods-vemars.gemspec +11 -2
- data/lib/cocoapods-vemars/command/project.rb +10 -0
- data/lib/cocoapods-vemars/command/vemars/prompt.rb +8 -3
- data/lib/cocoapods-vemars/gem_version.rb +1 -1
- data/lib/cocoapods-vemars/services/baselines_api.rb +1 -1
- data/lib/cocoapods-vemars/services/components_api.rb +1 -1
- data/lib/cocoapods-vemars/services/log_api.rb +67 -0
- metadata +121 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1541b08c9b9032c0f9072b5dee44bc86a8f489219c52ccdadbce186dadb2e168
|
4
|
+
data.tar.gz: 38b8f8909d827a2ac3e8c27f69a8ff4087864d6a7cede3a20163f98e8b6dea7a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e5738ecdce830dde3204906e0f59b2df0e925b56892d5664a132e6f6df858f45a0da85464ffbebfa22ec07ce611a4422855f0d1edff4f14bcf7803e67f51449f
|
7
|
+
data.tar.gz: 67cb1716b80d1f24aa2a8109a25095ec849b47757181a7db5364e778c666353df1c2e939e37123a21dc9220d3ea10130d80c96ac916fd47ef5d3d7a81dfaf69c
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
cocoapods-mars (0.0.
|
4
|
+
cocoapods-mars (0.0.16)
|
5
5
|
|
6
6
|
GEM
|
7
7
|
remote: https://rubygems.org/
|
@@ -73,6 +73,8 @@ GEM
|
|
73
73
|
concurrent-ruby (~> 1.0)
|
74
74
|
json (2.5.1)
|
75
75
|
json_pure (2.5.1)
|
76
|
+
macaddr (1.7.2)
|
77
|
+
systemu (~> 2.6.5)
|
76
78
|
minitest (5.14.4)
|
77
79
|
molinillo (0.6.6)
|
78
80
|
moneta (1.4.2)
|
@@ -90,6 +92,7 @@ GEM
|
|
90
92
|
rake (>= 0.8.1)
|
91
93
|
ruby-macho (1.4.0)
|
92
94
|
rubyzip (2.3.2)
|
95
|
+
systemu (2.6.5)
|
93
96
|
thread_safe (0.3.6)
|
94
97
|
tty-color (0.6.0)
|
95
98
|
tty-cursor (0.7.1)
|
@@ -124,6 +127,7 @@ DEPENDENCIES
|
|
124
127
|
concurrent-ruby
|
125
128
|
debase (= 0.2.5.beta2)
|
126
129
|
json_pure
|
130
|
+
macaddr
|
127
131
|
moneta
|
128
132
|
open-uri
|
129
133
|
plist (~> 3.2)
|
data/cocoapods-vemars.gemspec
CHANGED
@@ -18,6 +18,15 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
19
|
spec.require_paths = ['lib']
|
20
20
|
|
21
|
-
spec.
|
22
|
-
spec.
|
21
|
+
spec.add_runtime_dependency 'cocoapods'
|
22
|
+
spec.add_runtime_dependency 'plist', '>= 3.2'
|
23
|
+
spec.add_runtime_dependency 'json_pure'
|
24
|
+
spec.add_runtime_dependency 'rubyzip', '>= 1.0.0'
|
25
|
+
spec.add_runtime_dependency "tty-prompt"
|
26
|
+
spec.add_runtime_dependency "moneta"
|
27
|
+
spec.add_runtime_dependency "macaddr"
|
28
|
+
|
29
|
+
spec.add_development_dependency 'rexml'
|
30
|
+
spec.add_development_dependency 'xcodeproj'
|
31
|
+
spec.add_development_dependency 'open-uri'
|
23
32
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require_relative '../services/components_api'
|
2
|
+
require_relative '../services/log_api'
|
2
3
|
require_relative '../services/patcher'
|
3
4
|
require_relative '../services/tailor'
|
4
5
|
require_relative 'basicInfo'
|
@@ -34,6 +35,7 @@ module Pod
|
|
34
35
|
@components_details = []
|
35
36
|
@service_url = service_url
|
36
37
|
@sources = sources
|
38
|
+
@log_api = Log_api.new()
|
37
39
|
end
|
38
40
|
|
39
41
|
def generate
|
@@ -55,6 +57,9 @@ module Pod
|
|
55
57
|
end
|
56
58
|
reinitialize_git_repo
|
57
59
|
end
|
60
|
+
@log_api.record_event("fwk_new_project",{"app_id" => @app_id,"type" => "新项目"})
|
61
|
+
@log_api.record_event("fwk_pv",{"app_id" => @app_id})
|
62
|
+
@log_api.record_sdks(@selected_components,@app_id)
|
58
63
|
end
|
59
64
|
|
60
65
|
def patch(podfile_dir)
|
@@ -67,6 +72,10 @@ module Pod
|
|
67
72
|
patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url, @demo_tag)
|
68
73
|
patcher.execute
|
69
74
|
end
|
75
|
+
@log_api.record_event("fwk_new_project",{"app_id" => @app_id,"type" => "存量项目"})
|
76
|
+
@log_api.record_event("fwk_pv",{"app_id" => @app_id})
|
77
|
+
@log_api.record_sdks(@selected_components,@app_id)
|
78
|
+
|
70
79
|
end
|
71
80
|
|
72
81
|
def clone_template_project
|
@@ -148,6 +157,7 @@ module Pod
|
|
148
157
|
content = File.read(@config_json)
|
149
158
|
json = JSON.parse(content)
|
150
159
|
json["project_info"]["app_id"] = json["project_info"]["app_id"].to_s
|
160
|
+
@app_id = json["project_info"]["app_id"]
|
151
161
|
services = json["services"]
|
152
162
|
|
153
163
|
if @selected_components.include?("BDHotfix")
|
@@ -46,7 +46,13 @@ module Pod
|
|
46
46
|
languages = [ {name: "Objective-C", value: "objc"},{name:"Swift", value: "swift"}]
|
47
47
|
@language = prompt.select("选择开发语言:", languages)
|
48
48
|
promptAskWithCache("请输入config.json配置文件路径","config-path",store,prompt)
|
49
|
-
|
49
|
+
select_baseline = prompt.ask("是否需要选择基线?(默认使用最新版本)", convert: :boolean, default: "no")
|
50
|
+
if select_baseline
|
51
|
+
@version = prompt.select("选择基线:", baselines)
|
52
|
+
else
|
53
|
+
@version = baselines.first
|
54
|
+
puts "将使用最新基线版本: " + @version
|
55
|
+
end
|
50
56
|
@selected_components = prompt.multi_select("选择组件:",getComponents,per_page: 10)
|
51
57
|
|
52
58
|
#toDO
|
@@ -61,7 +67,7 @@ module Pod
|
|
61
67
|
|
62
68
|
private_configs = prompt.ask("是否进行私有化配置?",convert: :boolean,default:"no")
|
63
69
|
if private_configs
|
64
|
-
service_url = prompt.ask('请输入基线服务的URL地址:',default: 'https://mars-fwk.vemarsdev.com/')
|
70
|
+
service_url = prompt.ask('请输入基线服务的URL地址:',default: 'https://mars-fwk.vemarsdev.com/mpaas')
|
65
71
|
git_url = prompt.ask('请输入脚手架Demo仓库的地址:',default: 'https://github.com/volcengine/ve_Template_iOS.git')
|
66
72
|
sources = prompt.ask('请输入Cocoapods源的地址的URL地址:',default: 'https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/')
|
67
73
|
@repo_no_update = prompt.ask("是否跳过更新本地Pod仓库?",convert: :boolean,default:"no")
|
@@ -77,7 +83,6 @@ module Pod
|
|
77
83
|
super
|
78
84
|
@additional_args = argv.remainder!
|
79
85
|
|
80
|
-
|
81
86
|
if @prompt_type == 1
|
82
87
|
@project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url,sources)
|
83
88
|
elsif @prompt_type == 2
|
@@ -8,7 +8,7 @@ module Pod
|
|
8
8
|
attr_accessor :result
|
9
9
|
|
10
10
|
public def initialize(url=BASELINES_URL)
|
11
|
-
@baseline_url = (url.blank? ? BASELINES_URL : url + "
|
11
|
+
@baseline_url = (url.blank? ? BASELINES_URL : url + "/baseline/baselines")
|
12
12
|
end
|
13
13
|
|
14
14
|
def getBaselines(silent=false)
|
@@ -18,7 +18,7 @@ module Pod
|
|
18
18
|
@source = ""
|
19
19
|
@component_list = []
|
20
20
|
@baseline_api = Baselines_api.new(url)
|
21
|
-
@components_url = (url.blank? ? COMPONENTS_URL : url + "
|
21
|
+
@components_url = (url.blank? ? COMPONENTS_URL : url + "/baseline/baseline_config")
|
22
22
|
end
|
23
23
|
|
24
24
|
public def validate!
|
@@ -0,0 +1,67 @@
|
|
1
|
+
require 'Rest'
|
2
|
+
require 'macaddr'
|
3
|
+
|
4
|
+
|
5
|
+
module Pod
|
6
|
+
class Log_api
|
7
|
+
include Concurrent::Async
|
8
|
+
|
9
|
+
LOG_URL = 'http://fwk-log.vemarsdev.com/api/invoke/MultiUpload'.freeze
|
10
|
+
attr_accessor :result
|
11
|
+
|
12
|
+
public def initialize()
|
13
|
+
@log_url = LOG_URL
|
14
|
+
end
|
15
|
+
|
16
|
+
def record_event(event=nil,params=nil)
|
17
|
+
if event == "fwk_pv"
|
18
|
+
params["did"] = Mac.addr
|
19
|
+
params["from"] = "cli"
|
20
|
+
elsif
|
21
|
+
params["tech"] = "ios"
|
22
|
+
end
|
23
|
+
|
24
|
+
body= {"debug" => true,"unique_id" => Mac.addr,"events" => [{"event" => event,"params" => params}]}
|
25
|
+
header = {"content-type" => 'application/json'}
|
26
|
+
body_str = JSON.generate(body)
|
27
|
+
puts body_str
|
28
|
+
response = REST.post(@log_url, body_str, header)
|
29
|
+
if response.ok?
|
30
|
+
json = JSON.parse(response.body)
|
31
|
+
error_code = json["code"]
|
32
|
+
if error_code == 0
|
33
|
+
puts "Log Success #{json["msg"]}"
|
34
|
+
else
|
35
|
+
puts "Error #{error_code}: #{json["msg"]}"
|
36
|
+
end
|
37
|
+
else
|
38
|
+
puts "response status: #{response.status_code}"
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
|
43
|
+
def record_sdks(sdks=nil,appid=nil)
|
44
|
+
events = sdks.map{ |sdk|
|
45
|
+
{"event" => "fwk_add_sdk","params" => {"app_id" => appid,"sdk" => sdk,"tech" => "ios","type" => "custom"}}
|
46
|
+
}
|
47
|
+
|
48
|
+
body= {"debug" => true,"unique_id" => Mac.addr,"events" => events}
|
49
|
+
header = {"content-type" => 'application/json'}
|
50
|
+
body_str = JSON.generate(body)
|
51
|
+
puts body_str
|
52
|
+
response = REST.post(@log_url, body_str, header)
|
53
|
+
if response.ok?
|
54
|
+
json = JSON.parse(response.body)
|
55
|
+
error_code = json["code"]
|
56
|
+
if error_code == 0
|
57
|
+
puts "Log Success #{json["msg"]}"
|
58
|
+
else
|
59
|
+
puts "Error #{error_code}: #{json["msg"]}"
|
60
|
+
end
|
61
|
+
else
|
62
|
+
puts "response status: #{response.status_code}"
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
end
|
67
|
+
end
|
metadata
CHANGED
@@ -1,31 +1,143 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-mars
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.20
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- huangbomao@bytedance.com
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-03-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name:
|
14
|
+
name: cocoapods
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: '0'
|
20
|
+
type: :runtime
|
21
|
+
prerelease: false
|
22
|
+
version_requirements: !ruby/object:Gem::Requirement
|
23
|
+
requirements:
|
24
|
+
- - ">="
|
25
|
+
- !ruby/object:Gem::Version
|
26
|
+
version: '0'
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: plist
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - ">="
|
18
32
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
33
|
+
version: '3.2'
|
34
|
+
type: :runtime
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - ">="
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: '3.2'
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: json_pure
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - ">="
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: '0'
|
48
|
+
type: :runtime
|
49
|
+
prerelease: false
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - ">="
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: '0'
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: rubyzip
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - ">="
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: 1.0.0
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - ">="
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: 1.0.0
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: tty-prompt
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - ">="
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: '0'
|
76
|
+
type: :runtime
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - ">="
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: '0'
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
name: moneta
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
87
|
+
- - ">="
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '0'
|
90
|
+
type: :runtime
|
91
|
+
prerelease: false
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
94
|
+
- - ">="
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '0'
|
97
|
+
- !ruby/object:Gem::Dependency
|
98
|
+
name: macaddr
|
99
|
+
requirement: !ruby/object:Gem::Requirement
|
100
|
+
requirements:
|
101
|
+
- - ">="
|
102
|
+
- !ruby/object:Gem::Version
|
103
|
+
version: '0'
|
104
|
+
type: :runtime
|
105
|
+
prerelease: false
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
107
|
+
requirements:
|
108
|
+
- - ">="
|
109
|
+
- !ruby/object:Gem::Version
|
110
|
+
version: '0'
|
111
|
+
- !ruby/object:Gem::Dependency
|
112
|
+
name: rexml
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
114
|
+
requirements:
|
115
|
+
- - ">="
|
116
|
+
- !ruby/object:Gem::Version
|
117
|
+
version: '0'
|
118
|
+
type: :development
|
119
|
+
prerelease: false
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
121
|
+
requirements:
|
122
|
+
- - ">="
|
123
|
+
- !ruby/object:Gem::Version
|
124
|
+
version: '0'
|
125
|
+
- !ruby/object:Gem::Dependency
|
126
|
+
name: xcodeproj
|
127
|
+
requirement: !ruby/object:Gem::Requirement
|
128
|
+
requirements:
|
129
|
+
- - ">="
|
130
|
+
- !ruby/object:Gem::Version
|
131
|
+
version: '0'
|
20
132
|
type: :development
|
21
133
|
prerelease: false
|
22
134
|
version_requirements: !ruby/object:Gem::Requirement
|
23
135
|
requirements:
|
24
|
-
- - "
|
136
|
+
- - ">="
|
25
137
|
- !ruby/object:Gem::Version
|
26
|
-
version:
|
138
|
+
version: '0'
|
27
139
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
140
|
+
name: open-uri
|
29
141
|
requirement: !ruby/object:Gem::Requirement
|
30
142
|
requirements:
|
31
143
|
- - ">="
|
@@ -68,6 +180,7 @@ files:
|
|
68
180
|
- lib/cocoapods-vemars/hook/podfile_template.rb
|
69
181
|
- lib/cocoapods-vemars/services/baselines_api.rb
|
70
182
|
- lib/cocoapods-vemars/services/components_api.rb
|
183
|
+
- lib/cocoapods-vemars/services/log_api.rb
|
71
184
|
- lib/cocoapods-vemars/services/patcher.rb
|
72
185
|
- lib/cocoapods-vemars/services/renamer.rb
|
73
186
|
- lib/cocoapods-vemars/services/tailor.rb
|