podsorz 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +12 -12
- data/lib/podsorz/core/Binary/binary_repo.rb +2 -2
- data/lib/podsorz/core/PodsOrz/pods_git_operator.rb +1 -0
- data/lib/podsorz/core/PodsOrz/pods_repo.rb +2 -2
- data/lib/podsorz/core/PodsOrz/pods_version.rb +4 -1
- data/lib/podsorz/util/git_operator.rb +1 -1
- data/lib/podsorz/version.rb +1 -1
- data/podsorz.gemspec +10 -1
- metadata +5 -5
- data/Note +0 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d38f8163c1f9e6587babc509157e0b5a2ab28579ac671f7d601b54530d459877
|
4
|
+
data.tar.gz: d613d70b391488a7e5e0dbb23af7adfbb7a244ae11207df3bbd20c926fdeb43a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 820b026eb6a37aca7638b876a39dc2ed6c8bd82fa47155ae72c10349b99846012828b123e5d0f5fda5c05b28f17b2e1bc205783385c636d19f9794a2aebdb0da
|
7
|
+
data.tar.gz: e6bf24c686367fee43132c8c13601d304af3ae2a073617cef38544eb6b529d75a6bdba5edffd652c8a31379cdaa3674d31f6efb02dd0dd295813a51e707eacd7
|
data/Gemfile.lock
CHANGED
@@ -10,8 +10,8 @@ PATH
|
|
10
10
|
GEM
|
11
11
|
remote: https://rubygems.org/
|
12
12
|
specs:
|
13
|
-
CFPropertyList (3.0.
|
14
|
-
activesupport (5.2.4.
|
13
|
+
CFPropertyList (3.0.3)
|
14
|
+
activesupport (5.2.4.5)
|
15
15
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
16
16
|
i18n (>= 0.7, < 2)
|
17
17
|
minitest (~> 5.1)
|
@@ -23,10 +23,10 @@ GEM
|
|
23
23
|
json (>= 1.5.1)
|
24
24
|
atomos (0.1.3)
|
25
25
|
claide (1.0.3)
|
26
|
-
cocoapods (1.10.
|
26
|
+
cocoapods (1.10.1)
|
27
27
|
addressable (~> 2.6)
|
28
28
|
claide (>= 1.0.2, < 2.0)
|
29
|
-
cocoapods-core (= 1.10.
|
29
|
+
cocoapods-core (= 1.10.1)
|
30
30
|
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
31
31
|
cocoapods-downloader (>= 1.4.0, < 2.0)
|
32
32
|
cocoapods-plugins (>= 1.0.0, < 2.0)
|
@@ -41,7 +41,7 @@ GEM
|
|
41
41
|
nap (~> 1.0)
|
42
42
|
ruby-macho (~> 1.4)
|
43
43
|
xcodeproj (>= 1.19.0, < 2.0)
|
44
|
-
cocoapods-core (1.10.
|
44
|
+
cocoapods-core (1.10.1)
|
45
45
|
activesupport (> 5.0, < 6)
|
46
46
|
addressable (~> 2.6)
|
47
47
|
algoliasearch (~> 1.0)
|
@@ -64,20 +64,20 @@ GEM
|
|
64
64
|
cocoapods-try (1.2.0)
|
65
65
|
colored2 (3.1.2)
|
66
66
|
colorize (0.8.1)
|
67
|
-
concurrent-ruby (1.1.
|
67
|
+
concurrent-ruby (1.1.8)
|
68
68
|
escape (0.0.4)
|
69
69
|
ethon (0.12.0)
|
70
70
|
ffi (>= 1.3.0)
|
71
|
-
ffi (1.
|
71
|
+
ffi (1.14.2)
|
72
72
|
fourflusher (2.3.1)
|
73
73
|
fuzzy_match (2.0.4)
|
74
74
|
gh_inspector (1.1.3)
|
75
|
-
gli (2.
|
75
|
+
gli (2.20.0)
|
76
76
|
httpclient (2.8.3)
|
77
|
-
i18n (1.8.
|
77
|
+
i18n (1.8.9)
|
78
78
|
concurrent-ruby (~> 1.0)
|
79
|
-
json (2.
|
80
|
-
minitest (5.14.
|
79
|
+
json (2.5.1)
|
80
|
+
minitest (5.14.4)
|
81
81
|
molinillo (0.6.6)
|
82
82
|
nanaimo (0.3.0)
|
83
83
|
nap (1.1.0)
|
@@ -87,7 +87,7 @@ GEM
|
|
87
87
|
thread_safe (0.3.6)
|
88
88
|
typhoeus (1.4.0)
|
89
89
|
ethon (>= 0.9.0)
|
90
|
-
tzinfo (1.2.
|
90
|
+
tzinfo (1.2.9)
|
91
91
|
thread_safe (~> 0.1)
|
92
92
|
xcodeproj (1.19.0)
|
93
93
|
CFPropertyList (>= 2.3.3, < 4.0)
|
@@ -136,9 +136,9 @@ module PodsOrz
|
|
136
136
|
repo_push_cmd = []
|
137
137
|
repo_push_cmd << "cd #{file_path}"
|
138
138
|
if is_swift
|
139
|
-
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation
|
139
|
+
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@source_code_repo_url} --allow-warnings --use-libraries --skip-import-validation --use-modular-headers --swift-version=5.0 --skip-tests --platforms=ios"
|
140
140
|
else
|
141
|
-
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation --
|
141
|
+
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@source_code_repo_url} --allow-warnings --use-libraries --skip-import-validation --skip-tests --platforms=ios"
|
142
142
|
end
|
143
143
|
|
144
144
|
|
@@ -648,6 +648,7 @@ module PodsOrz
|
|
648
648
|
#rebase
|
649
649
|
rebase_branch = rebase_branch.strip.chomp
|
650
650
|
return is_sync_success if rebase_branch.nil?
|
651
|
+
return is_sync_success if rebase_branch.empty?
|
651
652
|
|
652
653
|
is_prepare_rebase = sync_prepare_rebase(pod, rebase_branch)
|
653
654
|
unless is_prepare_rebase
|
@@ -190,9 +190,9 @@ module PodsOrz
|
|
190
190
|
repo_push_cmd = []
|
191
191
|
repo_push_cmd << "cd #{file_path}"
|
192
192
|
if is_swift
|
193
|
-
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation --
|
193
|
+
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --use-modular-headers --swift-version=5.0 --skip-tests --platforms=ios"
|
194
194
|
else
|
195
|
-
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation --
|
195
|
+
repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --skip-tests --platforms=ios"
|
196
196
|
end
|
197
197
|
|
198
198
|
|
@@ -25,7 +25,10 @@ module PodsOrz
|
|
25
25
|
File.open(file_path, "r") do |file|
|
26
26
|
file.readlines.each do |line|
|
27
27
|
l = line.strip.chomp
|
28
|
-
|
28
|
+
if l.start_with?("#")
|
29
|
+
update_lines << line
|
30
|
+
next
|
31
|
+
end
|
29
32
|
|
30
33
|
if /\.(version)(.*) =/ =~ line
|
31
34
|
version_num = $~.post_match.strip.chomp.to_s
|
@@ -326,7 +326,7 @@ module PodsOrz
|
|
326
326
|
end
|
327
327
|
|
328
328
|
if has_conflicts
|
329
|
-
Logger.error("
|
329
|
+
Logger.error("branch: \"#{parent_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git commit\")(use \"git merge --abort\" to abort the merge)")
|
330
330
|
is_merge_success = false
|
331
331
|
return is_merge_success
|
332
332
|
end
|
data/lib/podsorz/version.rb
CHANGED
data/podsorz.gemspec
CHANGED
@@ -10,7 +10,16 @@ Gem::Specification.new do |spec|
|
|
10
10
|
spec.email = ["110293734@qq.com"]
|
11
11
|
|
12
12
|
spec.summary = %q{iOS application modulize into pods, improvement for develop modules.}
|
13
|
-
spec.description = %
|
13
|
+
spec.description = %{iOS application modulize into pods, improvement for develop modules.
|
14
|
+
CMD:
|
15
|
+
1.git-flow
|
16
|
+
2.auto publish code
|
17
|
+
3.auto push repo
|
18
|
+
4.auto rewrite podfile
|
19
|
+
5.sync other branch commit
|
20
|
+
6.binary static libary
|
21
|
+
}
|
22
|
+
|
14
23
|
spec.homepage = "https://github.com/XiangqiTu"
|
15
24
|
spec.license = "MIT"
|
16
25
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: podsorz
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Xiangqi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-02-
|
11
|
+
date: 2021-02-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gli
|
@@ -66,8 +66,9 @@ dependencies:
|
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
|
-
description:
|
70
|
-
CMD
|
69
|
+
description: "iOS application modulize into pods, improvement for develop modules.
|
70
|
+
\n CMD:\n 1.git-flow\n 2.auto publish code\n 3.auto push repo\n 4.auto
|
71
|
+
rewrite podfile\n 5.sync other branch commit\n 6.binary static libary\n "
|
71
72
|
email:
|
72
73
|
- 110293734@qq.com
|
73
74
|
executables:
|
@@ -79,7 +80,6 @@ files:
|
|
79
80
|
- Gemfile
|
80
81
|
- Gemfile.lock
|
81
82
|
- LICENSE.txt
|
82
|
-
- Note
|
83
83
|
- README.md
|
84
84
|
- Rakefile
|
85
85
|
- bin/podsorz
|