takelage 0.32.4 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527739bd9feff96d4a013476e4f6f83f60bf7b5aa0b24511234f6f97cf23a1bf
-  data.tar.gz: 6a8acf96580ece501883ffa91ec9093561d00dc08120c11179a2e56b9f77d769
+  metadata.gz: 0d2e5df02842f62ccd102245656fcdf8f0de8724b14a2486062d30400984d600
+  data.tar.gz: 181fdb63518c7ef9bdbfe269c94619a216420d0607daeadf8bb70adf533bb649
 SHA512:
-  metadata.gz: '0443059c587e02ed138d3f345d8e796b49babedfccfd2aa0eb66d631caea7d8fd527676f7b3cf73c1534d616069b244d28ac42c449c580866278e54b28d1ff00'
-  data.tar.gz: 5d995b2274173b2d77aa1c2bf5cf9d3d8910521ab221986d61d7608e8274c9c1102ea3dd81024f6eeede0fc08e9270561f5d57d0f8a1eeb8215cc7cd9e4f6b17
+  metadata.gz: 3a1023e6c0ad07039250ac980cdcbb0ff127831569c0feccf712e4b66e04505ea06aa2313ae64ead60b5ebc5ab2c9c54db365a5bc570c81a94de7767edd2ebcf
+  data.tar.gz: afbdb736f9d99c6dd34b78d8ee00e1a09337e3cded509ff06bed177cb2bc548e0bcda51fbc7bfa52da9b6c5d9ebf44bc43b9cad76005855797af8e23dbaf9bfb

data/lib/takelage.rb

@@ -44,9 +44,11 @@ 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/lib'
 require_relative 'takelage/init/packer/docker'
 require_relative 'takelage/init/packer/cli'
+require_relative 'takelage/init/takelage/rake'
+require_relative 'takelage/init/takelage/cli'
 require_relative 'takelage/init/cli'
 require_relative 'takelage/mutagen/check/daemon'
 require_relative 'takelage/mutagen/socket/check'

data/lib/takelage/default.yml

@@ -63,10 +63,10 @@ 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_init_lib_bit_init: 'bit init'
+cmd_init_lib_git_init: 'git init && git checkout -b main'
+cmd_init_lib_git_add_all: 'git add --all'
+cmd_init_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'
@@ -87,7 +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'
+init_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/info/status/bar.rb

@@ -26,7 +26,7 @@ module InfoStatusBar
 
   private
 
-  # Add takelage version info to bar
+  # Add takelage version info to bar.
   def _info_status_bar_takelage
     takelage_version_file = '/etc/takelage_version'
     return unless _file_exists? takelage_version_file
@@ -35,24 +35,24 @@ module InfoStatusBar
     @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
   end
 
-  # Add tau version info to bar
+  # Add tau version info to bar.
   def _info_status_bar_tau
     @bar_list << "tau: #{Takelage::VERSION.green}"
   end
 
-  # Add git status info to bar
+  # Add git status info to bar.
   def _info_status_bar_git
     @status_git = info_status_git
     @bar_list << ("git: #{@status_git ? 'ok'.green : 'no'.red}")
   end
 
-  # Add gopass status info to bar
+  # Add gopass status info to bar.
   def _info_status_bar_gopass
     @status_gopass = info_status_gopass
     @bar_list << ("gopass: #{@status_gopass ? 'ok'.green : 'no'.red}")
   end
 
-  # Add gpg status info to bar
+  # Add gpg status info to bar.
   def _info_status_bar_gpg
     if @status_git || @status_gopass
       @bar_list << "gpg: #{'ok'.green}"
@@ -62,18 +62,18 @@ module InfoStatusBar
     @bar_list << ("gpg: #{info_status_gpg ? 'ok'.green : 'no'.red}")
   end
 
-  # Add mutagen status info to bar
+  # Add mutagen status info to bar.
   def _info_status_bar_mutagen
     @bar_list << ("mutagen: #{mutagen_check_daemon ? 'ok'.green : 'no'.red}")
   end
 
-  # Add ssh status info to bar
+  # Add ssh status info to bar.
   def _info_status_bar_ssh
     @bar_list << ("ssh: #{info_status_ssh ? 'ok'.green : 'no'.red}")
   end
 end
 
-# Amend String class with colorization
+# Amend String class with colorization.
 class String
   # Colorize strings
   def colorize(color_code)

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

@@ -13,7 +13,7 @@ module InfoStatusGit
 
     if root.chomp.empty?
       log.error 'Cannot determine project root directory'
-      log.info 'Is there a Rakefile in the project root directory?'
+      log.warn 'Is there a Rakefile in the project root directory?'
       return false
     end
 

data/lib/takelage/init/cli.rb

@@ -5,5 +5,8 @@ module Takelage
   class Init < SubCommandBase
     desc 'packer [COMMAND]', 'Init packer project'
     subcommand 'packer', InitPacker
+
+    desc 'takelage [COMMAND]', 'Init takelage project'
+    subcommand 'takelage', InitTakelage
   end
 end

data/lib/takelage/init/lib.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# takelage init takelage lib
+module InitLib
+  private
+
+  # Import bit components.
+  def _init_lib_bit_require_import
+    if config.active['init_bit_require_import'] == 'true'
+      log.info 'Importing bit components'
+      return false unless bit_require_import
+    end
+
+    true
+  end
+
+  # Check bit.
+  def _init_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
+
+  # Init bit.
+  def _init_lib_bit_init
+    log.info 'Initializing bit workspace'
+    return false unless try config.active['cmd_init_lib_bit_init']
+
+    true
+  end
+
+  # Check git.
+  def _init_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
+
+  # Init git.
+  def _init_lib_git_init
+    log.info 'Initializing git workspace'
+    return false unless try config.active['cmd_init_lib_git_init']
+
+    true
+  end
+
+  # Check files.
+  def _init_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
+
+  # Create files.
+  def _init_lib_files_create(files)
+    files.each do |file|
+      template file[:template], file[:name]
+    end
+    true
+  end
+
+  # Run git add --all.
+  def _init_lib_git_add_all
+    log.info 'Preparing initial git commit'
+    return false unless try config.active['cmd_init_lib_git_add_all']
+
+    true
+  end
+
+  # Run git commit -m "Initial commit".
+  def _init_lib_git_commit_initial
+    log.info 'Saving initial git commit'
+    return false unless try config.active['cmd_init_lib_git_commit_initial']
+
+    true
+  end
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Takelage
-  # takelage info project
+  # takelage init packer
   class InitPacker < SubCommandBase
     include Thor::Actions
     include LoggingModule
@@ -17,12 +17,13 @@ module Takelage
     include BitClipboardPaste
     include BitRequireLib
     include BitRequireImport
-    include InitPackerLib
+    include InitLib
     include InitPackerDocker
 
     argument :name
 
     # Initialize bit require
+    # Define templates
     # rubocop:disable Metrics/MethodLength
     def initialize(args = [], local_options = {}, configuration = {})
       # initialize thor parent class
@@ -40,7 +41,7 @@ module Takelage
       }
       @gitignore = {
         name: '.gitignore',
-        template: 'templates/gitignore.tt'
+        template: '../templates/gitignore.tt'
       }
       @groupvarsprojectyml = {
         name: 'ansible/group_vars/all/project.yml',
@@ -56,7 +57,7 @@ module Takelage
       }
       @rakefile = {
         name: 'Rakefile',
-        template: 'templates/Rakefile.tt'
+        template: '../templates/Rakefile.tt'
       }
     end
     # rubocop:enable Metrics/MethodLength

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

@@ -2,19 +2,21 @@
 
 # takelage init packer docker
 module InitPackerDocker
+  # Backend method for init docker packer.
+  # @return [Boolean] successful init?
   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
+    return false unless _init_packer_docker_check_prerequisites files
 
-    exit_code = _init_packer_docker_lib_create_project files
+    exit_code = _init_packer_docker_create_project files
 
     # reinitialize config with newly created files
     initialize_config
 
-    return false unless _init_packer_docker_bit_require_import
+    return false unless _init_lib_bit_require_import
 
     return false unless exit_code
 
@@ -23,6 +25,7 @@ module InitPackerDocker
 
   private
 
+  # Add templates.
   def _init_packer_docker_files_get
     [
       @ansiblelint,
@@ -35,12 +38,27 @@ module InitPackerDocker
     ]
   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
+  # Check prerequisites.
+  def _init_packer_docker_check_prerequisites(files)
+    return false unless _init_lib_git_check
+
+    return false unless _init_lib_bit_check
+
+    return false unless _init_lib_files_check files
 
     true
   end
+
+  # Create project.
+  def _init_packer_docker_create_project(files)
+    exit_code = true
+
+    exit_code &&= _init_lib_git_init
+    exit_code &&= _init_lib_bit_init
+    exit_code &&= _init_lib_files_create files
+    exit_code &&= _init_lib_git_add_all
+    exit_code &&= _init_lib_git_commit_initial
+
+    exit_code
+  end
 end

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

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage init takelage
+  class InitTakelage < 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 InitLib
+    include InitTakelageRake
+
+    argument :name
+
+    # Initialize bit require
+    # Define templates
+    # 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']
+
+      @bitrequireyml = {
+        name: 'bitrequire.yml',
+        template: 'templates/bitrequireyml.tt'
+      }
+      @gitignore = {
+        name: '.gitignore',
+        template: '../templates/gitignore.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 takelage rake
+    #
+    desc 'rake [NAME]', 'Initialize takelage rake project [NAME]'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Initialize takelage rake project [NAME]
+    LONGDESC
+    # Initialize takelage rake project [NAME].
+    def rake
+      exit init_takelage_rake
+    end
+  end
+end

data/lib/takelage/init/takelage/rake.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# takelage init takelage rake
+module InitTakelageRake
+  # Backend method for init takelage rake.
+  # @return [Boolean] successful init?
+  def init_takelage_rake
+    log.debug 'Initialize takelage rake project'
+
+    files = _init_takelage_rake_files_get
+
+    return false unless _init_takelage_rake_check_prerequisites files
+
+    exit_code = _init_takelage_rake_create_project files
+
+    # reinitialize config with newly created files
+    initialize_config
+
+    return false unless _init_lib_bit_require_import
+
+    return false unless exit_code
+
+    true
+  end
+
+  private
+
+  # Add templates.
+  def _init_takelage_rake_files_get
+    [
+      @bitrequireyml,
+      @gitignore,
+      @projectyml,
+      @rakefile
+    ]
+  end
+
+  # Check prerequisites.
+  def _init_takelage_rake_check_prerequisites(files)
+    return false unless _init_lib_git_check
+
+    return false unless _init_lib_bit_check
+
+    return false unless _init_lib_files_check files
+
+    true
+  end
+
+  # Create project.
+  def _init_takelage_rake_create_project(files)
+    exit_code = true
+
+    exit_code &&= _init_lib_git_init
+    exit_code &&= _init_lib_bit_init
+    exit_code &&= _init_lib_files_create files
+    exit_code &&= _init_lib_git_add_all
+    exit_code &&= _init_lib_git_commit_initial
+
+    exit_code
+  end
+end

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

@@ -0,0 +1,5 @@
+---
+scopes:
+  takelage.rake:
+  - name: rake/meta
+  - name: rake/rubylint

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

@@ -0,0 +1,3 @@
+---
+name: <%= name %>
+version: 0.1.0

data/lib/takelage/version

@@ -1 +1 @@
-0.32.4
+0.33.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.32.4
+  version: 0.33.1
 platform: ruby
 authors:
 - Geospin
@@ -260,16 +260,20 @@ files:
 - lib/takelage/info/status/lib.rb
 - lib/takelage/info/status/ssh.rb
 - lib/takelage/init/cli.rb
+- lib/takelage/init/lib.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/init/takelage/cli.rb
+- lib/takelage/init/takelage/rake.rb
+- lib/takelage/init/takelage/templates/bitrequireyml.tt
+- lib/takelage/init/takelage/templates/projectyml.tt
+- lib/takelage/init/templates/Rakefile.tt
+- lib/takelage/init/templates/gitignore.tt
 - lib/takelage/lib/config.rb
 - lib/takelage/lib/logging.rb
 - lib/takelage/lib/project.rb

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

@@ -1,92 +0,0 @@
-# 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