qrpm 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42c8a277f8c960972b0fed47ef032d8ddc4e1a1484ed97c4b57f0849b6ff2b7
-  data.tar.gz: 96bfb0d37b1af65ac525a3b4f9393841bca7b8bfe14a82a47f096b1967ad72ff
+  metadata.gz: 69442a72ca837b3c52ffbda68a8859a7591cb626ce919f583bf7e39f116cc4ef
+  data.tar.gz: 6d08a9ed16af1b3c8f9a6afe9d1d31958a78dc8d7ce19638039abac01ef9642f
 SHA512:
-  metadata.gz: 6b20c857030afca9a85b73ae3081e8b684fe14331246abfea0f0bb93790ce70682825328bd0c34b8e15480c70fedd9b98ad651b2fe2f20ccf69e79783e5a7e66
-  data.tar.gz: 8683dcf8bb03fe5cf62d8a9a4d030d8b67381e1de7b74b0fbb94f6f28014c47b302611b38ede8a9f6cb2e432c91eed5c1b54cf7606ed8e37d812186477f2ac25
+  metadata.gz: 45fafccf06fb93ff1933ab932022421ad1952df731b7133bb831f8a3cedd303787fc46d82222f98c2b9845c3d5ed090ae8afdb075f24a4eb376b8f675580ad37
+  data.tar.gz: c4a3d9c6f372de9e4fccb67af861aea6bc2529dccced89bd3028e2a46dcf122b16f01a9075c0981a7543e456fe90d2ed5504be02c7da532af78923bf744608fa

data/example/qrpm.yml

@@ -1,5 +1,5 @@
 
-name: my_package_name
+name: testpck
 summary: This is a summary of the package
 description: Optional longer description of the package
 version: 1.2.3

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.2"
+  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",

data/qrpm.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "shellopts", "~> 2.1.1"
   spec.add_dependency "indented_io"
-  spec.add_dependency "constrain"
+  spec.add_dependency "constrain", "= 0.5.1"
   spec.add_dependency "forward_to"
 
   # Uncomment to register a new dependency of your gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -42,16 +42,16 @@ dependencies:
   name: constrain
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: forward_to
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: Gem qrpm