From 8a0048a88edf10056dcca580cca1c244757e1ab1 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 19 Jul 2021 22:26:59 -0100 Subject: [PATCH] 23.0.0-dev Signed-off-by: Maxence Lange --- CHANGELOG.md | 8 ++- Makefile | 75 ++++++++++++++++++---------- appinfo/info.xml | 4 +- composer.json | 2 +- composer.lock | 22 ++++---- lib/Command/Index.php | 2 +- lib/Command/Live.php | 2 +- lib/Controller/ApiController.php | 2 +- lib/Db/IndexesRequestBuilder.php | 2 +- lib/Db/TickRequestBuilder.php | 2 +- lib/Model/Index.php | 2 +- lib/Model/IndexOptions.php | 2 +- lib/Model/Runner.php | 2 +- lib/Model/SearchRequest.php | 2 +- lib/Model/Tick.php | 2 +- lib/Search/UnifiedSearchProvider.php | 2 +- 16 files changed, 82 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3daf22a3..0e09f084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog -### 21.0.0 + +### 23.0.0 + +- better load of the libs + + +### 20.0.1 - compat nc21 diff --git a/Makefile b/Makefile index e386f0b4..5ca8dd52 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ -app_name=fulltextsearch +app_name=FullTextSearch -project_dir=$(CURDIR) build_dir=$(CURDIR)/build/artifacts appstore_dir=$(build_dir)/appstore source_dir=$(build_dir)/source @@ -8,49 +7,74 @@ sign_dir=$(build_dir)/sign package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud +release_account=nextcloud-releases branch=master -codecov_token_dir=$(HOME)/.nextcloud/codecov_token -version+=21.0.0 +version=23.0.0-dev +since_tag=21.0.1 all: appstore release: appstore github-release github-upload -dev-setup: clean composer - github-release: + if [ -z "$(release_account)" ]; then \ + release_account=$(github_account); \ + release_branch=$(branch); \ + else \ + release_account=$(release_account); \ + release_branch=master; \ + fi; \ + if [ -z "$(since_tag)" ]; then \ + latest_tag=$$(git describe --tags `git rev-list --tags --max-count=1`); \ + else \ + latest_tag=$(since_tag); \ + fi; \ + comparison="$$latest_tag..HEAD"; \ + if [ -z "$$latest_tag" ]; then comparison=""; fi; \ + changelog=$$(git log $$comparison --oneline --no-merges | sed -e 's/^/$(github_account)\/$(app_name)@/'); \ github-release release \ - --user $(github_account) \ + --user $$release_account \ --repo $(app_name) \ - --target $(branch) \ - --tag v$(version) \ - --name "$(app_name) v$(version)" + --target $$release_branch \ + --tag $(version) \ + --description "**Changelog**
$$changelog" \ + --name "$(app_name) v$(version)"; \ + if [ $(github_account) != $$release_account ]; then \ + link="https://github.com/$$release_account/$(app_name)/releases/download/$(version)/$(app_name)-$(version).tar.gz";\ + github-release release \ + --user $(github_account) \ + --repo $(app_name) \ + --target $(branch) \ + --tag $(version) \ + --description "**Download**
$$link

**Changelog**
$$changelog
" \ + --name "$(app_name) v$(version)"; \ + fi; \ + github-upload: + if [ -z "$(release_account)" ]; then \ + release_account=$(github_account); \ + else \ + release_account=$(release_account); \ + fi; \ github-release upload \ - --user $(github_account) \ + --user $$release_account \ --repo $(app_name) \ - --tag v$(version) \ + --tag $(version) \ --name "$(app_name)-$(version).tar.gz" \ --file $(build_dir)/$(app_name)-$(version).tar.gz + clean: rm -rf $(build_dir) rm -rf node_modules - rm -rf vendor +# composer packages composer: composer install --prefer-dist - composer update --prefer-dist - -test: SHELL:=/bin/bash -test: - phpunit --coverage-clover=coverage.xml --configuration=tests/phpunit.xml tests - @if [ -f $(codecov_token_dir)/$(app_name) ]; then \ - bash <(curl -s https://codecov.io/bash) -t @$(codecov_token_dir)/$(app_name) ; \ - fi + composer upgrade --prefer-dist -appstore: dev-setup +appstore: clean composer mkdir -p $(sign_dir) rsync -a \ --exclude=/build \ @@ -60,18 +84,19 @@ appstore: dev-setup --exclude=/tests \ --exclude=.git \ --exclude=/.github \ - --exclude=/composer.json \ - --exclude=/composer.lock \ --exclude=/l10n/l10n.pl \ --exclude=/CONTRIBUTING.md \ --exclude=/issue_template.md \ --exclude=/README.md \ + --exclude=/composer.json \ + --exclude=/testConfiguration.json \ + --exclude=/composer.lock \ --exclude=/.gitattributes \ --exclude=/.gitignore \ --exclude=/.scrutinizer.yml \ --exclude=/.travis.yml \ --exclude=/Makefile \ - $(project_dir)/ $(sign_dir)/$(app_name) + ./ $(sign_dir)/$(app_name) tar -czf $(build_dir)/$(app_name)-$(version).tar.gz \ -C $(sign_dir) $(app_name) @if [ -f $(cert_dir)/$(app_name).key ]; then \ diff --git a/appinfo/info.xml b/appinfo/info.xml index f8d16be7..8d07c4db 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -10,7 +10,7 @@ Core App of the full-text search framework for your Nextcloud. ]]> - 21.0.0 + 23.0.0-dev agpl Maxence Lange FullTextSearch @@ -23,7 +23,7 @@ Core App of the full-text search framework for your Nextcloud. https://github.com/nextcloud/fulltextsearch.git https://raw.githubusercontent.com/nextcloud/fulltextsearch/master/screenshots/0.3.0.png - + diff --git a/composer.json b/composer.json index 95a21827..8253a431 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,6 @@ } }, "require": { - "daita/my-small-php-tools": "~22" + "artificial-owl/my-small-php-tools": "~23" } } diff --git a/composer.lock b/composer.lock index 4484dae5..8ba15673 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9a74aaff9a9f470d6915232e517f88a5", + "content-hash": "b52d6a5c9fb9be09368e44333c380806", "packages": [ { - "name": "daita/my-small-php-tools", - "version": "v22.0.3", + "name": "artificial-owl/my-small-php-tools", + "version": "v23.0.1", "source": { "type": "git", - "url": "https://github.com/daita/my-small-php-tools.git", - "reference": "5a6c67be6f76955f44651fba8ebad9e6f9216acc" + "url": "https://github.com/ArtificialOwl/my-small-php-tools.git", + "reference": "f6141b8d572dc11fe73db99d37f8fd3389550eec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/5a6c67be6f76955f44651fba8ebad9e6f9216acc", - "reference": "5a6c67be6f76955f44651fba8ebad9e6f9216acc", + "url": "https://api.github.com/repos/ArtificialOwl/my-small-php-tools/zipball/f6141b8d572dc11fe73db99d37f8fd3389550eec", + "reference": "f6141b8d572dc11fe73db99d37f8fd3389550eec", "shasum": "" }, "require": { @@ -26,7 +26,7 @@ "type": "library", "autoload": { "psr-4": { - "daita\\MySmallPhpTools\\": "lib/" + "ArtificialOwl\\MySmallPhpTools\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -41,10 +41,10 @@ ], "description": "My small PHP Tools", "support": { - "issues": "https://github.com/daita/my-small-php-tools/issues", - "source": "https://github.com/daita/my-small-php-tools/tree/v22.0.3" + "issues": "https://github.com/ArtificialOwl/my-small-php-tools/issues", + "source": "https://github.com/ArtificialOwl/my-small-php-tools/tree/v23.0.1" }, - "time": "2021-05-04T18:18:55+00:00" + "time": "2021-07-11T13:19:33+00:00" } ], "packages-dev": [], diff --git a/lib/Command/Index.php b/lib/Command/Index.php index 3ca084b8..d0f7132c 100644 --- a/lib/Command/Index.php +++ b/lib/Command/Index.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Command; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use Exception; use OC\Core\Command\InterruptedException; use OCA\FullTextSearch\ACommandBase; diff --git a/lib/Command/Live.php b/lib/Command/Live.php index 1a26a3d2..ee63ac04 100644 --- a/lib/Command/Live.php +++ b/lib/Command/Live.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Command; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use Exception; use OC\Core\Command\InterruptedException; use OCA\FullTextSearch\ACommandBase; diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php index d3c23166..6fd86cf3 100644 --- a/lib/Controller/ApiController.php +++ b/lib/Controller/ApiController.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Controller; -use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse; +use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse; use Exception; use OCA\FullTextSearch\AppInfo\Application; use OCA\FullTextSearch\Model\SearchRequest; diff --git a/lib/Db/IndexesRequestBuilder.php b/lib/Db/IndexesRequestBuilder.php index 3baeb449..d81df09f 100644 --- a/lib/Db/IndexesRequestBuilder.php +++ b/lib/Db/IndexesRequestBuilder.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Db; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use OCA\FullTextSearch\Model\Index; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/lib/Db/TickRequestBuilder.php b/lib/Db/TickRequestBuilder.php index ee52b203..81cdd0d5 100644 --- a/lib/Db/TickRequestBuilder.php +++ b/lib/Db/TickRequestBuilder.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Db; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use OCA\FullTextSearch\Model\Tick; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/lib/Model/Index.php b/lib/Model/Index.php index dd25e688..a324fff9 100644 --- a/lib/Model/Index.php +++ b/lib/Model/Index.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Model; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use JsonSerializable; use OCP\FullTextSearch\Model\IIndex; diff --git a/lib/Model/IndexOptions.php b/lib/Model/IndexOptions.php index e5fdd256..6d548765 100644 --- a/lib/Model/IndexOptions.php +++ b/lib/Model/IndexOptions.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Model; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use JsonSerializable; use OCP\FullTextSearch\Model\IIndexOptions; diff --git a/lib/Model/Runner.php b/lib/Model/Runner.php index b0c82ddd..f09075ea 100644 --- a/lib/Model/Runner.php +++ b/lib/Model/Runner.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Model; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use Exception; use OCA\FullTextSearch\ACommandBase; use OCA\FullTextSearch\Exceptions\RunnerAlreadyUpException; diff --git a/lib/Model/SearchRequest.php b/lib/Model/SearchRequest.php index ab07e553..c56a5e2a 100644 --- a/lib/Model/SearchRequest.php +++ b/lib/Model/SearchRequest.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Model; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use JsonSerializable; use OCP\FullTextSearch\Model\ISearchRequest; use OCP\FullTextSearch\Model\ISearchRequestSimpleQuery; diff --git a/lib/Model/Tick.php b/lib/Model/Tick.php index 3a9efc20..fada00a8 100644 --- a/lib/Model/Tick.php +++ b/lib/Model/Tick.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Model; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; /** * Class Tick diff --git a/lib/Search/UnifiedSearchProvider.php b/lib/Search/UnifiedSearchProvider.php index c2e908ef..70cf72e3 100644 --- a/lib/Search/UnifiedSearchProvider.php +++ b/lib/Search/UnifiedSearchProvider.php @@ -31,7 +31,7 @@ namespace OCA\FullTextSearch\Search; -use daita\MySmallPhpTools\Traits\TArrayTools; +use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use Exception; use OCA\FullTextSearch\Model\SearchRequest; use OCA\FullTextSearch\Service\ConfigService;