takeltau 0.36.5 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0384f3e2dd7b515d5943dfc67d59f75c429d56c8fa6473cf2c6fe564181cbf
-  data.tar.gz: bd538e579d0f138e832e09d3a5656e345a7d43db364bbbf31bcea6526250f6d4
+  metadata.gz: 293a71b537a49394f198b0a1479285f57e43d899ccaffdcf64f18e91a95a4445
+  data.tar.gz: 00e04f3a868ac61e81660b4e37e74a83d055c72d591ca53be88e04c48b32e488
 SHA512:
-  metadata.gz: 36da5dad2130782a8c53bcbdc165b077e85a8d6f7457aff1f64e36f4efcea523a34a010dd63ea44918517e30dfde63f3ea249cc71d8b3e8d9cb39a7f47644112
-  data.tar.gz: ce7d8a4eccd384f9239037e43e77d419d10cfe1d56d4234eabcf59014c7b4426578cf91a6a43bba9f623ec93b8d7e2d03f94f19b980d3a7131deab91afe66be3
+  metadata.gz: 4f259593b1df8171bcd2400ba152a55c430b3c535e8c8f5abe6cbc3e66c4484947e32472d0ff612e848f0429ee96424306329f0a7abc063f116c9610396fb628
+  data.tar.gz: b71b36fcba29683483fa39e35e46293dac09c61c6b1603977605ab0eacf16eefe12867058160544ac21774b05a0f34b95c24baf7b915c18530a60cebb3fe3dcc

data/lib/takeltau/default.yml

@@ -23,7 +23,6 @@ cmd_git_check_clean_git_status: 'git status --porcelain'
 cmd_git_check_hg_get_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
-cmd_git_lib_git_add_all: 'git add --all'
 cmd_git_lib_git_add_hg_dirs: 'git add \*/.hg/\*'
 cmd_git_lib_git_commit: 'git commit --message="%{message}"'
 cmd_git_lib_git_pull_origin: 'git pull origin %{main}'

data/lib/takeltau/git/lib.rb

@@ -2,23 +2,29 @@
 
 # tau git lib
 module GitLib
-  # Pull git workspace.
-  def git_lib_pull_workspace
-    log.info 'Pulling git workspace'
+  # Prepare git workspace.
+  # rubocop:disable Metrics/MethodLength
+  def git_lib_prepare_git_workspace
+    log.debug 'Prepare git workspace'
 
-    _git_lib_git_pull_origin_hg
-  end
+    return false unless configured? %w[project_root_dir]
 
-  # Push git workspace.
-  def git_lib_push_workspace(message)
-    log.info 'Pushing git workspace'
+    unless git_check_hg
+      log.error 'Not on git hg branch'
+      return false
+    end
 
-    return false unless _git_lib_git_add_all
-    return false unless _git_lib_git_commit message
-    return false unless _git_lib_git_pull_origin_hg
+    unless git_check_clean
+      log.error 'No clean git workspace'
+      return false
+    end
 
-    _git_lib_git_push_origin_hg
+    return true if _git_lib_git_pull_origin_hg
+
+    log.error 'Unable to pull git workspace'
+    false
   end
+  # rubocop:enable Metrics/MethodLength
 
   # Push git workspace.
   def git_lib_push_hg_dirs
@@ -29,30 +35,21 @@ module GitLib
     return false unless _git_lib_git_add_hg_dirs
     return false unless _git_lib_git_commit message
 
-    _git_lib_git_push_origin_hg
-  end
-
-  private
-
-  # git add all.
-  def _git_lib_git_add_all
-    log.debug 'Adding all files to git'
-
-    cmd_git_add_all = config.active['cmd_git_lib_git_add_all']
+    return true if _git_lib_git_push_origin_hg
 
-    return true if try cmd_git_add_all
-
-    log.error 'Unable to add all files to git'
+    log.error 'Unable to git push .hg mercurial directories'
     false
   end
 
+  private
+
   # git add hg dirs.
   def _git_lib_git_add_hg_dirs
     log.debug 'Adding all .hg mercurial dirs to git'
 
     cmd_git_add_hg_dirs = config.active['cmd_git_lib_git_add_hg_dirs']
 
-    return true if try cmd_git_add_hg_dirs
+    return true if (try cmd_git_add_hg_dirs).exitstatus.zero?
 
     log.error 'Unable to add all .hg mercurial dirs to git'
     false
@@ -67,7 +64,7 @@ module GitLib
       message: message
     )
 
-    return true if try cmd_git_commit
+    return true if (try cmd_git_commit).exitstatus.zero?
 
     log.error 'Unable to commit to git'
     false

data/lib/takeltau/hg/pull.rb

@@ -3,37 +3,18 @@
 # tau hg pull
 module HgPull
   # Backend method for hg pull.
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
   def hg_pull
     log.debug 'Pull hg repos'
 
-    return false unless configured? %w[project_root_dir]
+    return false unless git_lib_prepare_git_workspace
 
-    unless git_check_hg
-      log.error 'Not on git hg branch'
+    unless _hg_pull_hg_pull_repos
+      log.error 'Unable to tau hg pull'
       return false
     end
 
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    unless git_lib_pull_workspace
-      log.error 'Unable to pull git workspace'
-      return false
-    end
-
-    log.info _hg_pull_hg_pull_repos
-
-    return true if git_lib_push_hg_dirs
-
-    log.error 'Unable to push .hg mercurial directories'
-    false
+    git_lib_push_hg_dirs
   end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
 
   private
 
@@ -44,6 +25,8 @@ module HgPull
       root: config.active['project_root_dir']
     )
 
-    run cmd_hg_pull_repos
+    stdout, _, exitstatus = run_and_capture cmd_hg_pull_repos
+    log.info stdout
+    exitstatus.zero?
   end
 end

data/lib/takeltau/hg/push.rb

@@ -3,30 +3,18 @@
 # tau hg push
 module HgPush
   # Backend method for hg push.
-  # rubocop:disable Metrics/MethodLength
   def hg_push
     log.debug 'Push hg repos'
 
-    return false unless configured? %w[project_root_dir]
+    return false unless git_lib_prepare_git_workspace
 
-    unless git_check_hg
-      log.error 'Not on git hg branch'
+    unless _hg_push_hg_push_repos
+      log.error 'Unable to tau hg push'
       return false
     end
 
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    log.info _hg_push_hg_push_repos
-
-    return true if git_lib_push_workspace 'tau hg push'
-
-    log.error 'Unable to push git workspace'
-    false
+    git_lib_push_hg_dirs
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 
@@ -37,6 +25,8 @@ module HgPush
       root: config.active['project_root_dir']
     )
 
-    run cmd_hg_push_repos
+    stdout, _, exitstatus = run_and_capture cmd_hg_push_repos
+    log.info stdout
+    exitstatus.zero?
   end
 end

data/lib/takeltau/version

@@ -1 +1 @@
-0.36.5
+0.37.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.36.5
+  version: 0.37.1
 platform: ruby
 authors:
 - Takelwerk