-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
0 parents
commit 8d00428
Showing
37 changed files
with
13,906 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
build/ | ||
node_modules/ | ||
vendor/ | ||
|
||
# Editor directories and files | ||
.idea/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
sudo: false | ||
dist: trusty | ||
language: php | ||
php: | ||
- 7.3 | ||
env: | ||
global: | ||
- CORE_BRANCH=stable18 | ||
matrix: | ||
- DB=pgsql | ||
|
||
matrix: | ||
allow_failures: | ||
- env: DB=pgsql CORE_BRANCH=master | ||
include: | ||
- php: 7.3 | ||
env: DB=sqlite | ||
- php: 7.3 | ||
env: DB=mysql | ||
- php: 7.3 | ||
env: DB=pgsql CORE_BRANCH=master | ||
fast_finish: true | ||
|
||
|
||
before_install: | ||
# enable a display for running JavaScript tests | ||
- export DISPLAY=:99.0 | ||
- sh -e /etc/init.d/xvfb start | ||
- nvm install 8 | ||
- npm install -g npm@latest | ||
- make | ||
- make appstore | ||
# install core | ||
- cd ../ | ||
- git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $CORE_BRANCH nextcloud | ||
- mv "$TRAVIS_BUILD_DIR" nextcloud/apps/wiki | ||
|
||
before_script: | ||
- if [[ "$DB" == 'pgsql' ]]; then createuser -U travis -s oc_autotest; fi | ||
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'create database oc_autotest;'; fi | ||
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"; fi | ||
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"; fi | ||
- cd nextcloud | ||
- mkdir data | ||
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass='' | ||
- ./occ app:enable wiki | ||
- php -S localhost:8080 & | ||
- cd apps/wiki | ||
|
||
script: | ||
- make test | ||
|
||
after_failure: | ||
- cat ../../data/nextcloud.log | ||
|
||
addons: | ||
firefox: 'latest' | ||
mariadb: '10.3' | ||
|
||
services: | ||
- postgresql | ||
- mariadb |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,157 @@ | ||
# This file is licensed under the Affero General Public License version 3 or | ||
# later. See the COPYING file. | ||
# @author Bernhard Posselt <[email protected]> | ||
# @copyright Bernhard Posselt 2016 | ||
|
||
# Generic Makefile for building and packaging a Nextcloud app which uses npm and | ||
# Composer. | ||
# | ||
# Dependencies: | ||
# * make | ||
# * which | ||
# * curl: used if phpunit and composer are not installed to fetch them from the web | ||
# * tar: for building the archive | ||
# * npm: for building and testing everything JS | ||
# | ||
# If no composer.json is in the app root directory, the Composer step | ||
# will be skipped. The same goes for the package.json which can be located in | ||
# the app root or the js/ directory. | ||
# | ||
# The npm command by launches the npm build script: | ||
# | ||
# npm run build | ||
# | ||
# The npm test command launches the npm test script: | ||
# | ||
# npm run test | ||
# | ||
# The idea behind this is to be completely testing and build tool agnostic. All | ||
# build tools and additional package managers should be installed locally in | ||
# your project, since this won't pollute people's global namespace. | ||
# | ||
# The following npm scripts in your package.json install and update the bower | ||
# and npm dependencies and use gulp as build system (notice how everything is | ||
# run from the node_modules folder): | ||
# | ||
# "scripts": { | ||
# "test": "node node_modules/gulp-cli/bin/gulp.js karma", | ||
# "prebuild": "npm install && node_modules/bower/bin/bower install && node_modules/bower/bin/bower update", | ||
# "build": "node node_modules/gulp-cli/bin/gulp.js" | ||
# }, | ||
|
||
app_name=$(notdir $(CURDIR)) | ||
build_tools_directory=$(CURDIR)/build/tools | ||
source_build_directory=$(CURDIR)/build/artifacts/source | ||
source_package_name=$(source_build_directory)/$(app_name) | ||
appstore_build_directory=$(CURDIR)/build/artifacts/appstore | ||
appstore_package_name=$(appstore_build_directory)/$(app_name) | ||
npm=$(shell which npm 2> /dev/null) | ||
composer=$(shell which composer 2> /dev/null) | ||
|
||
all: build | ||
|
||
# Fetches the PHP and JS dependencies and compiles the JS. If no composer.json | ||
# is present, the composer step is skipped, if no package.json or js/package.json | ||
# is present, the npm step is skipped | ||
.PHONY: build | ||
build: | ||
ifneq (,$(wildcard $(CURDIR)/composer.json)) | ||
make composer | ||
endif | ||
ifneq (,$(wildcard $(CURDIR)/package.json)) | ||
make npm | ||
endif | ||
ifneq (,$(wildcard $(CURDIR)/js/package.json)) | ||
make npm | ||
endif | ||
|
||
# Installs and updates the composer dependencies. If composer is not installed | ||
# a copy is fetched from the web | ||
.PHONY: composer | ||
composer: | ||
ifeq (, $(composer)) | ||
@echo "No composer command available, downloading a copy from the web" | ||
mkdir -p $(build_tools_directory) | ||
curl -sS https://getcomposer.org/installer | php | ||
mv composer.phar $(build_tools_directory) | ||
php $(build_tools_directory)/composer.phar install --prefer-dist | ||
php $(build_tools_directory)/composer.phar update --prefer-dist | ||
else | ||
composer install --prefer-dist | ||
composer update --prefer-dist | ||
endif | ||
|
||
# Installs npm dependencies | ||
.PHONY: npm | ||
npm: | ||
ifeq (,$(wildcard $(CURDIR)/package.json)) | ||
cd js && $(npm) run build | ||
else | ||
npm run build | ||
endif | ||
|
||
# Removes the appstore build | ||
.PHONY: clean | ||
clean: | ||
rm -rf ./build | ||
|
||
# Same as clean but also removes dependencies installed by composer, bower and | ||
# npm | ||
.PHONY: distclean | ||
distclean: clean | ||
rm -rf vendor | ||
rm -rf node_modules | ||
rm -rf js/vendor | ||
rm -rf js/node_modules | ||
|
||
# Builds the source and appstore package | ||
.PHONY: dist | ||
dist: | ||
make source | ||
make appstore | ||
|
||
# Builds the source package | ||
.PHONY: source | ||
source: | ||
rm -rf $(source_build_directory) | ||
mkdir -p $(source_build_directory) | ||
tar cvzf $(source_package_name).tar.gz ../$(app_name) \ | ||
--exclude-vcs \ | ||
--exclude="../$(app_name)/build" \ | ||
--exclude="../$(app_name)/js/node_modules" \ | ||
--exclude="../$(app_name)/node_modules" \ | ||
--exclude="../$(app_name)/*.log" \ | ||
--exclude="../$(app_name)/js/*.log" \ | ||
|
||
# Builds the source package for the app store, ignores php and js tests | ||
.PHONY: appstore | ||
appstore: | ||
rm -rf $(appstore_build_directory) | ||
mkdir -p $(appstore_build_directory) | ||
tar cvzf $(appstore_package_name).tar.gz ../$(app_name) \ | ||
--exclude-vcs \ | ||
--exclude="../$(app_name)/build" \ | ||
--exclude="../$(app_name)/tests" \ | ||
--exclude="../$(app_name)/Makefile" \ | ||
--exclude="../$(app_name)/*.log" \ | ||
--exclude="../$(app_name)/phpunit*xml" \ | ||
--exclude="../$(app_name)/composer.*" \ | ||
--exclude="../$(app_name)/js/node_modules" \ | ||
--exclude="../$(app_name)/js/tests" \ | ||
--exclude="../$(app_name)/js/test" \ | ||
--exclude="../$(app_name)/js/*.log" \ | ||
--exclude="../$(app_name)/js/package.json" \ | ||
--exclude="../$(app_name)/js/bower.json" \ | ||
--exclude="../$(app_name)/js/karma.*" \ | ||
--exclude="../$(app_name)/js/protractor.*" \ | ||
--exclude="../$(app_name)/package.json" \ | ||
--exclude="../$(app_name)/bower.json" \ | ||
--exclude="../$(app_name)/karma.*" \ | ||
--exclude="../$(app_name)/protractor\.*" \ | ||
--exclude="../$(app_name)/.*" \ | ||
--exclude="../$(app_name)/js/.*" \ | ||
|
||
.PHONY: test | ||
test: composer | ||
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml | ||
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# Wiki App | ||
Place this app in **nextcloud/apps/** | ||
|
||
## Building the app | ||
|
||
The app can be built by using the provided Makefile by running: | ||
|
||
make | ||
|
||
This requires the following things to be present: | ||
* make | ||
* which | ||
* tar: for building the archive | ||
* curl: used if phpunit and composer are not installed to fetch them from the web | ||
* npm: for building and testing everything JS, only required if a package.json is placed inside the **js/** folder | ||
|
||
The make command will install or update Composer dependencies if a composer.json is present and also **npm run build** if a package.json is present in the **js/** folder. The npm **build** script should use local paths for build systems and package managers, so people that simply want to build the app won't need to install npm libraries globally, e.g.: | ||
|
||
**package.json**: | ||
```json | ||
"scripts": { | ||
"test": "node node_modules/gulp-cli/bin/gulp.js karma", | ||
"prebuild": "npm install && node_modules/bower/bin/bower install && node_modules/bower/bin/bower update", | ||
"build": "node node_modules/gulp-cli/bin/gulp.js" | ||
} | ||
``` | ||
|
||
|
||
## Publish to App Store | ||
|
||
First get an account for the [App Store](http://apps.nextcloud.com/) then run: | ||
|
||
make && make appstore | ||
|
||
The archive is located in build/artifacts/appstore and can then be uploaded to the App Store. | ||
|
||
## Running tests | ||
You can use the provided Makefile to run all tests by using: | ||
|
||
make test | ||
|
||
This will run the PHP unit and integration tests and if a package.json is present in the **js/** folder will execute **npm run test** | ||
|
||
Of course you can also install [PHPUnit](http://phpunit.de/getting-started.html) and use the configurations directly: | ||
|
||
phpunit -c phpunit.xml | ||
|
||
or: | ||
|
||
phpunit -c phpunit.integration.xml | ||
|
||
for integration tests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
<?xml version="1.0"?> | ||
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> | ||
<id>wiki</id> | ||
<name>Wiki</name> | ||
<summary>A wiki for Nextcloud</summary> | ||
<description><![CDATA[ | ||
The Wiki app adds wiki functionality to Nextcloud. | ||
]]></description> | ||
<version>0.0.2</version> | ||
<licence>AGPL</licence> | ||
<author mail="[email protected]" >Jonas Meurer</author> | ||
<namespace>Wiki</namespace> | ||
<category>organization</category> | ||
<category>social</category> | ||
<website>https://0xacab.org/wiki</website> | ||
<bugs>https://0xacab.org/wiki</bugs> | ||
<repository type="git">https://0xacab.org/wiki.git</repository> | ||
<dependencies> | ||
<nextcloud min-version="16" max-version="19" /> | ||
</dependencies> | ||
<navigations> | ||
<navigation> | ||
<name>Wiki</name> | ||
<route>wiki.page.index</route> | ||
</navigation> | ||
</navigations> | ||
</info> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?php | ||
/** | ||
* Nextcloud - Wiki | ||
* | ||
* This file is licensed under the Affero General Public License version 3 or | ||
* later. See the COPYING file. | ||
*/ | ||
|
||
return [ | ||
'resources' => [ | ||
// pages | ||
'page' => ['url' => '/pages'], | ||
'page_api' => ['url' => '/api/0.1/pages'] | ||
], | ||
'routes' => [ | ||
// wikis | ||
['name' => 'wiki#index', 'url' => '/', 'verb' => 'GET'], | ||
['name' => 'wiki#show', 'url' => '/show', 'verb' => 'GET'], | ||
|
||
// api | ||
['name' => 'page_api#preflighted_cors', 'url' => '/api/0.1/{path}', | ||
'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], | ||
] | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"name": "nextcloud/wiki", | ||
"type": "project", | ||
"license": "AGPL", | ||
"authors": [ | ||
{ | ||
"name": "Jonas Meurer", | ||
"email": "[email protected]" | ||
} | ||
], | ||
"require": {}, | ||
"require-dev": { | ||
"phpunit/phpunit": "^7.5" | ||
}, | ||
"scripts": { | ||
"lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l \"{}\" \\;" | ||
} | ||
} |
Oops, something went wrong.