qrpm 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69442a72ca837b3c52ffbda68a8859a7591cb626ce919f583bf7e39f116cc4ef
-  data.tar.gz: 6d08a9ed16af1b3c8f9a6afe9d1d31958a78dc8d7ce19638039abac01ef9642f
+  metadata.gz: 9d468f2efcb7fffda8a4dad3e2476857ab62fa2b00def58c9ffbe8d59f7cc867
+  data.tar.gz: 91973e0057876141ede7bb1b1f7b3c5432ff320a25532b47736154c6be2c87a8
 SHA512:
-  metadata.gz: 45fafccf06fb93ff1933ab932022421ad1952df731b7133bb831f8a3cedd303787fc46d82222f98c2b9845c3d5ed090ae8afdb075f24a4eb376b8f675580ad37
-  data.tar.gz: c4a3d9c6f372de9e4fccb67af861aea6bc2529dccced89bd3028e2a46dcf122b16f01a9075c0981a7543e456fe90d2ed5504be02c7da532af78923bf744608fa
+  metadata.gz: 2158c236484f1e83f7a77cf53299d675413059be03939a7cd7a7577931c8af0ad56e71bcd07f08541d3e2fe24e2806ef3cc8708a8132b33e36c8176a6a07a2b3
+  data.tar.gz: e057e5818b904e1aa4526e66627d6d09f18180ba9185a151926954abf84e5235a21415dd6028c08617bc119cfb4d32a8ea35cdb058a7e718052ceb6165221b08

data/exe/qrpm

@@ -55,6 +55,49 @@ begin
 
     BUILT-IN VARIABLES
 
+    There are the following built-in variables. They are listed below with their 
+    default values:
+
+      rootdir         /
+      rootconfdir     /etc
+      rootexecdir     /usr
+      rootlibdir      /usr
+      rootconstdir    /usr/share
+      rootdocdir      /usr/share
+      rootdatadir     /var
+
+      sysetcdir       /etc
+      sysbindir       /usr/bin
+      syssbindir      /usr/sbin
+      syslibdir       /usr/lib64
+      syslibexecdir   /usr/libexec
+      syssharedir     /usr/share
+      sysdocdir       /usr/share/doc
+      sysvardir       /var/lib
+      sysspooldir     /var/spool
+      sysrundir       /var/run
+      syslockdir      /var/lock
+      syscachedir     /var/cache
+      syslogdir       /var/log
+      systmpdir       /tmp
+
+      pcketcdir       /etc/NAME
+      pckbindir       /usr/bin
+      pcksbindir      /usr/sbin
+      pcklibdir       /usr/lib64/NAME
+      pcklibexecdir   /usr/libexec/NAME
+      pcksharedir     /usr/share/NAME
+      pckdocdir       /usr/share/doc/NAME
+      pckvardir       /var/NAME
+      pckspooldir     /var/spool/NAME
+      pckrundir       /var/run/NAME
+      pcklockdir      /var/lock/NAME
+      pckcachedir     /var/cache/NAME
+      pcklogdir       /var/log/NAME
+      pcktmpdir       /tmp/NAME
+
+    Note that there are no package specific directories for bin and sbin
+
     INSTALLATION DIRECTORIES
 
     OPTIONS
@@ -95,6 +138,11 @@ begin
 
     -d,dump
       Dump internal data and exit. For debug
+
+    COMMANDS
+      show! -- QRPM-FILE VARIABLE...
+        Output the value of a variable. Typically used to extract the version
+        number from a qrpm.yml file
   )
 
   opts, args = ShellOpts.process(SPEC, ARGV, verbose: true, quiet: true)
@@ -111,11 +159,14 @@ begin
   # on the command line
   overrides = {}
   file = nil
+  show = []
   while arg = args.extract(0..1)
     if arg =~ /^(.*?)=(.*)$/
       overrides[$1] = $2
     elsif file.nil?
       file = arg
+    elsif opts.subcommand == :show!
+      show << arg
     else
       args.expect(-1, "More than one file argument")
     end
@@ -131,7 +182,7 @@ begin
   File.directory?(qrpmdir) or error "Can't find '#{qrpmdir}'"
 
   # Compute builddir
-  if opts.builddir? && opts.force_builddir? 
+  if opts.builddir? && opts.force_builddir?
     ShellOpts.error "Can't use both --builddir and --force-builddir"
   elsif opts.builddir? || opts.force_builddir? 
     builddir = opts.builddir || opts.force_builddir || "builddir"
@@ -166,6 +217,13 @@ begin
   qrpm = compiler.compile(conf)
   rpm = qrpm.rpm
 
+  if opts.subcommand == :show!
+    for variable in show
+      puts qrpm[variable].sub(/^\/\//, "/")
+    end
+    exit
+  end
+
   if opts.dump?
     puts "Compiler"
     indent { compiler.dump }

data/lib/qrpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qrpm
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/lib/qrpm.rb

@@ -68,8 +68,8 @@ module Qrpm
     syssbindir: "$rootexecdir/sbin",
     syslibdir: "$rootlibdir/lib64",
     syslibexecdir: "$rootexecdir/libexec",
-    syssharedir: "$rootconstdir/$pckdir", # Always a subdir of /usr/share
-    sysdocdir: "$syssharedir",
+    syssharedir: "$rootconstdir",
+    sysdocdir: "$syssharedir/doc",
     sysvardir: "$rootdatadir/lib",
     sysspooldir: "$rootdatadir/spool",
     sysrundir: "$rootdatadir/run",
@@ -79,11 +79,10 @@ module Qrpm
     systmpdir: "/tmp" # Always /tmp because of security
   }
 
-  # There are no package-specific versions of bindir and sbindir
   PACKAGE_DIRS = {
     pcketcdir: "$sysetcdir/$pckdir",
-    pckbindir: "$sysbindir", # No subdir
-    pcksbindir: "$syssbindir", # No subdir
+    pckbindir: "$sysbindir", # No package-specific directory
+    pcksbindir: "$syssbindir", # No package-specific directory
     pcklibdir: "$syslibdir/$pckdir",
     pcklibexecdir: "$syslibexecdir/$pckdir",
     pcksharedir: "$syssharedir/$pckdir",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2024-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts