Merging Develop to Master for Alpha 1

.gitignore

@@ -3,7 +3,7 @@ node_modules/
 videos/
 .DS_Store
 screenshots/
-ui/
 build/
 npm-debug.log
 yarn.lock
+logs/

.travis.yml

@@ -21,6 +21,9 @@ before_install:
   - sudo mv docker-compose /usr/local/bin
   - TARGETDIR=$(pwd) docker-compose up -d
 script:
+  - docker run --rm -v "$(pwd):/clutter" holochain/holochain-proto:develop bash -c "cd /clutter; hcdev test"
+  - docker run --rm -v "$(pwd):/clutter" holochain/holochain-proto:develop bash -c "cd /clutter; hcdev scenario collisionOfHandles"
+  - docker run --rm -v "$(pwd):/clutter" holochain/holochain-proto:develop bash -c "cd /clutter; hcdev scenario followAndShare"
   - cd ui-automation
   - npm install
   - npm test

README.md

@@ -1,25 +1,86 @@
 # Clutter
 
-[![Code Status](https://img.shields.io/badge/Code-Pre--Alpha-orange.svg)](https://github.com/Holochain/clutter#feature-roadmap-and-current-progress)
-[![In Progress](https://img.shields.io/waffle/label/Holochain/clutter/in%20progress.svg)](http://waffle.io/Holochain/clutter)
-[![Gitter](https://badges.gitter.im/metacurrency/holochain.svg)](https://gitter.im/metacurrency/holochain?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
+[![Code Status](https://img.shields.io/badge/Code-Pre--Alpha-orange.svg)](https://github.com/holochain/clutter#feature-roadmap-and-current-progress)
+[![Build Status](https://travis-ci.org/holochain/clutter.svg?branch=develop)](https://travis-ci.org/Holochain/clutter)
+[![In Progress](https://img.shields.io/waffle/label/holochain/clutter/in%20progress.svg)](http://waffle.io/holochain/clutter)
+[![Chat](https://img.shields.io/badge/chat-live-brightgreen.svg)](https://chat.holochain.net/appsup/channels/app-clutter)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
 
-**P2P twitter-clone built on holochain**
-A group of cats is called a Clutter, Cludder, Clowder, Kendle, or Kindle. Maybe it's time for a fully distributed shoutcast network of cool cats to eat a certain bluebird.
+**P2P twitter-clone built on Holochain**
+A group of cats is called a Clutter, Cludder, Clowder, Kendle, or Kindle. Maybe it's time for a peer-to-peer shoutcast system to eat a certain blue bird.
 
-Clutter is a work in progress, sample application which exists to demonstrate how easy it is to build applications on holochain.
+Clutter is a work in progress. It's a sample application designed to demonstrate how easy it is to build applications on [Holochain](https://github.com/holochain/holochain-proto).
 
+If you would like to simply download a build version of the latest Clutter, download and unzip the [latest release](https://github.com/holochain/clutter/releases)
 
 **[Code Status:](https://github.com/metacurrency/holochain/milestones?direction=asc&sort=completeness&state=all)** Pre-alpha. Not for production use. This application has not been audited for any security validation.
 
-## Installation & Usage
+## Clutter Installation
+### From Holochain Release
+If you want to just see Clutter in action and haven't yet installed Holochain, the best way to try it out is simply to use the version included in the latest Holochain release. Go to the [Holochain Releases](https://github.com/holochain/holochain-proto/releases) page and download and unzip the archive for your machine. That archive contains a full version of clutter, along with instructions for running it.
 
-Prerequiste: [Install holochain](https://github.com/metacurrency/holochain/#installation) on your machine and make sure you do the step to set the $GOPATH.
+### From Clutter Release
+You can download the latest Clutter release directly from the [Clutter Release page](https://github.com/Holochain/clutter/releases).
 
-The best way to try out Clutter on your own is to run 2 instances of Clutter and your own Bootstrap server.  So download the latest release from [Clutter Release](https://github.com/Holochain/clutter/releases), unzip it and make 2 copies of the contents into folders called clutter1 and clutter2.  Both folders will have a dna folder and a ui folder in each.
+### Via `hcdev`
 
-Firstly run the bootstrap server which will let each instance of Clutter know about its peers.  The ```bs```  command is part of the Holochain install.  If it doesn't work you probably need to set the $GO_PATH variable. (Soon we won't need this step)
+**Prerequiste:**  [Install holochain](http://developer.holochain.org/Install_Holochain) on your machine and make sure you do the step to set the $GOPATH.
+
+Run the command:
+
+`hcdev init -cloneExample=clutter`
+
+This will create a copy of the Clutter source code in a `clutter` directory.
+
+You can then run clutter in development mode with:
+
+``` shell
+cd clutter
+hcdev web
+```
+and point your browser at `http://localhost:4141` to access the UI.
+
+**--or--**,
+
+assuming that you've already setup your Holochain environment with [`hcadmin init`](https://developer.holochain.org/Command_Line_Tools#hcadmin_init) you can join and run Clutter with:
+
+``` shell
+cd clutter
+hcadmin join . clutter
+hcd clutter
+```
+and point your browser at `http://localhost:3141` to access the UI.
+
+## Installation: for Developers
+
+**Prerequiste:** [Install Holochain](http://developer.holochain.org/Install_Holochain) on your machine and make sure you do the step to set the $GOPATH.
+
+**Dependencies:** If you want to work on the Clutter UI, you will need `nodejs` (https://nodejs.org/en/) (LTS) installed, with `npm` or `yarn` (https://yarnpkg.com/lang/en/docs/install) to be able to build and copy it from the `ui-src` to the `ui` directory:
+
+The following commands will clone the latest build of clutter to your machine (you may want to use your own fork instead of our repo) and then you will either install npm or yarn to build the UI for the app.
+```
+git clone https://github.com/Holochain/clutter.git
+cd clutter/ui-src
+npm install # (or yarn install)
+npm run build # (or yarn build)
+cd ..
+```
+
+After `npm run build`, `npm start` to configure and start the React UI.
+
+### Running Clutter in Dev mode
+Now if you want to run the app, you can run:
+```
+hcdev web
+```
+
+### Running Clutter with Local Boostrap
+
+Holochain does local discovery with MDNS which is not always availble on Windows machines. So during development instead you may want to run your own local bootstrap server for node discovery. These instructions detail how to run 2 instances of Clutter and your own Bootstrap server.
+
+Make two copies of your your clutter folder one called `clutter1` and the other `clutter2`. Both folders will need to have a dna folder and a ui folder in each.
+
+Firstly run the bootstrap server which will let each instance of Clutter know about its peers.  The ```bs```  command is part of the Holochain install. If it doesn't work you probably need to set the $GO_PATH variable. (Soon we won't need this step)
 ```
   bs
 ```
@@ -32,29 +93,29 @@ You will get a response like
 Now start up Clutter in each folder.
 ```
   cd clutter1
-  hcdev -no-nat-upnp -port=6001 -agentID=lucy -mdns=true -bootstrapServer=localhost:3142 web 3141
+  hcdev -DHTport=6001 -agentID=lucy -bootstrapServer=localhost:3142 web 3141
 
   cd ..
   cd clutter2
-  hcdev -no-nat-upnp -port=6002 -agentID=phil -mdns=true -bootstrapServer=localhost:3142 web 4141
+  hcdev -DHTport=6002 -agentID=phil -bootstrapServer=localhost:3142 web 4141
 ```
 You will see a response like:
 ```
 Copying chain to: /Users/philipbeadle/.holochaindev
 Serving holochain with DNA hash:QmVbbeDAHVxC9cTvx6UhNEeTCK99SRKfxKDz3s4mR6TnsS on port:3141
 ```
-Now open a browser at http://localhost:3142/QmVbbeDAHVxC9cTvx6UhNEeTCK99SRKfxKDz3s4mR6TnsS (substituting in the DNA hash from the response above if different) and look at the Bootstrap server.  You will see 2 records like this
+Now open a browser at http://localhost:3142/QmVbbeDAHVxC9cTvx6UhNEeTCK99SRKfxKDz3s4mR6TnsS (substituting in the DNA hash from the response above if different) and look at the Bootstrap server. You will see 2 records like this
 ```doQmVbbeDAHVxC9cTvx6UhNEeTCK99SRKfxKDz3s4mR6TnsS
   [{"Req":{"Version":1,"NodeID":"QmTAjDmQHobs2oQZp4UrbSzkShUGVKcsQUdakHeQ4YYxRX","NodeAddr":"/ip4/0.0.0.0/tcp/6003"},"Remote":"[::1]:63187","LastSeen":"2018-01-11T12:32:15.659887156+11:00"},{"Req":{"Version":1,"NodeID":"QmWQVaqEayZJWnvxLtsKr1iyeTDp3s7m7TTE36HhAUTiTK","NodeAddr":"/ip4/0.0.0.0/tcp/6002"},"Remote":"[::1]:63153","LastSeen":"2018-01-11T12:28:40.85765899+11:00"}]
 ```
-Now open a browser to http://localhost:3141 and you will see Clutter.  Open another tab to http://localhost:4141 and you now have 2 instances of Clutter that you can chat between.  Add a handle in each and then meow and follow each instance and you will see the meows!!
+Now open a browser to http://localhost:3141 and you will see Clutter. Open another tab to http://localhost:4141 and you now have 2 instances of Clutter that you can chat between. Add a handle in each and then meow and follow each instance and you will see the meows!!
 
-### Docker Usage
+## Docker Usage
 You can do all this much easier with Docker. Download the latest release from [Clutter Release](https://github.com/Holochain/clutter/releases), unzip it and cd into the folder. Then run
 ```
   cd ui-src
-  yarn install
-  yarn build
+  npm install # (or yarn install)
+  npm run build # (or yarn build)
   cd ..
   TARGETDIR=$(pwd) docker-compose up
 ```
@@ -67,34 +128,55 @@ This will build the source into a React app and install it in Holochain. Then yo
 ```
 and try out Clutter.
 
-### Tests
+## Tests
 To run all the stand alone DNA tests:
 
 ``` shell
 hcdev test
 ```
 
-Currently there are two scenario tests:
+## Scenarios
+
+### Scenario - Collision Of Handles - Sequence Diagram
+
+``` shell
+  hcdev scenario collisionOfHandles
+```
+
+<img src="collisionOfHandles-sequence.svg" width="80%" />
 
 #### followAndShare
 ``` shell
-hcdev -mdns=true scenario followAndShare
+hcdev scenario followAndShare
 ```
 This test spins up two nodes `jane` and `joe` and tests that following and reading posts works. To watch the network traffic and details try:
 
 ``` shell
-hcdev -debug -mdns=true scenario followAndShare
+hcdev -debug scenario followAndShare
 ```
 #### scaling
 
 This test is designed to be run on separate machines and spins up many clones on each and confirms that they all talk to each other.
 
+## UI automation
+in clutter folder
+```
+  hcdev -execpath=$HOME/.holochaindev1 -DHTport=6001 -agentID=agent3141 web 3141
+  hcdev -execpath=$HOME/.holochaindev2 -DHTport=6002 -agentID=agent4141 web 4141
+  hcdev -execpath=$HOME/.holochaindev3 -DHTport=6003 -agentID=agent5141 web 5141
+```
+
+if running all in one terminal you will need to kill the processes between restarts.
+```
+  kill -kill `lsof -t -i tcp:3141` & kill -kill `lsof -t -i tcp:4141` & kill -kill `lsof -t -i tcp:5141`
+```
+
 ## What the Automated build does
 
-When a branch is pushed to Github Travis runs a build.  The build does the following:
+When a branch is pushed to Github Travis runs a build. The build does the following:
 1. Installs docker-compose
 2. Runs docker-compose up -d which spins up a bootstrap server and 3 instances of clutter
-3. Install the cypress dependencies
+3. Installs the cypress dependencies
 4. Runs the Cypress e2e tests.
 5. If on master a new release is published to github releases. (coming soon)
 
@@ -105,12 +187,14 @@ When a branch is pushed to Github Travis runs a build.  The build does the follo
  - [x] Follow someone (by specified handle)
  - [x] Unfollow someone
  - [x] View post stream of people you follow sorted by time
- - [x] Detect #hashtags in post text
- - [x] Create hashtag anchors if they don't exist
- - [x] Link from hashtag anchor to posts with that hashtag
- - [x] Show posts which have a particular hashtag
- - [x] Mark posts as a favorite :star:
- - [x] Link favorited posts from a user/handle
+ - [x] Provide React/Redux UI
+ - [x] Implement Cypress and Storybook UI testing
+ - [ ] Detect #hashtags in post text
+ - [ ] Create hashtag anchors if they don't exist
+ - [ ] Link from hashtag anchor to posts with that hashtag
+ - [ ] Show posts which have a particular hashtag
+ - [ ] Mark posts as a favorite :star:
+ - [ ] Link favorited posts from a user/handle
  - [ ] Show someone's :star: favorited posts
  - [ ] Edit a previous post **(partially implemented)**
  - [ ] Refollow someone previously unfollowed **(partially implemented - Have to fix put/del/put links sequence)**
@@ -134,7 +218,7 @@ When a branch is pushed to Github Travis runs a build.  The build does the follo
 
 
 ## Contribute
-We welcome pull requests and issue tickets.  Find us on [gitter](https://gitter.im/metacurrency/holochain) to chat.
+We welcome pull requests and issue tickets. Find us on [gitter](https://gitter.im/metacurrency/holochain) to chat.
 
 Contributors to this project are expected to follow our [development protocols & practices](https://github.com/metacurrency/holochain/wiki/Development-Protocols).
 
@@ -143,6 +227,6 @@ Contributors to this project are expected to follow our [development protocols &
 
 Copyright (C) 2017, The MetaCurrency Project (Eric Harris-Braun, Arthur Brock, et. al.)
 
-This program is free software: you can redistribute it and/or modify it under the terms of the license provided in the LICENSE file (GPLv3).  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This program is free software: you can redistribute it and/or modify it under the terms of the license provided in the LICENSE file (GPLv3). This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 **Note:** We are considering other 'looser' licensing options (like MIT license) but at this stage are using GPL while we're getting the matter sorted out.

collisionOfHandles-sequence.md

@@ -0,0 +1,66 @@
+Copying chain to: /Users/philipbeadle/.holochaindev
+Holochain dev service initialized:
+    /tmp/hcdev_scenario_test_nodes_philipbeadle/art directory created
+    defaults stored to system.conf
+    key-pair generated
+    using [email protected] as default agent identity (stored to agent.txt)
+Copying chain to: /tmp/hcdev_scenario_test_nodes_philipbeadle/art
+Holochain dev service initialized:
+    /tmp/hcdev_scenario_test_nodes_philipbeadle/lucy directory created
+    defaults stored to system.conf
+    key-pair generated
+    using [email protected] as default agent identity (stored to agent.txt)
+Copying chain to: /tmp/hcdev_scenario_test_nodes_philipbeadle/lucy
+Holochain dev service initialized:
+    /tmp/hcdev_scenario_test_nodes_philipbeadle/phil directory created
+    defaults stored to system.conf
+    key-pair generated
+    using [email protected] as default agent identity (stored to agent.txt)
+Copying chain to: /tmp/hcdev_scenario_test_nodes_philipbeadle/phil
+lucy: Test 'lucy.0' t+2000ms: Lucy creates a new handle the first time she uses Clutter
+lucy: <mermaid>[email protected]>>DHT:Check to see if [email protected] has any exisitng handles</mermaid>
+lucy: <mermaid>DHT->>[email protected]:returns any handles</mermaid>
+phil: Test 'phil.0' t+6000ms: Phil sets up a new handle 'Archer' the first time he uses Clutter
+phil: <mermaid>[email protected]>>DHT:Check to see if [email protected] has any exisitng handles</mermaid>
+phil: <mermaid>DHT->>[email protected]:returns any handles</mermaid>
+phil: <mermaid>[email protected]>>DHT:Check to see if Archer exists</mermaid>
+phil: <mermaid>DHT-->>[email protected]:Archer does not exist</mermaid>
+phil: <mermaid>[email protected]>>DHT:Check to see if Archer is already taken</mermaid>
+phil: <mermaid>[email protected]>>DHT:Check to see if handle has been setup</mermaid>
+phil: <mermaid>[email protected]>>DHT:Check to see if the Root of all anchors has been setup</mermaid>
+phil: <mermaid>[email protected]>>[email protected]:commit Root of all anchors to local chain</mermaid>
+phil: <mermaid>[email protected]>>DHT:Publish Root of all anchors</mermaid>
+phil: <mermaid>DHT-->>[email protected]:Return the Root Anchor Type</mermaid>
+phil: <mermaid>[email protected]>>[email protected]:commit handle to local chain</mermaid>
+phil: <mermaid>[email protected]>>DHT:Publish handle</mermaid>
+phil: <mermaid>[email protected]>>DHT:Link handle to Root of all anchors</mermaid>
+phil: <mermaid>[email protected]>>[email protected]:commit Archer has been setup</mermaid>
+phil: <mermaid>[email protected]>>DHT:Publish Archer</mermaid>
+phil: <mermaid>[email protected]>>DHT:Link Archer to handle</mermaid>
+phil: <mermaid>DHT-->>[email protected]:Return the anchor for Archer</mermaid>
+phil: <mermaid>[email protected]>>[email protected]:commit new handle</mermaid>
+phil: <mermaid>[email protected]>>DHT:Publish Archer</mermaid>
+phil: <mermaid>[email protected]>>DHT:Link Archer to "handle_links"</mermaid>
+phil: <mermaid>[email protected]>>DHT:Link Archer to "directory_links"</mermaid>
+phil: passed! ✔
+art: Test 'art.0' t+8001ms: Art tries to use handle 'Archer' which is already taken by Phil
+art: <mermaid>[email protected]>>DHT:Check to see if [email protected] has any exisitng handles</mermaid>
+art: <mermaid>DHT->>[email protected]:returns any handles</mermaid>
+art: <mermaid>[email protected]>>DHT:Check to see if Archer exists</mermaid>
+art: <mermaid>DHT-->>[email protected]:Archer exists</mermaid>
+art: passed! ✔
+lucy: <mermaid>[email protected]>>DHT:Check to see if Lucy exists</mermaid>
+lucy: <mermaid>DHT-->>[email protected]:Lucy does not exist</mermaid>
+DHT Query with no peers in routing table!
+lucy: <mermaid>[email protected]>>DHT:Check to see if Lucy is already taken</mermaid>
+lucy: <mermaid>[email protected]>>DHT:Check to see if handle has been setup</mermaid>
+lucy: <mermaid>DHT-->>[email protected]:Return the anchorType handle</mermaid>
+lucy: <mermaid>[email protected]>>[email protected]:commit Lucy has been setup</mermaid>
+lucy: <mermaid>[email protected]>>DHT:Publish Lucy</mermaid>
+lucy: <mermaid>[email protected]>>DHT:Link Lucy to handle</mermaid>
+lucy: <mermaid>DHT-->>[email protected]:Return the anchor for Lucy</mermaid>
+lucy: <mermaid>[email protected]>>[email protected]:commit new handle</mermaid>
+lucy: <mermaid>[email protected]>>DHT:Publish Lucy</mermaid>
+lucy: <mermaid>[email protected]>>DHT:Link Lucy to "handle_links"</mermaid>
+lucy: <mermaid>[email protected]>>DHT:Link Lucy to "directory_links"</mermaid>
+lucy: passed! ✔