qrpm 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f18febdc69d52be520720e7279961f03469e6011ae6a149a2aeee6151dd5dda
-  data.tar.gz: 7ac4f4b7ec4cbfd1633378ad6794a26761af9eb13e6e64643384738297d24c41
+  metadata.gz: 449228e498e0856af0253472dd643db07f548cccece91096ab858651facf7d77
+  data.tar.gz: d476f3ada3fc7502a422c7a5454383e46c5a7d880020d291e71cf313c8c4929b
 SHA512:
-  metadata.gz: 69504c36e66243663c420b1728643733ad06f781e01d6365b6e56b91bd3e6f6f0c5587c68a89c96a656ebf0596a65d9cd023873ce3e10b92c3a98716f1905adf
-  data.tar.gz: 93a16bf658e128f970f94cb78ce5ae61fecd87c8504cb9beab14c4d50b9d515bcf1bb0c195decd365d1b11b3f27cdc2b5e5eb78e2a7c3d63585f2a3ee281778e
+  metadata.gz: '099a87257e60bbe0aa18164d1a09bc62961bc4352a2ca607ce7c9d5f8cc377560eea20398af5f8a0bfb71ad4fa84423f6a501e723cd40cad7a8e6cbdb5e391e2'
+  data.tar.gz: cbd7563e7ebd7153f228168b87f43bc2f6af453a58642445efb03936e7ae93b0ff2fc09eb952471c824bd14c0a106fa52466eb5ee6a40c5e9bb4b6aa168d1e86

data/example/qrpm.yml

@@ -10,8 +10,8 @@ require:
   - httpd
   - postgresql13
 
-make: # List of commands to build project
-  - echo "Hej du" > bin/another_file
+make: |
+  echo "Hej du" > bin/another_file
 
 $bindir:
   - bin/a_file

data/example.yml

@@ -68,8 +68,8 @@ pg:
 # - git submodule init
 # - git submodule update
 
-make:
-  - cd $srcdir; make
+make: |
+  cd $srcdir; make
 
 ${pg.sharedir}/extension:
   - $srcdir/url_encode.control

data/exe/qrpm

@@ -34,7 +34,15 @@ begin
     is set to the name of the current directory and version to the latest tag
     in git (which needs to be present). Other defaults are detailed below
 
-    VARIABLES 
+    SETUP
+
+      Use qrpm -t to generate a template qrpm.yml file:
+
+        qrpm -t [TEMPLATE-FILE]
+
+      Then customize as needed
+
+    VARIABLES
 
     The configuration file can define and use variables. They are defined by
     key/value definitions and the value can refer to values of other
@@ -46,6 +54,21 @@ begin
     part of the command so only one command is allowed. This restriction keeps
     the parser simple, it may change in the future
 
+    The special 'make' variable takes a string and executes it before packaing
+    the project
+
+    STANDARD VARIABLES
+
+    The following RPM variables are recognized:
+
+      name
+      summary
+      description
+      version
+      release
+      packager
+      requires
+
     INCLUDE FILES
 
     The qrpm file can include other files that are searched for in a list of
@@ -55,7 +78,7 @@ begin
 
     BUILT-IN VARIABLES
 
-    There are the following built-in variables. They are listed below with their 
+    There are the following built-in variables. They are listed below with their
     default values:
 
       rootdir         /
@@ -104,7 +127,7 @@ begin
 
     -f,force
       Create package even if repository is dirty. Normally qrpm checks if the
-      current directory is clean
+      current (git) directory is clean
 
     -C,directory=EDIR
       Change to directory before doing anything else but include the current
@@ -184,9 +207,9 @@ begin
   # Compute builddir
   if opts.builddir? && opts.force_builddir?
     ShellOpts.error "Can't use both --builddir and --force-builddir"
-  elsif opts.builddir? || opts.force_builddir? 
+  elsif opts.builddir? || opts.force_builddir?
     builddir = opts.builddir || opts.force_builddir || "builddir"
-    opts.force_builddir? || !File.exist?(builddir) or 
+    opts.force_builddir? || !File.exist?(builddir) or
         ShellOpts.error "Build directory 'builddir' exists - use -B to override"
     builddir = File.expand_path(builddir)
   else
@@ -194,7 +217,7 @@ begin
   end
 
   # Check if repository is clean
-  opts.force? || opts.dump? || `cd #{qrpmdir}; git status --porcelain | grep -v '??' 2>/dev/null` == "" or 
+  opts.force? || opts.dump? || `cd #{qrpmdir}; git status --porcelain | grep -v '??' 2>/dev/null` == "" or
       ShellOpts.error "Repository is dirty"
 
   # Create lexer
@@ -240,10 +263,10 @@ begin
   # Create spec/srpm/rpm file
   target = (opts.spec? ? :spec : (opts.source? ? :srpm : :rpm))
   files = rpm.build(
-      target: target, 
-      file: opts.spec, 
-      verbose: opts.verbose?, 
-      destdir: currdir, 
+      target: target,
+      file: opts.spec,
+      verbose: opts.verbose?,
+      destdir: currdir,
       builddir: builddir)
 
   puts "Built #{files.map { |f| File.basename(f) }.join(" ")}" if !opts.quiet?

data/lib/qrpm/node.rb

@@ -47,9 +47,9 @@ module Qrpm
     # Interpolate variables in Node. Note that interpolation is not recursive
     # except for DirectoryNode objects that interpolates both key and elements.
     # #interpolate sets the interpolated flag and returns self
-    def interpolate(dict) 
+    def interpolate(dict)
       @interpolated = true
-      self 
+      self
     end
 
     # True if object has been interpolated
@@ -116,7 +116,7 @@ module Qrpm
 
   class ValueNode < Node
     # Source code of expression
-    def source() @expr.source end 
+    def source() @expr.source end
 
     # Override Qrpm#value. Initially nil, initialized by #interpolate
     attr_reader :value
@@ -129,10 +129,10 @@ module Qrpm
 
     # Override Qrpm methods
     def variables() @variables ||= expr.variables end
-    
-    def interpolate(dict) 
+
+    def interpolate(dict)
       @value ||= expr.interpolate(dict) # Allows StandardDirNode to do its own assignment
-      super 
+      super
     end
 
     def signature() "#{class_name}(#{name},#{expr.source})" end
@@ -185,7 +185,7 @@ module Qrpm
     # Override ContainerNode#exprs
     def exprs() expr.values end
 
-    def initialize(parent, name, hash = {}) 
+    def initialize(parent, name, hash = {})
       constrain hash, Hash
       super(parent, name, hash.dup)
     end
@@ -195,7 +195,7 @@ module Qrpm
     def dump
       puts "{"
       indent {
-        expr.each { |k,v| 
+        expr.each { |k,v|
           print "#{k}: "
           v.dump
         }
@@ -213,8 +213,8 @@ module Qrpm
 
     # Override Node#interpolate. Only interpolates contained DirectoryNode
     # objects (TODO doubtfull - this is a Qrpm-level problem not a Node problem)
-    def interpolate(dict) 
-      exprs.each { |e| e.is_a?(DirectoryNode) and e.interpolate(dict) } 
+    def interpolate(dict)
+      exprs.each { |e| e.is_a?(DirectoryNode) and e.interpolate(dict) }
       super
     end
 
@@ -241,7 +241,7 @@ module Qrpm
   # Exactly one of 'file', 'symlink', and 'reflink' must be defined. 'perm'
   # can't be used together with 'symlink' or 'reflink'
   #
-  # When interpolated the following methods are defined on a FileNode: 
+  # When interpolated the following methods are defined on a FileNode:
   #
   #   srcpath     Path to source file
   #   dstpath     Path to destination file
@@ -288,7 +288,7 @@ module Qrpm
 
     def interpolate(dict)
       super
-      exprs.each { |e| e.interpolate(dict) } 
+      exprs.each { |e| e.interpolate(dict) }
       @srcpath = value[%w(file symlink reflink).find { |k| expr.key?(k) }].value
       @dstname = value["name"]&.value || File.basename(srcpath)
       @dstpath = "#{parent.directory}/#{@dstname}"
@@ -337,7 +337,7 @@ module Qrpm
     # Override ContainerNode#exprs
     def exprs() expr end
 
-    def initialize(parent, name, array = []) 
+    def initialize(parent, name, array = [])
       constrain array, Array
       super(parent, name, array.dup)
     end
@@ -371,7 +371,7 @@ module Qrpm
   class DirectoryNode < ArrayNode
     # Override Qrpm#key
     attr_reader :key
-    
+
     # File system path to the directory. An alias for uuid/key
     def directory() key end
 
@@ -387,7 +387,7 @@ module Qrpm
     def interpolate(dict)
       # #key is used by the embedded files to compute their paths so it has be
       # interpolated before we interpolate the files through the +super+ method
-      @key = name.interpolate(dict) 
+      @key = name.interpolate(dict)
       super
     end
   end

data/lib/qrpm/rpm.rb

@@ -9,19 +9,16 @@ module Qrpm
   #   release     Release
   #   summary     Short one-line description of package (mandatory)
   #   description Description
-  #   packager    Name of the packager (defaults to the name of the user or 
+  #   packager    Name of the packager (defaults to the name of the user or
   #               $USER@$HOSTNAME if not found)
   #   license     License (defaults to GPL)
   #   require     Array of required packages
   #   make        Controls the build process:
-  #                 null    Search the top-level directory for configure or
-  #                         make files and runs them. Skip building if not 
-  #                         found. This is the default
-  #                 true    Expect the top-level directory to contain 
-  #                         configure or make files and runs them. It is an 
+  #                 true    Expect the top-level directory to contain
+  #                         configure or make files and runs them. It is an
   #                         error if the Makefile is missing
-  #                 (array of commands)
-  #                         Runs the commands to build the project
+  #                 (possibly multiline command)
+  #                         Runs the command to build the project
   #
   # Each field has a dynamically generated accessor method that can be
   # referenced in the template file
@@ -37,16 +34,16 @@ module Qrpm
       "group" => [String],
       "include" => [Array, String],
       "require" => [Array, String],
-      "make" => [Array, String]
+      "make" => [String]
     })
 
     RPM_DIRS = %w(SOURCES BUILD RPMS SPECS SRPMS tmp)
 
     # Field accessor methods. FIXME Value should have been resolved
-    FIELDS.each { |f,ts| 
+    FIELDS.each { |f,ts|
       if ts.include? Array
         eval <<-EOS
-          def #{f}() 
+          def #{f}()
             case v = @fields["#{f}"]
               when ValueNode
                 v.value

data/lib/qrpm/template.erb

@@ -15,28 +15,21 @@ Source: %{name}.tar.gz
 %description
 <%= description %>
 
+%global debug_package %{nil}
+
 %prep
 %setup -n <%= name %>
 
 %build
 cd <%= srcdir %>
-<% if make.nil? -%>
-  <% if has_configure? -%>
-    ./configure
-  <% end -%>
-  <% if has_make? -%>
-    make
-  <% end -%>
-<% elsif make == false -%>
-<% elsif make == true -%>
+<% if make.nil? || make == false -%>
+<% elsif make == true %>
   <% if has_configure? -%>
     ./configure
   <% end -%>
   make
-<% elsif make.is_a? Array -%>
-  <% for cmd in make -%>
-    <%= cmd  %>
-  <% end -%>
+<% elsif make.is_a? String -%>
+  <%= make %>
 <% end -%>
 
 %install

data/lib/qrpm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -111,7 +111,6 @@ files:
 - lib/qrpm/template.yml
 - lib/qrpm/utils.rb
 - lib/qrpm/version.rb
-- packager.sh
 - packager.yml
 - program.sh
 - qrpm.gemspec

data/packager.sh

@@ -1,65 +0,0 @@
-#!/usr/bin/bash
-
-# This scripts creates and build a simple RPM package
-#
-# Prerequisites:
-#  - rpm-build, make and gcc (as it's a c file) packages must be installed
-#
-
-# Ref. http://aerostitch.github.io/linux_and_unix/RedHat/build_sample_rpm.html
-
-# Holds the name of the root directory containing the necessary structure to
-# build RPM packages.
-RPM_ROOT_DIR=~/rpm_factory
-
-PKG_NAME=dummy_package
-PKG_TAR=/tmp/${PKG_NAME}.tar.gz
-BINARY_FILE=hello_world
-# Recreate the root directory and its structure if necessary
-mkdir -p ${RPM_ROOT_DIR}/{SOURCES,BUILD,RPMS,SPECS,SRPMS,tmp}
-pushd  $RPM_ROOT_DIR
-cp ${PKG_TAR} ${RPM_ROOT_DIR}/SOURCES/
-
-# Creating a basic spec file
-cat << __EOF__ > ${RPM_ROOT_DIR}/SPECS/${PKG_NAME}.spec
-Summary: This package is a sample for quickly build dummy RPM package.
-Name: $PKG_NAME
-Version: 1.0
-Release: 0
-License: GPL
-Packager: $USER
-Group: Development/Tools
-Source: %{name}.tar.gz
-BuildRequires: coreutils
-BuildRoot: ${RPM_ROOT_DIR}/tmp/%{name}-%{version}
-
-%description
-%{summary}
-
-%prep
-%setup -n ${PKG_NAME}
-
-%build
-make $BINARY_FILE
-
-%install
-mkdir -p "%{buildroot}/opt/${PKG_NAME}"
-cp $BINARY_FILE "%{buildroot}/opt/${PKG_NAME}/"
-
-%files
-/opt/${PKG_NAME}/hello_world
-
-%clean
-%if "%{clean}" != ""
-  rm -rf %{_topdir}/BUILD/%{name}
-  [ $(basename %{buildroot}) == "%{name}-%{version}-%{release}.%{_target_cpu}" ] && rm -rf %{buildroot}
-%endif
-
-%post
-chmod 755 -R /opt/${PKG_NAME}
-__EOF__
-
-rpmbuild -v -bb --define "_topdir ${RPM_ROOT_DIR}" SPECS/${PKG_NAME}.spec
-popd
-
-