cocoapods-vemars 0.0.5 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7b7bdedf40d7340147bc0587f4fa986e751273655edaa17cb21e8d9314c9d8a9
4
- data.tar.gz: 43d084a4ccee5fc343af7d4f5e44a7d4c91c63d26cd68e3c4a0fb10e2c49dd7d
3
+ metadata.gz: a851c66bb67131db1792030b809e4e1e67efabe6f572773ad7dafb1074b44ad9
4
+ data.tar.gz: 37e96f45ae54e967b493d77c74862524e0d4dc2292dc4cddc24cf9c23011d3ae
5
5
  SHA512:
6
- metadata.gz: aa023e879ca0e000beec163259c02123a63202e58df4381d9f35ce079c7f35064e48a93f4a4a2f94ea4631641259418d6cf8bcebe7dfa4d3158ed3f7facc85dd
7
- data.tar.gz: cb8a73dba5d8fd82f2dcfb672cae9f59bfef124bb2e2ad8b7d2f80d84d23c7dd080b62febef86ff9df1bdc3bcf80d5a0ceadacf7e331d0f2e7e7753d21e6d60f
6
+ metadata.gz: ea27b65735cc062c672fd4c40beb42704c0445f9878a577c2d0ae28dea4052dc88edb1e1bf0d51c67cf36feba19f94cf93eb67a01b5d857df9bb8b1ec67cbcbf
7
+ data.tar.gz: c579291d9c2719de1135781d658634190d88cca41042df43a82fb86fd79e980e18548bd2bfef179549e39cc57f9daca7038017059396c743351da8b0d3bf5cb5
data/Gemfile CHANGED
@@ -7,9 +7,9 @@ gem 'plist', '~> 3.2'
7
7
  gem 'rexml'
8
8
  gem 'concurrent-ruby', require: 'concurrent'
9
9
  gem 'xcodeproj'
10
- gem 'json'
10
+ gem 'json_pure'
11
11
  gem 'cocoapods'
12
-
12
+ # gem 'json'
13
13
  group :debug do
14
14
  gem 'ruby-debug-ide'
15
15
  gem 'debase', '0.2.5.beta2'
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cocoapods-vemars (0.0.4)
4
+ cocoapods-vemars (0.0.9)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -12,17 +12,17 @@ GEM
12
12
  i18n (>= 0.7, < 2)
13
13
  minitest (~> 5.1)
14
14
  tzinfo (~> 1.1)
15
- addressable (2.7.0)
15
+ addressable (2.8.0)
16
16
  public_suffix (>= 2.0.2, < 5.0)
17
17
  algoliasearch (1.27.5)
18
18
  httpclient (~> 2.8, >= 2.8.3)
19
19
  json (>= 1.5.1)
20
20
  atomos (0.1.3)
21
21
  claide (1.0.3)
22
- cocoapods (1.10.1)
22
+ cocoapods (1.10.2)
23
23
  addressable (~> 2.6)
24
24
  claide (>= 1.0.2, < 2.0)
25
- cocoapods-core (= 1.10.1)
25
+ cocoapods-core (= 1.10.2)
26
26
  cocoapods-deintegrate (>= 1.0.3, < 2.0)
27
27
  cocoapods-downloader (>= 1.4.0, < 2.0)
28
28
  cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -37,7 +37,7 @@ GEM
37
37
  nap (~> 1.0)
38
38
  ruby-macho (~> 1.4)
39
39
  xcodeproj (>= 1.19.0, < 2.0)
40
- cocoapods-core (1.10.1)
40
+ cocoapods-core (1.10.2)
41
41
  activesupport (> 5.0, < 6)
42
42
  addressable (~> 2.6)
43
43
  algoliasearch (~> 1.0)
@@ -47,24 +47,24 @@ GEM
47
47
  netrc (~> 0.11)
48
48
  public_suffix
49
49
  typhoeus (~> 1.0)
50
- cocoapods-deintegrate (1.0.4)
50
+ cocoapods-deintegrate (1.0.5)
51
51
  cocoapods-downloader (1.4.0)
52
52
  cocoapods-plugins (1.0.0)
53
53
  nap
54
- cocoapods-search (1.0.0)
54
+ cocoapods-search (1.0.1)
55
55
  cocoapods-trunk (1.5.0)
56
56
  nap (>= 0.8, < 2.0)
57
57
  netrc (~> 0.11)
58
58
  cocoapods-try (1.2.0)
59
59
  colored2 (3.1.2)
60
- concurrent-ruby (1.1.8)
60
+ concurrent-ruby (1.1.9)
61
61
  debase (0.2.5.beta2)
62
62
  debase-ruby_core_source (>= 0.10.12)
63
63
  debase-ruby_core_source (0.10.12)
64
64
  escape (0.0.4)
65
65
  ethon (0.14.0)
66
66
  ffi (>= 1.15.0)
67
- ffi (1.15.1)
67
+ ffi (1.15.3)
68
68
  fourflusher (2.3.1)
69
69
  fuzzy_match (2.0.4)
70
70
  gh_inspector (1.1.3)
@@ -72,6 +72,7 @@ GEM
72
72
  i18n (1.8.10)
73
73
  concurrent-ruby (~> 1.0)
74
74
  json (2.5.1)
75
+ json_pure (2.5.1)
75
76
  minitest (5.14.4)
76
77
  molinillo (0.6.6)
77
78
  nanaimo (0.3.0)
@@ -79,7 +80,7 @@ GEM
79
80
  netrc (0.11.0)
80
81
  plist (3.6.0)
81
82
  public_suffix (4.0.6)
82
- rake (13.0.3)
83
+ rake (13.0.6)
83
84
  rexml (3.2.5)
84
85
  ruby-debug-ide (0.7.2)
85
86
  rake (>= 0.8.1)
@@ -89,16 +90,16 @@ GEM
89
90
  ethon (>= 0.9.0)
90
91
  tzinfo (1.2.9)
91
92
  thread_safe (~> 0.1)
92
- xcodeproj (1.19.0)
93
+ xcodeproj (1.21.0)
93
94
  CFPropertyList (>= 2.3.3, < 4.0)
94
95
  atomos (~> 0.1.3)
95
96
  claide (>= 1.0.2, < 2.0)
96
97
  colored2 (~> 3.1)
97
98
  nanaimo (~> 0.3.0)
99
+ rexml (~> 3.2.4)
98
100
 
99
101
  PLATFORMS
100
102
  x86_64-darwin-19
101
- x86_64-darwin-20
102
103
 
103
104
  DEPENDENCIES
104
105
  bundler (~> 2.2.15)
@@ -106,7 +107,7 @@ DEPENDENCIES
106
107
  cocoapods-vemars!
107
108
  concurrent-ruby
108
109
  debase (= 0.2.5.beta2)
109
- json
110
+ json_pure
110
111
  plist (~> 3.2)
111
112
  rake
112
113
  rexml
@@ -3,7 +3,7 @@ require_relative '../services/patcher'
3
3
  require_relative '../services/tailor'
4
4
  require_relative 'basicInfo'
5
5
  require_relative '../services/renamer'
6
- require 'json'
6
+ require 'json/pure'
7
7
  module Pod
8
8
 
9
9
  class VemarsProject
@@ -85,7 +85,7 @@ module Pod
85
85
  end
86
86
 
87
87
  def collect_components
88
- components_api = Components_api.new(@basicInfo.version,service_url)
88
+ components_api = Components_api.new(@basicInfo.version,@service_url)
89
89
  all_components = components_api.getComponents
90
90
  @source = components_api.source
91
91
  @selected_components.each do |com|
@@ -105,7 +105,8 @@ module Pod
105
105
 
106
106
 
107
107
  def construct_plist
108
- json = JSON.load_file @config_json
108
+ content = File.read(@config_json)
109
+ json = JSON.parse(content)
109
110
  json["project_info"]["app_id"] = json["project_info"]["app_id"].to_s
110
111
  services = Hash.new
111
112
  if @selected_components.include? "BDHotfix"
@@ -23,7 +23,9 @@ module Pod
23
23
  ['--bundle_id=bundle_id', 'the bundle_id from Vemars'],
24
24
  ['--com=COM1,COM2', 'Selected components in vemars.'],
25
25
  ['--config=CONFIG_PATH', 'config path of vemars.'],
26
- ['--service_url=SERVICE_URL', 'url of vemars CLI service.']
26
+ ['--service_url=SERVICE_URL', 'url of vemars CLI service.'],
27
+ ['--git=GIT_URL', 'git url of demo repo'],
28
+ ['--pod_repo_no_update', 'do not run pod repo update']
27
29
  ]
28
30
  options.concat(super.reject { |option, _| option == '--silent' })
29
31
  end
@@ -34,12 +36,13 @@ module Pod
34
36
  @language = argv.option('language', 'objc')
35
37
  git_url = argv.option('git', 'git@github.com:volcengine/ve_Template_iOS.git')
36
38
  @silent = argv.flag?('silent', false)
39
+ @repo_no_update = argv.flag?('pod_repo_no_update',false)
37
40
  @appkey = argv.option('appkey', '')
38
41
  @bundle_id = argv.option('bundle_id', nil)
39
42
  @selected_components = argv.option('com', "").split(',')
40
43
  @config_json = argv.option('config', '/onekit-config.json')
41
44
  service_url = argv.option('service_url',nil)
42
- @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,@service_url)
45
+ @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url)
43
46
  super
44
47
  @additional_args = argv.remainder!
45
48
  end
@@ -81,7 +84,12 @@ module Pod
81
84
  Dir.chdir(project_dir) do
82
85
  # system('bundle install')
83
86
  # system('bundle exec pod install --repo-update')
84
- system('pod install --repo-update')
87
+ if @repo_no_update
88
+ puts "pod install with no repo update"
89
+ system('pod install --no-repo-update')
90
+ else
91
+ system('pod install --repo-update')
92
+ end
85
93
  end
86
94
  end
87
95
 
@@ -19,9 +19,10 @@ module Pod
19
19
  options = [
20
20
  ['--path=PODFILE_PATH', 'the /path/to/Dir_contains_Podfile'],
21
21
  ['--com=COM1,COM2', 'Selected components in vemars.'],
22
- ['--silent', 'do not run pod install'],
23
22
  ['--config=CONFIG_PATH', 'config path of vemars.'],
24
- ['--service_url=SERVICE_URL', 'url of vemars CLI service.']
23
+ ['--service_url=SERVICE_URL', 'url of vemars CLI service.'],
24
+ ['--git=GIT_URL', 'git url of demo repo'],
25
+ ['--pod_repo_no_update', 'do not run pod repo update']
25
26
  ]
26
27
  options.concat(super.reject { |option, _| option == '--silent' })
27
28
  end
@@ -31,11 +32,12 @@ module Pod
31
32
  @path = argv.option('path', '')
32
33
  @selected_components = argv.option('com', '').split(',')
33
34
  @config_json = argv.option('config', '/onekit-config.json')
34
- super
35
- @additional_args = argv.remainder!
35
+ @repo_no_update = argv.flag?('pod_repo_no_update',false)
36
36
  git_url = argv.option('git', 'git@github.com:volcengine/ve_Template_iOS.git')
37
37
  service_url = argv.option('service_url',nil)
38
38
  @project = VemarsProject.new(@appkey, @selected_components, @config_json, @baseline, git_url, service_url)
39
+ super
40
+ @additional_args = argv.remainder!
39
41
  end
40
42
 
41
43
  def validate!
@@ -67,7 +69,12 @@ module Pod
67
69
  Dir.chdir(project_dir) do
68
70
  # system('bundle install')
69
71
  # system('bundle exec pod install --repo-update')
70
- system('pod install --repo-update')
72
+ if @repo_no_update
73
+ puts "pod install with no repo update"
74
+ system('pod install --no-repo-update')
75
+ else
76
+ system('pod install --repo-update')
77
+ end
71
78
  end
72
79
  end
73
80
 
@@ -1,3 +1,3 @@
1
1
  module CocoapodsVemars
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.9"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-vemars
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.9
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: 2021-08-17 00:00:00.000000000 Z
11
+ date: 2021-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler