takeltau 0.36.1 → 0.36.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/takeltau/default.yml +1 -0
- data/lib/takeltau/git/lib.rb +24 -0
- data/lib/takeltau/hg/pull.rb +7 -1
- data/lib/takeltau/version +1 -1
- 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: b2465bad2b7f3f05a0989db146bcd4aeebccb1157c03ccd54a34e2dc6653ad46
|
4
|
+
data.tar.gz: 5a5a34f4ca5c59e66ef99e6814aea3c07f8f591f9511ee24484473462fe9083c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a2ce4ee0a6cbf779b3f0066f46e4ad4a9ec500b704661b9e93b3b27c230246a129552d9dedbafa1ee858bc9482ec13d03b499b915914593799fbd3616cd10f91
|
7
|
+
data.tar.gz: d1bc6aa9527413db818055b1f6aecc0654352a41fbca79d1c461329b71d2d5ea1d6d2427b0795b268da856c1eab217e3aefdef71b32f9129e68db5f8e708ff78
|
data/lib/takeltau/default.yml
CHANGED
@@ -24,6 +24,7 @@ cmd_git_check_hg_get_git_branch: 'git symbolic-ref HEAD'
|
|
24
24
|
cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
|
25
25
|
cmd_git_check_workspace_pwd: 'pwd'
|
26
26
|
cmd_git_lib_git_add_all: 'git add --all'
|
27
|
+
cmd_git_lib_git_add_hg_dirs: 'git add \*/.hg/\*'
|
27
28
|
cmd_git_lib_git_commit: 'git commit --message="%{message}"'
|
28
29
|
cmd_git_lib_git_pull_origin: 'git pull origin %{main}'
|
29
30
|
cmd_git_lib_git_push_origin: 'git push origin %{main}'
|
data/lib/takeltau/git/lib.rb
CHANGED
@@ -20,6 +20,18 @@ module GitLib
|
|
20
20
|
_git_lib_git_push_origin_hg
|
21
21
|
end
|
22
22
|
|
23
|
+
# Push git workspace.
|
24
|
+
def git_lib_push_hg_dirs
|
25
|
+
log.info 'Pushing git workspace'
|
26
|
+
|
27
|
+
message = '"Update .hg mercurial directories'
|
28
|
+
|
29
|
+
return false unless _git_lib_git_add_hg_dirs
|
30
|
+
return false unless _git_lib_git_commit message
|
31
|
+
|
32
|
+
_git_lib_git_push_origin_hg
|
33
|
+
end
|
34
|
+
|
23
35
|
private
|
24
36
|
|
25
37
|
# git add all.
|
@@ -34,6 +46,18 @@ module GitLib
|
|
34
46
|
false
|
35
47
|
end
|
36
48
|
|
49
|
+
# git add hg dirs.
|
50
|
+
def _git_lib_git_add_hg_dirs
|
51
|
+
log.debug 'Adding all .hg mercurial dirs to git'
|
52
|
+
|
53
|
+
cmd_git_add_hg_dirs = config.active['cmd_git_lib_git_add_hg_dirs']
|
54
|
+
|
55
|
+
return true if try cmd_git_add_hg_dirs
|
56
|
+
|
57
|
+
log.error 'Unable to add all .hg mercurial dirs to git'
|
58
|
+
false
|
59
|
+
end
|
60
|
+
|
37
61
|
# git commit.
|
38
62
|
def _git_lib_git_commit(message)
|
39
63
|
log.debug "Committing to git with message \"#{message}\""
|
data/lib/takeltau/hg/pull.rb
CHANGED
@@ -3,6 +3,7 @@
|
|
3
3
|
# tau hg pull
|
4
4
|
module HgPull
|
5
5
|
# Backend method for hg pull.
|
6
|
+
# rubocop:disable Metrics/AbcSize
|
6
7
|
# rubocop:disable Metrics/MethodLength
|
7
8
|
def hg_pull
|
8
9
|
log.debug 'Pull hg repos'
|
@@ -25,9 +26,14 @@ module HgPull
|
|
25
26
|
end
|
26
27
|
|
27
28
|
log.info _hg_pull_hg_pull_repos
|
28
|
-
|
29
|
+
|
30
|
+
return true if git_lib_push_hg_dirs
|
31
|
+
|
32
|
+
log.error 'Unable to push .hg mercurial directories'
|
33
|
+
false
|
29
34
|
end
|
30
35
|
# rubocop:enable Metrics/MethodLength
|
36
|
+
# rubocop:enable Metrics/AbcSize
|
31
37
|
|
32
38
|
private
|
33
39
|
|
data/lib/takeltau/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.36.
|
1
|
+
0.36.3
|