takeltau 0.38.0 → 0.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a5ea68fdc1d3340cb871a3abdd21675c99508c0b5ac0095e3c2cfe675bf983e
-  data.tar.gz: 561785ba66192b34f594165be501296afc90825a889559fb2ff5f02e2637db89
+  metadata.gz: efcd37beaf72d26ec96d9036cec64b14150b2b1b3685d30842aa3843ccb29b1e
+  data.tar.gz: 5018c78c0dd215eeb8a49b17c58e1230ed697957d1188fb2abdf33e906c3f219
 SHA512:
-  metadata.gz: 0bcdb05348ba4b8e416a9326578301f8518ef8b51dc74ec822b7547a27dde30f5a712f14bf5cd05495fd44fbf9d94a30abb55659ff143768612e03717d495425
-  data.tar.gz: 576340ebafa4c5bb4f170aee9d9bffb2e30aec58ab4d669bfcd66b2ef18f76d885bd41e7d825561a9921fe4eee262fe9833bbe8e76bf040ed13ee3801e1bb373
+  metadata.gz: 6052b700a56b6c15f8c1c980a97ab47f10b33b9403f3266920f8aaa232b0dcb0a5db921df9863089b5f5440a7816c120b8169ff2be7b6306aed213562fa9acb5
+  data.tar.gz: a644c2d3082c2b1a6ed8a0ace6ce05e7b2bfbf327d7b118fd8201a668644e15c3791002edcd874bb0c98f467cceb699dc87dcbf2f3af8a4fd89e9b56c643054f

data/README.md

@@ -95,24 +95,26 @@ tau [info status bar](features/cucumber/features/info/info.status.bar.feature) |
 tau [info status git](features/cucumber/features/info/info.status.git.feature) | Check git status
 tau [info status gopass](features/cucumber/features/info/info.status.gopass.feature) | Check gopass status
 tau [info status gpg](features/cucumber/features/info/info.status.gpg.feature) | Check gpg status
+tau [info status hg](features/cucumber/features/info/info.status.hg.feature) | Check hg status
 tau [info status mutagen](features/cucumber/features/info/info.status.mutagen.feature) | Check mutagen status
 tau [info status ssh](features/cucumber/features/info/info.status.ssh.feature) | Check ssh status
-tau [init packer docker](features/cucumber/features/info/init.packer.docker.feature) | Initialize packer project for docker images
+tau [init packer docker](features/cucumber/features/init/init.packer.docker.feature) | Initialize packer project for docker images
+tau [init takelage rake](features/cucumber/features/init/init.takelage.rake.feature) | Initialize takelage rake project
 tau [mutagen check daemon](features/cucumber/features/mutagen/mutagen.check.daemon.feature)) | Check if mutagen host conenction is available
 tau [mutagen socket check](features/cucumber/features/mutagen/mutagen.socket.check.feature) [SOCKET] | Check if mutagen [SOCKET] exists
 tau [mutagen socket create](features/cucumber/features/mutagen/mutagen.socket.create.feature) [NAME] [IN] [OUT] | Create a mutagen socket [NAME] from [IN] to [OUT] of the container
 tau [mutagen socket list](features/cucumber/features/mutagen/mutagen.socket.list.feature) | List mutagen sockets
-tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
 tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) [SOCKET] | Terminate a mutagen [SOCKET]
+tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
+tau [self commands](features/cucumber/features/self/self.commands.feature) | List all commands
 tau [self config active](features/cucumber/features/self/self.config.active.feature) | Print active takelage configuration
 tau [self config default](features/cucumber/features/self/self.config.default.feature) | Print takelage default configuration
 tau [self config home](features/cucumber/features/self/self.config.home.feature) | Print takelage home config file configuration
 tau [self config project](features/cucumber/features/self/self.config.project.feature) | Print takelage project config file configuration
-tau [self commands](features/cucumber/features/self/self.commands.feature) | List all commands
 tau [self version](features/cucumber/features/self/self.version.feature) | Print tau semantic version number
 tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature)
-tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.feature)
 tau commands | Alias for tau [self commands](features/cucumber/features/self/self.commands.feature)
+tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.feature)
 tau login | Alias for tau [docker container login](features/cucumber/features/docker/docker.container.login.feature)
 tau project | Alias for tau [info project active](features/cucumber/features/info/info.project.active.feature)
 tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature)

data/lib/takeltau/default.yml

@@ -4,7 +4,7 @@ cmd_docker_check_daemon_docker_info: 'docker info'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
-cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --extra=%{extra} %{entrypoint_options}'
 cmd_docker_container_create_network: 'docker network create %{network}'
 cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
 cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
@@ -48,11 +48,12 @@ cmd_mutagen: 'mutagen'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
 cmd_mutagen_check_daemon_version: 'mutagen version'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
+cmd_mutagen_forward_socket_docker: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} --socket-group-source=docker --socket-permission-mode=0660 docker://root@%{container}:unix:/var/run/docker.sock unix:%{hostsock}'
 cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'
 cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
 cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
 cmd_mutagen_forward_socket_list: 'mutagen forward list --label-selector="%{takellabel}"'
-docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
+docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: '.config/gcloud'
 docker_entrypoint_options: ''
 docker_registry: 'https://registry.hub.docker.com'
@@ -67,6 +68,7 @@ info_project_private: 'private/project.yml'
 login_wait_for_sockets: '0'
 mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
 mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_docker_host: '/var/run/docker.sock'
 mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
 mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
 mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'

data/lib/takeltau/docker/container/cli.rb

@@ -22,6 +22,7 @@ module Takeltau
     include MutagenCheckDaemon
     include MutagenSocketCheck
     include MutagenSocketCreate
+    include MutagenSocketDocker
     include MutagenSocketTerminate
 
     # Initialize docker container
@@ -40,6 +41,7 @@ module Takeltau
       @hostname = _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"
       @takellabel = config.active['mutagen_socket_takelage_label']
+      @dockersock_host = config.active['mutagen_socket_path_docker_host']
       @mutagensock_container = config.active['mutagen_socket_path_mutagen_container']
       @mutagensock_host = config.active['mutagen_socket_path_mutagen_host']
       @gpgsock_container = config.active['mutagen_socket_path_gpg_container']

data/lib/takeltau/docker/container/lib.rb

@@ -10,6 +10,7 @@ module DockerContainerLib
   def _docker_container_lib_start_sockets
     return false unless mutagen_check_daemon
 
+    mutagen_socket_docker @dockersock_host
     mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
     mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host
     mutagen_socket_create 'ssh', @sshsock_container, @sshsock_host
@@ -91,7 +92,6 @@ module DockerContainerLib
       config.active['cmd_docker_container_create'],
       container: container,
       docker_run_options: config.active['docker_run_options'],
-      dockersock: '/var/run/docker.sock',
       entrypoint: entrypoint,
       entrypoint_options: config.active['docker_entrypoint_options'],
       extra: config.active['docker_entrypoint_extra'],
@@ -122,7 +122,6 @@ module DockerContainerLib
     end
 
     log.debug 'We are inside a takelage container'
-
     true
   end
 
@@ -145,9 +144,7 @@ module DockerContainerLib
     )
 
     name = (run cmd_get_container_name_by_id).chomp
-
     log.debug "Container #{container} has name \"#{name}\""
-
     name
   end
 

data/lib/takeltau/info/status/bar.rb

@@ -9,6 +9,7 @@ module InfoStatusBar
     log.debug 'Get status info bar'
 
     @bar_list = []
+    @bar_status = true
 
     _info_status_bar_takelage
     _info_status_bar_tau
@@ -19,9 +20,8 @@ module InfoStatusBar
     _info_status_bar_mutagen
     _info_status_bar_ssh
 
-    bar = @bar_list.join(' | ')
-    log.debug "status info bar: #{bar}"
-    bar
+    say @bar_list.join(' | ')
+    @bar_status
   end
   # rubocop:enable Metrics/MethodLength
 
@@ -29,11 +29,10 @@ module InfoStatusBar
 
   # Add takelage version info to bar.
   def _info_status_bar_takelage
-    takelage_version_file = '/etc/takelage_version'
-    return unless _file_exists? takelage_version_file
+    # Check if we are inside a takelage docker container
+    return unless _docker_container_lib_check_matrjoschka
 
-    _file_read takelage_version_file
-    @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
+    @bar_list << _info_status_lib_get_channel_and_version
   end
 
   # Add tau version info to bar.
@@ -44,12 +43,14 @@ module InfoStatusBar
   # Add git status info to bar.
   def _info_status_bar_git
     @status_git = info_status_git
+    @bar_status &&= @status_git
     @bar_list << ("git: #{@status_git ? 'ok'.green : 'no'.red}")
   end
 
   # Add gopass status info to bar.
   def _info_status_bar_gopass
     @status_gopass = info_status_gopass
+    @bar_status &&= @status_gopass
     @bar_list << ("gopass: #{@status_gopass ? 'ok'.green : 'no'.red}")
   end
 
@@ -60,23 +61,30 @@ module InfoStatusBar
       return
     end
 
-    @bar_list << ("gpg: #{info_status_gpg ? 'ok'.green : 'no'.red}")
+    status_gpg = info_status_gpg
+    @bar_status &&= status_gpg
+    @bar_list << ("gpg: #{status_gpg ? 'ok'.green : 'no'.red}")
   end
 
   # Add git status info to bar.
   def _info_status_bar_hg
     @status_hg = info_status_hg
+    @bar_status &&= @status_hg
     @bar_list << ("hg: #{@status_hg ? 'ok'.green : 'no'.red}")
   end
 
   # Add mutagen status info to bar.
   def _info_status_bar_mutagen
-    @bar_list << ("mutagen: #{mutagen_check_daemon ? 'ok'.green : 'no'.red}")
+    status_mutagen = mutagen_check_daemon
+    @bar_status &&= status_mutagen
+    @bar_list << ("mutagen: #{status_mutagen ? 'ok'.green : 'no'.red}")
   end
 
   # Add ssh status info to bar.
   def _info_status_bar_ssh
-    @bar_list << ("ssh: #{info_status_ssh ? 'ok'.green : 'no'.red}")
+    status_ssh = info_status_ssh
+    @bar_status &&= status_ssh
+    @bar_list << ("ssh: #{status_ssh ? 'ok'.green : 'no'.red}")
   end
 end
 

data/lib/takeltau/info/status/cli.rb

@@ -42,7 +42,7 @@ module Takeltau
     LONGDESC
     # Print status info bar.
     def bar
-      say info_status_bar
+      exit info_status_bar
     end
 
     #

data/lib/takeltau/info/status/lib.rb

@@ -43,4 +43,18 @@ module InfoStatusLib
       )
     try cmd_git_key_available
   end
+
+  # Get takelage environment string
+  def _info_status_lib_get_channel_and_version
+    takelage_version_file = '/etc/takelage_version'
+    return '' unless _file_exists? takelage_version_file
+
+    _file_read takelage_version_file
+
+    channel = config.active['docker_repo']
+    version = @content_file.chomp
+
+    log.debug "#{channel}: #{version.green}"
+    "#{channel}: #{version.green}"
+  end
 end

data/lib/takeltau/init/packer/templates/playbooksiteyml.tt

@@ -3,4 +3,4 @@
   hosts: all
   gather_facts: false
   roles:
-    - takel-cleanup
+    - takel_cleanup

data/lib/takeltau/mutagen/socket/cli.rb

@@ -17,6 +17,7 @@ module Takeltau
     include MutagenCheckDaemon
     include MutagenSocketCheck
     include MutagenSocketCreate
+    include MutagenSocketDocker
     include MutagenSocketList
     include MutagenSocketTidy
     include MutagenSocketTerminate
@@ -61,6 +62,18 @@ module Takeltau
       exit mutagen_socket_create name, containersock, hostsock
     end
 
+    #
+    # mutagen socket create
+    #
+    desc 'docker [OUT]', 'Create a mutagen docker socket [OUT] of the container'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Create a mutagen docker socket [OUT] of the container
+    LONGDESC
+    # Create a mutagen docker socket [OUT] of the container.
+    def docker(hostsock)
+      exit mutagen_socket_docker hostsock
+    end
+
     #
     # mutagen socket list
     #

data/lib/takeltau/mutagen/socket/docker.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# tau mutagen socket docker
+module MutagenSocketDocker
+  # Backend method for mutagen socket docker.
+  # rubocop:disable Metrics/MethodLength
+  def mutagen_socket_docker(hostsock)
+    # See DockerContainerLib::_docker_container_lib_hostname
+    socketname = "#{@hostname[-11..-1]}-docker"
+    log.debug "Create the mutagen docker socket \"#{socketname}\" in the container " \
+      "pointing to the host at \"#{hostsock}\""
+
+    return false unless mutagen_check_daemon
+
+    return false if mutagen_socket_check socketname
+
+    socket_created = _mutagen_socket_docker_socket(socketname, hostsock)
+
+    unless socket_created.include? 'Created session'
+      log.debug "Unable to create mutagen docker socket \"#{socketname}\""
+      return false
+    end
+
+    log.debug "Created the mutagen docker socket \"#{socketname}\""
+    true
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  private
+
+  # Get git branch.
+  def _mutagen_socket_docker_socket(socketname, hostsock)
+    cmd_create_socket = format(
+      config.active['cmd_mutagen_forward_socket_docker'],
+      socketname: socketname,
+      hostsock: hostsock,
+      container: @hostname,
+      hostlabel: @hostlabel,
+      takellabel: @takellabel
+    )
+    run cmd_create_socket
+  end
+end

data/lib/takeltau/self/commands.rb

@@ -27,7 +27,7 @@ module SelfCommands
   # Manipulate output of thor list command.
   def _manipulate_output_(thor_list)
     tau_commands = thor_list.gsub("takeltau\n", '')
-    tau_commands.gsub!("------\n", '')
+    tau_commands.gsub!("--------\n", '')
     tau_commands.gsub!('thor ', 'tau ')
     tau_commands.gsub!(/(.*)takeltau:c_l_i:(.*)#(.*)/, '\1\2               #\3')
     tau_commands.gsub!(/.*COMMAND.*\n/, '')

data/lib/takeltau/version

@@ -1 +1 @@
-0.38.0
+0.39.2

data/lib/takeltau.rb

@@ -40,6 +40,7 @@ require_relative 'takeltau/init/cli'
 require_relative 'takeltau/mutagen/check/daemon'
 require_relative 'takeltau/mutagen/socket/check'
 require_relative 'takeltau/mutagen/socket/create'
+require_relative 'takeltau/mutagen/socket/docker'
 require_relative 'takeltau/mutagen/socket/terminate'
 require_relative 'takeltau/mutagen/socket/tidy'
 require_relative 'takeltau/docker/check/daemon'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.39.2
 platform: ruby
 authors:
 - Takelwerk
@@ -272,6 +272,7 @@ files:
 - lib/takeltau/mutagen/socket/check.rb
 - lib/takeltau/mutagen/socket/cli.rb
 - lib/takeltau/mutagen/socket/create.rb
+- lib/takeltau/mutagen/socket/docker.rb
 - lib/takeltau/mutagen/socket/list.rb
 - lib/takeltau/mutagen/socket/terminate.rb
 - lib/takeltau/mutagen/socket/tidy.rb