From 58caf38935554d2bafc16080b6906fbe6902a72c Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Tue, 20 Aug 2019 00:21:12 -0700
Subject: [PATCH] =?UTF-8?q?Add=20=E2=80=98oni-conf=E2=80=99=20and=20the=20?=
 =?UTF-8?q?ability=20to=20upload=20multi-file=20packages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘oni-conf’ is the first package to include more than one file, it’s mostly a
package to allow distributing snippets.
---
 .gitignore                |  3 +++
 .gitlab-ci.yml            | 13 ++++++++++
 GNUmakefile               |  8 +++++-
 oni-conf/Cask             | 10 ++++++++
 oni-conf/oni-conf.el      | 51 +++++++++++++++++++++++++++++++++++++++
 oni-conf/snippets/section |  8 ++++++
 6 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 oni-conf/Cask
 create mode 100644 oni-conf/oni-conf.el
 create mode 100644 oni-conf/snippets/section

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12f2089
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/*/.cask/
+/*/bin/
+/*/dist/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcef562..62a1a54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: silex/emacs:26.1-alpine-dev
 
 stages:
   - test
+  - pre-package-multifile
   - package
   - deploy
 
@@ -25,8 +26,20 @@ test-oni-php:
   stage: test
   script: make test-oni-php DEPS="oni-flycheck oni-company oni-fci"
 
+package-oni-conf:
+  stage: pre-package-multifile
+  before_script:
+    - rm -rf oni-conf/dist
+  script:
+    - cask --path oni-conf package
+  artifacts:
+    paths:
+      - oni-conf/dist/
+
 package:
   stage: package
+  dependencies:
+    - package-oni-conf
   before_script:
     - rm -rf bin/
     - mkdir bin/
diff --git a/GNUmakefile b/GNUmakefile
index c33f856..c584d2e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,7 +2,7 @@ FILES := $(wildcard *.el)
 
 PACKAGE_TARGETS := $(addprefix package-,$(FILES))
 
-package: $(PACKAGE_TARGETS)
+package: $(PACKAGE_TARGETS) package-oni-conf
 
 package-%: %
 	emacs --batch \
@@ -10,6 +10,12 @@ package-%: %
 	    --funcall package-initialize \
 	    --eval '(package-upload-file "$^")'
 
+package-oni-conf:
+	emacs --batch \
+	    --load oni-package.el \
+	    --funcall package-initialize \
+	    --eval '(package-upload-file (car (file-expand-wildcards "oni-conf/dist/*.tar")))'
+
 test-%:
 	emacs --batch \
 	    --load oni-package.el \
diff --git a/oni-conf/Cask b/oni-conf/Cask
new file mode 100644
index 0000000..59d947c
--- /dev/null
+++ b/oni-conf/Cask
@@ -0,0 +1,10 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-conf.el")
+
+(depends-on "oni-yasnippet" :git "../" :files ("oni-yasnippet.el"))
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))
diff --git a/oni-conf/oni-conf.el b/oni-conf/oni-conf.el
new file mode 100644
index 0000000..c5ff9c1
--- /dev/null
+++ b/oni-conf/oni-conf.el
@@ -0,0 +1,51 @@
+;;; oni-conf.el --- Conf-mode configuration          -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 20190613083458
+;; Package-Requires: (oni-yasnippet)
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Configuration for the different ‘conf-mode’ variations.
+
+;;; Code:
+
+(require 'yasnippet)
+
+(defconst oni-conf-root
+  (file-name-directory
+   (or load-file-name
+       (buffer-file-name)))
+  "The directory where ‘oni-conf’ was loaded from.")
+
+;;;###autoload
+(defun oni-conf-snippets-initialize ()
+  "Initialize the snippets for ‘oni-conf’."
+  (let ((snippets-dir (expand-file-name "snippets" oni-conf-root)))
+    (when (boundp 'yas-snippet-dirs)
+      (add-to-list 'yas-snippet-dirs snippets-dir t))
+    (yas-load-directory snippets-dir)))
+
+;;;###autoload
+(with-eval-after-load 'oni-conf
+  (with-eval-after-load 'yasnippet
+    (oni-conf-snippets-initialize)))
+
+(provide 'oni-conf)
+;;; oni-conf.el ends here
diff --git a/oni-conf/snippets/section b/oni-conf/snippets/section
new file mode 100644
index 0000000..496e4fd
--- /dev/null
+++ b/oni-conf/snippets/section
@@ -0,0 +1,8 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: Xorg Section
+# key: Section
+# --
+Section "$1"
+	Identifier "$2"
+    $0
+EndSection