pindo 5.0.1 → 5.0.2
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/pindo/base/githelper.rb +5 -1
- data/lib/pindo/module/build/buildhelper.rb +6 -4
- data/lib/pindo/version.rb +7 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 10f0f3745c15acde24feb9bdb931bfcfdbc303258d631426aa57624c07a4c9b7
|
|
4
|
+
data.tar.gz: 40614dbbb067470b2a0f5c81712720179f9074efbdcb57bd32855a1944fb9b45
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d7d064e4852ee0fba47ce2af38bc56ad4bb7c879fddd5bbca42ae6ac4d7a4498ac68fc99fd7a11d50204546287350cac75c0d31b0e3975cba2c5446c0d2c5634
|
|
7
|
+
data.tar.gz: 7d087143f365ece955ab0c571480de52e8f54948a306f46610ed922ddb91209f296a492889bf670e743eb55444076effcf75d6dc96a00958d0372d8b094aea4f
|
data/lib/pindo/base/githelper.rb
CHANGED
|
@@ -487,12 +487,16 @@ module Pindo
|
|
|
487
487
|
private
|
|
488
488
|
|
|
489
489
|
def display_file_status(branch, files)
|
|
490
|
+
puts "========================================"
|
|
490
491
|
puts "\n当前所在分支:#{branch}有下面这些文件没有提交："
|
|
492
|
+
puts
|
|
491
493
|
puts "\n#{files}\n"
|
|
494
|
+
puts
|
|
495
|
+
puts "========================================"
|
|
492
496
|
end
|
|
493
497
|
|
|
494
498
|
def process_user_choice(project_dir, branch)
|
|
495
|
-
process_types = ["全部提交", "全部删除", "
|
|
499
|
+
process_types = ["全部提交", "全部删除", "先退出，手动来处理退出"]
|
|
496
500
|
cli = HighLine.new
|
|
497
501
|
menu_choice = "None"
|
|
498
502
|
|
|
@@ -35,21 +35,23 @@ module Pindo
|
|
|
35
35
|
def write_gitignore(git_root_dir)
|
|
36
36
|
gitignore_path = File.join(git_root_dir, '.gitignore')
|
|
37
37
|
gitignore_content = <<~GITIGNORE
|
|
38
|
-
#
|
|
38
|
+
# pindo_common_ignore_1.0.0
|
|
39
39
|
build_ios.log
|
|
40
40
|
feishu.json
|
|
41
41
|
CHANGELOG.md
|
|
42
|
-
|
|
42
|
+
|
|
43
43
|
# Platform specific directories
|
|
44
44
|
/GoodPlatform/iOS/config.json
|
|
45
45
|
/GoodPlatform/iOS/*
|
|
46
|
+
/GoodPlatform/iOS/build/*
|
|
46
47
|
/GoodPlatform/Android/*
|
|
47
|
-
/GoodPlatform/MacOS/*
|
|
48
48
|
/GoodPlatform/BaseiOS/Unity/*
|
|
49
49
|
/GoodPlatform/BaseiOS/Pods/
|
|
50
|
+
/GoodPlatform/BaseiOS/build/
|
|
51
|
+
/GoodPlatform/BaseiOS/config.json
|
|
50
52
|
/GoodPlatform/BaseiOS/Podfile.lock
|
|
53
|
+
|
|
51
54
|
/GoodPlatform/BaseAndroid/Unity/*
|
|
52
|
-
/GoodPlatform/BaseMac/Unity/*
|
|
53
55
|
GITIGNORE
|
|
54
56
|
# Append to existing .gitignore or create new one
|
|
55
57
|
File.open(gitignore_path, 'a') do |f|
|
data/lib/pindo/version.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
module Pindo
|
|
2
2
|
|
|
3
|
-
VERSION = "5.0.
|
|
3
|
+
VERSION = "5.0.2"
|
|
4
4
|
|
|
5
5
|
class VersionCheck
|
|
6
6
|
|
|
@@ -31,7 +31,7 @@ module Pindo
|
|
|
31
31
|
# Pindo::Command::Env::Upgrade::run([])
|
|
32
32
|
# end
|
|
33
33
|
puts
|
|
34
|
-
puts "最新版本是#{pindo_latest_version}目前可用, 可使用pindo
|
|
34
|
+
puts "最新版本是#{pindo_latest_version}目前可用, 可使用 gem install pindo 升级"
|
|
35
35
|
puts
|
|
36
36
|
puts pindo_lates_update_info
|
|
37
37
|
puts
|
|
@@ -40,8 +40,9 @@ module Pindo
|
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
rescue Exception => e
|
|
43
|
-
puts "
|
|
44
|
-
puts
|
|
43
|
+
puts "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
|
|
44
|
+
puts
|
|
45
|
+
|
|
45
46
|
|
|
46
47
|
end
|
|
47
48
|
end
|
|
@@ -66,12 +67,12 @@ module Pindo
|
|
|
66
67
|
puts "当前pindo版本 #{Pindo::VERSION}"
|
|
67
68
|
puts "最新版本 #{pindo_latest_version}"
|
|
68
69
|
puts "要求最低版本 #{pindo_mini_version}"
|
|
69
|
-
raise Informative, "请使用pindo
|
|
70
|
+
raise Informative, "请使用 gem install pindo 升级!"
|
|
70
71
|
end
|
|
71
72
|
end
|
|
72
73
|
|
|
73
74
|
rescue Exception => e
|
|
74
|
-
raise Informative, "
|
|
75
|
+
raise Informative, "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
|
|
75
76
|
end
|
|
76
77
|
end
|
|
77
78
|
|