nub 0.0.76 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa43f1a038ebba265bc6b032dcb802cd5870e9b1cc703fe46fb5a96f6240d71a
-  data.tar.gz: 5f6201fb958875f52935cb9b0257831671d3dd3db21f2ccbcb49356fdd1cf8d8
+  metadata.gz: 3efbedee8e45692f1b9cf2039541b2196ad9d9e511916964bae27f1777c9a796
+  data.tar.gz: 7928aabd0d289dd414473f7aa18c2c50e2b3f9626efb557dc801a2bdef5468a4
 SHA512:
-  metadata.gz: da19249c6af9fac56ac2d8c7ec4c6a525792bbca53fe1b63b8dc5e47c0439e525b5e918ddfdc82fb820579e708dc4ed12602722491638f4be3681701e9d75019
-  data.tar.gz: 902fbbaae0773ca9cd7a36b6d3575d9fba4b602ea85e3ae6789c9a599d4fc30cc5fb273bd18d7f7f71b9503027315a037199be38f0b60fc4700dd749f019c64f
+  metadata.gz: b768e4e55ac03d9619cbcf64c5429e045c3dc9e8975825b8aaf3352843ac2effa06a6d0866ee7c8157e60ec0b29aa594358145b623b07c308fbdedda57a9a085
+  data.tar.gz: 89fb4422d0d78aa692a096401468508ebdbf3abd611ebff5fdfc3c6cc504bf046cfc4ed69ec703af6aba503b34203e01ef75ac87d463b64f5f28d32cee697923

data/lib/nub/fileutils.rb

@@ -119,38 +119,24 @@ module FileUtils
   def self.insert(file, values, regex:nil, offset:1)
     return false if not values or values.empty?
 
-    changed = false
     values = [values] if values.is_a?(String)
     FileUtils.touch(file) if not File.exist?(file)
 
-    begin
-      data = nil
-      File.open(file, 'r+') do |f|
-        data = f.read
-        lines = data.split("\n")
+    changed = self.update(file){|data|
+      lines = data.split("\n")
 
-        # Match regex for insert location
-        regex = Regexp.new(regex) if regex.is_a?(String)
-        i = regex ? lines.index{|x| x =~ regex} : lines.size
-        return false if not i
+      # Match regex for insert location
+      regex = Regexp.new(regex) if regex.is_a?(String)
+      if i = regex ? lines.index{|x| x =~ regex} : lines.size
         i += offset if regex and offset
 
         # Insert at offset
-        values.each{|x|
-          lines.insert(i, x) and i += 1
-          changed = true
-        }
-
-        # Truncate then write out new content
-        f.seek(0)
-        f.truncate(0)
-        f.puts(lines)
+        values.each{|x| lines.insert(i, x) and i += 1}
+
+        # Change data inline
+        data.gsub!(data, lines * "\n")
       end
-    rescue
-      # Revert back to the original incase of failure
-      File.open(file, 'w'){|f| f << data} if data
-      raise
-    end
+    }
 
     return changed
   end

data/lib/nub/pacman.rb

@@ -23,71 +23,93 @@ require 'fileutils'
 require_relative 'log'
 require_relative 'sys'
 require_relative 'module'
+require_relative 'fileutils'
 
 # Wrapper around system Arch Linux pacman
 module Pacman
   extend self
-  mattr_accessor(:path, :config, :sysroot)
+  mattr_accessor(:path, :config, :sysroot, :mirrors, :repos, :arch, :env)
 
   # Configure pacman for the given root
   # @param path [String] path where all pacman artifacts will be (i.e. logs, cache etc...)
   # @param config [String] config file path to use, note gets copied in
+  # @param mirrors [Array] of mirror paths to use, mirror file name is expected to be the
+  #                        name of the repo e.g. archlinux.mirrorlist
+  # @param arch [String] capturing the pacman target architecture e.g. x86_64
   # @param sysroot [String] path to the system root to use
-  def init(path, config, sysroot)
+  # @param env [Hash] of environment variables to set for session
+  def init(path, config, mirrors, arch:'x86_64', sysroot:nil, env:nil)
+    mirrors = [mirrors] if mirrors.is_a?(String)
     self.path = path
+    self.arch = arch
     self.sysroot = sysroot
     self.config = File.join(path, File.basename(config))
+    self.repos = mirrors.map{|x| File.basename(x, '.mirrorlist')}
+    self.mirrors = mirrors.map{|x| File.join(path, File.basename(x))}
 
     # Validate incoming params
-    Log.die("pacman path '#{path}' doesn't exist") unless Dir.exist?(path)
-    Log.die("pacman sysroot '#{sysroot}' doesn't exist") unless Dir.exist?(sysroot)
-    Log.die("pacman config file '#{config}' doesn't exist") unless File.exist?(config)
+    Log.die("pacman config '#{config}' doesn't exist") unless File.exist?(config)
 
-    # Update the given pacman config file to use the given path
+    # Copy in pacman files for use in target
     FileUtils.rm_rf(File.join(path, '.'))
+    FileUtils.mkdir_p(File.join(self.path, 'db'))
+    FileUtils.mkdir_p(self.sysroot) if self.sysroot && !Dir.exist?(self.sysroot)
     FileUtils.cp(config, path, preserve: true)
-    
-    Sys.exec("cp -a #{@pacman_src_mirrors} #{@pacman_path}")
-    Fedit.replace(@pacman_conf, /(Architecture = ).*/, "\\1#{@vars.arch}")
-    # Leave DBPath set as /var/lib/pacman and copy out sync
-    Fedit.replace(@pacman_conf, /#(CacheDir\s+= ).*/, "\\1#{File.join(@pacman_path, 'cache')}")
-    Fedit.replace(@pacman_conf, /#(LogFile\s+= ).*/, "\\1#{File.join(@pacman_path, 'pacman.log')}")
-    Fedit.replace(@pacman_conf, /#(GPGDir\s+= ).*/, "\\1#{File.join(@pacman_path, 'gnupg')}")
-    Fedit.replace(@pacman_conf, /#(HookDir\s+= ).*/, "\\1#{File.join(@pacman_path, 'hooks')}")
-    Fedit.replace(@pacman_conf, /.*(\/.*mirrorlist).*/, "Include = #{@pacman_path}\\1")
+    FileUtils.cp(mirrors, path, preserve: true)
 
-    repos = Dir[File.join(@pacman_path, "*.mirrorlist")].map{|x| File.basename(x, '.mirrorlist')}
-    Sys.exec("pacman-key --config #{@pacman_conf} --init")
-    Sys.exec("pacman-key --config #{@pacman_conf} --populate #{repos * ' '}")
+    # Update the given pacman config file to use the given path
+    FileUtils.replace(self.config, /(Architecture = ).*/, "\\1#{self.arch}")
+    FileUtils.replace(self.config, /#(DBPath\s+= ).*/, "\\1#{File.join(self.path, 'db')}")
+    FileUtils.replace(self.config, /#(CacheDir\s+= ).*/, "\\1#{File.join(self.path, 'cache')}")
+    FileUtils.replace(self.config, /#(LogFile\s+= ).*/, "\\1#{File.join(self.path, 'pacman.log')}")
+    FileUtils.replace(self.config, /#(GPGDir\s+= ).*/, "\\1#{File.join(self.path, 'gnupg')}")
+    FileUtils.replace(self.config, /#(HookDir\s+= ).*/, "\\1#{File.join(self.path, 'hooks')}")
+    FileUtils.replace(self.config, /.*(\/.*mirrorlist).*/, "Include = #{self.path}\\1")
 
     # Initialize pacman keyring
-    #Sys.exec("pacman-key --config #{self.config} --init")
-    #Sys.exec("pacman-key --config #{self.config} --populate #{repos * ' '}")
+    Sys.exec("pacman-key --config #{self.config} --init")
+    Sys.exec("pacman-key --config #{self.config} --populate #{repos * ' '}")
   end
 
   # Update the pacman database
   def update
-    success = false
-    while not success
-      begin
-        cmd = "pacman -Sy"
-        cmd += " --sysroot #{self.sysroot}" if self.sysroot
-        Sys.exec(cmd)
-        success = true
-      rescue Exception => e
-        puts(e.message)
-      end
-    end
+    cmd = "pacman -Sy"
+    cmd += " --config #{self.config}" if self.config
+    Sys.exec(cmd)
   end
 
   # Install the given packages
-  # @param pkgs [Array] List of packages to install
-  def install()
-    puts("Pacstrap package installs for '#{deployment}'...".colorize(:cyan))
-    cmd = ['pacstrap', '-GMc', deployment_work, '--config', @pacman_conf, '--needed', *apps[:reg]]
-    cmd += ['--ignore', apps[:ignore] * ','] if apps[:ignore].any?
-    !puts("Error: Failed to install packages correctly".colorize(:red)) and
-      exit unless Sys.exec(cmd, env:@proxyenv)
+  # @param pkgs [Array] of packages to install
+  # @param ignore [Array] of packages to ignore
+  def install(pkgs, ignore:nil)
+    cmd = []
+
+    if self.sysroot
+      cmd += ["pacstrap", "-GMc", self.sysroot, '--config', self.config]
+    else
+      cmd += ["pacman", "-S"]
+    end
+
+    # Ignore any packages called out
+    ignore = [ignore] if ignore.is_a?(String)
+    cmd += ["--ignore", "#{ignore * ','}"] if ignore && ignore.any?
+
+    # Add packages to install
+    cmd += ['--needed', *pkgs]
+
+    # Execute if there are any packages given
+    if pkgs.any?
+      self.env ? Sys.exec(cmd, env:self.env) : Sys.exec(cmd)
+    end
+  end
+
+  # Remove the given conflicting packages
+  # @param pkgs [Array] of packages to remove
+  def remove_conflict(pkgs)
+    cmd = "pacman -Rn"
+    cmd += " -r #{self.sysroot}" if self.sysroot
+    cmd += " -d -d --noconfirm #{pkgs * ' '} &>/dev/null || true"
+    Sys.exec(cmd)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.76
+  version: 0.0.81
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize