From 34ae0077001a941440cd794f051cbebcfdb47deb Mon Sep 17 00:00:00 2001
From: Josh Baker <joshbaker77@gmail.com>
Date: Thu, 29 Dec 2016 11:54:35 -0700
Subject: [PATCH] 1.7.0

---
 CHANGELOG.md         | 11 +++++++
 README.md            |  2 +-
 build.sh             |  9 +++++-
 core/commands.json   | 73 ++++++++++++++++++++++++++++++++++++++++++++
 core/commands_gen.go | 73 ++++++++++++++++++++++++++++++++++++++++++++
 docker/Dockerfile    |  2 +-
 6 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6331fd7c..2235dbd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.7.0] - 2016-12-29
+### Added
+- #104: PDEL command - Selete objects that match a pattern (@GameFreedom)
+- #99: COMMAND keyword for masking geofences by command type (@amorskoy)
+- #96: SCAN keyword for roaming geofences
+- fba34a9: JSET, JGET, JDEL commands
+
+### Fixed
+- #107: Memory leak (@amorskoy)
+- #98: Output json fix
+
 ## [1.6.0] - 2016-12-11
 ### Added
 - #87: Fencing event grouping (@huangpeizhi)
diff --git a/README.md b/README.md
index ea0cdf8d..2357dab7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
     width="200" height="200" border="0" alt="Tile38"></a>
 </p>
 <p align="center">
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.6.0-green.svg" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.7.0-green.svg" alt="Version"></a>
 <a href="https://travis-ci.org/tidwall/tile38"><img src="https://travis-ci.org/tidwall/tile38.svg?branch=master" alt="Build Status"></a>
 <a href="https://hub.docker.com/r/tile38/tile38"><img src="https://img.shields.io/badge/docker-ready-blue.svg" alt="Docker Ready"></a>
 </p>
diff --git a/build.sh b/build.sh
index 3fc7ebff..d68ebe58 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.6.0"
+VERSION="1.7.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
@@ -14,6 +14,13 @@ if [ "$PROTECTED_MODE" == "no" ]; then
 	LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/core.ProtectedMode=no"
 fi
 
+if [ "$1" == "update-version" ]; then
+	# update the versions in the README.md and Dockerfile
+	sed -i '' "s/version-.\..\../version-$VERSION/g" README.md
+	sed -i '' "s/ENV\ TILE38_VERSION\ .\..\../ENV TILE38_VERSION $VERSION/g" docker/Dockerfile
+	exit
+fi
+
 # Check go install
 if [ "$(which go)" == "" ]; then
 	echo "error: Go is not installed. Please download and follow installation instructions at https://golang.org/dl to continue."
diff --git a/core/commands.json b/core/commands.json
index b9b08300..ce7fd77e 100644
--- a/core/commands.json
+++ b/core/commands.json
@@ -1187,5 +1187,78 @@
       }
     ],
     "group": "keys"
+  },
+  "JGET": {
+    "summary": "Get a value from a JSON document",
+    "complexity": "O(1)",
+    "arguments":[
+      {
+        "name": "key",
+        "type": "string"
+      },
+      {
+        "name": "id",
+        "type": "string"
+      },
+      {
+        "name": "path",
+        "type": "string"
+      },
+      {
+        "command": "RAW",
+        "name": [],
+        "type": [],
+        "optional": true
+      }
+    ],
+    "group": "keys"
+  },
+  "JSET": {
+    "summary": "Set a value in a JSON document",
+    "complexity": "O(1)",
+    "arguments":[
+      {
+        "name": "key",
+        "type": "string"
+      },
+      {
+        "name": "id",
+        "type": "string"
+      },
+      {
+        "name": "path",
+        "type": "string"
+      },
+      {
+        "name": "value",
+        "type": "string"
+      },
+      {
+        "command": "RAW",
+        "name": [],
+        "type": [],
+        "optional": true
+      }
+    ],
+    "group": "keys"
+  },
+  "JDEL": {
+    "summary": "Delete a value from a JSON document",
+    "complexity": "O(1)",
+    "arguments":[
+      {
+        "name": "key",
+        "type": "string"
+      },
+      {
+        "name": "id",
+        "type": "string"
+      },
+      {
+        "name": "path",
+        "type": "string"
+      }
+    ],
+    "group": "keys"
   }
 }
diff --git a/core/commands_gen.go b/core/commands_gen.go
index d0e07d15..8e6a648a 100644
--- a/core/commands_gen.go
+++ b/core/commands_gen.go
@@ -1349,5 +1349,78 @@ var commandsJSON = `{
       }
     ],
     "group": "keys"
+  },
+  "JGET": {
+    "summary": "Get a value from a JSON document",
+    "complexity": "O(1)",
+    "arguments":[
+      {
+        "name": "key",
+        "type": "string"
+      },
+      {
+        "name": "id",
+        "type": "string"
+      },
+      {
+        "name": "path",
+        "type": "string"
+      },
+      {
+        "command": "RAW",
+        "name": [],
+        "type": [],
+        "optional": true
+      }
+    ],
+    "group": "keys"
+  },
+  "JSET": {
+    "summary": "Set a value in a JSON document",
+    "complexity": "O(1)",
+    "arguments":[
+      {
+        "name": "key",
+        "type": "string"
+      },
+      {
+        "name": "id",
+        "type": "string"
+      },
+      {
+        "name": "path",
+        "type": "string"
+      },
+      {
+        "name": "value",
+        "type": "string"
+      },
+      {
+        "command": "RAW",
+        "name": [],
+        "type": [],
+        "optional": true
+      }
+    ],
+    "group": "keys"
+  },
+  "JDEL": {
+    "summary": "Delete a value from a JSON document",
+    "complexity": "O(1)",
+    "arguments":[
+      {
+        "name": "key",
+        "type": "string"
+      },
+      {
+        "name": "id",
+        "type": "string"
+      },
+      {
+        "name": "path",
+        "type": "string"
+      }
+    ],
+    "group": "keys"
   }
 }`
diff --git a/docker/Dockerfile b/docker/Dockerfile
index dc71fb0b..714d4c83 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.6.0
+ENV TILE38_VERSION 1.7.0
 ENV TILE38_DOWNLOAD_URL https://github.com/tidwall/tile38/releases/download/$TILE38_VERSION/tile38-$TILE38_VERSION-linux-amd64.tar.gz
 
 RUN addgroup -S tile38 && adduser -S -G tile38 tile38