Merge pull request #1 from garyb/master

Add `thisOrBoth` and `thatOrBoth`

Author: puffnfresh

.gitignore

@@ -1,3 +1,6 @@
-node_modules
-bower_components
-dist
+/.*
+!/.gitignore
+!/.travis.yml
+/bower_components/
+/node_modules/
+/output/

MODULES.md

@@ -96,6 +96,20 @@ these :: forall a b c. (a -> c) -> (b -> c) -> (a -> b -> c) -> These a b -> c
 ```
 
 
+#### `thisOrBoth`
+
+``` purescript
+thisOrBoth :: forall a b. a -> Maybe b -> These a b
+```
+
+
+#### `thatOrBoth`
+
+``` purescript
+thatOrBoth :: forall a b. b -> Maybe a -> These a b
+```
+
+
 #### `fromThese`
 
 ``` purescript

gulpfile.js

@@ -1,14 +1,32 @@
-require('mandragora-bucket')(require('gulp'), {
-  paths: {
-    bower: [
-      'bower_components/purescript-*/src/**/*.purs',
-      'bower_components/purescript-*/purescript-*/src/**/*.purs'
-    ],
-    src: ['src/**/*.purs'],
-    test: ['test/**/*.purs'],
-    docs: {
-      dest: 'MODULES.md'
-    }
-  },
-  tmpDir: 'dist'
+/* jshint node: true */
+"use strict";
+
+var gulp = require("gulp");
+var plumber = require("gulp-plumber");
+var purescript = require("gulp-purescript");
+
+var sources = [
+  "src/**/*.purs",
+  "bower_components/purescript-*/src/**/*.purs"
+];
+
+gulp.task("make", function() {
+  return gulp.src(sources)
+    .pipe(plumber())
+    .pipe(purescript.pscMake());
 });
+
+gulp.task("docs", function () {
+  return gulp.src(["src/**/*.purs"])
+    .pipe(plumber())
+    .pipe(purescript.pscDocs())
+    .pipe(gulp.dest("MODULES.md"));
+});
+
+gulp.task("dotpsci", function () {
+  return gulp.src(sources)
+    .pipe(plumber())
+    .pipe(purescript.dotPsci());
+});
+
+gulp.task("default", ["make", "docs"]);

package.json

@@ -1,8 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "gulp": "~3.8.1",
-    "bower": "~1.4.1",
-    "mandragora-bucket": "~0.2.1"
+    "gulp": "^3.8.11",
+    "gulp-plumber": "^1.0.0",
+    "gulp-purescript": "^0.4.2"
   }
 }

src/Data/These.purs

@@ -85,6 +85,14 @@ these l _ _ (This a) = l a
 these _ r _ (That x) = r x
 these _ _ lr (Both a x) = lr a x
 
+thisOrBoth :: forall a b. a -> Maybe b -> These a b
+thisOrBoth a Nothing = This a
+thisOrBoth a (Just b) = Both a b
+
+thatOrBoth :: forall a b. b -> Maybe a -> These a b
+thatOrBoth b Nothing = That b
+thatOrBoth b (Just a) = Both a b
+
 fromThese :: forall a b. a -> b -> These a b -> Tuple a b
 fromThese _ x (This a)   = Tuple a x
 fromThese a _ (That x)   = Tuple a x