Merged develop into master

Author: rogerzr

Readme.md

@@ -2,4 +2,45 @@
 [Nexus](https://github.com/jaracil/nexus/) command line tool. Wrapper of the golang [Nexus client](https://github.com/jaracil/nxcli)
 
 ## Install
-    go get github.com/nayarsystems/nxctl
+    go get github.com/nayarsystems/nxctl
+
+## Config file
+
+The config is read using [Viper](https://github.com/spf13/viper), so it supports JSON, TOML, YAML, HCL, or Java properties formats, from any of these paths: 
+
+* ./
+* $HOME/.nxctl/
+* $HOME/.config/nxctl/
+* $HOME/.local/config/nxctl/
+* /etc/nxctl/
+* %APPDATA%/nxctl/
+
+-- 
+
+    $ cat /home/user/.config/nxctl/default.yml 
+    user: defaultuser
+    password: secretpass
+    server: wss://nexus.local
+    timeout: 120
+
+    $ cat /home/user/.config/nxctl/production.json
+    {
+        "user" : "root" 
+        "password" : "%%verysecretpass%%",
+        "server" : "wss://nexus.remote.com",
+    }
+
+
+Config files can be selected by passing the -c flag, using the filename (without extension):
+
+    $ ./nxctl shell 
+    2016/08/12 08:21:08 Connected to wss://nexus.local
+    2016/08/12 08:21:47 Logged as defaultuser
+    ...
+
+    $ ./nxctl -c production shell 
+    2016/08/12 08:21:08 Connected to wss://nexus.remote.com
+    2016/08/12 08:21:47 Logged as root
+    ...
+
+

cross.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -x
+
+GOOS=linux GOARCH=amd64 go build -o nxctl.linux.amd64
+GOOS=linux GOARCH=386 go build -o nxctl.linux.386
+
+GOOS=darwin GOARCH=amd64 go build -o nxctl.darwin.amd64
+GOOS=darwin GOARCH=386 go build -o nxctl.darwin.386
+
+GOOS=windows GOARCH=amd64 go build -o nxctl.windows.amd64.exe
+GOOS=windows GOARCH=386 go build -o nxctl.windows.386.exe
+
+GOARCH=arm go build -o nxctl.arm

interface.go

@@ -2,12 +2,21 @@ package main
 
 import "github.com/nayarsystems/kingpin"
 
+const (
+	DEFAULT_USER    = "test"
+	DEFAULT_PASS    = "test"
+	DEFAULT_SERVER  = "127.0.0.1:1717"
+	DEFAULT_TIMEOUT = 60
+)
+
 var (
-	app      = kingpin.New("cli", "Nexus command line interface")
-	serverIP = app.Flag("server", "Server address.").Default("127.0.0.1:1717").Short('s').String()
-	timeout  = app.Flag("timeout", "Execution timeout").Default("60").Short('t').Int()
-	user     = app.Flag("user", "Nexus username").Short('u').Default("test").String()
-	pass     = app.Flag("pass", "Nexus password").Default("test").Short('p').String()
+	app       = kingpin.New("cli", "Nexus command line interface")
+	serverIP  = app.Flag("server", "Server address.").Short('s').String()
+	timeout   = app.Flag("timeout", "Execution timeout").Short('t').Int()
+	user      = app.Flag("user", "Nexus username").Short('u').String()
+	pass      = app.Flag("pass", "Nexus password").Short('p').String()
+	config    = app.Flag("config", "Config filename").Short('c').String()
+	ignoreapi = app.Flag("ignoreapi", "Ignore API version check").Bool()
 
 	///
 
@@ -25,6 +34,10 @@ var (
 	pushMethod = push.Arg("method", "Method to call").Required().String()
 	pushParams = push.Arg("params", "parameters").StringMap()
 
+	pushJ       = app.Command("pushj", "Execute a task.push rpc call on Nexus. Params is a json dict like: { 'param': value }")
+	pushJMethod = pushJ.Arg("method", "Method to call").Required().String()
+	pushJParams = pushJ.Arg("json {param:value,...}", "{'param': 3, 'other': {'val': true}}").Required().String()
+
 	pull       = app.Command("pull", "Execute a task.pull rpc call on Nexus")
 	pullMethod = pull.Arg("prefix", "Method to call").Required().String()
 
@@ -69,6 +82,10 @@ var (
 	userReload       = userCmd.Command("reload", "Reloads users on a prefix")
 	userReloadPrefix = userReload.Arg("prefix", "prefix").Required().String()
 
+	userMaxSessions     = userCmd.Command("max-sessions", "Sets the maximum number of sessions for an user")
+	userMaxSessionsUser = userMaxSessions.Arg("username", "username").Required().String()
+	userMaxSessionsN    = userMaxSessions.Arg("max", "max").Required().Int()
+
 	///
 
 	sessionsCmd = app.Command("sessions", "Show sessions info")
@@ -121,8 +138,29 @@ var (
 	templateDelUser     = templateDel.Arg("user", "user").Required().String()
 	templateDelTemplate = templateDel.Arg("template", "template").Required().String()
 
-	templateList     = templateCmd.Command("list", "List the templates from the user")
-	templateListUser = templateList.Arg("user", "user").Required().String()
+	//
+
+	whitelistCmd = app.Command("whitelist", "Whitelist management")
+
+	whitelistAdd     = whitelistCmd.Command("add", "Whitelist an address for the user")
+	whitelistAddUser = whitelistAdd.Arg("user", "user").Required().String()
+	whitelistAddIP   = whitelistAdd.Arg("ip", "ip regex").Required().String()
+
+	whitelistDel     = whitelistCmd.Command("del", "Removes a whitelisted address from the user")
+	whitelistDelUser = whitelistDel.Arg("user", "user").Required().String()
+	whitelistDelIP   = whitelistDel.Arg("ip", "ip regex").Required().String()
+
+	//
+
+	blacklistCmd = app.Command("blacklist", "Blacklist management")
+
+	blacklistAdd     = blacklistCmd.Command("add", "Blacklist an address for the user")
+	blacklistAddUser = blacklistAdd.Arg("user", "user").Required().String()
+	blacklistAddIP   = blacklistAdd.Arg("ip", "ip regex").Required().String()
+
+	blacklistDel     = blacklistCmd.Command("del", "Removes a blacklist from the user")
+	blacklistDelUser = blacklistDel.Arg("user", "user").Required().String()
+	blacklistDelIP   = blacklistDel.Arg("ip", "ip regex").Required().String()
 
 	//