Commit Graph

3083 Commits

Author SHA1 Message Date
Ben Kalman bbfc27d7fe Revert "Remove demo-server and receipts code" (#2791) 2016-10-31 17:10:17 -07:00
Ben Kalman ba5e309c84 Remove demo-server and receipts code (#2790)
They're in attic now: https://github.com/attic-labs/attic
2016-10-31 17:08:18 -07:00
Ben Kalman 26391d9d57 Implement private databases for the demo server (#2772)
Private databases begin with "/p/" - for example, "/kalman" is not
private, but "/p/kalman" is private. They are not the same database.

The bulk of this work is the receipt infrastructure.

A receipt is form data that gives access to a database, encrypted using
secretbox. For example, "Database=/p/kalman&Date=12345678" might encrypt
to "SFH5bcIJ3_XgEbtmi_AdCKTItW20fl90czVl5_pF5PAXhNQ366U1yOpYGAjT".

* A new tool receiptkey generates random receipt (secretbox) keys.
* A new tool receipttool generates receipts for databases.
* demo-server has been updated to check for a receipt in the
  Authorization header to access private databases.

receipttool and demo-server must be given the same receipt key.
2016-10-31 10:58:33 -07:00
Mike Gray 8b198cc71b Nomsfs working with FUSE for Mac 3.5.2
Only changes were in vendor
2016-10-30 18:57:55 -04:00
Dan Willhite 82f2a1218b Add resources field to find-photo's Photo object (#2778) 2016-10-30 14:21:35 -07:00
Dan Willhite 1cd34e0ebd Add Append() method to types.Path (#2783) 2016-10-29 12:37:50 -07:00
Erik Arvidsson 3a4e0dbd75 Remove publish-js-sdk.py (#2786)
This file was renamed to publish-to-npm.py
2016-10-28 18:04:38 -07:00
Erik Arvidsson 9a3a119e60 Update build scripts to use the installed node (#2781) 2016-10-28 18:01:07 -07:00
Erik Arvidsson 37ede2373e Rename publish-js-sdk to publish-to-npm (#2785)
I'm doing this in two steps to allow the builders to continue to work.
2016-10-28 17:54:06 -07:00
Erik Arvidsson 817af58a5b Add omitempty to Go marshal (#2784)
If you provide an omitempty tag and the Go value is the zero/empty value
then we do not include that field in the resulting Noms struct.

Towards #2376
2016-10-28 17:36:02 -07:00
Erik Arvidsson 9dafe3da6c Make publish-js-sdk.py publish all packages (#2777) 2016-10-28 16:36:25 -07:00
Erik Arvidsson 2bd617ade8 Add delete field to structs (#2779) 2016-10-28 15:22:37 -07:00
Erik Arvidsson 7983e61afc Use babel-preset-noms (#2780) 2016-10-28 15:04:20 -07:00
Erik Arvidsson 0029b81ab4 Fix babel-preset-noms (#2776)
It wasn't working on the code coverage tests. Now I restored this
to what it was before these changes (minus removing some features
that chrome and node now supports out of the box)
2016-10-28 12:10:00 -07:00
Aaron Boodman bfaad752f8 Remove old noms-merge command from autobuild binaries list (#2775) 2016-10-27 17:57:55 -07:00
Erik Arvidsson bbea22b395 Mark non standalone packages as private (#2773)
This prevents us from doing npm publish on them.

https://docs.npmjs.com/files/package.json#private
2016-10-27 17:05:21 -07:00
Erik Arvidsson 529d796ad4 Fix syntax error in package.json (#2774) 2016-10-27 16:27:31 -07:00
Erik Arvidsson 7be17c5dfd Add a babel-preset-react module (#2770)
This simplifies dependency handling
2016-10-27 16:24:03 -07:00
Ben Kalman 2e27fd9815 Add vendor/golang.org/x/crypto (#2771) 2016-10-27 16:15:20 -07:00
cmasone-attic f2ca3d6e8e Add noms merge (#2768)
Add optional merging functionality to noms commit.
noms merge <database> <left-dataset-name> <right-dataset-name> <output-dataset-name>

The command above will look in the given Database for the two named
Datasets and, if possible, merge their HeadValue()s and commit the
result back to <output-dataset-name>.

Fixes #2535
2016-10-27 15:27:36 -07:00
Dan Willhite 8bd980553b Make pin return unchanged spec if it's already pinned (#2769) 2016-10-27 15:17:53 -07:00
Erik Arvidsson 8320cb6d28 Use the eslint-config-noms instead (#2767) 2016-10-27 13:28:26 -07:00
cmasone-attic e954427903 Go: add heuristic merge option to db.Commit() (#2759)
This patch adds an optional MergePolicy field to CommitOptions. It's a
callback. If the caller sets it, then the commit code will look for a
common ancestor between the Dataset HEAD and the provided Commit. If
the caller-provided Commit descends from HEAD, then Commit proceeds as
normal.
If it does not, but there is a common ancestor, the code runs
merge.ThreeWay() on the values of the provided Commit, HEAD, and the
common ancestor, invoking the MergePolicy callback to resolve
conflicts. If merge succeeds, a merge Commit is created that descends
from both HEAD and the caller-provided Commit. This becomes the new
HEAD of the Dataset.

Fixes #2534
2016-10-27 11:52:46 -07:00
Erik Arvidsson b9db5d1bc2 Make our eslint setup less hacky (#2766)
Rename the package to eslint-config-noms as documented on the eslint
site.

This allows other npm modules to use and `extends: 'noms'` in their
eslint rc file.
2016-10-27 11:51:55 -07:00
Vinicius Baggio Fuentes b0d51997fa go/marshal: allow any struct names while unmarshaling. (#2761) 2016-10-26 17:56:52 -07:00
Erik Arvidsson 3be4130a03 Export BatchStoreAdaptor (#2760) 2016-10-26 14:58:51 -07:00
zcstarr fdf86980d5 Adds face merge functionality to photos (#2750)
Performs face merge functionality, it takes a photo's set of
face center points and face rectangles and returns the
set of faces in which the face rectangle contains the face
center point. We store a new photo object with a set of faces, that
have the names from the face center points and the rectangles from the
face rectangles.
2016-10-26 09:28:16 -07:00
Erik Arvidsson c15a2bb770 Use a newer version of @attic/eslintrc (#2758) 2016-10-25 16:58:02 -07:00
Erik Arvidsson 17d1587b34 Disable more eslint rules (#2756) 2016-10-25 16:14:40 -07:00
Erik Arvidsson 68581f6f1c Disable space-after-type-colon eslint rule (#2755) 2016-10-25 15:58:50 -07:00
Erik Arvidsson 7ae91491a6 Update version of eslintrc (#2754)
This is so that we can have the clients depend on the fix.
2016-10-25 15:47:19 -07:00
Mike Gray b9ffc511d9 Better codecov usage (#2753) 2016-10-25 15:28:54 -04:00
Ben Kalman 107c3fe9c0 Update eslint to 3.8.1, noms was broken at 3.8.1 (#2751)
Also remove roll.py (not used anymore, we use file path) and make it
pinned to a specific version (so that this doesn't happen again.
2016-10-24 17:31:59 -07:00
cmasone-attic d8f172df09 Remove commit de-duping (#2749)
Now that we're going to put in real commit-merge logic, we
can take out the very-old hack that deduplicated identical
commits.

Fixes #2720
2016-10-24 10:12:16 -07:00
Aaron Boodman 428eb8d15d Update js-tour.md 2016-10-23 08:18:11 -07:00
Aaron Boodman 81655bb81b Update go-tour.md 2016-10-23 08:17:34 -07:00
Aaron Boodman bbf9a84974 Update index.md 2016-10-23 08:14:42 -07:00
Aaron Boodman a3c29038ce Update README.md 2016-10-23 08:12:11 -07:00
Aaron Boodman dcaf5c12dd Update index.md 2016-10-23 08:09:09 -07:00
Aaron Boodman 412f1a0ca9 Rename index.html to index.md 2016-10-23 08:08:25 -07:00
Aaron Boodman 4deac983a0 Create index.html 2016-10-23 08:07:51 -07:00
Erik Arvidsson 0eb940e50a First cut at noms migrate (#2594)
This iterates over all the values of the old version and creates new
values of the new version.

Closes #2428
Fixes #2272
2016-10-21 15:16:29 -07:00
Aaron Boodman fd7c1cc14d Make dropbox work with the photos sample (#2745)
* dropbox/find-photos: encode auth token in photo URLs so they can
work in UI.

* Remove requirement for datePublished from photo-index

Dropbox doesn't have a publish date

* fix test

* review comments

* npm test
2016-10-21 14:49:03 -07:00
Ben Kalman cf296b48ca Fix photo set intersection bug (#2746) 2016-10-21 14:28:42 -07:00
Aaron Boodman 3afbc18079 picasa/slurp: use the redirect-less flow instead (#2732)
picasa/slurp: use the redirect-less flow instead
2016-10-20 21:32:41 -07:00
Ben Kalman 007ba18987 Use the same cursor when initializing and finalizing the chunker (#2729)
Previously we would clone them from the original cursor, to (a) not
modify the original cursor, and (b) have initialization and finalization
not interfere with each other.

However, this isn't necessary and it just creates unnecessary churn. For
example, when we read-ahead, it would be wasteful to re-read the
read-head chunks from initialization.
2016-10-20 16:04:03 -07:00
Dan Willhite d94fb97788 Move diff package to top-level go directory (#2739)
Towards #609.
2016-10-20 10:19:57 -07:00
Aaron Boodman b9e104bfbd Fix date grouping logic (#2740)
Fix timestamp grouping
2016-10-20 09:49:45 -07:00
Aaron Boodman 7099c89bc9 Introduce the concept of an 'id' to several samples (#2738) 2016-10-20 09:49:22 -07:00
Aaron Boodman 02d0a8e8f7 ['foo'] -> .foo (#2736) 2016-10-20 06:51:40 -07:00