Further updates for v1.0.0

Author: garyb

.travis.yml

@@ -1,15 +1,21 @@
 language: node_js
-sudo: false
-node_js:
-  - 0.10
+dist: trusty
+sudo: required
+node_js: 6
 env:
   - PATH=$HOME/purescript:$PATH
 install:
   - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
   - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
   - tar -xvf $HOME/purescript.tar.gz -C $HOME/
   - chmod a+x $HOME/purescript
-  - npm install bower gulp -g
-  - npm install && bower install
+  - npm install -g bower
+  - npm install
+  - bower install
 script:
-  - gulp
+  - npm run -s build
+after_success:
+- >-
+  test $TRAVIS_TAG &&
+  echo $GITHUB_TOKEN | pulp login &&
+  echo y | pulp publish --no-push

README.md

@@ -1,6 +1,9 @@
 # purescript-these
 
+[![Latest release](http://img.shields.io/bower/v/purescript-these.svg)](https://github.com/purescript/purescript-these/releases)
 [![Build Status](https://travis-ci.org/purescript-contrib/purescript-these.svg?branch=master)](https://travis-ci.org/purescript-contrib/purescript-these)
+[![Dependency Status](https://www.versioneye.com/user/projects/57553f1e7757a0004a1ddf1d/badge.svg?style=flat)](https://www.versioneye.com/user/projects/57553f1e7757a0004a1ddf1d)
+[![Maintainer: garyb](https://img.shields.io/badge/maintainer-garyb-lightgrey.svg)](http://github.com/garyb)
 
 Data type isomorphic to `α ∨ β ∨ (α ∧ β)`
 
@@ -10,6 +13,6 @@ Data type isomorphic to `α ∨ β ∨ (α ∧ β)`
 bower install purescript-these
 ```
 
-## Module documentation
+## Documentation
 
-- [Data.These](docs/Data.These.md)
+Module documentation is [published on Pursuit](http://pursuit.purescript.org/packages/purescript-these).

bower.json

@@ -1,13 +1,22 @@
 {
   "name": "purescript-these",
+  "homepage": "https://github.com/purescript-contrib/purescript-these",
   "description": "Data type isomorphic to: α ∨ β ∨ (α ∧ β)",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git://github.com/purescript-contrib/purescript-these.git"
   },
+  "ignore": [
+    "**/.*",
+    "bower_components",
+    "node_modules",
+    "output",
+    "test",
+    "bower.json",
+    "package.json"
+  ],
   "dependencies": {
-    "purescript-foldable-traversable": "^1.0.0",
-    "purescript-tuples": "^1.0.0"
+    "purescript-generics": "^1.0.0"
   }
 }

docs/Data.These.md

@@ -1,9 +1,12 @@
 {
   "private": true,
+  "scripts": {
+    "clean": "rimraf output && rimraf .pulp-cache",
+    "build": "pulp build --censor-lib --strict"
+  },
   "devDependencies": {
-    "gulp": "^3.8.11",
-    "gulp-plumber": "^1.0.0",
-    "gulp-purescript": "^0.5.0",
-    "rimraf": "^2.3.3"
+    "pulp": "^9.0.0",
+    "purescript-psa": "^0.3.9",
+    "rimraf": "^2.5.0"
   }
 }

gulpfile.js

@@ -1,32 +1,25 @@
 module Data.These where
 
 import Prelude
-  ( ($)
-  , (<$>)
-  , (<*>)
-  , (<<<)
-  , (<>)
-  , class Applicative
-  , class Apply
-  , class Bind
-  , class Functor
-  , class Monad
-  , class Semigroup
-  , class Show
-  , show
-  , pure
-  , id
-  )
+
+import Control.Extend (class Extend)
 
 import Data.Bifunctor (class Bifunctor)
 import Data.Bitraversable (class Bitraversable, class Bifoldable, bitraverse)
+import Data.Functor.Invariant (class Invariant, imapF)
+import Data.Generic (class Generic)
 import Data.Maybe (Maybe(..))
 import Data.Traversable (class Traversable, class Foldable, foldMap, foldl, foldr)
 import Data.Tuple (Tuple(..))
 
-data These a b = This a
-               | That b
-               | Both a b
+data These a b
+  = This a
+  | That b
+  | Both a b
+
+derive instance eqThese :: (Eq a, Eq b) => Eq (These a b)
+derive instance ordThese :: (Ord a, Ord b) => Ord (These a b)
+derive instance genericThese :: (Generic a, Generic b) => Generic (These a b)
 
 instance semigroupThese :: (Semigroup a, Semigroup b) => Semigroup (These a b) where
   append (This a) (This b) = This (a <> b)
@@ -44,6 +37,9 @@ instance functorThese :: Functor (These a) where
   map f (That a) = That (f a)
   map _ (This a) = This a
 
+instance invariantThese :: Invariant (These a) where
+  imap = imapF
+
 instance foldableThese :: Foldable (These a) where
   foldr f z = foldr f z <<< theseRight
   foldl f z = foldl f z <<< theseRight
@@ -88,17 +84,22 @@ instance applicativeThese :: Semigroup a => Applicative (These a) where
 instance bindThese :: Semigroup a => Bind (These a) where
   bind (This a) _ = This a
   bind (That x) k = k x
-  bind (Both a x) k = case k x of
-                         This b -> This (a <> b)
-                         That y -> Both a y
-                         Both b y -> Both (a <> b) y
+  bind (Both a x) k =
+    case k x of
+      This b -> This (a <> b)
+      That y -> Both a y
+      Both b y -> Both (a <> b) y
 
 instance monadThese :: Semigroup a => Monad (These a)
 
+instance extendEither :: Extend (These a) where
+  extend _ (This a) = This a
+  extend f x = map (const (f x)) x
+
 instance showThese :: (Show a, Show b) => Show (These a b) where
-  show (This x) = "This (" <> show x <> ")"
-  show (That y) = "That (" <> show y <> ")"
-  show (Both x y) = "Both (" <> show x <> ") (" <> show y <> ")"
+  show (This x) = "(This " <> show x <> ")"
+  show (That y) = "(That " <> show y <> ")"
+  show (Both x y) = "(Both " <> show x <> " " <> show y <> ")"
 
 these :: forall a b c. (a -> c) -> (b -> c) -> (a -> b -> c) -> These a b -> c
 these l _ _ (This a) = l a