From 6c7f3b3bbd901c3a59edc5312d033e5b770f980a Mon Sep 17 00:00:00 2001
From: Sylvain Baubeau <sbaubeau@redhat.com>
Date: Mon, 12 Jan 2015 10:36:59 +0100
Subject: [PATCH 1/3] Add /api route to show API version #116

---
 api/api.go    | 12 ++++++++++++
 api/router.go |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/api/api.go b/api/api.go
index a4d4be16..182d2536 100644
--- a/api/api.go
+++ b/api/api.go
@@ -1,8 +1,20 @@
 // Package api provides implementation of aptly REST API
 package api
 
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/smira/aptly/aptly"
+)
+
 // Lock order acquisition (canonical):
 //  1. RemoteRepoCollection
 //  2. LocalRepoCollection
 //  3. SnapshotCollection
 //  4. PublishedRepoCollection
+
+// GET /api
+func apiVersion(c *gin.Context) {
+	api := make(map[string]string)
+	api["Version"] = aptly.Version
+	c.JSON(200, api)
+}
diff --git a/api/router.go b/api/router.go
index 3e5b5efd..0eb6827e 100644
--- a/api/router.go
+++ b/api/router.go
@@ -16,6 +16,10 @@ func Router(c *ctx.AptlyContext) http.Handler {
 	router.Use(gin.ErrorLogger())
 
 	root := router.Group("/api")
+	{
+		root.GET("/", apiVersion)
+	}
+
 	{
 		root.GET("/repos", apiReposList)
 		root.POST("/repos", apiReposCreate)

From d489694ea9822aa6fe2684f3c7a59e27253f7a2a Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <Smirnov.Andrey@gmail.com>
Date: Tue, 13 Jan 2015 18:47:41 +0300
Subject: [PATCH 2/3] Refactoring: simplify version generation. Rename API to
 /api/version. #167

---
 api/api.go    | 6 ++----
 api/router.go | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/api/api.go b/api/api.go
index 182d2536..30ba1a24 100644
--- a/api/api.go
+++ b/api/api.go
@@ -12,9 +12,7 @@ import (
 //  3. SnapshotCollection
 //  4. PublishedRepoCollection
 
-// GET /api
+// GET /api/version
 func apiVersion(c *gin.Context) {
-	api := make(map[string]string)
-	api["Version"] = aptly.Version
-	c.JSON(200, api)
+	c.JSON(200, gin.H{"Version": aptly.Version})
 }
diff --git a/api/router.go b/api/router.go
index 0eb6827e..a34bdd10 100644
--- a/api/router.go
+++ b/api/router.go
@@ -16,8 +16,9 @@ func Router(c *ctx.AptlyContext) http.Handler {
 	router.Use(gin.ErrorLogger())
 
 	root := router.Group("/api")
+
 	{
-		root.GET("/", apiVersion)
+		root.GET("/version", apiVersion)
 	}
 
 	{

From a0fa0becc2153b099342eae64f434c59b7d2c7a4 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <Smirnov.Andrey@gmail.com>
Date: Tue, 13 Jan 2015 18:49:32 +0300
Subject: [PATCH 3/3] Add system test on version API. #167

---
 system/t12_api/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/t12_api/__init__.py b/system/t12_api/__init__.py
index 9642eebe..b09d27a0 100644
--- a/system/t12_api/__init__.py
+++ b/system/t12_api/__init__.py
@@ -5,3 +5,4 @@ Testing aptly REST API
 from .repos import *
 from .files import *
 from .publish import *
+from .version import *
\ No newline at end of file