cmt 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1229896c4197b67c41c64fe2c898e620adfe16c3b7f1ce73c49895ad4932df2c
-  data.tar.gz: 1ed6a854c9fc5327e3886dd0146aaa25d3865e8ce340532a9fd499faa6a74fe0
+  metadata.gz: 4df6c8d43f4b993e82bbf050c270c7d891e949f31f5c7e68ea2eeb4eb5703b8a
+  data.tar.gz: cebf41863388b9dc98cc4b6f60a1c3fc097e61c26d52b073f44be5e368ec1013
 SHA512:
-  metadata.gz: c59e660257922f1249819a2ba04c67ca0c59d4333170745437cdd404e83ee088f75823dbc0422d2b901a085fc23a3d007c3a2bc57cacde642c30f3ed8cbe7fc1
-  data.tar.gz: d8c503eb326f7c57c302fca0565b78fe0e46203b4a295fe31a6cd2bfd770ac7534a8d0f26c47f6a4ea7f9f34f7521bf9df6593872d5e9fe7e525ff6609abcef9
+  metadata.gz: dafe415e6f6af6928593482ac77f41c6b3de7c4f8354e6492f0aee1bb6a1fd27d2f7fdad7c6c56dbcac45fff132646f1f6203207c130574102de574f4b111c12
+  data.tar.gz: 3630fcfeaba1c8f8d7a28478a185ffddcd059c4d75b4b155d669aa428d66efb278421716ab9f2bb15c523e803c7451346910a49b7e8fea0a6e66529b84665c96

data/lib/cmt.rb

@@ -1,31 +1,42 @@
-require "thor"
-require "pathname"
-require "fileutils"
-require "json"
-require "logger"
-
-require_relative "config/git_config"
-require_relative "dotfiles/dotfiles_cli"
-require_relative "pkg/pkg"
-require_relative "version"
-
-$logger = Logger.new($stdout)
-$logger.formatter = proc do |severity, datetime, _progname, msg|
-  date_format = datetime.strftime("%Y-%m-%d %H:%M:%S")
-  JSON.dump(date: date_format, severity: severity.ljust(5), pid: "##{Process.pid}", message: msg) + "\n" # rubocop:disable Style/StringConcatenation
-end
+require 'thor'
+require 'pathname'
+require 'fileutils'
+require 'json'
+
+require_relative 'config/git_config'
+require_relative 'env/env_cli'
+require_relative 'pkg/pkg'
+require_relative 'util/log'
+require_relative 'version'
+
+class Cmt < Pkg
+  desc 'init', 'Init'
+  option :force, type: :boolean, default: false
+  def init(repo)
+    force = options['force']
+
+    if File.exist? Config::CONFIG_DIR
+      if force
+        FileUtils.rm_rf(Config::CONFIG_DIR)
+      else
+        Log::LOGGER.error("Config already exists at '#{Config::CONFIG_DIR}'")
+        abort("Config already exists at '#{Config::CONFIG_DIR}'")
+      end
+    end
+
+    `git clone #{repo} #{Config::CONFIG_DIR}`
+  end
 
-class Cmt < Thor
-  desc "config SUBCOMMAND ...ARGS", "manage set of tracked repositories"
-  subcommand "config", GitConfig
+  desc 'config SUBCOMMAND ...ARGS', 'manage set of tracked repositories'
+  subcommand 'config', GitConfig
 
-  desc "dotfiles SUBCOMMAND ...ARGS", "manage set of tracked repositories"
-  subcommand "dotfiles", DotfilesCli
+  desc 'env SUBCOMMAND ...ARGS', 'manage set of tracked repositories'
+  subcommand 'env', EnvCli
 
-  desc "pkg SUBCOMMAND ...ARGS", "manage set of tracked repositories"
-  subcommand "pkg", Pkg
+  # desc "pkg SUBCOMMAND ...ARGS", "manage set of tracked repositories"
+  # subcommand "pkg", Pkg
 
-  desc "version", "Print version"
+  desc 'version', 'Print version'
   def version
     puts(VERSION)
   end

data/lib/config/config.rb

@@ -1,18 +1,19 @@
-require "thor"
-require "fileutils"
+require 'thor'
+require 'fileutils'
+require 'json'
 
-$CONFIG_DIR = File.join(Dir.home, ".config", "cmt")
+module Config
+  CONFIG_DIR = File.join(Dir.home, '.config', 'cmt').freeze
 
-class Config
   def self.get_config_json(file, default_config)
     FileUtils.mkdir_p File.dirname(file)
-    File.write(file, JSON.pretty_generate(default_config, { indent: "    " })) unless File.exist?(file)
+    File.write(file, JSON.pretty_generate(default_config, { indent: '    ' })) unless File.exist?(file)
 
     config = JSON.load_file(file)
     default_config.merge(config)
   end
 
   def self.write_config_file(file, config)
-    File.write(file, JSON.pretty_generate(config, { indent: "    " }))
+    File.write(file, JSON.pretty_generate(config, { indent: '    ' }))
   end
 end

data/lib/config/git_config.rb

@@ -1,38 +1,39 @@
-require "thor"
+require 'thor'
 
-require_relative "config"
+require_relative 'config'
+require_relative '../util/log'
 
 class GitConfig < Thor
-  desc "init", "Init"
+  desc 'init', 'Init'
   option :force, type: :boolean, default: false
   def init(repo)
-    force = options["force"]
+    force = options['force']
 
-    if File.exist? $CONFIG_DIR
+    if File.exist? Config::CONFIG_DIR
       if force
-        FileUtils.rm_rf($CONFIG_DIR)
+        FileUtils.rm_rf(Config::CONFIG_DIR)
       else
-        $logger.error("Config already exists at '#{$CONFIG_DIR}'")
-        abort("Config already exists at '#{$CONFIG_DIR}'")
+        Log::LOGGER.error("Config already exists at '#{Config::CONFIG_DIR}'")
+        abort("Config already exists at '#{Config::CONFIG_DIR}'")
       end
     end
 
-    `git clone #{repo} #{$CONFIG_DIR}`
+    `git clone #{repo} #{Config::CONFIG_DIR}`
   end
 
-  desc "update", "update"
-  option :message, default: "Update config"
+  desc 'update', 'update'
+  option :message, default: 'Update config'
   def update
     message = options['message']
-    Dir.chdir($CONFIG_DIR) do
+    Dir.chdir(Config::CONFIG_DIR) do
       changes = `git status --porcelain=v1`
       num_changes = changes.split.length
 
       if num_changes.zero?
-        $logger.error("No changes to commit in '#{$CONFIG_DIR}'")
-        abort("No changes to commit in '#{$CONFIG_DIR}'")
+        Log::LOGGER.error("No changes to commit in '#{Config::CONFIG_DIR}'")
+        abort("No changes to commit in '#{Config::CONFIG_DIR}'")
       else
-        $logger.info("Commit changes")
+        Log::LOGGER.info('Commit changes')
         system 'git', 'add', '.'
         system 'git', 'commit', '-m', "'#{message}'"
         system 'git', 'push'
@@ -40,31 +41,31 @@ class GitConfig < Thor
     end
   end
 
-  desc "status", "Show git status in '#{$CONFIG_DIR}'"
+  desc 'status', "Show git status in '#{Config::CONFIG_DIR}'"
   def status(*args)
-    Dir.chdir($CONFIG_DIR) do
+    Dir.chdir(Config::CONFIG_DIR) do
       system 'git', 'status', *args
     end
   end
 
-  desc "pull", "Pull newest changes in '#{$CONFIG_DIR}'"
+  desc 'pull', "Pull newest changes in '#{Config::CONFIG_DIR}'"
   def pull(*args)
-    Dir.chdir($CONFIG_DIR) do
+    Dir.chdir(Config::CONFIG_DIR) do
       system 'git', 'pull', *args
     end
   end
 
-  desc "exec", "Execute any git command in '#{$CONFIG_DIR}'"
+  desc 'exec', "Execute any git command in '#{Config::CONFIG_DIR}'"
   def exec(*args)
-    Dir.chdir($CONFIG_DIR) do
+    Dir.chdir(Config::CONFIG_DIR) do
       system 'git', *args
     end
   end
 
-  desc "code", "Open '#{$CONFIG_DIR}' in code"
+  desc 'code', "Open '#{Config::CONFIG_DIR}' in code"
   def code(*args)
-    $logger.info("Open '#{$CONFIG_DIR}' in code")
-    Dir.chdir($CONFIG_DIR) do
+    Log::LOGGER.info("Open '#{Config::CONFIG_DIR}' in code")
+    Dir.chdir(Config::CONFIG_DIR) do
       system 'code', '.', *args
     end
   end

data/lib/{dotfiles/dotfiles.rb → env/env.rb}

@@ -1,22 +1,23 @@
-require "thor"
+require 'thor'
 require 'pathname'
 require 'fileutils'
 require 'json'
-require "logger"
+require 'logger'
 
 require_relative '../config/config'
 require_relative '../util/file_util'
+require_relative '../util/log'
 
-class Dotfiles
-  CONFIG_SUB_DIR = 'dotfiles'.freeze
-  ROOT_PATH = File.join($CONFIG_DIR, CONFIG_SUB_DIR).freeze
-  CONFIG_FILE = File.join(ROOT_PATH, 'dotfiles.json').freeze
+class Env
+  CONFIG_SUB_DIR = 'env'.freeze
+  ROOT_PATH = File.join(Config::CONFIG_DIR, CONFIG_SUB_DIR).freeze
+  CONFIG_FILE = File.join(ROOT_PATH, 'env.json').freeze
   FILES_PATH = File.join(ROOT_PATH, 'files').freeze
   FOLDERS_PATH = File.join(ROOT_PATH, 'folders').freeze
 
   DEFAULT_CONFIG = {
-    "files" => [],
-    "folders" => []
+    'files' => [],
+    'folders' => []
   }.freeze
 
   def add(file)
@@ -47,7 +48,7 @@ class Dotfiles
 
     Config.write_config_file(CONFIG_FILE, config)
 
-    $logger.info("Added '#{parsed_file}'")
+    Log::LOGGER.info("Added '#{parsed_file}'")
   end
 
   def remove(file)
@@ -66,11 +67,11 @@ class Dotfiles
 
     Config.write_config_file(CONFIG_FILE, config)
 
-    $logger.info("Removed '#{local_file}'")
+    Log::LOGGER.info("Removed '#{local_file}'")
   end
 
   def apply
-    $logger.info('Start apply')
+    Log::LOGGER.info('Start apply')
 
     config = Config.get_config_json(CONFIG_FILE, DEFAULT_CONFIG)
     files = config['files']
@@ -79,7 +80,7 @@ class Dotfiles
       dest_file = FileUtil.to_system_file(file)
 
       abs_file = File.join(FILES_PATH, file)
-      $logger.debug("Copy #{abs_file} to #{dest_file}")
+      Log::LOGGER.debug("Copy #{abs_file} to #{dest_file}")
 
       FileUtils.cp_r(abs_file, dest_file, remove_destination: true)
     end
@@ -90,16 +91,16 @@ class Dotfiles
       dest_file = File.dirname(FileUtil.to_system_file(folder))
 
       abs_file = File.join(FOLDERS_PATH, folder)
-      $logger.debug("Copy #{abs_file} to #{dest_file}")
+      Log::LOGGER.debug("Copy #{abs_file} to #{dest_file}")
 
       FileUtils.cp_r(abs_file, dest_file, remove_destination: true)
     end
 
-    $logger.info('Finished apply')
+    Log::LOGGER.info('Finished apply')
   end
 
   def sync
-    $logger.info('Start sync')
+    Log::LOGGER.info('Start sync')
 
     config = Config.get_config_json(CONFIG_FILE, DEFAULT_CONFIG)
     files = config['files']
@@ -108,7 +109,7 @@ class Dotfiles
       dest_file = FileUtil.to_system_file(file)
 
       abs_file = File.join(FILES_PATH, file)
-      $logger.debug("Copy #{dest_file} to #{abs_file}")
+      Log::LOGGER.debug("Copy #{dest_file} to #{abs_file}")
 
       FileUtils.cp_r(dest_file, abs_file, remove_destination: true)
     end
@@ -119,12 +120,12 @@ class Dotfiles
       dest_file = FileUtil.to_system_file(folder)
 
       abs_file = File.dirname(File.join(FOLDERS_PATH, folder))
-      $logger.debug("Copy #{dest_file} to #{abs_file}")
+      Log::LOGGER.debug("Copy #{dest_file} to #{abs_file}")
 
       FileUtils.cp_r(dest_file, abs_file, remove_destination: true)
     end
 
-    $logger.info('Finished sync')
+    Log::LOGGER.info('Finished sync')
   end
 
   def get_local_path(file)

data/lib/env/env_cli.rb

@@ -0,0 +1,25 @@
+require_relative 'env'
+
+class EnvCli < Thor
+  ENV = Env.new
+
+  desc 'add <file>', 'Add file/folder to sync'
+  def add(file)
+    ENV.add(file)
+  end
+
+  desc 'remove <file>', 'Remove file/folder from sync'
+  def remove(file)
+    ENV.remove(file)
+  end
+
+  desc 'apply', 'Copies all env defined in the user config to the system'
+  def apply
+    ENV.apply
+  end
+
+  desc 'sync', 'Updates all files defined in the user config from the system to the config dir'
+  def sync
+    ENV.sync
+  end
+end

data/lib/pkg/pkg.rb

@@ -1,104 +1,84 @@
-require "thor"
+require 'thor'
 
-require_relative "pkgm/dnf"
-require_relative "pkgm/pacman"
-require_relative "pkgm/yay"
-require_relative "pkgm/pip"
-require_relative "pkgm/snap"
-require_relative "pkgm/winget"
-require_relative "pkg_config"
+require_relative 'pkgm/dnf'
+require_relative 'pkgm/pacman'
+require_relative 'pkgm/yay'
+require_relative 'pkgm/pip'
+require_relative 'pkgm/snap'
+require_relative 'pkgm/winget'
+require_relative 'pkg_config'
+require_relative '../util/log'
 
 class Pkg < Thor
   SYSTEM_PACKAGE_MANGER = {
-    "manjaro" => Pacman,
-    "fedora" => Dnf,
-    "windows" => Winget
+    'manjaro' => 'pacman',
+    'fedora' => 'dnf',
+    'windows' => 'winget'
   }.freeze
-  OTHER_PACKAGE_MANGER = {
-    "pip" => Pip,
-    "snap" => Snap,
-    "yay" => Yay
+  PACKAGE_MANGER = {
+    'pacman' => Pacman,
+    'dnf' => Dnf,
+    'winget' => Winget,
+    'pip' => Pip,
+    'snap' => Snap,
+    'yay' => Yay
   }.freeze
-  RELEASE_FILE = "/etc/os-release".freeze
+  RELEASE_FILE = '/etc/os-release'.freeze
 
-  desc "install_all", "Install"
-  option "pkgm", default: "system"
-  def install_all(*args)
-    manager = get_package_manager(options["pkgm"])
+  # desc "install_all", "Install"
+  # option "pkgm", default: "system"
+  # def install_all(*args)
+  #   manager = Pkg.get_package_manager(options["pkgm"])
 
-    config_file = PkgConfig.get_config_file(manager)
-    config = Config.get_config_json(config_file, PkgConfig.default_config)
+  #   config_file = PkgConfig.get_config_file(manager)
+  #   config = Config.get_config_json(config_file, PkgConfig.default_config)
 
-    packages = config["packages"]
+  #   packages = config["packages"]
 
-    manager.install_all(packages, *args)
-  end
+  #   manager.install_all(packages, *args)
+  # end
 
-  desc "install", "Install"
-  option "pkgm", default: "system"
-  def install(package, *args)
-    manager = get_package_manager(options["pkgm"])
+  def self.get_package_manager(pkgm)
+    pkgm = Pkg.get_system_package_manager unless pkgm != 'system'
+    manager = PACKAGE_MANGER[pkgm]
 
-    installed = manager.install(package, *args)
+    if manager.nil?
+      Log::LOGGER.error("'#{pkgm}' is not supported")
+      abort("'#{pkgm}' is not supported")
+    end
 
-    return unless installed
+    Log::LOGGER.info("Using package manager '#{manager}'")
 
-    PkgConfig.add(manager, package)
+    manager
   end
 
-  desc "update", "update"
-  option "pkgm", default: "system"
-  def update(*args)
-    manager = get_package_manager(options["pkgm"])
-
-    manager.update(*args)
-  end
+  def self.get_system_package_manager
+    manager = nil
 
-  desc "uninstall", "uninstall"
-  option "pkgm", default: "system"
-  def uninstall(package, *args)
-    manager = get_package_manager(options["pkgm"])
+    if Gem.win_platform?
+      manager = SYSTEM_PACKAGE_MANGER['windows']
+    else
+      r = { 'distro' => nil }
+      unless File.exist?(RELEASE_FILE)
+        Log::LOGGER.error("'#{RELEASE_FILE}' does not exist")
+        abort("'#{RELEASE_FILE}' does not exist")
+      end
 
-    uninstalled = manager.uninstall(package, *args)
+      File.foreach(RELEASE_FILE) do |line|
+        r = { 'distro' => ::Regexp.last_match(1) } if line =~ /^ID=(.*)/
+      end
 
-    return unless uninstalled
+      manager = SYSTEM_PACKAGE_MANGER[r['distro']]
+    end
 
-    PkgConfig.remove(manager, package)
+    return manager
   end
 
-  no_commands do
-    def get_package_manager(pkgm)
-      manager = nil
-
-      if pkgm == "system"
-
-        if Gem.win_platform?
-          manager = SYSTEM_PACKAGE_MANGER["windows"]
-        else
-          r = { "distro" => nil }
-          unless File.exist?(RELEASE_FILE)
-            $logger.error("'#{RELEASE_FILE}' does not exist")
-            abort("'#{RELEASE_FILE}' does not exist")
-          end
-
-          File.foreach(RELEASE_FILE) do |line|
-            r = { "distro" => ::Regexp.last_match(1) } if line =~ /^ID=(.*)/
-          end
-
-          manager = SYSTEM_PACKAGE_MANGER[r["distro"]]
-        end
-      else
-        manager = OTHER_PACKAGE_MANGER[pkgm]
-      end
-
-      if manager.nil?
-        $logger.error("'#{pkgm}' is not supported")
-        abort("'#{pkgm}' is not supported")
-      end
-
-      $logger.info("Using package manager '#{manager}'")
+  desc 'system SUBCOMMAND ...ARGS', 'manage system packages'
+  subcommand 'system', Pkg.get_package_manager('system')
 
-      manager
-    end
+  PACKAGE_MANGER.each do |key, value|
+    desc "#{key} SUBCOMMAND ...ARGS", "manage #{key} packages"
+    subcommand key, value
   end
 end

data/lib/pkg/pkg_config.rb

@@ -1,35 +1,57 @@
-require "json"
+require 'json'
 
-require_relative "../config/config"
+require_relative '../config/config'
+require_relative '../util/log'
+
+module ConfigOptions
+  PACKAGES = 'packages'.freeze
+  REMOTES = 'remotes'.freeze
+  REPOS = 'repos'.freeze
+end
 
 class PkgConfig
-  CONFIG_SUB_DIR = "pkg".freeze
-  ROOT_PATH = File.join($CONFIG_DIR, CONFIG_SUB_DIR).freeze
+  CONFIG_SUB_DIR = 'pkg'.freeze
+  ROOT_PATH = File.join(Config::CONFIG_DIR, CONFIG_SUB_DIR).freeze
   DEFAULT_CONFIG = {
-    "repos" => [],
-    "packages" => []
+    ConfigOptions::PACKAGES => [],
+    ConfigOptions::REMOTES => [],
+    ConfigOptions::REPOS => []
   }.freeze
 
-  def self.add(pkgm, package)
+  def self.add(pkgm, config_option, item, success)
+    unless success
+      Log::LOGGER.error("#{config_option[1..]} '#{item}' could not be added")
+      abort
+    end
+
     config_file = PkgConfig.get_config_file(pkgm)
+    Log::LOGGER.info("Add '#{item}' to list '#{config_option}' in '#{config_file}")
 
     config = Config.get_config_json(config_file, DEFAULT_CONFIG)
 
-    packages = config["packages"]
+    puts(config)
 
-    packages.append package unless packages.include? package
+    list = config[config_option]
+    list.append item unless list.include? item
+    config[config_option] = list.sort
 
     Config.write_config_file(config_file, config)
   end
 
-  def self.remove(pkgm, package)
+  def self.remove(pkgm, config_option, item, success)
+    unless success
+      Log::LOGGER.error("#{config_option[1..]} '#{item}' could not be removed")
+      abort
+    end
+
     config_file = PkgConfig.get_config_file(pkgm)
+    Log::LOGGER.info("Remove '#{item}' from list '#{config_option}' in '#{config_file}")
 
     config = Config.get_config_json(config_file, DEFAULT_CONFIG)
 
-    packages = config["packages"]
-
-    packages.delete package if packages.include? package
+    list = config[config_option]
+    list.delete item if list.include? item
+    config[config_option] = list.sort
 
     Config.write_config_file(config_file, config)
   end

data/lib/pkg/pkgm/dnf.rb

@@ -1,17 +1,50 @@
-class Dnf
-  def self.install_all(packages, *args)
-    system "sudo", "dnf", "install", *args, *packages
+require 'thor'
+
+require_relative '../pkg_config'
+
+class Dnf < Thor
+  desc 'add_repo', 'Add repository'
+  def add_repo(repo)
+    system 'sudo', 'dnf', 'install', '-y', 'dnf-plugins-core'
+    success = system 'sudo', 'dnf', 'config-manager', '--add-repo', repo
+
+    PkgConfig.add(self.class.name, ConfigOptions::REPOS, repo, success)
   end
 
-  def self.install(package, *args)
-    system "sudo", "dnf", "install", *args, package
+  desc 'remove_repo', 'Remove repository'
+  def remove_repo(repo, url)
+    system 'sudo', 'dnf', 'install', '-y', 'dnf-plugins-core'
+    success = system 'sudo', 'dnf', 'config-manager', '--set-disabled', repo
+
+    PkgConfig.remove(self.class.name, ConfigOptions::REPOS, url, success)
   end
 
-  def self.update(*args)
-    system "sudo", "dnf", "update", *args
+  desc 'list_repos', 'List repos'
+  def list_repos
+    system 'dnf', 'repolist', 'enabled'
   end
 
-  def self.uninstall(package, *args)
-    system "sudo", "dnf", "remove", *args, package
+  # desc "install_all", "Install all"
+  # def install_all(packages, *args)
+  #   system "sudo", "dnf", "install", *args, *packages
+  # end
+
+  desc 'install', 'Install'
+  def install(package, *args)
+    success = system 'sudo', 'dnf', 'install', *args, package
+
+    PkgConfig.add(self.class.name, ConfigOptions::PACKAGES, package, success)
+  end
+
+  desc 'update', 'update'
+  def update(*args)
+    system 'sudo', 'dnf', 'update', *args
+  end
+
+  desc 'uninstall', 'Uninstall'
+  def uninstall(package, *args)
+    success = system 'sudo', 'dnf', 'remove', *args, package
+
+    PkgConfig.remove(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 end

data/lib/pkg/pkgm/pacman.rb

@@ -1,17 +1,29 @@
-class Pacman
-  def self.install_all(packages, *args)
-    system "sudo", "pacman", "-Sy", *args, *packages
-  end
+require 'thor'
+
+require_relative '../pkg_config'
+
+class Pacman < Thor
+  # desc "install_all", "Install all"
+  # def install_all(packages, *args)
+  #   system "sudo", "pacman", "-Sy", *args, *packages
+  # end
 
-  def self.install(package, *args)
-    system "sudo", "pacman", "-Sy", *args, package
+  desc 'install', 'Install'
+  def install(package, *args)
+    success = system 'sudo', 'pacman', '-Sy', *args, package
+
+    PkgConfig.add(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 
-  def self.update(*args)
-    system "sudo", "pacman", "-Syu", *args
+  desc 'update', 'update'
+  def update(*args)
+    system 'sudo', 'pacman', '-Syu', *args
   end
 
-  def self.uninstall(package, *args)
-    system "sudo", "pacman", "-R", *args, package
+  desc 'uninstall', 'Uninstall'
+  def uninstall(package, *args)
+    success = system 'sudo', 'pacman', '-R', *args, package
+
+    PkgConfig.remove(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 end

data/lib/pkg/pkgm/pip.rb

@@ -1,18 +1,31 @@
-class Pip
-  def self.install_all(packages, *args)
-    system "python3", "-m", "pip", "install", *args, *packages
-  end
+require 'thor'
+
+require_relative '../pkg_config'
+require_relative '../../util/log'
+
+class Pip < Thor
+  # desc "install_all", "Install all"
+  # def install_all(packages, *args)
+  #   system "python3", "-m", "pip", "install", *args, *packages
+  # end
 
-  def self.install(package, *args)
-    system "python3", "-m", "pip", "install", *args, package
+  desc 'install', 'Install'
+  def install(package, *args)
+    success = system 'python3', '-m', 'pip', 'install', *args, package
+
+    PkgConfig.add(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 
-  def self.update(*_args)
-    $logger.error("Update is not supported for pip")
-    abort("Update is not supported for pip")
+  desc 'update', 'update'
+  def update(*_args)
+    Log::LOGGER.error('Update is not supported for pip')
+    abort('Update is not supported for pip')
   end
 
-  def self.uninstall(package, *args)
-    system "python3", "-m", "pip", "uninstall", *args, package
+  desc 'uninstall', 'Uninstall'
+  def uninstall(package, *args)
+    success = system 'python3', '-m', 'pip', 'uninstall', *args, package
+
+    PkgConfig.remove(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 end

data/lib/pkg/pkgm/snap.rb

@@ -1,18 +1,31 @@
-class Snap
-  def self.install_all(packages, *args)
-    system "snap", "install", *args, *packages
-  end
+require 'thor'
+
+require_relative '../pkg_config'
+require_relative '../../util/log'
+
+class Snap < Thor
+  # desc "install_all", "Install all"
+  # def install_all(packages, *args)
+  #   system "snap", "install", *args, *packages
+  # end
 
-  def self.install(package, *args)
-    system "snap", "install", *args, package
+  desc 'install', 'Install'
+  def install(package, *args)
+    success = system 'snap', 'install', *args, package
+
+    PkgConfig.add(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 
-  def self.update(*_args)
-    $logger.error("Update is not supported for snap")
-    abort("Update is not supported for snap")
+  desc 'update', 'update'
+  def update(*_args)
+    Log::LOGGER.error('Update is not supported for snap')
+    abort('Update is not supported for snap')
   end
 
-  def self.uninstall(package, *args)
-    system "snap", "remove", *args, package
+  desc 'uninstall', 'Uninstall'
+  def uninstall(package, *args)
+    success = system 'snap', 'remove', *args, package
+
+    PkgConfig.remove(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 end

data/lib/pkg/pkgm/winget.rb

@@ -1,19 +1,31 @@
-class Winget
-  def self.install_all(packages, *args)
-    packages.each do |package|
-      Winget.install(package, *args)
-    end
-  end
+require 'thor'
+
+require_relative '../pkg_config'
+
+class Winget < Thor
+  # desc "install_all", "Install all"
+  # def install_all(packages, *args)
+  #   packages.each do |package|
+  #     Winget.install(package, *args)
+  #   end
+  # end
 
-  def self.install(package, *args)
-    system "winget", "install", *args, "--id=#{package}", "-e"
+  desc 'install', 'Install'
+  def install(package, *args)
+    success = system 'winget', 'install', *args, "--id=#{package}", '-e'
+
+    PkgConfig.add(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 
-  def self.update(*_args)
-    system "winget", "upgrade"
+  desc 'update', 'update'
+  def update(*_args)
+    system 'winget', 'upgrade'
   end
 
-  def self.uninstall(package, *args)
-    system "winget", "uninstall", *args, "--id=#{package}", "-e"
+  desc 'uninstall', 'Uninstall'
+  def uninstall(package, *args)
+    success = system 'winget', 'uninstall', *args, "--id=#{package}", '-e'
+
+    PkgConfig.remove(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 end

data/lib/pkg/pkgm/yay.rb

@@ -1,17 +1,29 @@
-class Yay
-  def self.install_all(packages, *args)
-    system "yay", "-Sy", *args, *packages
-  end
+require 'thor'
+
+require_relative '../pkg_config'
+
+class Yay < Thor
+  # desc "install_all", "Install all"
+  # def install_all(packages, *args)
+  #   system "yay", "-Sy", *args, *packages
+  # end
 
-  def self.install(package, *args)
-    system "yay", "-Sy", *args, package
+  desc 'install', 'Install'
+  def install(package, *args)
+    success = system 'yay', '-Sy', *args, package
+
+    PkgConfig.add(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 
-  def self.update(*args)
-    system "yay", "-Syu", *args
+  desc 'update', 'update'
+  def update(*args)
+    system 'yay', '-Syu', *args
   end
 
-  def self.uninstall(package, *args)
-    system "yay", "-R", *args, package
+  desc 'uninstall', 'Uninstall'
+  def uninstall(package, *args)
+    success = system 'yay', '-R', *args, package
+
+    PkgConfig.remove(self.class.name, ConfigOptions::PACKAGES, package, success)
   end
 end

data/lib/util/file_util.rb

@@ -1,12 +1,12 @@
-class FileUtil
-  USER_HOME = "user-home".freeze
+module FileUtil
+  USER_HOME = 'user-home'.freeze
 
   def self.to_local_file(file)
     local_file = File.absolute_path(file.dup)
 
     if local_file.include? Dir.home
       local_file[Dir.home] = USER_HOME
-    elsif local_file.start_with?("/")
+    elsif local_file.start_with?('/')
       local_file = local_file[1..]
     end
 

data/lib/util/log.rb

@@ -0,0 +1,9 @@
+require 'logger'
+
+module Log
+  LOGGER = Logger.new($stdout)
+  LOGGER.formatter = proc do |severity, datetime, _progname, msg|
+    date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
+    JSON.dump(date: date_format, severity: severity.ljust(5), pid: "##{Process.pid}", message: msg) + "\n" # rubocop:disable Style/StringConcatenation
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 # module Cmt
-VERSION = "0.0.4".freeze
+VERSION = '0.0.6'.freeze
 # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - simon.schuster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -36,8 +36,8 @@ files:
 - lib/cmt.rb
 - lib/config/config.rb
 - lib/config/git_config.rb
-- lib/dotfiles/dotfiles.rb
-- lib/dotfiles/dotfiles_cli.rb
+- lib/env/env.rb
+- lib/env/env_cli.rb
 - lib/pkg/pkg.rb
 - lib/pkg/pkg_config.rb
 - lib/pkg/pkgm/dnf.rb
@@ -47,6 +47,7 @@ files:
 - lib/pkg/pkgm/winget.rb
 - lib/pkg/pkgm/yay.rb
 - lib/util/file_util.rb
+- lib/util/log.rb
 - lib/version.rb
 homepage: https://github.com/Setre14/cmt
 licenses:

data/lib/dotfiles/dotfiles_cli.rb

@@ -1,30 +0,0 @@
-require_relative "dotfiles"
-
-class DotfilesCli < Thor
-  DOTFILES = Dotfiles.new
-
-  desc "init", "Download objects and refs from another repository"
-  def init
-    DOTFILES.init
-  end
-
-  desc "add <file>", "Download objects and refs from another repository"
-  def add(file)
-    DOTFILES.add(file)
-  end
-
-  desc "remove <file>", "Download objects and refs from another repository"
-  def remove(file)
-    DOTFILES.remove(file)
-  end
-
-  desc "apply", "Copies all dotfiles defined in the user config to the system"
-  def apply
-    DOTFILES.apply
-  end
-
-  desc "sync", "Updates all files defined in the user config from the system to the config dir"
-  def sync
-    DOTFILES.sync
-  end
-end