archlinux 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a6439dbf4a18b2f03c70c67dd3707dbe0aa860e147bbb86242a5540173fe09
-  data.tar.gz: 2b56713549a7861cf2602e3132f66c94a66d10419de67fe89ea973a32724e6bc
+  metadata.gz: 9a503802bfcc8eecbd6b5605d96f6cf9de4ded00319ec74c9a091d56840fd86b
+  data.tar.gz: 31a14e3c70aed70bad24a5a716fb3088093866ea2db7c7e46b87ca3c101aad24
 SHA512:
-  metadata.gz: 69423c894c111c99ca618d9b86e17f10e7b040edd8e2facb06fa6dd599fb37d1b4011162da28a13dc73e2f15859437c36cb5284e1b0e393f25c014da5543ea9d
-  data.tar.gz: 4823b44bfdb3ca749657bf81d1b003cd5abb72f08d822d5880890a8cd6b561855f05f5df46b618b48ede8cbe3874f999e3f2372016d50e200a988ca3c73196bf
+  metadata.gz: af974b69974f277bf426b912c7619ba7fc6d87ea4fc7dfa86b5858c6abe9b2a6b862d8d32359344d566c2d4a59fd92a74be14ef3fa4bb1cbe955887c07321e80
+  data.tar.gz: 712fc0f6b8035b038facd41ea33df1185be0819d77f0b11caf91cc08440d3432d1765e1eb652aa83865037d6e8d1f0d464475222dcf77264d6acd5493bfe91e2

data/archlinux.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.lines.map(&:chomp)
   s.name        = 'archlinux'
   s.summary     = "Archlinux DSL to manage whole system state"
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.licenses = ["GPL-3.0-or-later"]
   s.metadata['rubygems_mfa_required'] = 'true'
   s.required_ruby_version = '>=3.0'

data/lib/declarations/file.rb

@@ -47,6 +47,15 @@ def symlink(target, link_name)
         exit
       end
 
+      # Check if file exists and is a symlink
+      if File.exist?(link_name) && File.symlink?(link_name)
+        links_to = File.readlink(link_name)
+        next if links_to == target # skip creating link if it's already exists
+
+        # Remove the link if it links to something else
+        File.unlink link_name
+      end
+
       log "Linking", target: target, link_name: link_name
 
       # make the parent if it doesn't exist

data/lib/declarations/pacman.rb

@@ -19,29 +19,28 @@ def package(*names)
 
   # install step to install packages required and remove not required
   on_install do
-    # install missing packages
-    need_install = @packages.reject { |p| package? p }
-    need_install_args = need_install.join(" ")
-    if need_install.any?
-      log "Installing packages", packages: need_install
-      sudo "pacman --noconfirm --needed -S #{need_install_args}"
-    end
-
-    # expand groups to packages
+    # Expand groups to packages
     packages_args = @packages.join(" ")
     group_packages = Set.new(`pacman --quiet -Sg #{packages_args}`.lines.map(&:strip))
 
-    # full list of packages that should exist on the system
-    all = @packages + group_packages
+    all = @packages + group_packages # full list of packages that should exist on the system
 
     # actual list on the system
     installed = Set.new(`pacman -Q --quiet --explicit --unrequired --native`.lines.map(&:strip))
 
     unneeded = installed - all
-    next if unneeded.empty?
+    if unneeded.any?
+      log "Removing packages", packages: unneeded
+      sudo("pacman -Rsu #{unneeded.join(" ")}")
+    end
 
-    log "Removing packages", packages: unneeded
-    sudo("pacman -Rsu #{unneeded.join(" ")}")
+    # install missing packages
+    need_install = @packages.reject { |p| package? p }
+    need_install_args = need_install.join(" ")
+    if need_install.any?
+      log "Installing packages", packages: need_install
+      sudo "pacman --noconfirm --needed -S #{need_install_args}"
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archlinux
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Emad Elsaid
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: