From a04ec5eb5319b7b895ff286fb082acfaaefe0534 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Sat, 8 Jul 2017 13:55:17 +0100 Subject: Export patterns as API and consume them in executables Gitano's executables, in addition to being required for operation, are intended to be examples of how to use the gitano library, so rather than importing with require "gitano.patterns", gitano should be imported and use gitano.patterns. No changes to imports are made inside lib/gitano/ because this would cause an import loop. --- bin/gitano-post-receive-hook.in | 2 +- bin/gitano-pre-receive-hook.in | 2 +- bin/gitano-setup.in | 2 +- lib/gitano.lua | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/gitano-post-receive-hook.in b/bin/gitano-post-receive-hook.in index 0751535..ad77da2 100644 --- a/bin/gitano-post-receive-hook.in +++ b/bin/gitano-post-receive-hook.in @@ -36,7 +36,7 @@ -- @@GITANO_LUA_PATH local gitano = require "gitano" -local pat = require "gitano.patterns" +local pat = gitano.patterns local gall = require "gall" local luxio = require "luxio" local sio = require "luxio.simple" diff --git a/bin/gitano-pre-receive-hook.in b/bin/gitano-pre-receive-hook.in index 19483d1..a81f892 100644 --- a/bin/gitano-pre-receive-hook.in +++ b/bin/gitano-pre-receive-hook.in @@ -36,7 +36,7 @@ -- @@GITANO_LUA_PATH local gitano = require "gitano" -local pat = require "gitano.patterns" +local pat = gitano.patterns local gall = require "gall" local luxio = require "luxio" local sio = require "luxio.simple" diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in index 174b6b8..209104d 100644 --- a/bin/gitano-setup.in +++ b/bin/gitano-setup.in @@ -36,7 +36,7 @@ -- @@GITANO_LUA_PATH local gitano = require "gitano" -local pat = require "gitano.patterns" +local pat = gitano.patterns local gall = require "gall" local luxio = require "luxio" local sio = require "luxio.simple" diff --git a/lib/gitano.lua b/lib/gitano.lua index c8f6bc4..38c22ef 100644 --- a/lib/gitano.lua +++ b/lib/gitano.lua @@ -41,6 +41,7 @@ local supple = require 'gitano.supple' local auth = require 'gitano.auth' local plugins = require 'gitano.plugins' local i18n = require 'gitano.i18n' +local patterns = require 'gitano.patterns' local _VERSION = {1, 0, 0} _VERSION.major = _VERSION[1] @@ -68,4 +69,5 @@ return { auth = auth, plugins = plugins, i18n = i18n, + patterns = patterns, } -- cgit v1.2.1