From f46aced226171bce711e96281f6ac5fb1428d71d Mon Sep 17 00:00:00 2001 From: Gerben Date: Mon, 10 Sep 2018 19:20:01 +0200 Subject: [PATCH] Remove unused files&folders --- .travis.yml | 64 -------- Makefile | 157 ------------------- README.md | 52 ------ composer.json | 15 -- css/style.css | 3 - img/app.svg | 56 ------- js/script.js | 0 phpunit.integration.xml | 7 - phpunit.xml | 7 - templates/content/index.php | 1 - templates/index.php | 18 --- templates/navigation/index.php | 10 -- templates/settings/index.php | 10 -- tests/Integration/AppTest.php | 29 ---- tests/Unit/Controller/PageControllerTest.php | 31 ---- tests/bootstrap.php | 19 --- 16 files changed, 479 deletions(-) delete mode 100644 .travis.yml delete mode 100644 Makefile delete mode 100644 README.md delete mode 100644 composer.json delete mode 100644 css/style.css delete mode 100644 img/app.svg delete mode 100644 js/script.js delete mode 100644 phpunit.integration.xml delete mode 100644 phpunit.xml delete mode 100644 templates/content/index.php delete mode 100644 templates/index.php delete mode 100644 templates/navigation/index.php delete mode 100644 templates/settings/index.php delete mode 100644 tests/Integration/AppTest.php delete mode 100644 tests/Unit/Controller/PageControllerTest.php delete mode 100644 tests/bootstrap.php diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b66bc03..0000000 --- a/.travis.yml +++ /dev/null @@ -1,64 +0,0 @@ -sudo: false -dist: trusty -language: php -php: - - 5.6 - - 7 - - 7.1 -env: - global: - - CORE_BRANCH=stable14 - matrix: - - DB=pgsql - -matrix: - allow_failures: - - env: DB=pgsql CORE_BRANCH=master - include: - - php: 5.6 - env: DB=sqlite - - php: 5.6 - env: DB=mysql - - php: 5.6 - 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/raw - -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 raw - - php -S localhost:8080 & - - cd apps/raw - -script: - - make test - -after_failure: - - cat ../../data/nextcloud.log - -addons: - firefox: 'latest' - mariadb: '10.1' - -services: - - postgresql - - mariadb diff --git a/Makefile b/Makefile deleted file mode 100644 index ada504f..0000000 --- a/Makefile +++ /dev/null @@ -1,157 +0,0 @@ -# This file is licensed under the Affero General Public License version 3 or -# later. See the COPYING file. -# @author Bernhard Posselt -# @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 diff --git a/README.md b/README.md deleted file mode 100644 index aacb0c9..0000000 --- a/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# Raw -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 diff --git a/composer.json b/composer.json deleted file mode 100644 index a998070..0000000 --- a/composer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Raw", - "description": "a", - "type": "project", - "license": "AGPL", - "authors": [ - { - "name": "a" - } - ], - "require": {}, - "require-dev": { - "phpunit/phpunit": "^5.4" - } -} diff --git a/css/style.css b/css/style.css deleted file mode 100644 index ce350c6..0000000 --- a/css/style.css +++ /dev/null @@ -1,3 +0,0 @@ -#hello { - color: red; -} diff --git a/img/app.svg b/img/app.svg deleted file mode 100644 index fe370f8..0000000 --- a/img/app.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/js/script.js b/js/script.js deleted file mode 100644 index e69de29..0000000 diff --git a/phpunit.integration.xml b/phpunit.integration.xml deleted file mode 100644 index eae19f1..0000000 --- a/phpunit.integration.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - ./tests/Integration - - - diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 82c96d6..0000000 --- a/phpunit.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - ./tests/Unit - - - diff --git a/templates/content/index.php b/templates/content/index.php deleted file mode 100644 index 159202e..0000000 --- a/templates/content/index.php +++ /dev/null @@ -1 +0,0 @@ -

Hello world

diff --git a/templates/index.php b/templates/index.php deleted file mode 100644 index 401dd4c..0000000 --- a/templates/index.php +++ /dev/null @@ -1,18 +0,0 @@ - - -
-
- inc('navigation/index')); ?> - inc('settings/index')); ?> -
- -
-
- inc('content/index')); ?> -
-
-
- diff --git a/templates/navigation/index.php b/templates/navigation/index.php deleted file mode 100644 index efa95c6..0000000 --- a/templates/navigation/index.php +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/templates/settings/index.php b/templates/settings/index.php deleted file mode 100644 index ac7c671..0000000 --- a/templates/settings/index.php +++ /dev/null @@ -1,10 +0,0 @@ -
-
- -
-
- -
-
diff --git a/tests/Integration/AppTest.php b/tests/Integration/AppTest.php deleted file mode 100644 index e3e7f22..0000000 --- a/tests/Integration/AppTest.php +++ /dev/null @@ -1,29 +0,0 @@ -container = $app->getContainer(); - } - - public function testAppInstalled() { - $appManager = $this->container->query('OCP\App\IAppManager'); - $this->assertTrue($appManager->isInstalled('raw')); - } - -} diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php deleted file mode 100644 index 6f4ca81..0000000 --- a/tests/Unit/Controller/PageControllerTest.php +++ /dev/null @@ -1,31 +0,0 @@ -getMockBuilder('OCP\IRequest')->getMock(); - - $this->controller = new PageController( - 'raw', $request, $this->userId - ); - } - - public function testIndex() { - $result = $this->controller->index(); - - $this->assertEquals('index', $result->getTemplateName()); - $this->assertTrue($result instanceof TemplateResponse); - } - -} diff --git a/tests/bootstrap.php b/tests/bootstrap.php deleted file mode 100644 index ff71f03..0000000 --- a/tests/bootstrap.php +++ /dev/null @@ -1,19 +0,0 @@ -addValidRoot(OC::$SERVERROOT . '/tests'); - -// Fix for "Autoload path not allowed: .../raw/tests/testcase.php" -\OC_App::loadApp('raw'); - -if(!class_exists('PHPUnit_Framework_TestCase')) { - require_once('PHPUnit/Autoload.php'); -} - -OC_Hook::clear();