qrpm 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85d9882ee64a9c241212a8c7d83b0cb8c326ee64c1dcb53bf0950c216d41c868
-  data.tar.gz: 877340a9c37016f4e8c5750dab7600250ed1a0a677d83e914104c0358e97587e
+  metadata.gz: 69442a72ca837b3c52ffbda68a8859a7591cb626ce919f583bf7e39f116cc4ef
+  data.tar.gz: 6d08a9ed16af1b3c8f9a6afe9d1d31958a78dc8d7ce19638039abac01ef9642f
 SHA512:
-  metadata.gz: fa2a874c63f91d7d00df124413ddc2c85495031e6f73c577b3892ca4ec18f4794a548aed99a41fca307c3f5f79b200166d52fb1e2439d29304720a890494ed9d
-  data.tar.gz: 677aceb85dcfc033f83df21a3bc1b8b501747855f3d42dfbf75b5c6dfea7bfc5eb9e26592a4261e751d1b461d75d23e1c1b7c5f547da0b86d38423f5e8ae8c49
+  metadata.gz: 45fafccf06fb93ff1933ab932022421ad1952df731b7133bb831f8a3cedd303787fc46d82222f98c2b9845c3d5ed090ae8afdb075f24a4eb376b8f675580ad37
+  data.tar.gz: c4a3d9c6f372de9e4fccb67af861aea6bc2529dccced89bd3028e2a46dcf122b16f01a9075c0981a7543e456fe90d2ed5504be02c7da532af78923bf744608fa

data/exe/qrpm

@@ -126,6 +126,10 @@ begin
   currdir = overrides["currdir"] = File.expand_path(overrides["currdir"] || Dir.getwd)
   qrpmdir = overrides["qrpmdir"] = File.expand_path(overrides["qrpmdir"] || opts.directory || ".")
 
+  # Check builddir (todo: also currdir?)
+  File.directory?(currdir) or error "Can't find '#{currdir}'"
+  File.directory?(qrpmdir) or error "Can't find '#{qrpmdir}'"
+
   # Compute builddir
   if opts.builddir? && opts.force_builddir? 
     ShellOpts.error "Can't use both --builddir and --force-builddir"
@@ -139,7 +143,7 @@ begin
   end
 
   # Check if repository is clean
-  opts.force? || opts.dump? || `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"
 
   # Check configuration file
@@ -156,8 +160,8 @@ begin
   Dir.chdir(qrpmdir)
 
   # Parse QRPM configuration file. Include paths are still resolved with the
-  # context of the original directory while filesystem paths are relative to
-  # the source directory
+  # context of the original directory if -C is used while filesystem paths are
+  # relative to the source directory
   compiler = Qrpm::Compiler.new(overrides)
   qrpm = compiler.compile(conf)
   rpm = qrpm.rpm

data/lib/qrpm/version.rb

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

data/lib/qrpm.rb

@@ -102,7 +102,7 @@ module Qrpm
   DEFAULTS = {
     "name" => "$(basename $PWD)",
     "summary" => "The $name RPM package",
-    "version" => "$(cd ${{srcdir}} && git tag -l 2>/dev/null | tail -1 | tr -dc '.0-9' || echo 0.0.0)",
+    "version" => "$(cd ${{srcdir}} && git tag -l 2>/dev/null | sort -V | tail -1 | tr -dc '.0-9' || echo 0.0.0)",
     "description" => "$summary",
     "release" => "1",
     "license" => "GPL",

metadata

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