takelage 0.30.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df3a519d6d5690b6dd1c9758d720bfff1ebd6afc8a3c116db5651bb223b0266
-  data.tar.gz: d924838d82f60a4d1bab01e151896f0875552726b8a9d8bdb0a6a672f12def91
+  metadata.gz: 6da2e24ce8c09334e2d3bc396e5ee529eab1564216719fc2f362edcb78b6a480
+  data.tar.gz: 5b1ca2322fa5277110e7ed54f9f9e2c2dc8618c1cdcefaadeabbbe744398f2e7
 SHA512:
-  metadata.gz: 8cceb1a7e8200a7217b4bb5b068d8c51b40e7c425921c7150c346964a1d31fbe103dcc1b2f9b90870f3388f5fbe1bb62e3a54f664d564f33b083916288920784
-  data.tar.gz: 40fd4ac0c4782ae56a26a76c3fbe3503252147b78e1ca66cd8ccde97f3e909acd6f084ba177ac31de6d61dc01632f828a448c91d8abb56e59b0cfc31bc3b8863
+  metadata.gz: 986fc63051162a239d4e4ef310f1c0113fe48858d7dfda51b37fcdbb8bfadf7c43f80aa7a4c6804a1ced4cd689422a973b11636a2c676d35639eba13da74d511
+  data.tar.gz: 191305505829cd4da5ee1f8d2bc7e06cb54461a6970ec5af86910d2d0c05f6d66d56b11e107bad12fbfa95a50cc9a1049caf4fb6200b763c19e19be8d3bc7a61

data/README.md

@@ -101,6 +101,7 @@ tau [info status gopass](features/cucumber/features/info/info.status.gopass.feat
 tau [info status gpg](features/cucumber/features/info/info.status.gpg.feature) | Check gpg 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 [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

data/lib/takelage.rb

@@ -44,6 +44,10 @@ require_relative 'takelage/bit/require/import'
 require_relative 'takelage/bit/require/cli'
 require_relative 'takelage/bit/cli'
 require_relative 'takelage/completion/cli'
+require_relative 'takelage/init/packer/lib'
+require_relative 'takelage/init/packer/docker'
+require_relative 'takelage/init/packer/cli'
+require_relative 'takelage/init/cli'
 require_relative 'takelage/mutagen/check/daemon'
 require_relative 'takelage/mutagen/socket/check'
 require_relative 'takelage/mutagen/socket/create'
@@ -147,6 +151,9 @@ module Takelage
     desc 'info [COMMAND] ', 'Get information'
     subcommand 'info', Info
 
+    desc 'init [COMMAND] ', 'Init projects'
+    subcommand 'init', Init
+
     desc 'mutagen [COMMAND] ', 'Manage mutagen'
     subcommand 'mutagen', Mutagen
 

data/lib/takelage/default.yml

@@ -4,7 +4,8 @@ bit_remote: ''
 bit_require_file: 'bitrequire.yml'
 bit_root: '/bit'
 bit_ssh: ''
-cmd_bit_check_workspace_bit_list: 'bit list'
+cmd_bit: 'bit'
+cmd_bit_check_workspace_bit_list: 'bit status'
 cmd_bit_check_workspace_pwd: 'pwd'
 cmd_bit_clipboard_lib_bit_status: 'bit status'
 cmd_bit_clipboard_copy_bit_list_scope: 'bit list --skip-update --json %{scope}'
@@ -29,6 +30,7 @@ cmd_bit_scope_add_scope: 'bit remote add %{remote}/%{scope}'
 cmd_bit_scope_list_find_scopes: 'find -L %{root} -name scope.json'
 cmd_bit_scope_new_bit_init: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
+cmd_docker: 'docker'
 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}$'
@@ -45,6 +47,7 @@ cmd_docker_image_tag_check_docker_images: 'docker images --quiet %{image}'
 cmd_docker_image_tag_list_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:latest'
 cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
+cmd_git: 'git'
 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'
@@ -60,6 +63,11 @@ cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
+cmd_init_packer_lib_bit_init: 'bit init'
+cmd_init_packer_lib_git_init: 'git init && git checkout -b main'
+cmd_init_packer_lib_git_add_all: 'git add --all'
+cmd_init_packer_lib_git_commit_initial: 'git commit -m "Initial commit"'
+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}'
@@ -79,6 +87,7 @@ docker_user: 'takelage'
 git_bit_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
+init_packer_docker_bit_require_import: 'true'
 login_wait_for_sockets: '0'
 mutagen_socket_path_mutagen: '~/.mutagen/daemon/daemon.sock'
 mutagen_socket_path_gpg: '~/.gnupg/S.gpg-agent'

data/lib/takelage/docker/check/daemon.rb

@@ -8,7 +8,7 @@ module DockerCheckDaemon
   def docker_check_daemon
     return true if @docker_daemon_running
 
-    return false unless command_available? 'docker'
+    return false unless command_available_else_error? config.active['cmd_docker']
 
     log.debug 'Check if the docker daemon is running'
 

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

@@ -32,7 +32,7 @@ module InfoStatusBar
     return unless _file_exists? takelage_version_file
 
     _file_read takelage_version_file
-    @bar_list << "takelage: #{@content_file.chomp.green}"
+    @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
   end
 
   # Add tau version info to bar

data/lib/takelage/init/cli.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage init
+  class Init < SubCommandBase
+    desc 'packer [COMMAND]', 'Init packer project'
+    subcommand 'packer', InitPacker
+  end
+end

data/lib/takelage/init/packer/cli.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage info project
+  class InitPacker < SubCommandBase
+    include Thor::Actions
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include ProjectModule
+    include GitCheckClean
+    include GitCheckBit
+    include GitCheckWorkspace
+    include BitCheckWorkspace
+    include BitClipboardLib
+    include BitClipboardCopy
+    include BitClipboardPaste
+    include BitRequireLib
+    include BitRequireImport
+    include InitPackerLib
+    include InitPackerDocker
+
+    argument :name
+
+    # Initialize bit require
+    # rubocop:disable Metrics/MethodLength
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      @bit_require_file = config.active['bit_require_file']
+
+      @ansiblelint = {
+        name: 'ansible/.ansible-lint',
+        template: 'templates/ansiblelint.tt'
+      }
+      @bitrequireyml = {
+        name: 'bitrequire.yml',
+        template: 'templates/bitrequireyml.tt'
+      }
+      @gitignore = {
+        name: '.gitignore',
+        template: 'templates/gitignore.tt'
+      }
+      @groupvarsprojectyml = {
+        name: 'ansible/group_vars/project.yml',
+        template: 'templates/groupvarsprojectyml.tt'
+      }
+      @playbooksiteyml = {
+        name: 'ansible/playbook-site.yml',
+        template: 'templates/playbooksiteyml.tt'
+      }
+      @projectyml = {
+        name: 'project.yml',
+        template: 'templates/projectyml.tt'
+      }
+      @rakefile = {
+        name: 'Rakefile',
+        template: 'templates/Rakefile.tt'
+      }
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    # Provide template path for Thor:Actions
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    #
+    # init packer docker
+    #
+    desc 'docker [NAME]', 'Initialize packer project [NAME] for docker images'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Initialize packer project [NAME] for docker images
+    LONGDESC
+    # Initialize packer project [NAME] for docker images.
+    def docker
+      exit init_packer_docker
+    end
+  end
+end

data/lib/takelage/init/packer/docker.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# takelage init packer docker
+module InitPackerDocker
+  def init_packer_docker
+    log.debug 'Initialize packer project for docker images'
+
+    files = _init_packer_docker_files_get
+
+    return false unless _init_packer_docker_lib_check_prerequisites files
+
+    exit_code = _init_packer_docker_lib_create_project files
+
+    # reinitialize config with newly created files
+    initialize_config
+
+    return false unless _init_packer_docker_bit_require_import
+
+    return false unless exit_code
+
+    true
+  end
+
+  private
+
+  def _init_packer_docker_files_get
+    [
+      @ansiblelint,
+      @bitrequireyml,
+      @gitignore,
+      @groupvarsprojectyml,
+      @playbooksiteyml,
+      @projectyml,
+      @rakefile
+    ]
+  end
+
+  def _init_packer_docker_bit_require_import
+    if config.active['init_packer_docker_bit_require_import'] == 'true'
+      log.info 'Importing bit components'
+      return false unless bit_require_import
+    end
+
+    true
+  end
+end

data/lib/takelage/init/packer/lib.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# takelage info status lib
+module InitPackerLib
+  private
+
+  def _init_packer_docker_lib_check_prerequisites(files)
+    return false unless _init_packer_lib_git_check
+
+    return false unless _init_packer_lib_bit_check
+
+    return false unless _init_packer_lib_files_check files
+
+    true
+  end
+
+  def _init_packer_docker_lib_create_project(files)
+    exit_code = true
+
+    exit_code &&= _init_packer_lib_git_init
+    exit_code &&= _init_packer_lib_bit_init
+    exit_code &&= _init_packer_lib_files_create files
+    exit_code &&= _init_packer_lib_git_add_all
+    exit_code &&= _init_packer_lib_git_commit_initial
+
+    exit_code
+  end
+
+  def _init_packer_lib_bit_check
+    return false unless command_available_else_error? config.active['cmd_bit']
+    return true unless bit_check_workspace
+
+    log.error 'bit is already initialized!'
+    false
+  end
+
+  def _init_packer_lib_bit_init
+    log.info 'Initializing bit workspace'
+    return false unless try config.active['cmd_init_packer_lib_bit_init']
+
+    true
+  end
+
+  def _init_packer_lib_git_check
+    return false unless command_available_else_error? config.active['cmd_git']
+    return true unless git_check_workspace
+
+    log.error 'git is already initialized!'
+    false
+  end
+
+  def _init_packer_lib_git_init
+    log.info 'Initializing git workspace'
+    return false unless try config.active['cmd_init_packer_lib_git_init']
+
+    true
+  end
+
+  def _init_packer_lib_files_check(files)
+    exit_status = true
+    files.each do |file|
+      if _file_exists? file[:name]
+        log.error "File exists: #{file[:name]}"
+        exit_status = false
+      end
+    end
+    exit_status
+  end
+
+  def _init_packer_lib_files_create(files)
+    files.each do |file|
+      template file[:template], file[:name]
+    end
+    true
+  end
+
+  # git add --all.
+  def _init_packer_lib_git_add_all
+    log.info 'Preparing initial git commit'
+    return false unless try config.active['cmd_init_packer_lib_git_add_all']
+
+    true
+  end
+
+  # git commit -m "Initial commit".
+  def _init_packer_lib_git_commit_initial
+    log.info 'Saving initial git commit'
+    return false unless try config.active['cmd_init_packer_lib_git_commit_initial']
+
+    true
+  end
+end

data/lib/takelage/init/packer/templates/Rakefile.tt

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+load 'rake/meta/Rakefile'

data/lib/takelage/init/packer/templates/ansiblelint.tt

@@ -0,0 +1,3 @@
+---
+skip_list:
+  - role-name

data/lib/takelage/init/packer/templates/bitrequireyml.tt

@@ -0,0 +1,13 @@
+---
+scopes:
+  takelage.ansible:
+  - name: ansible/molecule/default
+  - name: ansible/molecule/image
+  - name: ansible/roles/takel-cleanup
+  takelage.packer:
+  - name: packer/templates/takelage/docker
+  takelage.rake:
+  - name: rake/ansible
+  - name: rake/images
+  - name: rake/meta
+  - name: rake/rubylint

data/lib/takelage/init/packer/templates/gitignore.tt

@@ -0,0 +1,16 @@
+.DS_Store
+.idea
+*.iml
+*.iso
+packer/images
+packer/packer_cache
+__pycache__/
+*.pyc
+.pytest_cache
+pytestdebug.log
+*.retry
+takelage.log
+takelage.yml
+.vagrant
+vault-password-file
+*.vdi

data/lib/takelage/init/packer/templates/groupvarsprojectyml.tt

@@ -0,0 +1,2 @@
+---
+project: "{{ lookup('pipe', 'tau project') | from_yaml }}"

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

@@ -0,0 +1,6 @@
+---
+- name: (playbook-site) create project
+  hosts: all
+  gather_facts: false
+  roles:
+    - takel-cleanup

data/lib/takelage/init/packer/templates/projectyml.tt

@@ -0,0 +1,19 @@
+---
+name: <%= name %>
+version: 0.1.0
+
+pipelines:
+  - prod
+
+images:
+  project:
+    base_user: takelage
+    base_repo: takelslim
+    base_tag: latest
+    layers:
+      - site
+    omit_pipeline_name: prod
+    target_user: takelage
+    target_repo: init
+
+local_user: packer_local

data/lib/takelage/lib/config.rb

@@ -68,7 +68,7 @@ module ConfigModule
     if config_key == 'project_root_dir'
       log.error 'Please create a "Rakefile" in the project root directory'
     else
-      log.error "Unset config key. Please configure \"#{config_key}\""
+      log.error "Missing config key. Please configure \"#{config_key}\""
     end
     @configured = false
     false

data/lib/takelage/lib/system.rb

@@ -7,22 +7,26 @@ require 'yaml'
 # Interaction with the operating system
 # rubocop:disable Metrics/ModuleLength
 module SystemModule
-  # Check if a command is available
+  # Check if a command is available else log error message
   # @return [Boolean] is the command available?
-  def command_available?(command)
-    return true if instance_variable_get("@command_available_#{command}")
-
-    log.debug "Check if the command \"#{command}\" is available"
+  def command_available_else_error?(command)
+    unless _command_available? command
+      log.error "The command \"#{command}\" is not available"
+      return false
+    end
 
-    status = try "which #{command}"
+    command_available command
+  end
 
-    unless status.exitstatus.zero?
-      log.debug "The command \"#{command}\" is not available"
+  # Check if a command is available else log warning message
+  # @return [Boolean] is the command available?
+  def command_available_else_warn?(command)
+    unless _command_available? command
+      log.warn "The command \"#{command}\" is not available"
       return false
     end
 
-    log.debug "The command \"#{command}\" is available"
-    instance_variable_set("@command_available_#{command}", true)
+    command_available command
   end
 
   # Convert hash to yaml.
@@ -118,6 +122,23 @@ module SystemModule
 
   private
 
+  # Check if command is available
+  def _command_available?(command)
+    return true if instance_variable_get("@command_available_#{command}")
+
+    log.debug "Check if the command \"#{command}\" is available"
+    status = try "which #{command}"
+    return false unless status.exitstatus.zero?
+
+    true
+  end
+
+  # Command is available
+  def command_available(command)
+    log.debug "The command \"#{command}\" is available"
+    instance_variable_set("@command_available_#{command}", true)
+  end
+
   # Check if file exists.
   def _file_exists?(file)
     unless File.exist? File.expand_path(file)

data/lib/takelage/mutagen/check/daemon.rb

@@ -9,7 +9,7 @@ module MutagenCheckDaemon
   def mutagen_check_daemon
     return true if @mutagen_daemon_available
 
-    return false unless command_available? 'mutagen'
+    return false unless command_available_else_warn? config.active['cmd_mutagen']
 
     log.debug 'Check mutagen status'
 

data/lib/takelage/version

@@ -1 +1 @@
-0.30.0
+0.32.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Geospin
@@ -126,16 +126,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +259,17 @@ files:
 - lib/takelage/info/status/gpg.rb
 - lib/takelage/info/status/lib.rb
 - lib/takelage/info/status/ssh.rb
+- lib/takelage/init/cli.rb
+- lib/takelage/init/packer/cli.rb
+- lib/takelage/init/packer/docker.rb
+- lib/takelage/init/packer/lib.rb
+- lib/takelage/init/packer/templates/Rakefile.tt
+- lib/takelage/init/packer/templates/ansiblelint.tt
+- lib/takelage/init/packer/templates/bitrequireyml.tt
+- lib/takelage/init/packer/templates/gitignore.tt
+- lib/takelage/init/packer/templates/groupvarsprojectyml.tt
+- lib/takelage/init/packer/templates/playbooksiteyml.tt
+- lib/takelage/init/packer/templates/projectyml.tt
 - lib/takelage/lib/config.rb
 - lib/takelage/lib/logging.rb
 - lib/takelage/lib/project.rb
@@ -290,7 +301,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="