From a207e47ce525cf94eb75e63ceadefe5a2d05c1fe Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Fri, 27 Sep 2019 13:59:23 +0200
Subject: [PATCH] SpecParser update. New realease to match.

---
 Makefile                 | 6 +++---
 project.zsh              | 2 +-
 shard.yml                | 4 ++--
 src/backends/apk.cr      | 2 +-
 src/backends/pkgutils.cr | 2 +-
 src/backends/weird.cr    | 2 +-
 src/context.cr           | 4 ++--
 src/main.cr              | 2 +-
 src/package.cr           | 4 ++--
 src/recipe.cr            | 6 ++----
 10 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 7bafe62..86f3cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE = 'packaging'
-VERSION = '0.9.2'
+VERSION = '0.9.3'
 
 PREFIX := /usr/local
 BINDIR := $(PREFIX)/bin
@@ -9,7 +9,7 @@ INCLUDEDIR := $(PREFIX)/include
 MANDIR := $(SHAREDIR)/man
 LIBEXECDIR := $(PREFIX)/libexec
 SYSCONFDIR := $(PREFIX)/etc
-VERSION := 0.9.2
+VERSION := 0.9.3
 
 CC := cc
 AR := ar
@@ -162,7 +162,7 @@ $(PACKAGE)-$(VERSION).tar.bz2: distdir
 		$(PACKAGE)-$(VERSION)/src/config.cr
 
 help:
-	@echo ' :: packaging-0.9.2'
+	@echo ' :: packaging-0.9.3'
 	@echo ''
 	@echo 'Generic targets:'
 	@echo '    - help           Prints this help message.'
diff --git a/project.zsh b/project.zsh
index 97aeb53..80c6fbe 100644
--- a/project.zsh
+++ b/project.zsh
@@ -1,6 +1,6 @@
 
 package=packaging
-version=0.9.2
+version=0.9.3
 
 variables+=(
 	LIBEXECDIR  '$(PREFIX)/libexec'
diff --git a/shard.yml b/shard.yml
index efa9d99..edb6a17 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: packaging
-version: 0.9.2
+version: 0.9.3
 
 # authors:
 #   - name <email@example.com>
@@ -8,7 +8,7 @@ version: 0.9.2
 #   Short description of package
 
 dependencies:
-    specfileparser:
+    specparser:
         git: https://git.karchnu.fr/WeirdOS/recipes-parser
 
 # dependencies:
diff --git a/src/backends/apk.cr b/src/backends/apk.cr
index 32da54d..1392be4 100644
--- a/src/backends/apk.cr
+++ b/src/backends/apk.cr
@@ -36,7 +36,7 @@ class ApkBackend < Package::Backend::Packaging
 		@name = "apk"
 	end
 
-	def package(context : Package::Context, package : Package::Package)
+	def package(context : Package::Context, package : Package::Package) : Bool
 		# FIXME: This needs to have access to architecture (from Context?)
 		#        to work properly.
 		old_cwd = Dir.current
diff --git a/src/backends/pkgutils.cr b/src/backends/pkgutils.cr
index 91fec47..65895db 100644
--- a/src/backends/pkgutils.cr
+++ b/src/backends/pkgutils.cr
@@ -5,7 +5,7 @@ class PkgutilsBackend < Package::Backend::Packaging
 		@name = "pkgutils"
 	end
 
-	def package(context : Package::Context, package : Package::Package)
+	def package(context : Package::Context, package : Package::Package) : Bool
 		puts "#{package.fake_root_directory} -> #{context.packages_directory}/#{package.name}##{package.version}-#{package.release}.pkg.tar.xz"
 		pp! r = context.run package.fake_root_directory, "tar", ["cJf", "#{context.packages_directory}/#{package.name}##{package.version}.pkg.tar.xz", "."]
 
diff --git a/src/backends/weird.cr b/src/backends/weird.cr
index fe12c67..5807a40 100644
--- a/src/backends/weird.cr
+++ b/src/backends/weird.cr
@@ -8,7 +8,7 @@ class WeirdBackend < Package::Backend::Packaging
 		@name = "weird"
 	end
 
-	def package(context : Package::Context, package : Package::Package)
+	def package(context : Package::Context, package : Package::Package) : Bool
 		destination_package_file = "#{context.packages_directory}/#{package.name}-#{package.version}-#{package.release}.weird"
 
 		tmpdir = package.recipe.working_directory
diff --git a/src/context.cr b/src/context.cr
index 8481263..02e72b0 100644
--- a/src/context.cr
+++ b/src/context.cr
@@ -1,6 +1,6 @@
 require "colorize"
 
-require "specfileparser"
+require "specparser"
 
 require "./exception.cr"
 
@@ -250,7 +250,7 @@ class Package::Context
 	end
 
 	def read_configuration(filename : String)
-		specs = SpecFileParser.parse(filename).not_nil!
+		specs = SpecParser.parse(filename)
 
 		specs.assignments.each do |key, value|
 			case key
diff --git a/src/main.cr b/src/main.cr
index bf03ecc..5934ad9 100644
--- a/src/main.cr
+++ b/src/main.cr
@@ -21,7 +21,7 @@ skip_build_dependencies = false
 print_deps = false
 
 used_X = false
-OptionParser.parse! do |parser|
+OptionParser.parse do |parser|
 	parser.banner = "Usage: package [options] <port <port <…>>>"
 
 	parser.on("-X DIR", "--repository DIR", "Sets a ports repository for finding dependencies (default=.).") { |dir|
diff --git a/src/package.cr b/src/package.cr
index 68284ef..7a8e4b4 100644
--- a/src/package.cr
+++ b/src/package.cr
@@ -1,4 +1,4 @@
-require "specfileparser"
+require "specparser"
 
 class Package::Package
 	getter recipe : Recipe
@@ -7,7 +7,7 @@ class Package::Package
 	def initialize(@recipe, @automatic = false, @fake_root_directory = nil)
 	end
 
-	def initialize(@recipe, section : SpecFileParser::Section)
+	def initialize(@recipe, section : SpecParser::Section)
 		@automatic = false
 
 		@name = section.options[0]
diff --git a/src/recipe.cr b/src/recipe.cr
index 25e4ea5..dddc001 100644
--- a/src/recipe.cr
+++ b/src/recipe.cr
@@ -2,7 +2,7 @@ require "uuid"
 require "uri"
 require "file_utils"
 
-require "specfileparser"
+require "specparser"
 
 require "./context.cr"
 require "./package.cr"
@@ -91,7 +91,7 @@ class Package::Recipe
 	end
 
 	def initialize(@context, filename : String)
-		specs = SpecFileParser.parse filename, {
+		specs = SpecParser.parse filename, {
 			"pkg" => fake_root_directory,
 			"prefix" => prefix
 		}
@@ -101,8 +101,6 @@ class Package::Recipe
 
 		@recipe_directory = File.dirname filename
 
-		raise "Could not parse `#{filename}`" if specs.nil?
-
 		specs.assignments.each do |key, value|
 			case key
 			when "name"