takelage 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd37119ed7278082e62916cfc9c14086b719007ab746e58651647a95779ae96c
-  data.tar.gz: fe3fc46ef24bdb12a106f02c9c18c8ceddf3faa4683fa67bf805aea31aaef01a
+  metadata.gz: 240831f6c4308e8336a2d476a4ff3f5b728804e7e03d4e1463c9262fff7d2b56
+  data.tar.gz: 85d29bb364dbaf5758f51813a1f6388c9ad6babd417da65d30b6907283147c9f
 SHA512:
-  metadata.gz: 5dfaf046db1564a22555132cb6fea9974f397a86ea9a660877c2bcfc3fdccfa2f59e86a6bc0be7b42831254cdbeb7c1997b67a227488d1dd18e22a1386ed870b
-  data.tar.gz: 1598f3a2a4890118bb6a2b72e1c6a2be5e89391f6f20248ed5f0293479ce79e57c29203f4c60541acd66346353943235e575d9bac6637360f91848aa746dde30
+  metadata.gz: cfa4649517e1818407361da9e3a17832cb010dbcc6d79139e05e95f355838ae175f09b5959b338972b7953b1a11d8fdf04b31b21f8c7c6451026b93837cd1c55
+  data.tar.gz: ad5526d627c8cdb72d21936de73c8990782eb85f908ed405eab683bcc67b8e03dab564891636d919ab65c2cf4cce1d329efc4f28e8bd192d2ce2d60b64d15046

data/README.md

@@ -81,7 +81,7 @@ tau [docker socket scheme](features/cucumber/features/docker/docker.socket.schem
 tau [docker socket start](features/cucumber/features/docker/docker.socket.start.feature) | Start sockets for docker container
 tau [docker socket stop](features/cucumber/features/docker/docker.socket.stop.feature) | Stop sockets for docker container
 tau [git check clean](features/cucumber/features/git/git.check.clean.feature) | Check if the git workspace is clean
-tau [git check master](features/cucumber/features/git/git.check.master.feature) | Check if we are on the git master branch
+tau [git check main](features/cucumber/features/git/git.check.main.feature) | Check if we are on the git main branch
 tau [git check workspace](features/cucumber/features/git/git.check.workspace.feature) | Check if a git workspace exists
 tau [info project active](features/cucumber/features/info/info.project.active.feature) | Print active project info
 tau [info project main](features/cucumber/features/info/info.project.main.feature) | Print main project info

data/lib/takelage.rb

@@ -21,7 +21,7 @@ require_relative 'takelage/lib/config'
 require_relative 'takelage/lib/project'
 
 require_relative 'takelage/git/check/clean'
-require_relative 'takelage/git/check/master'
+require_relative 'takelage/git/check/main'
 require_relative 'takelage/git/check/workspace'
 require_relative 'takelage/git/check/cli'
 require_relative 'takelage/git/cli'

data/lib/takelage/bit/clipboard/cli.rb

@@ -7,7 +7,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckClean
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitClipboardLib

data/lib/takelage/bit/clipboard/copy.rb

@@ -71,7 +71,7 @@ module BitClipboardCopy
     bit_dev = config.active['bit_dev_user']
 
     # check if scope is a candidate for a bit.dev remote scope
-    if scope.start_with? bit_dev + '.'
+    if scope.start_with? "#{bit_dev}."
       return false unless _bit_clipboard_bit_dev_scope_exists scope
     else
       return false unless _bit_clipboard_custom_scope_exists scope

data/lib/takelage/bit/clipboard/lib.rb

@@ -26,8 +26,8 @@ module BitClipboardLib
 
   # Prepare git workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_git_workspace
-    unless git_check_master
-      log.error 'Not on git master branch'
+    unless git_check_main
+      log.error 'Not on git main branch'
       return false
     end
 
@@ -91,12 +91,14 @@ module BitClipboardLib
     run cmd_bit_clipboard_git_commit
   end
 
-  # git push origin master.
+  # git push origin main.
   def _bit_clipboard_lib_git_push
-    log.debug 'Pushing master branch to origin'
+    log.debug 'Pushing main branch to origin'
 
-    cmd_bit_clipboard_git_push =
-      config.active['cmd_bit_clipboard_git_push']
+    cmd_bit_clipboard_git_push = format(
+      config.active['cmd_bit_clipboard_git_push'],
+      main: config.active['git_main_branch']
+    )
 
     run cmd_bit_clipboard_git_push
   end
@@ -104,8 +106,10 @@ module BitClipboardLib
   # git pull.
   def _bit_clipboard_lib_git_pull
     log.debug 'Updating git workspace'
-    cmd_bit_clipboard_git_pull =
-      config.active['cmd_bit_clipboard_git_pull']
+    cmd_bit_clipboard_git_pull = format(
+      config.active['cmd_bit_clipboard_git_pull'],
+      main: config.active['git_main_branch']
+    )
 
     return true if try cmd_bit_clipboard_git_pull
 

data/lib/takelage/bit/clipboard/paste.rb

@@ -42,7 +42,7 @@ module BitClipboardPaste
 
     bit_list_scope = _bit_clipboard_paste_cid_exists_list_scope scope
 
-    return true if bit_list_scope.include? '"id": "' + cid + '",'
+    return true if bit_list_scope.include? "\"id\": \"#{cid}\","
 
     log.error "No remote component \"#{cid}\""
     false

data/lib/takelage/bit/require/cli.rb

@@ -7,7 +7,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckClean
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeList

data/lib/takelage/bit/require/import.rb

@@ -71,7 +71,7 @@ module BitRequireImport
 
   # Check if there are bit components
   def _bit_require_import_check_component_valid(component, scope)
-    return true if (component.class == Hash) && component.key?('name')
+    return true if component.instance_of?(Hash) && component.key?('name')
 
     log.error "No component in #{scope}"
     false

data/lib/takelage/bit/scope/add.rb

@@ -28,9 +28,9 @@ module BitScopeAdd
 
     return true unless git_check_workspace
 
-    return true if git_check_master
+    return true if git_check_main
 
-    log.error 'Not on git master branch'
+    log.error 'Not on git main branch'
     false
   end
 

data/lib/takelage/bit/scope/cli.rb

@@ -6,7 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeAdd

data/lib/takelage/default.yml

@@ -14,8 +14,8 @@ cmd_bit_clipboard_copy_bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
 cmd_bit_clipboard_copy_bit_export_to_scope: 'bit export --skip-update %{scope}'
 cmd_bit_clipboard_git_add: 'git add %{file}'
 cmd_bit_clipboard_git_commit: 'git commit --message="%{message}"'
-cmd_bit_clipboard_git_pull: 'git pull origin master'
-cmd_bit_clipboard_git_push: 'git push origin master'
+cmd_bit_clipboard_git_pull: 'git pull origin %{main}'
+cmd_bit_clipboard_git_push: 'git push origin %{main}'
 cmd_bit_clipboard_paste_bit_list_scope: 'bit list --skip-update --json %{scope}'
 cmd_bit_clipboard_paste_bit_import_cid: 'bit import --ignore-package-json --ignore-dist --skip-update --path %{dir} %{cid}'
 cmd_bit_clipboard_pull_bit_import_all: 'bit import --ignore-package-json --ignore-dist --skip-update'
@@ -54,7 +54,7 @@ cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
 cmd_git_check_clean_git_status: 'git status --porcelain'
-cmd_git_check_master_git_branch: 'git symbolic-ref HEAD'
+cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
@@ -68,5 +68,6 @@ docker_socket_gpg_agent_port: 17874
 docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'
 docker_user: 'takelage'
+git_main_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'

data/lib/takelage/docker/socket/host.rb

@@ -6,6 +6,17 @@ module DockerSocketHost
   def docker_socket_host
     log.debug 'Getting docker socket host ip address'
 
+    socket_host = _docker_socket_host_get_socket_host
+
+    log.debug "Docker socket host ip address is \"#{socket_host}\""
+
+    socket_host
+  end
+
+  private
+
+  # Get the socket host, i.e. the ip of the docker host.
+  def _docker_socket_host_get_socket_host
     socket_host = '127.0.0.1'
 
     addr_infos = Socket.getifaddrs
@@ -13,13 +24,12 @@ module DockerSocketHost
     # if interface docker0 exists (== linux host)
     # then return the ip address
     addr_infos.each do |addr_info|
-      if addr_info.name == 'docker0'
-        socket_host = addr_info.addr.ip_address if addr_info.addr.ipv4?
+      if (addr_info.name == 'docker0') && addr_info.addr.ipv4?
+        socket_host = addr_info.addr.ip_address
+        break
       end
     end
 
-    log.debug "Docker socket host ip address is \"#{socket_host}\""
-
     socket_host
   end
 end

data/lib/takelage/git/check/cli.rb

@@ -7,7 +7,7 @@ module Takelage
     include SystemModule
     include ConfigModule
     include GitCheckClean
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
 
     #
@@ -23,15 +23,15 @@ module Takelage
     end
 
     #
-    # git check master
+    # git check main
     #
-    desc 'master', 'Check if we are on the git master branch'
+    desc 'main', 'Check if we are on the git main branch'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if we are on the git master branch
+    Check if we are on the git main branch
     LONGDESC
-    # Check if we are on the git master branch.
-    def master
-      exit git_check_master
+    # Check if we are on the git main branch.
+    def main
+      exit git_check_main
     end
 
     #

data/lib/takelage/git/check/main.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# takelage git check main
+module GitCheckMain
+  # Backend method for git check main.
+  # @return [Boolean] are we on the git main branch?
+  def git_check_main
+    log.debug 'Check if we are on the git main branch'
+
+    return false unless git_check_workspace
+
+    branch = _git_check_main_get_branch
+    log.debug "We are on git branch \"#{branch}\""
+
+    branch == config.active['git_main_branch']
+  end
+
+  private
+
+  # Get git branch.
+  def _git_check_main_get_branch
+    cmd_get_branch =
+      config.active['cmd_git_check_main_git_branch']
+    (run cmd_get_branch).strip.split('/')[-1]
+  end
+end

data/lib/takelage/lib/logging.rb

@@ -9,7 +9,7 @@ module LoggingModule
     attr_accessor :logger
 
     def initialize
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new($stdout)
     end
   end
 

data/lib/takelage/lib/subcmd.rb

@@ -3,9 +3,11 @@
 # Thor with subcommands that work correctly with help
 class SubCommandBase < Thor
   # Set the subcommand banner.
+  # rubocop:disable Style/OptionalBooleanParameter
   def self.banner(command, _namespace = nil, _subcommand = false)
     "#{basename} #{subcommand_prefix} #{command.usage}"
   end
+  # rubocop:enable Style/OptionalBooleanParameter
 
   # Set the subcommand prefix.
   def self.subcommand_prefix

data/lib/takelage/version

@@ -1 +1 @@
-0.22.0
+0.22.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Geospin
@@ -261,7 +261,7 @@ files:
 - lib/takelage/docker/socket/stop.rb
 - lib/takelage/git/check/clean.rb
 - lib/takelage/git/check/cli.rb
-- lib/takelage/git/check/master.rb
+- lib/takelage/git/check/main.rb
 - lib/takelage/git/check/workspace.rb
 - lib/takelage/git/cli.rb
 - lib/takelage/info/cli.rb

data/lib/takelage/git/check/master.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# takelage git check master
-module GitCheckMaster
-  # Backend method for git check master.
-  # @return [Boolean] are we on the git master branch?
-  def git_check_master
-    log.debug 'Check if we are on the git master branch'
-
-    return false unless git_check_workspace
-
-    branch = _git_check_master_get_branch
-    log.debug "We are on git branch \"#{branch}\""
-
-    branch == 'master'
-  end
-
-  private
-
-  # Get git branch.
-  def _git_check_master_get_branch
-    cmd_get_branch =
-      config.active['cmd_git_check_master_git_branch']
-    (run cmd_get_branch).strip.split('/')[-1]
-  end
-end