podsorz 0.0.12 → 0.0.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.bundle/config +2 -0
- data/.vscode/launch.json +17 -0
- data/lib/podsorz/command/binary.rb +6 -6
- data/lib/podsorz/command/check.rb +4 -1
- data/lib/podsorz/command/install.rb +1 -1
- data/lib/podsorz/command/sort.rb +2 -1
- data/lib/podsorz/core/Binary/binary_builder.rb +1 -1
- data/lib/podsorz/core/Binary/binary_manager.rb +1 -1
- data/lib/podsorz/core/Binary/binary_repo.rb +11 -4
- data/lib/podsorz/core/Binary/binary_server.rb +10 -3
- data/lib/podsorz/core/Config/orz_config_templet.rb +61 -23
- data/lib/podsorz/core/Config/orz_env_detector.rb +20 -2
- data/lib/podsorz/core/Config/pod_orzconfig_parse.rb +23 -13
- data/lib/podsorz/core/PodFile/podfile_io.rb +7 -4
- data/lib/podsorz/core/PodsOrz/pods_check_merge.rb +0 -1
- data/lib/podsorz/core/PodsOrz/pods_detector.rb +7 -6
- data/lib/podsorz/core/PodsOrz/pods_git_manager.rb +3 -3
- data/lib/podsorz/core/PodsOrz/pods_git_operator.rb +2 -2
- data/lib/podsorz/core/PodsOrz/pods_repo.rb +6 -3
- data/lib/podsorz/core/PodsOrz/pods_version.rb +3 -1
- data/lib/podsorz/util/git_operator.rb +3 -2
- data/lib/podsorz/version.rb +1 -1
- data/pkg/podsorz-0.0.10.gem +0 -0
- data/pkg/podsorz-0.0.11.gem +0 -0
- data/pkg/podsorz-0.0.12.gem +0 -0
- data/pkg/podsorz-0.0.7.gem +0 -0
- data/pkg/podsorz-0.0.8.gem +0 -0
- data/pkg/podsorz-0.0.9.gem +0 -0
- metadata +10 -3
- data/Podfile +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0cda1b5515c7a75e9751be12e7436652f84ed3c2685840e1c790ee8b8cd66a49
|
4
|
+
data.tar.gz: 80784af753d7cd4a8ae01fd595f13a04f172390697a7641ccfd64759dd4d1225
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f280fbd5a6532a4c78339d546942837e473c074f63b0aab68450335b55b07e817032a7b0f5e4057c905c530ff140e114f58276b8986a67ed7631598bf54330f5
|
7
|
+
data.tar.gz: c17db6227da4e4bd6b2c7868ed1146cfc262bcedb8339b03326de517a442b0a6b5b4a28e8c40f231236ece9e4f87365d25aa608dcff13a6a382f5f466f1047d8
|
data/.bundle/config
ADDED
data/.vscode/launch.json
ADDED
@@ -0,0 +1,17 @@
|
|
1
|
+
{
|
2
|
+
// Use IntelliSense to learn about possible attributes.
|
3
|
+
// Hover to view descriptions of existing attributes.
|
4
|
+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
5
|
+
"version": "0.2.0",
|
6
|
+
"configurations": [
|
7
|
+
{
|
8
|
+
"name": "Listen for rdebug-ide",
|
9
|
+
"type": "Ruby",
|
10
|
+
"request": "attach",
|
11
|
+
"cwd": "${workspaceRoot}",
|
12
|
+
"remoteHost": "127.0.0.1",
|
13
|
+
"remotePort": "1234",
|
14
|
+
"remoteWorkspaceRoot": "${workspaceRoot}"
|
15
|
+
}
|
16
|
+
]
|
17
|
+
}
|
@@ -14,7 +14,7 @@ module PodsOrz
|
|
14
14
|
prepare_work(dir_path)
|
15
15
|
|
16
16
|
git_manager = PodsOrz::PodsGitManager.new(dir_path)
|
17
|
-
result_hash = filter_binary_pods_list(git_manager, :package)
|
17
|
+
result_hash = filter_binary_pods_list(dir_path,git_manager, :package)
|
18
18
|
package_list = result_hash[:package]
|
19
19
|
|
20
20
|
binary_manager = PodsOrz::BinaryManager.new(dir_path)
|
@@ -32,7 +32,7 @@ module PodsOrz
|
|
32
32
|
prepare_work(dir_path)
|
33
33
|
|
34
34
|
git_manager = PodsOrz::PodsGitManager.new(dir_path)
|
35
|
-
filter_binary_pods_list(git_manager, :show)
|
35
|
+
filter_binary_pods_list(dir_path,git_manager, :show)
|
36
36
|
end
|
37
37
|
|
38
38
|
end
|
@@ -45,7 +45,7 @@ module PodsOrz
|
|
45
45
|
prepare_work(dir_path)
|
46
46
|
|
47
47
|
git_manager = PodsOrz::PodsGitManager.new(dir_path)
|
48
|
-
result_hash = filter_binary_pods_list(git_manager, :package)
|
48
|
+
result_hash = filter_binary_pods_list(dir_path,git_manager, :package)
|
49
49
|
package_list = result_hash[:package]
|
50
50
|
|
51
51
|
binary_manager = PodsOrz::BinaryManager.new(dir_path)
|
@@ -59,12 +59,12 @@ module PodsOrz
|
|
59
59
|
end
|
60
60
|
|
61
61
|
def self.prepare_work(dir_path)
|
62
|
-
pods_repo = PodsOrz::PodsRepo.new()
|
62
|
+
pods_repo = PodsOrz::PodsRepo.new(dir_path)
|
63
63
|
pods_repo.check_repo_exist()
|
64
64
|
end
|
65
65
|
|
66
66
|
|
67
|
-
def self.filter_binary_pods_list(git_manager, cmd_type)
|
67
|
+
def self.filter_binary_pods_list(dir_path,git_manager, cmd_type)
|
68
68
|
result_hash = {
|
69
69
|
:binary => [],
|
70
70
|
:package => []
|
@@ -104,7 +104,7 @@ module PodsOrz
|
|
104
104
|
can_package_list = []
|
105
105
|
|
106
106
|
#2.查询Podfile_orz是否为已发版本状态
|
107
|
-
binary_repo = PodsOrz::BinaryRepo.new()
|
107
|
+
binary_repo = PodsOrz::BinaryRepo.new(dir_path)
|
108
108
|
binary_repo.check_binary_repo_exist()
|
109
109
|
|
110
110
|
origin_binary_list.each do |pod|
|
@@ -1,6 +1,8 @@
|
|
1
1
|
# require "podsorz/core/PodsOrz/pods_check_merge"
|
2
2
|
# require "../../PodsOrz/lib/podsorz/core/PodsOrz/pods_check_merge.rb"
|
3
3
|
require "podsorz/core/PodsOrz/pods_check_merge"
|
4
|
+
require "podsorz/core/Config/pod_orzconfig_parse"
|
5
|
+
|
4
6
|
|
5
7
|
module PodsOrz
|
6
8
|
def self.check_command
|
@@ -16,7 +18,8 @@ module PodsOrz
|
|
16
18
|
exit()
|
17
19
|
end
|
18
20
|
|
19
|
-
|
21
|
+
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
|
22
|
+
kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", dir_path)
|
20
23
|
# puts "kx_pods_path #{kx_pods_path}"
|
21
24
|
checkManger = PodsOrz::PodsCheckMerge.new()
|
22
25
|
checkManger.branchList(kx_pods_path)
|
@@ -18,7 +18,7 @@ module PodsOrz
|
|
18
18
|
exit() unless is_same
|
19
19
|
|
20
20
|
#获取binary 列表
|
21
|
-
list_hash = PodsOrz.filter_binary_pods_list(git_manager, :binary)
|
21
|
+
list_hash = PodsOrz.filter_binary_pods_list(dir_path,git_manager, :binary)
|
22
22
|
|
23
23
|
git_manager.install_pod(dir_path, list_hash[:binary])
|
24
24
|
end
|
data/lib/podsorz/command/sort.rb
CHANGED
@@ -15,8 +15,9 @@ module PodsOrz
|
|
15
15
|
exit()
|
16
16
|
end
|
17
17
|
|
18
|
-
|
18
|
+
|
19
19
|
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
|
20
|
+
kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", dir_path)
|
20
21
|
pods_list = @orzconfig_parse.fix_pod_list
|
21
22
|
if pods_list.empty?
|
22
23
|
Logger.warning("fix_pods is empty nothing to do")
|
@@ -13,7 +13,7 @@ module PodsOrz
|
|
13
13
|
@kx_binary_path = File.expand_path("../kx_binary", main_path)
|
14
14
|
|
15
15
|
@podfile_io = podfile_io
|
16
|
-
@pod_repo = PodsOrz::PodsRepo.new()
|
16
|
+
@pod_repo = PodsOrz::PodsRepo.new(main_path)
|
17
17
|
|
18
18
|
@http_host = "http://192.168.6.127:8899"
|
19
19
|
@remote_binary_directory = "binary_pod"
|
@@ -11,7 +11,7 @@ module PodsOrz
|
|
11
11
|
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
12
12
|
@podfile_io = PodsOrz::PodfileIO.new(main_path)
|
13
13
|
|
14
|
-
@binary_repo = PodsOrz::BinaryRepo.new()
|
14
|
+
@binary_repo = PodsOrz::BinaryRepo.new(main_path)
|
15
15
|
@binary_repo.check_binary_repo_exist()
|
16
16
|
|
17
17
|
@binary_builder = PodsOrz::BinaryBuilder.new(main_path, @podfile_io)
|
@@ -1,15 +1,22 @@
|
|
1
1
|
require "podsorz/util/logger"
|
2
2
|
require 'open3'
|
3
3
|
require "podsorz/core/Binary/binary_server"
|
4
|
+
require "podsorz/core/Config/pod_orzconfig_parse"
|
5
|
+
|
4
6
|
|
5
7
|
module PodsOrz
|
6
8
|
class BinaryRepo
|
7
9
|
attr_accessor :repo_name, :repo_url, :binary_server
|
8
10
|
|
9
|
-
def initialize()
|
10
|
-
@
|
11
|
-
|
12
|
-
@
|
11
|
+
def initialize(main_path)
|
12
|
+
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
13
|
+
|
14
|
+
@repo_name = @orzconfig_parse.file_binaryrepo_name
|
15
|
+
@repo_url = @orzconfig_parse.remote_url_binaryspec
|
16
|
+
|
17
|
+
# 替换成config配置参数
|
18
|
+
# @source_code_repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
|
19
|
+
@source_code_repo_url = @orzconfig_parse.remote_url_codespec
|
13
20
|
@binary_server = PodsOrz::BinaryServer.new()
|
14
21
|
end
|
15
22
|
|
@@ -51,15 +51,22 @@ module PodsOrz
|
|
51
51
|
|
52
52
|
Logger.warning("upload #{file_name}...\n #{upload_cmd}")
|
53
53
|
|
54
|
-
|
55
|
-
|
56
|
-
io_lines.each do |line|
|
54
|
+
Open3.popen3(cmd_list.join(";")) do |stdin , stdout , stderr, wait_thr|
|
55
|
+
while line = stdout.gets
|
57
56
|
puts line
|
58
57
|
if line.include? "\"success\":"
|
59
58
|
is_upload_success = true if line.include? "true"
|
60
59
|
condition_var.signal
|
61
60
|
end
|
62
61
|
end
|
62
|
+
end
|
63
|
+
|
64
|
+
IO.popen(upload_cmd) do |io|
|
65
|
+
io_lines = io.readlines
|
66
|
+
io_lines.each do |line|
|
67
|
+
puts line
|
68
|
+
|
69
|
+
end
|
63
70
|
io.close
|
64
71
|
end
|
65
72
|
}
|
@@ -1,31 +1,69 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
#作者姓名xiangqi简写
|
6
|
-
BRANCH_AUTHOR_SUFFIX = "xq"
|
7
|
-
end
|
1
|
+
#############
|
2
|
+
#开发人员专用
|
3
|
+
#############
|
8
4
|
|
9
5
|
#想要开发修改的的Pod
|
10
|
-
|
11
|
-
#
|
12
|
-
# "KXModuleQuestionRepo",
|
6
|
+
$FIX_POD_LIST = [
|
7
|
+
# "AFNetworking",
|
13
8
|
]
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
9
|
+
|
10
|
+
|
11
|
+
module GitConfig
|
12
|
+
#App 当前版本
|
13
|
+
APP_RELEASE_VERSION = "1.1.4"
|
14
|
+
|
15
|
+
#作者姓名xiangqi简写
|
16
|
+
BRANCH_AUTHOR_SUFFIX = "xq"
|
17
|
+
|
18
|
+
|
19
|
+
|
20
|
+
#App pods的远端仓库地址 源码
|
21
|
+
REMOTE_URL_SOURCECODE = 'git@gitlab.91banban.com:zhuita-ios/pod_group/pods'
|
22
|
+
#App podspec的发布地址仓库
|
23
|
+
REMOTE_URL_CODESPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/specs.git'
|
24
|
+
|
25
|
+
|
26
|
+
#App 二进制存放地址 service
|
27
|
+
REMOTE_URL_SOURCEBINARY = 'http://192.168.6.127:8899'
|
28
|
+
#App 二进制 podspec的发布地址仓库
|
29
|
+
REMOTE_URL_BINARYSPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/binary_specs.git'
|
30
|
+
|
31
|
+
end
|
32
|
+
|
33
|
+
module FileConfig
|
34
|
+
#开发pods组件时仓库名称(需要与主工程同一级文件夹)
|
35
|
+
FILE_DEVPODS_NAME = 'zt_pods'
|
36
|
+
|
37
|
+
#ztPods/kxPods下的Pod源码库打包成二进制库相关 需要用到该行标识注释
|
38
|
+
FILE_PACKAGE_FILTER_MARK = 'ztPods'
|
39
|
+
|
40
|
+
#与cocoapods同一级的私有repo仓库文件夹名称
|
41
|
+
FILE_CODEREPO_NAME = "zhuita_specs"
|
42
|
+
|
43
|
+
#与cocoapods同一级的私有二进制 repo仓库文件夹名称
|
44
|
+
FILE_BINARYREPO_NAME = "zhuita_binary_specs"
|
45
|
+
|
46
|
+
end
|
47
|
+
|
48
|
+
|
49
|
+
|
50
|
+
|
51
|
+
|
52
|
+
#############
|
53
|
+
#打包人员专用
|
54
|
+
#############
|
55
|
+
|
56
|
+
#------Binary Static library ------#
|
57
|
+
#是否全部Pod以二进制静态库加载,false代表以源码显示【打包机】请用源码
|
19
58
|
$is_all_binary = false
|
20
|
-
#当is_all_binary = false 所有pod即将显示源码时,仍然希望部分Pod二进制静态库加载
|
59
|
+
#当is_all_binary = false 所有pod即将显示源码时,仍然希望部分Pod二进制静态库加载
|
21
60
|
$static_lib_list = [
|
22
|
-
# "AFNetworking",
|
61
|
+
# "AFNetworking",
|
23
62
|
]
|
24
|
-
|
25
|
-
#------Package Action------#
|
26
|
-
#当is_all_binary = false 并不是针对所有pod 打binary包,仍然希望部分pod打包成二进制静态库的Pod
|
63
|
+
|
64
|
+
#------Package Action------#
|
65
|
+
#当is_all_binary = false 并不是针对所有pod 打binary包,仍然希望部分pod打包成二进制静态库的Pod
|
27
66
|
$will_package_list = [
|
28
|
-
# "AFNetworking",
|
67
|
+
# "AFNetworking",
|
29
68
|
]
|
30
|
-
|
31
|
-
#
|
69
|
+
|
@@ -15,7 +15,7 @@ module PodsOrz
|
|
15
15
|
result = File.exist?(podfile_path)
|
16
16
|
unless result
|
17
17
|
Logger.warning("Podfile not exist, create empty Podfile")
|
18
|
-
IO.popen("cd #{directoryPath};
|
18
|
+
IO.popen("cd #{directoryPath};pod init")
|
19
19
|
end
|
20
20
|
end
|
21
21
|
|
@@ -23,12 +23,30 @@ module PodsOrz
|
|
23
23
|
podfile_path = File.expand_path("Podfile_orz.rb", directoryPath)
|
24
24
|
result = File.exist?(podfile_path)
|
25
25
|
unless result
|
26
|
-
Logger.error("Podfile_orz.rb not exist,
|
26
|
+
Logger.error("Podfile_orz.rb not exist,auto generate one which content is copy from origin Podfile")
|
27
|
+
IO.popen("cd #{directoryPath};touch Podfile_orz.rb")
|
28
|
+
copy_content_from_podfile(directoryPath)
|
27
29
|
end
|
28
30
|
|
29
31
|
result
|
30
32
|
end
|
31
33
|
|
34
|
+
def copy_content_from_podfile(directoryPath)
|
35
|
+
podfile_path = File.expand_path("Podfile", directoryPath)
|
36
|
+
total_sentences = []
|
37
|
+
File.open(podfile_path, "r") { |io|
|
38
|
+
total_sentences = io.readlines
|
39
|
+
}
|
40
|
+
|
41
|
+
dest_path = File.expand_path("Podfile_orz.rb", directoryPath)
|
42
|
+
File.open(dest_path, "w+") {|io|
|
43
|
+
total_sentences.each do |sentence|
|
44
|
+
io.write(sentence)
|
45
|
+
end
|
46
|
+
}
|
47
|
+
|
48
|
+
end
|
49
|
+
|
32
50
|
def detect_PodsOrzConfig(directoryPath)
|
33
51
|
orzconfig_path = File.expand_path("PodsOrzConfig.rb", directoryPath)
|
34
52
|
orzconfig_result = File.exist?(orzconfig_path)
|
@@ -3,7 +3,15 @@ require "podsorz/util/logger"
|
|
3
3
|
|
4
4
|
module PodsOrz
|
5
5
|
class PodOrzconfigParse
|
6
|
-
|
6
|
+
#Git Config
|
7
|
+
attr_accessor :fix_pod_list, :app_release_version, :branch_author_suffix
|
8
|
+
attr_accessor :remote_url_sourcecode,:remote_url_codespec, :remote_url_binary, :remote_url_binaryspec
|
9
|
+
|
10
|
+
#File Config
|
11
|
+
attr_accessor :file_devpods_name, :file_package_filter_mark, :file_coderepo_name,:file_binaryrepo_name
|
12
|
+
|
13
|
+
#Package
|
14
|
+
attr_accessor :is_all_binary, :static_lib_list, :will_package_list
|
7
15
|
|
8
16
|
def initialize(main_path)
|
9
17
|
orzconfig_path = File.expand_path("PodsOrzConfig.rb", main_path)
|
@@ -16,23 +24,25 @@ module PodsOrz
|
|
16
24
|
|
17
25
|
require orzconfig_path
|
18
26
|
|
27
|
+
#GitConfig
|
28
|
+
@fix_pod_list = $FIX_POD_LIST
|
19
29
|
@app_release_version = GitConfig::APP_RELEASE_VERSION
|
20
|
-
@app_release_version = "" if @app_release_version.nil?
|
21
|
-
|
22
30
|
@branch_author_suffix = GitConfig::BRANCH_AUTHOR_SUFFIX
|
23
|
-
@
|
24
|
-
|
25
|
-
@
|
26
|
-
@
|
27
|
-
|
31
|
+
@remote_url_sourcecode = GitConfig::REMOTE_URL_SOURCECODE
|
32
|
+
@remote_url_codespec = GitConfig::REMOTE_URL_CODESPEC
|
33
|
+
@remote_url_binary = GitConfig::REMOTE_URL_SOURCEBINARY;
|
34
|
+
@remote_url_binaryspec = GitConfig::REMOTE_URL_BINARYSPEC;
|
35
|
+
|
36
|
+
#FileConfig
|
37
|
+
@file_devpods_name = FileConfig::FILE_DEVPODS_NAME
|
38
|
+
@file_package_filter_mark = FileConfig::FILE_PACKAGE_FILTER_MARK
|
39
|
+
@file_coderepo_name = FileConfig::FILE_CODEREPO_NAME
|
40
|
+
@file_binaryrepo_name = FileConfig::FILE_BINARYREPO_NAME
|
41
|
+
|
42
|
+
#Package
|
28
43
|
@is_all_binary = $is_all_binary
|
29
|
-
@is_all_binary = false if @is_all_binary.nil?
|
30
|
-
|
31
44
|
@static_lib_list = $static_lib_list
|
32
|
-
@static_lib_list = [] if @static_lib_list.nil?
|
33
|
-
|
34
45
|
@will_package_list = $will_package_list
|
35
|
-
@will_package_list = [] if @will_package_list.nil?
|
36
46
|
end
|
37
47
|
end
|
38
48
|
end
|
@@ -1,5 +1,7 @@
|
|
1
1
|
require "podsorz/util/logger"
|
2
2
|
require "podsorz/core/PodFile/podfile_model"
|
3
|
+
require "podsorz/core/Config/pod_orzconfig_parse"
|
4
|
+
|
3
5
|
|
4
6
|
module PodsOrz
|
5
7
|
|
@@ -10,14 +12,14 @@ module PodsOrz
|
|
10
12
|
@main_path = main_path
|
11
13
|
@http_host = "http://192.168.6.127:8899"
|
12
14
|
@remote_binary_directory = "binary_pod"
|
13
|
-
|
15
|
+
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
14
16
|
self.parse_podfile_orz
|
15
17
|
end
|
16
18
|
|
17
19
|
def filter_binary_pod_models()
|
18
20
|
filter_result_models = []
|
19
21
|
|
20
|
-
filter_strings = ["sourceVendorPods", "subspecPods",
|
22
|
+
filter_strings = ["sourceVendorPods", "subspecPods", @orzconfig_parse.file_package_filter_mark]
|
21
23
|
|
22
24
|
result_lines = []
|
23
25
|
|
@@ -104,7 +106,7 @@ module PodsOrz
|
|
104
106
|
pod_name_list.each do |podname|
|
105
107
|
@total_pod_models.map { |model|
|
106
108
|
if model.name.start_with? podname.to_s
|
107
|
-
model.path = "
|
109
|
+
model.path = "../#{@orzconfig_parse.file_devpods_name}/" + podname.to_s
|
108
110
|
end
|
109
111
|
}
|
110
112
|
end
|
@@ -115,7 +117,8 @@ module PodsOrz
|
|
115
117
|
pod_name_list.each do |podname|
|
116
118
|
@total_pod_models.map { |model|
|
117
119
|
if model.name.start_with? podname.to_s
|
118
|
-
|
120
|
+
# 替换为config参数
|
121
|
+
model.git = "#{@orzconfig_parse.remote_url_sourcecode}/" + podname.to_s + ".git"
|
119
122
|
model.branch = branch_name.to_s
|
120
123
|
end
|
121
124
|
}
|
@@ -6,10 +6,10 @@ module PodsOrz
|
|
6
6
|
attr_accessor :kx_pods_path, :orzconfig_parse
|
7
7
|
|
8
8
|
def initialize(main_path)
|
9
|
-
|
10
|
-
|
11
|
-
detect_kx_pods(main_path)
|
9
|
+
|
12
10
|
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
11
|
+
@kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
|
12
|
+
detect_kx_pods(main_path)
|
13
13
|
end
|
14
14
|
|
15
15
|
def check_directory(main_path)
|
@@ -26,7 +26,7 @@ module PodsOrz
|
|
26
26
|
if result
|
27
27
|
pods_result = File.directory?(@kx_pods_path)
|
28
28
|
unless pods_result
|
29
|
-
Logger.warning("
|
29
|
+
Logger.warning("#{@orzconfig_parse.file_devpods_name} directory not exist, generate default directory")
|
30
30
|
FileUtils.mkdir_p(@kx_pods_path, :mode => 0777)
|
31
31
|
end
|
32
32
|
end
|
@@ -63,7 +63,7 @@ module PodsOrz
|
|
63
63
|
result = false if file_entries.empty?
|
64
64
|
result = false unless file_entries.include?(".git")
|
65
65
|
|
66
|
-
Logger.error("【#{pod}】 at #{pod_path} exist, but .git not work success, please manual check.")
|
66
|
+
Logger.error("【#{pod}】 at #{pod_path} exist, but .git not work success, please manual check.") unless result
|
67
67
|
else
|
68
68
|
result = clone_orz_pod(pod)
|
69
69
|
end
|
@@ -77,7 +77,8 @@ module PodsOrz
|
|
77
77
|
|
78
78
|
Logger.default("Start clone 【#{pod}】 Project...")
|
79
79
|
git_clone_content = ""
|
80
|
-
|
80
|
+
# 替换为config参数
|
81
|
+
IO.popen("git clone #{@orzconfig_parse.remote_url_sourcecode}/#{pod}.git #{pod_directory}", :err=>[:child, :out]) {|io|
|
81
82
|
git_clone_content = io.read
|
82
83
|
puts(git_clone_content)
|
83
84
|
is_clone_success = false if git_clone_content.to_s.include? "fatal"
|
@@ -13,7 +13,7 @@ module PodsOrz
|
|
13
13
|
def initialize(main_path)
|
14
14
|
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
15
15
|
|
16
|
-
kx_pods_path = File.expand_path("
|
16
|
+
kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
|
17
17
|
@pods_git_operator = PodsOrz::PodsGitOperator.new(kx_pods_path, @orzconfig_parse.app_release_version, @orzconfig_parse.branch_author_suffix)
|
18
18
|
|
19
19
|
@podfile_io = PodsOrz::PodfileIO.new(main_path)
|
@@ -21,7 +21,7 @@ module PodsOrz
|
|
21
21
|
|
22
22
|
@pods_version = PodsOrz::PodsVersion.new(main_path)
|
23
23
|
|
24
|
-
@pods_repo = PodsOrz::PodsRepo.new()
|
24
|
+
@pods_repo = PodsOrz::PodsRepo.new(main_path)
|
25
25
|
end
|
26
26
|
|
27
27
|
#Switch Command --
|
@@ -477,7 +477,7 @@ module PodsOrz
|
|
477
477
|
command.join
|
478
478
|
|
479
479
|
command = Thread.new do
|
480
|
-
Open3.popen3("cd #{main_path};pod update
|
480
|
+
Open3.popen3("cd #{main_path};pod update") do |stdin , stdout , stderr, wait_thr|
|
481
481
|
while line = stdout.gets
|
482
482
|
puts line
|
483
483
|
end
|
@@ -40,7 +40,7 @@ module PodsOrz
|
|
40
40
|
|
41
41
|
def switch_feature_pod(pod)
|
42
42
|
previous_branch = self.current_pod_branch(pod)
|
43
|
-
next_branch = "feature/" + "#{@author_suffix}"
|
43
|
+
next_branch = "feature/" + "#{@author_suffix}"
|
44
44
|
|
45
45
|
is_ready = true
|
46
46
|
is_same = previous_branch.include? next_branch
|
@@ -116,7 +116,7 @@ module PodsOrz
|
|
116
116
|
|
117
117
|
def switch_bugfix_pod(pod)
|
118
118
|
previous_branch = self.current_pod_branch(pod)
|
119
|
-
next_branch = "bugfix/" + "#{@author_suffix}"
|
119
|
+
next_branch = "bugfix/" + "#{@author_suffix}"
|
120
120
|
|
121
121
|
is_ready = true
|
122
122
|
is_same = previous_branch.include? next_branch
|
@@ -1,13 +1,16 @@
|
|
1
1
|
require "podsorz/util/logger"
|
2
2
|
require 'open3'
|
3
|
+
require "podsorz/core/Config/pod_orzconfig_parse"
|
4
|
+
|
3
5
|
|
4
6
|
module PodsOrz
|
5
7
|
class PodsRepo
|
6
8
|
attr_accessor :repo_name, :repo_url
|
7
9
|
|
8
|
-
def initialize()
|
9
|
-
@
|
10
|
-
@repo_url =
|
10
|
+
def initialize(main_path)
|
11
|
+
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
12
|
+
@repo_url = @orzconfig_parse.remote_url_codespec
|
13
|
+
@repo_name = @orzconfig_parse.file_coderepo_name
|
11
14
|
end
|
12
15
|
|
13
16
|
def check_repo_exist
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require "podsorz/util/logger"
|
2
|
+
require "podsorz/core/Config/pod_orzconfig_parse"
|
2
3
|
|
3
4
|
|
4
5
|
module PodsOrz
|
@@ -6,7 +7,8 @@ module PodsOrz
|
|
6
7
|
attr_accessor :kx_pods_path
|
7
8
|
|
8
9
|
def initialize(main_path)
|
9
|
-
@
|
10
|
+
@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
|
11
|
+
@kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
|
10
12
|
end
|
11
13
|
|
12
14
|
def increase_pod_version(pod)
|
@@ -24,7 +24,7 @@ module PodsOrz
|
|
24
24
|
has_branch = false
|
25
25
|
IO.popen("cd '#{path}';git branch") do |io|
|
26
26
|
io.each do |line|
|
27
|
-
has_branch = true if line.
|
27
|
+
has_branch = true if line.strip.eql? branch_name
|
28
28
|
end
|
29
29
|
|
30
30
|
io.close
|
@@ -36,7 +36,8 @@ module PodsOrz
|
|
36
36
|
has_branch = false
|
37
37
|
IO.popen("cd '#{path}';git fetch --all;git branch -a") do |io|
|
38
38
|
io.each do |line|
|
39
|
-
has_branch = true if line.
|
39
|
+
# has_branch = true if line.strip.eql? branch_name
|
40
|
+
has_branch = true if line.to_s.chomp.strip.end_with? branch_name
|
40
41
|
end
|
41
42
|
|
42
43
|
io.close
|
data/lib/podsorz/version.rb
CHANGED
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
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.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Xiangqi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-12-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gli
|
@@ -76,12 +76,13 @@ executables:
|
|
76
76
|
extensions: []
|
77
77
|
extra_rdoc_files: []
|
78
78
|
files:
|
79
|
+
- ".bundle/config"
|
79
80
|
- ".gitignore"
|
80
81
|
- ".rspec"
|
82
|
+
- ".vscode/launch.json"
|
81
83
|
- Gemfile
|
82
84
|
- Gemfile.lock
|
83
85
|
- LICENSE.txt
|
84
|
-
- Podfile
|
85
86
|
- README.md
|
86
87
|
- Rakefile
|
87
88
|
- bin/podsorz
|
@@ -116,6 +117,12 @@ files:
|
|
116
117
|
- lib/podsorz/util/logger.rb
|
117
118
|
- lib/podsorz/util/process_operator.rb
|
118
119
|
- lib/podsorz/version.rb
|
120
|
+
- pkg/podsorz-0.0.10.gem
|
121
|
+
- pkg/podsorz-0.0.11.gem
|
122
|
+
- pkg/podsorz-0.0.12.gem
|
123
|
+
- pkg/podsorz-0.0.7.gem
|
124
|
+
- pkg/podsorz-0.0.8.gem
|
125
|
+
- pkg/podsorz-0.0.9.gem
|
119
126
|
- podsorz.gemspec
|
120
127
|
homepage: https://github.com/XiangqiTu
|
121
128
|
licenses:
|
data/Podfile
DELETED
File without changes
|