lg_pod_plugin 1.1.6.4 → 1.1.6.6
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 +4 -4
- data/lib/command/install.rb +0 -1
- data/lib/lg_pod_plugin/db/database.rb +3 -3
- data/lib/lg_pod_plugin/downloader/request.rb +3 -3
- data/lib/lg_pod_plugin/git/gitlab_api.rb +3 -2
- data/lib/lg_pod_plugin/installer/PodDownload +0 -0
- data/lib/lg_pod_plugin/installer/concurrency.rb +7 -5
- data/lib/lg_pod_plugin/installer/install.rb +2 -5
- data/lib/lg_pod_plugin/installer/main.rb +0 -1
- data/lib/lg_pod_plugin/installer/project.rb +2 -2
- data/lib/lg_pod_plugin/utils/l_util.rb +9 -9
- data/lib/lg_pod_plugin/version.rb +1 -1
- data/lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle +0 -0
- data/lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle +0 -0
- metadata +5 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 49669409fc52a28372c3033cd25e908b939267d30147689f982b84c9cea0d748
|
4
|
+
data.tar.gz: ddd14338375b62677fd81ee52e0a3f15170b58a852870c203b3a27f2121a7151
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2a9bb5866675919b09e0ebcad919085431ec96eb103caa56477356a833e9369365e9fed62506c8919866d4c6ae8ecb2bfb918a5dd22dc956cf16adc28cc674c7
|
7
|
+
data.tar.gz: 85604ebf38280f2c65d929dcf60c0af3a29434b244290a4f67682b337090f81e8fc93e51bd165ee10529d0ee1bd826c9ac794894e344732fc93ebbf3531c1a37
|
data/lib/command/install.rb
CHANGED
@@ -42,8 +42,8 @@ module LgPodPlugin
|
|
42
42
|
self.commit = commit
|
43
43
|
end
|
44
44
|
|
45
|
-
def self.get_pod_id(name, git)
|
46
|
-
key = name + git
|
45
|
+
def self.get_pod_id(name, git, branch)
|
46
|
+
key = name + git + branch
|
47
47
|
return Digest::MD5.hexdigest(key)
|
48
48
|
end
|
49
49
|
|
@@ -221,7 +221,7 @@ module LgPodPlugin
|
|
221
221
|
end
|
222
222
|
|
223
223
|
def insert_pod_refs(name, git, branch, tag, commit)
|
224
|
-
id = LPodLatestRefs.get_pod_id(name, git)
|
224
|
+
id = LPodLatestRefs.get_pod_id(name, git, branch)
|
225
225
|
pod = LPodLatestRefs.new(id, name, git, branch, tag, commit)
|
226
226
|
if self.query_pod_refs(id) != nil
|
227
227
|
self.db.execute_batch(
|
@@ -125,7 +125,7 @@ module LgPodPlugin
|
|
125
125
|
if branch
|
126
126
|
new_commit, _ = GitLabAPI.request_github_refs_heads git, branch, self.net_ping.uri
|
127
127
|
unless new_commit
|
128
|
-
id = LPodLatestRefs.get_pod_id(name, git)
|
128
|
+
id = LPodLatestRefs.get_pod_id(name, git, branch)
|
129
129
|
pod_info = LSqliteDb.shared.query_pod_refs(id)
|
130
130
|
new_commit = pod_info ? pod_info.commit : nil
|
131
131
|
return [branch, new_commit]
|
@@ -137,14 +137,14 @@ module LgPodPlugin
|
|
137
137
|
else
|
138
138
|
new_commit, new_branch = GitLabAPI.request_github_refs_heads git, nil, self.net_ping.uri
|
139
139
|
unless new_commit
|
140
|
-
id = LPodLatestRefs.get_pod_id(name, git)
|
140
|
+
id = LPodLatestRefs.get_pod_id(name, git, "HEAD")
|
141
141
|
pod_info = LSqliteDb.shared.query_pod_refs(id)
|
142
142
|
new_commit = pod_info ? pod_info.commit : nil
|
143
143
|
new_branch = pod_info ? pod_info.branch : nil
|
144
144
|
return [new_branch, new_commit]
|
145
145
|
end
|
146
146
|
if new_commit
|
147
|
-
LSqliteDb.shared.insert_pod_refs(name, git,
|
147
|
+
LSqliteDb.shared.insert_pod_refs(name, git, "HEAD", nil, new_commit)
|
148
148
|
end
|
149
149
|
[new_branch, new_commit]
|
150
150
|
end
|
@@ -178,11 +178,12 @@ module LgPodPlugin
|
|
178
178
|
end
|
179
179
|
return self.use_default_refs_heads git, branch
|
180
180
|
end
|
181
|
-
commit, _ =
|
181
|
+
commit, _ = GithubAPI.request_github_refs_heads git, branch
|
182
182
|
if commit
|
183
183
|
return [commit, branch]
|
184
184
|
else
|
185
|
-
|
185
|
+
commit, _ = self.use_default_refs_heads git, branch
|
186
|
+
return [commit, branch]
|
186
187
|
end
|
187
188
|
end
|
188
189
|
|
Binary file
|
@@ -1,5 +1,5 @@
|
|
1
1
|
require 'json'
|
2
|
-
require 'aescrypt'
|
2
|
+
# require 'aescrypt'
|
3
3
|
|
4
4
|
module LgPodPlugin
|
5
5
|
|
@@ -8,12 +8,14 @@ module LgPodPlugin
|
|
8
8
|
public
|
9
9
|
def self.async_download_pods(installers)
|
10
10
|
return if installers.empty?
|
11
|
-
|
12
|
-
|
13
|
-
|
11
|
+
hash = installers.map(&:download_params).uniq
|
12
|
+
json_text = JSON.generate(hash)
|
13
|
+
file_path = LFileManager.download_director.join(LUtils.md5(json_text)).to_path + ".json"
|
14
|
+
# pp file_path
|
15
|
+
File.open(file_path, 'w+') { |f| f.write(json_text) }
|
14
16
|
pwd = Pathname.new(File.dirname(__FILE__)).realpath
|
15
17
|
FileUtils.chdir pwd
|
16
|
-
system("./PodDownload #{
|
18
|
+
system("./PodDownload #{file_path}")
|
17
19
|
installers.each(&:copy_file_to_caches)
|
18
20
|
end
|
19
21
|
|
@@ -69,12 +69,9 @@ module LgPodPlugin
|
|
69
69
|
git = checkout_options[:git]
|
70
70
|
return unless git
|
71
71
|
cache_podspec = request.lg_spec.spec if request.lg_spec
|
72
|
-
branch = checkout_options[:branch]
|
72
|
+
branch = checkout_options[:branch] ||= request.params[:branch]
|
73
73
|
checkout_options[:name] = name if name
|
74
|
-
|
75
|
-
branch = self.request.params[:branch] if request.params[:branch]
|
76
|
-
checkout_options[:branch] = branch if branch
|
77
|
-
end
|
74
|
+
checkout_options[:branch] = branch if branch
|
78
75
|
lg_pod_path = LFileManager.cache_workspace(LProject.shared.workspace)
|
79
76
|
lg_pod_path.mkdir(0700) unless lg_pod_path.exist?
|
80
77
|
checkout_options[:path] = lg_pod_path
|
@@ -16,7 +16,7 @@ module LgPodPlugin
|
|
16
16
|
attr_reader :external_pods
|
17
17
|
attr_reader :need_update_pods
|
18
18
|
attr_accessor :cache_specs
|
19
|
-
attr_accessor :redirect_url_hash
|
19
|
+
# attr_accessor :redirect_url_hash
|
20
20
|
def setup(workspace,podfile_path, update, repo_update)
|
21
21
|
@podfile = Pod::Podfile.from_file(podfile_path)
|
22
22
|
@update = update
|
@@ -36,7 +36,7 @@ module LgPodPlugin
|
|
36
36
|
@cache_specs = Hash.new
|
37
37
|
@external_pods = Hash.new.merge!(external_pods)
|
38
38
|
@need_update_pods = Hash.new
|
39
|
-
@redirect_url_hash = Hash.new
|
39
|
+
# @redirect_url_hash = Hash.new
|
40
40
|
return self
|
41
41
|
end
|
42
42
|
|
@@ -3,20 +3,20 @@ require 'resolv'
|
|
3
3
|
require "ipaddr"
|
4
4
|
require 'base64'
|
5
5
|
require 'fileutils'
|
6
|
-
require_relative 'aes-crypt'
|
6
|
+
# require_relative 'aes-crypt'
|
7
7
|
|
8
8
|
module LgPodPlugin
|
9
9
|
|
10
10
|
class LUtils
|
11
11
|
|
12
|
-
def self.encrypt(message, password)
|
13
|
-
|
14
|
-
|
15
|
-
end
|
16
|
-
|
17
|
-
def self.decrypt(message, password)
|
18
|
-
|
19
|
-
end
|
12
|
+
# def self.encrypt(message, password)
|
13
|
+
# encrypted_data = AESCrypt.encrypt(message, password)
|
14
|
+
# encrypted_data.tr("\n", "")
|
15
|
+
# end
|
16
|
+
#
|
17
|
+
# def self.decrypt(message, password)
|
18
|
+
# AESCrypt.decrypt message, password
|
19
|
+
# end
|
20
20
|
|
21
21
|
def self.md5(text)
|
22
22
|
return "" unless text
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lg_pod_plugin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.6.
|
4
|
+
version: 1.1.6.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- dongzb01
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-06-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: cocoapods
|
@@ -44,20 +44,6 @@ dependencies:
|
|
44
44
|
- - "<"
|
45
45
|
- !ruby/object:Gem::Version
|
46
46
|
version: '2.0'
|
47
|
-
- !ruby/object:Gem::Dependency
|
48
|
-
name: aescrypt
|
49
|
-
requirement: !ruby/object:Gem::Requirement
|
50
|
-
requirements:
|
51
|
-
- - "~>"
|
52
|
-
- !ruby/object:Gem::Version
|
53
|
-
version: '1.0'
|
54
|
-
type: :runtime
|
55
|
-
prerelease: false
|
56
|
-
version_requirements: !ruby/object:Gem::Requirement
|
57
|
-
requirements:
|
58
|
-
- - "~>"
|
59
|
-
- !ruby/object:Gem::Version
|
60
|
-
version: '1.0'
|
61
47
|
- !ruby/object:Gem::Dependency
|
62
48
|
name: bacon
|
63
49
|
requirement: !ruby/object:Gem::Requirement
|
@@ -174,6 +160,7 @@ files:
|
|
174
160
|
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/2.7/sqlite3_native.bundle
|
175
161
|
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.0/sqlite3_native.bundle
|
176
162
|
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.1/sqlite3_native.bundle
|
163
|
+
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle
|
177
164
|
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/constants.rb
|
178
165
|
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/database.rb
|
179
166
|
- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/errors.rb
|
@@ -229,6 +216,7 @@ files:
|
|
229
216
|
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/2.7/sqlite3_native.bundle
|
230
217
|
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.0/sqlite3_native.bundle
|
231
218
|
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.1/sqlite3_native.bundle
|
219
|
+
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle
|
232
220
|
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/constants.rb
|
233
221
|
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/database.rb
|
234
222
|
- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/errors.rb
|
@@ -276,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
276
264
|
- !ruby/object:Gem::Version
|
277
265
|
version: '0'
|
278
266
|
requirements: []
|
279
|
-
rubygems_version: 3.
|
267
|
+
rubygems_version: 3.4.13
|
280
268
|
signing_key:
|
281
269
|
specification_version: 4
|
282
270
|
summary: 封装了自定义podfile 中pod 方法
|