pixab 2.6.1 → 2.6.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/pixab/version.rb +1 -1
- data/lib/projects/ComponentSynchronizer.rb +8 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e6b8c8409f3aed1339f32316bf5e78207cc768cd45b3f488eeda92852dabbffa
|
|
4
|
+
data.tar.gz: bff6b53f8c90223e444a53b47e6f4518f452cd635c4fa17b77a9347b2f82c688
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 672f01d7b5217758eaa57d6f1ed229dafb9e2de5300928cc0d5f618522d7f7a2cca9c3a25d419610977d9b69a6ddf526a041cd9066910ea49f5058ae8bea7b9e
|
|
7
|
+
data.tar.gz: 150192991051384a78ff4d3fb468cc899913d3242d7a0b2cce6518a278343133ce94d9c381e718ec93eacd8808b23ef79c77a8f7fd745f7f7292c008b6785db5
|
data/lib/pixab/version.rb
CHANGED
|
@@ -12,7 +12,7 @@ module Pixab
|
|
|
12
12
|
|
|
13
13
|
class ComponentSynchronizer
|
|
14
14
|
|
|
15
|
-
attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install, :is_use__target_branch
|
|
15
|
+
attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install, :is_use__target_branch, :need_merge_origin
|
|
16
16
|
attr_reader :repo_manager, :repos, :main_repo_name, :updated_repo_names
|
|
17
17
|
|
|
18
18
|
def initialize(repo_manager = RepoManager.new, commands = nil)
|
|
@@ -21,6 +21,7 @@ module Pixab
|
|
|
21
21
|
@is_need_remote_repo = false
|
|
22
22
|
@is_need_pod_install = false
|
|
23
23
|
@is_use__target_branch = true
|
|
24
|
+
@need_merge_origin = true
|
|
24
25
|
|
|
25
26
|
if commands.nil?
|
|
26
27
|
return
|
|
@@ -38,6 +39,8 @@ module Pixab
|
|
|
38
39
|
@is_need_pod_install = true
|
|
39
40
|
when "--current-branch"
|
|
40
41
|
@is_use__target_branch = false
|
|
42
|
+
when "--no-merge-origin"
|
|
43
|
+
@need_merge_origin = false
|
|
41
44
|
else
|
|
42
45
|
end
|
|
43
46
|
end
|
|
@@ -119,6 +122,10 @@ module Pixab
|
|
|
119
122
|
|
|
120
123
|
# 合并代码并检查冲突
|
|
121
124
|
def merge_and_check
|
|
125
|
+
if not need_merge_origin
|
|
126
|
+
return
|
|
127
|
+
end
|
|
128
|
+
|
|
122
129
|
system "mbox merge --repo #{main_repo_name}"
|
|
123
130
|
FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
|
|
124
131
|
`git --no-pager diff --check`
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pixab
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- 廖再润
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-08-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: colored2
|