Added gulp to the mix

dorothyDorothy · May 30, 2017 · c1cd0d3 · c1cd0d3
1 parent 260b91d
commit c1cd0d3
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 /vendor
+/node_modules
+/logs/*
+!/logs/.gitkeep
 composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
   - 5.6
   - 7.0
-  - hhvm
 
 before_script:
   - composer self-update

diff --git a/README.md b/README.md
diff --git a/src/Learning.php → _src/Learning.php b/src/Learning.php → _src/Learning.php
@@ -9,6 +9,7 @@ public function hasCheese($bool = true)
     return $bool;
   }
 
+
   public function getCheese() {
   	return $this->cheese;
   }

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     },
     "autoload": {
         "psr-4": {
-            "DorothyMolloy\\LearningProject\\": "src"
+            "DorothyMolloy\\LearningProject\\": "_src"
         }
     }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -0,0 +1,47 @@
+var gulp = require('gulp');
+
+var plugins = require("gulp-load-plugins")({
+    pattern: ['gulp-*', 'gulp.*'],
+    replaceString: /\bgulp[\-.]/
+});
+
+/* --- File paths --- */
+var basePaths = {
+	root: '_src/',
+  sass_source: '_src/scss/',
+  js_source: '_src/js/',
+  css_dest: 'deploy/html/css/',
+  js_dest: 'deploy/html/js/'
+};
+
+var appFiles = {
+	php: basePaths.root + '*.php'
+};
+
+/* --- gutils --- */
+
+var gutil = require('gulp-util');
+var changeEvent = function(evt) {
+    gutil.log('File', gutil.colors.cyan(evt.path.replace(new RegExp('/.*(?=/' + basePaths.src + ')/'), '')), 'was', gutil.colors.magenta(evt.type));
+};
+
+/* --- Composer --- */
+composer = require('gulp-composer');
+gulp.task('composer', function(){
+	composer('self-update');
+});
+
+/* --- Replace with something useful! --- */
+gulp.task('thing' , function(){
+	console.log("now calling thing");
+});
+
+
+gulp.task('watch', function(){
+	gulp.watch(['./composer.json', appFiles.php], [ 'composer', 'thing'])
+		.on('change', function(evt){
+			changeEvent(evt);
+		});
+});
+
+gulp.task('default', ['composer', 'watch']);
diff --git a/html/index.php b/html/index.php
@@ -0,0 +1,34 @@
+<?php 
+use DorothyMolloy\LearningProject\Learning;
+require_once '../vendor/autoload.php';
+?>
+
+<!doctype html>
+<html class="no-js" lang="">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <title>the learning project</title>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <!--<link rel="stylesheet" href="css/main.css"> -->
+    </head>
+    <body>
+        <!--[if lt IE 8]>
+            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+        <![endif]-->
+
+        <!-- Add your site or application content here -->
+        <h1>The Learning Project</h1>
+        <p>
+        <?php 
+
+        $learning = new Learning();
+        echo("what cheese? " . $learning->getCheese());
+        ?>
+        </p>
+
+    </body>
+</html>
+
+
diff --git a/logs/.gitkeep b/logs/.gitkeep
diff --git a/npm_install.sh b/npm_install.sh
@@ -0,0 +1 @@
+npm i gulp-composer gulp-load-plugins --save-dev
diff --git a/package.json b/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "learningproject",
+  "version": "1.0",
+  "description": "Just for fun",
+  "main": "gulpfile.js",
+  "dependencies": {
+    "gulp-composer": "^1.4.2",
+    "gulp-load-plugins": "^1.5.0"
+  },
+  "devDependencies": {
+    "browser-sync": "^2.15.0",
+    "gulp": "^3.9.1",
+    "gulp-composer": "^0.4.0",
+    "gulp-load-plugins": "^1.5.0",
+    "gulp-util": "^2.2.14",
+    "gulp-sass": "^2.3.2"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "ssh://[email protected]:dorothyDorothy/learingproject.git"
+  },
+  "keywords": [
+    "Learning",
+    "climbingturn"
+  ],
+  "author": "Dorothy Molloy",
+  "license": "ISC"
+}
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/tests/LearningTest.php b/tests/LearningTest.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: php @@
     php:
       - 5.6
       - 7.0
-      - hhvm
     before_script:
       - composer self-update
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		npm i gulp-composer gulp-load-plugins --save-dev