qrpm 0.0.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1312be4795eb5a09f50e9d3813539fa2e9ab6d6f899bcdcaca0a0829a5bea4e5
-  data.tar.gz: fa6761732ed85389d7b160fa886b48be3df6771c8c45694983235adac1c2bf24
+  metadata.gz: 75abaaf1244589f445a86adcd727e7c4b904ef43ca901d85efac65fdfbd01fac
+  data.tar.gz: 267f7d0505c1e802ea1bcf2d3a11a4384d0829d3c06d1737926ced73f86cb12f
 SHA512:
-  metadata.gz: 443bbfa4827a137a3825065596935ec8291e07b12f18a7081668a8e7f5aff625e7447dbfac3ca4b9f4d9af4e1a17777f4b0aea60478c7c92588964a6b33b6aad
-  data.tar.gz: 85b1110925362970c3512e9e74cf63b61b99dc26cf61ae8a5bc8906e143f5116fb8e3ef6ba8b03565c4d0c7d87beaf90ba0be0faac44d5ee3f0afe23d895ee25
+  metadata.gz: 00756525e6e8e98281ed1cc92bbe2aa5c2f19cb29d4ba24becc4915b3ad00d2edf98cc1779292fab050bf5f540f97e8b71072452e49c8ff7790d6a5642d488ac
+  data.tar.gz: 99d94787339e6208597510b0ea2af252337bce943b0a654e75cde38b7b09b94b51369b148d14460a9cd65d1ca47517e601c7334af013c8e17608e6627cefbb9d

data/example.yml

@@ -0,0 +1,30 @@
+# QRPM configuration file. See https://github.com/clrgit/qrpm
+
+name: $pg_name-url_encode
+summary: Adds the url_encode extension to postgres
+description: RPM wrapper for the postgres url_encode extension (https://github.com/okbob/url_encode)
+version: $(cd url_encode; git tag | tail -1 | sed 's/^v//')
+
+requires:
+  - $pg_name-server
+  - $pg_name-libs
+
+pg_name: $(rpm -q -qf '%{NAME}\n' -f $(readlink -f $(which pg_config)))
+pg_version: $(pg_config --version | sed 's/^[^0-9]* \([0-9]\+\).*$/\1/')
+pg_libdir: $(pg_config --libdir)
+pg_extdir: $(pg_config --share)/extension
+
+init:
+  - git submodule init
+  - git submodule update
+
+make:
+  - cd url_encode; make
+
+$pg_libdir:
+  - url_encode/src/url_encode.so
+
+$pg_extdir:
+  - url_encode/url_encode.control
+  - url_encode/sql/url_encode--1.2.sql
+

data/exe/qrpm

@@ -12,6 +12,7 @@ require 'indented_io'
 # TODO
 #   o Fix BuildRoot (contains absolute path)
 #   o Enable escape of $
+#   o Separate standard variable from user-variables in dump
 
 begin
   SPEC = %(
@@ -44,14 +45,16 @@ begin
       files
 
     -C,directory=EDIR
-      Change to directory before doing anything else
+      Change to directory before doing anything else. Output files are still
+      created in the current directory, though
 
     -d,dump
-      Dump internal data and exit
+      Dump internal data and exit. For debug
   )
 
-  opts, args = ShellOpts.process(SPEC, ARGV)
+  opts, args = ShellOpts.process(SPEC, ARGV, verbose: true)
 
+  currdir = Dir.getwd
   Dir.chdir(opts.directory) if opts.directory?
 
   if opts.template?
@@ -60,7 +63,8 @@ begin
     exit
   end
 
-  # Collect var=val settings in the dict hash and sets the configuration file
+  # Collect var=val settings into the dict hash and sets the configuration file
+  # if present
   dict = {}
   while arg = args.extract(0..1)
     if arg =~ /^(.*?)=(.*)$/
@@ -76,9 +80,6 @@ begin
   file ||= Qrpm::QRPM_CONFIG_FILE
   ::File.exist?(file) or raise "Can't find '#{file}'"
 
-  # Check if repository is clean
-  opts.force? || `git status --porcelain 2>/dev/null` == "" or raise "Repository is dirty"
-
   # Load the qrpm configuration file
   yaml = YAML.load(IO.read(file).sub(/^__END__\s*$/m, ""))
 
@@ -90,8 +91,11 @@ begin
     exit
   end
 
+  # Check if repository is clean
+  opts.force? || `git status --porcelain | grep -v '??' 2>/dev/null` == "" or raise "Repository is dirty"
+
   target = (opts.spec? ? :spec : (opts.source? ? :srpm : :rpm))
-  rpm.build(target: target, file: opts.spec)
+  rpm.build(target: target, file: opts.spec, verbose: opts.verbose?, destdir: currdir)
 
 rescue RuntimeError => ex
   ShellOpts.error ex.message

data/lib/qrpm/parser.rb

@@ -32,9 +32,15 @@ module Qrpm
         fields.key?(f) or raise "Missing mandatory variable: #{f}"
       }
 
+      # Get full name of user
+      fullname = Etc.getpwnam(ENV['USER'])&.gecos
+      if fullname.nil? || fullname == ""
+        fullname = ENV['USER']
+      end
+
       # Defaults for description and packager fields
       fields["description"] ||= fields["summary"]
-      fields["packager"] ||= ENV['USER']
+      fields["packager"] ||= fullname
       fields["release"] ||= "0"
       fields["license"] ||= "GPL"
 
@@ -42,6 +48,10 @@ module Qrpm
       # of the variables
       expand_fields
 
+      # Expand variables in directory entries. The algorithm is simpler than in
+      # #expand_fields because no further variable defitinitions can happend
+      expand_dirs
+
       # Replace symbolic directory names
       @dirs = dirs.map { |dir, files|
         if DIRS.key?(dir) 
@@ -106,6 +116,25 @@ module Qrpm
       "logdir" => "/var/log"
     }
 
+    # TODO TODO TODO
+
+    # Expand shell expansions ($(shell command))
+    #
+    def expand_shell_commands(object)
+      case object
+        when Array; object.map { |e| expand_shell_commands(e) }
+        when Hash; object.map { |k,v| [k, expand_shell_commands(v)] }.to_h
+        when String; 
+          puts object.scan(/\$\(([^\)]+)\)/)
+          object.scan(/\$\(([^\)]+)\)/)
+
+        when Integer, Float, true, false, nil; object
+      else
+        raise "Illegal object: #{object}"
+      end
+    end
+
+
     # Returns array of variables in the object. Variables can be either '$name' or
     # '${name}'. The variables are returned in left-to-right order
     #
@@ -122,7 +151,7 @@ module Qrpm
 
     # Expand variables in the given string
     #
-    # The method takes case to substite left-to-rigth to avoid a variable expansion
+    # The method takes care to substite left-to-rigth to avoid a variable expansion
     # to infer with the name of an immediately preceding variable. Eg. $a$b; if $b
     # is resolved to 'c' then a search would otherwise be made for a variable named
     # '$ac' 

data/lib/qrpm/rpm.rb

@@ -11,8 +11,9 @@ module Qrpm
     #   license     License (defaults to GPL)
     #   summary     Short one-line description of package
     #   description Description
-    #   packager    Name of the packager (defaults to the value of the $USER 
-    #               environment variable)
+    #   packager    Name of the packager (defaults to the name of the current
+    #               user or the value of the $USER environment variable if not
+    #               found)
     #   require     Array of required packages
     #   make        Controls the build process:
     #                 null    Search the top-level directory for configure or
@@ -42,17 +43,21 @@ module Qrpm
     def files() @files ||= nodes.select(&:file?) end
     def links() @lines ||= nodes.select(&:link?) end
 
-    def has_configure?() ::File.exist? "configure" end
-    def has_make?() ::File.exist? "make" end
+    def verbose?() @verbose end
 
-    def initialize(fields, nodes, template: TEMPLATE)
+    def initialize(fields, nodes, template: TEMPLATE, verbose: false)
       @fields, @nodes = fields, nodes
       @template = template
+      @verbose = verbose
+      @verb = verbose ? "" : "&>/dev/null"
     end
 
-    def build(target: :rpm, file: nil)
+    def has_configure?() ::File.exist? "configure" end
+    def has_make?() ::File.exist? "make" end
+
+    def build(target: :rpm, file: nil, verbose: false, destdir: ".")
+      verb = verbose ? "" : "&>/dev/null"
       Dir.mktmpdir { |rootdir|
-        rootdir = "/home/clr/prj/qrpm/tmp"
         FileUtils.rm_rf(rootdir)
         FileUtils.mkdir_p(rootdir)
 
@@ -73,7 +78,7 @@ module Qrpm
         FileUtils.cp_r(".", tarroot, preserve: true)
         
         # Roll tarball and put it in the SOURCES directory
-        system "tar zcf #{tar_path} -C #{rootdir}/tmp #{name}" or raise "Can't roll tarball"
+        system "tar zcf #{tar_path} -C #{rootdir}/tmp #{name} #{verb}" or raise "Can't roll tarball"
 
         # Remove temporary tar dir
         FileUtils.rm_rf tarroot
@@ -84,15 +89,15 @@ module Qrpm
 
         # Emit spec or build RPM
         if target == :spec
-          IO.write(spec_file, @spec)
+          IO.write("#{destdir}/#{spec_file}", @spec)
         else
           IO.write(spec_path, @spec)
-          system "rpmbuild -v -ba --define \"_topdir #{rootdir}\" #{rootdir}/SPECS/#{name}.spec" or
-              raise "Failed building RPM file"
+          system "rpmbuild -v -ba --define \"_topdir #{rootdir}\" #{rootdir}/SPECS/#{name}.spec #{verb}" or
+              raise "Failed building RPM file. Re-run with -v option to see errors"
           if target == :srpm
-            system "cp #{rootdir}/SRPMS/* ." or raise "Failed copying SRPM file"
+            system "cp #{rootdir}/SRPMS/* #{destdir}" or raise "Failed copying SRPM file"
           elsif target == :rpm
-            system "cp #{rootdir}/RPMS/*/#{name}-[0-9]* ." or raise "Failed copying RPM file"
+            system "cp #{rootdir}/RPMS/*/#{name}-[0-9]* #{destdir}" or raise "Failed copying RPM file"
           else
             raise ArgumentError, "Not a valid value for :target - #{target.inspect}"
           end

data/lib/qrpm/template.erb

@@ -41,6 +41,7 @@ make
 <% end -%>
 
 %install
+<% if !nodes.empty? -%>
 mkdir -p <%= nodes.map { |f| "%{buildroot}#{f.directory}" }.uniq.join(" ") %>
 <% for file in files -%>
 cp <%= file.file %> %{buildroot}<%= file.path %>
@@ -48,6 +49,7 @@ cp <%= file.file %> %{buildroot}<%= file.path %>
 <% for link in links -%>
 touch %{buildroot}<%= link.path %>
 <% end -%>
+<% end -%>
 
 %files
 <% for file in files -%>

data/lib/qrpm/template.yml

@@ -1,3 +1,4 @@
+# QRPM configuration file. See https://github.com/clrgit/qrpm
 
 # Package information
 #

data/lib/qrpm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -55,6 +55,7 @@ files:
 - bin/setup
 - clean
 - cmd
+- example.yml
 - example/bin/a_file
 - example/bin/another_file
 - example/qrpm.yml