qrpm 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1312be4795eb5a09f50e9d3813539fa2e9ab6d6f899bcdcaca0a0829a5bea4e5
-  data.tar.gz: fa6761732ed85389d7b160fa886b48be3df6771c8c45694983235adac1c2bf24
+  metadata.gz: 84aec760efd4d34c3de41e77edeeb5cc925ee195bea84243dad283c2ec50005e
+  data.tar.gz: 99a8f384f3913952ce99ad80f0be8718d3cb4a91d882a5eb82675a5cc63b41b3
 SHA512:
-  metadata.gz: 443bbfa4827a137a3825065596935ec8291e07b12f18a7081668a8e7f5aff625e7447dbfac3ca4b9f4d9af4e1a17777f4b0aea60478c7c92588964a6b33b6aad
-  data.tar.gz: 85b1110925362970c3512e9e74cf63b61b99dc26cf61ae8a5bc8906e143f5116fb8e3ef6ba8b03565c4d0c7d87beaf90ba0be0faac44d5ee3f0afe23d895ee25
+  metadata.gz: 7416eba4e7747d1fb5603d62a985671e2b8ba40c90d95636c737dbd1c998a3431d2ffeba919e5cff1575efe8dd88b3f43173bddf48e22a3de7cae2e5c30ed868
+  data.tar.gz: 17108a42af16ffe022c72dda457d4d868e16e98a807e1e61296df1a9f2da02cf7a0ef3322334d04b30b85e782723587bad7b6bb15b537fc4d339fba1c14bc6ae

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 = %(
@@ -76,9 +77,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,6 +88,9 @@ begin
     exit
   end
 
+  # Check if repository is clean
+  opts.force? || `git status --porcelain 2>/dev/null` == "" or raise "Repository is dirty"
+
   target = (opts.spec? ? :spec : (opts.source? ? :srpm : :rpm))
   rpm.build(target: target, file: opts.spec)
 

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) 
@@ -122,7 +132,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
@@ -52,7 +53,6 @@ module Qrpm
 
     def build(target: :rpm, file: nil)
       Dir.mktmpdir { |rootdir|
-        rootdir = "/home/clr/prj/qrpm/tmp"
         FileUtils.rm_rf(rootdir)
         FileUtils.mkdir_p(rootdir)
 

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.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Claus Rasmussen