cli client [DO NOT MERGE]

.gitignore

@@ -1,3 +1,6 @@
 node_modules/
 public/bower_components/
-.vscode/
+.vscode/
+client/~
+client/build
+*.pyc

client/Dockerfile

@@ -0,0 +1,9 @@
+FROM python:3.5.2-alpine
+
+ENV AppDir=/app
+ENV AppName=
+
+
+mkdir $AppDir
+
+ENTRYPOINT ["$AppDir", ""]

client/MANIFEST

@@ -0,0 +1,7 @@
+# file GENERATED by distutils, do NOT edit
+setup.py
+client\__init__.py
+client\__main__.py
+client\connection.py
+client\dealerships.py
+client\vehicles.py

client/client/__init__.py

@@ -0,0 +1,3 @@
+# Copyright ClusterHQ Inc.  See LICENSE file for details.
+__all__ = [ "client" ]
+

client/client/__main__.py

@@ -0,0 +1,23 @@
+# Copyright ClusterHQ Inc.  See LICENSE file for details.
+"""
+Executed with 'python -m <packageName>'.
+Cannot be imported as a regular module.
+"""
+if __name__ != '__main__':
+    raise ImportError('This module cannot be imported in a Python script.')
+
+baseurl = 'http://localhost:8000/'
+
+import argparse #noqa
+import sys #noqa
+
+from client import connection, dealerships, vehicles
+
+PARSER = argparse.ArgumentParser(description='Primary argument parser', prog='Specify the desired sub-command.')
+SUBPARSERS = PARSER.add_subparsers()
+connection.make_parser(SUBPARSERS)
+dealerships.make_parser(SUBPARSERS)
+vehicles.make_parser(SUBPARSERS)
+
+args = PARSER.parse_args()
+args.func(args)

client/client/connection.py

@@ -0,0 +1,49 @@
+# Copyright ClusterHQ Inc.  See LICENSE file for details.
+
+import json
+import os
+
+### Specify the fully qualified path to the configuration file
+configpath = '{}\.inventory_app.config.json'.format(os.path.expanduser('~'))
+connectionVar = 'INVAPPENDPOINT'
+
+def SetEndpoint(endpoint):
+    """
+    Sets an environment variable to define the URI of the inventory app API
+    and writes the endpoint to a JSON file.
+    """
+    file = GetConfigHandle()
+    file.write(json.dumps({
+        'endpoint': endpoint
+    }))
+    os.environ[connectionVar] = endpoint
+    file.close()
+
+def GetEndpoint():
+    """
+    Get the connection endpoint.
+    """
+    endpoint = os.environ.get(connectionVar)
+    if endpoint == None:
+        raise "Please specify a connection endpoint."
+    else:
+        return endpoint
+
+def GetConfigHandle():
+    home = os.path.expanduser('~')    
+    return open('{0}\.inventory_app.json'.format(home), mode='w')
+
+def make_parser(parent):
+    """
+    Create command line parser for this module.
+    """
+    subparser = parent.add_parser('connection')
+    setup_parser(subparser)
+    subparser.set_defaults(func=main)
+
+def setup_parser(parser):
+    parser.add_argument('--endpoint', help='The prefix of the endpoint (eg. https://localhost:8000)')
+
+def main(args):
+    print("Called main in connection")
+    SetEndpoint(args.endpoint)

client/client/dealerships.py

@@ -0,0 +1,34 @@
+# Copyright ClusterHQ Inc.  See LICENSE file for details.
+
+import requests
+import argparse
+from . import connection
+
+def AddDealership(name, phone, address):
+    print("Creating a new dealership, name: {name}, phone: {phone}, address: {address}".format(name=name, phone=phone, address=address))
+    method = '{}/dealerships'.format(connection.GetEndpoint())
+    requests.post(method, data={
+        'name': name,
+        'phone': phone,
+        'addr': address
+    })
+
+def make_parser(parent):
+    """
+    Create command line parser for this module.
+    """
+    subparser = parent.add_parser('dealerships', aliases=['dealer'])
+    setup_parser(subparser)
+    subparser.set_defaults(func=main)
+
+def setup_parser(parser):
+    """
+    Sets up the parameters for this module.
+    """
+    parser.add_argument('--name', required=True, help='The name of the dealership', metavar='DealerName')
+    parser.add_argument('--phone', required=True, help='The phone number for the dealership', metavar='DealerPhone')
+    parser.add_argument('--address', required=True, help='The address of the dealership', metavar='DealerAddress')
+
+def main(args):
+    print("Called main in dealerships")
+    AddDealership(args.name, args.phone, args.address)

client/client/vehicles.py

@@ -0,0 +1,21 @@
+# Copyright ClusterHQ Inc.  See LICENSE file for details.
+
+import json
+import requests
+
+def AddVehicle(manufacturer, model, year):
+    print("Adding a new vehicle")
+
+def make_parser(parent):
+    """
+    Create command line parser for this module.
+    """
+    subparser = parent.add_parser('vehicles')
+    setup_parser(subparser)
+    subparser.set_defaults(func=main)
+
+def setup_parser(parser):
+    parser.add_argument('--manufacturer', required=True)
+
+def main():
+    print("Called main in vehicles")

client/launch.ps1

@@ -0,0 +1,5 @@
+### Create Python Virtual Environment and change context into it
+$VirtualEnvPath = "$env:USERPROFILE\pyclient"
+virtualenv "$VirtualEnvPath"
+& $VirtualEnvPath\scripts\activate.ps1 
+

client/setup.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+### Documentation for setup.py can be found here: https://docs.python.org/3.5/distutils/setupscript.html
+
+from distutils.core import setup
+
+setup(name='InventoryAppClient',
+      version='1.0',
+      description='A command line client companion for the ClusterHQ Inventory Application sample app.',
+      author='Trevor Sullivan, Ryan Wallner',
+      author_email='[email protected], [email protected]',
+      url='https://github.com/clusterhq/inventory-app',
+      packages=['client'],
+     )
+

docker-compose.localdev.yml

@@ -0,0 +1,36 @@
+# This Docker Compose file is used for local development work.
+# It contains static port mappings, to make the services easily accessible to developers.
+
+version: '2'
+
+volumes:
+  rethink-data:
+    driver: local
+
+services:
+  db:
+    networks:
+      - net
+    image: rethinkdb
+    volumes:
+      - rethink-data:/data
+    ports:
+      - 28015
+      - 29015
+      - '8080:8080'
+  frontend:
+    networks:
+      - net
+    build: ./frontend
+    image: frontend
+    depends_on:
+      - db
+    ports:
+      - '8000:8000'
+    environment:
+      - DATABASE_HOST=db
+      - DATABASE_PORT=28015
+
+networks:
+  net:
+    driver: bridge

frontend/controllers/dealership.js

@@ -0,0 +1,30 @@
+db = require('../db/dbutils')
+rdb = require('rethinkdb')
+
+module.exports.addDealership = function (req, res) {
+	console.log('Creating a new dealership');
+	console.log(req.body);
+	console.log('Dealership name is ' + req.body.name);
+	dbconn = db.connect();
+	dbconn.then(function (conn) {
+		rdb.table('Dealership').insert(req.body).run(conn, function(err, results){
+			console.log(results);
+			conn.close();
+		});
+	});
+	res.send(201, { status: 'Successful' })
+}
+
+module.exports.getDealerships = function (req, res) {
+  console.log('Received GET /dealerships request')
+  dbconn.then(function(conn) {
+    rdb.table('Dealership').run(conn, function(err, cursor) {
+      if (err) throw err;
+      cursor.toArray(function(err, result) {
+          if (err) throw err;
+          console.log("Sending back Dealership results");
+          res.send(JSON.stringify(result, null, 2));
+        });
+    });
+  })
+}

frontend/controllers/vehicles.js

@@ -0,0 +1,16 @@
+db = require('../db/dbutils')
+rdb = require('rethinkdb')
+
+module.exports.getVehicles = function (req, res) {
+	console.log('recieved vehicles request')
+	dbconn.then(function(conn) { 
+		rdb.table('Vehicle').run(conn, function(err, cursor) {
+			if (err) throw err;
+			cursor.toArray(function(err, result) {
+				if (err) throw err;
+				console.log("Sending back Vehicle results");
+				res.send(JSON.stringify(result, null, 2));
+				});
+		});
+	})
+}

frontend/test/dbutils.js → frontend/db/dbutils.js

@@ -8,6 +8,7 @@ var port = process.env.DATABASE_PORT || 28015;
 
 // Setup the connection
 exports.connect = function connect() {
+	console.log('Connecting to RethinkDB')
 	return r.connect({host: host, port: port}) 
 }
 

frontend/package.json

@@ -28,6 +28,7 @@
     "rethinkdb": "2.3.3",
     "request": "2.74.0",
     "assert": "1.4.1",
+    "body-parser": "1.15.2",
     "util": "0.10.3"
   },
   "keywords": [

frontend/sc_modules/http-handler.js

@@ -1,24 +1,11 @@
-r = require('rethinkdb');
+db = require('../db/dbutils')
+rdb = require('rethinkdb')
 
 module.exports.attach = function (expressApp) {
 	// Setup HTTP/REST API for Server Side.
 
-	// Should these vars be centralized?
-	var host = process.env.DATABASE_HOST || '127.0.0.1';
-	var port = process.env.DATABASE_PORT || 28015;
-
-	// Should move this into each API request?
-	// using a function like `connect()` to wrap
-	// it made API response flaky.
-	// See test/dbutils.js for better version.
-	// TODO
-	var conn = null;
-	r.connect({host: host, port: port}, function(err, connection) {
-    		if (err) throw err;
-    		console.log("Connected to RethinkDB");
-    	   	conn = connection;
-	})
-
+	// Connect to RethinkDB
+	dbconn = db.connect();
 
 	// Simple GET /ping for testing HTTP
 	expressApp.get('/ping',(req,res) => {
@@ -28,34 +15,16 @@ module.exports.attach = function (expressApp) {
 	})
 
 	// GET /dealerships (All Dealerships)
-	expressApp.get('/dealerships',(req, res) => {
-		console.log('recieved dealerships request')
-		r.table('Dealership').run(conn, function(err, cursor) {
-    		if (err) throw err;
-    		cursor.toArray(function(err, result) {
-        		if (err) throw err;
-        		console.log("Sending back Dealership results");
-        		res.send(JSON.stringify(result, null, 2));
-    			});
-		});
-	})
+	expressApp.get('/dealerships', require('../controllers/dealership.js').getDealerships)
+
+	// POST /dealerships 
+	expressApp.post('/dealerships', require('../controllers/dealership.js').addDealership)
 
 	// GET /vehicles (All Vehicles)
-	expressApp.get('/vehicles',(req, res) => {
-		console.log('recieved vehicles request')
-		r.table('Vehicle').run(conn, function(err, cursor) {
-    		if (err) throw err;
-    		cursor.toArray(function(err, result) {
-        		if (err) throw err;
-        		console.log("Sending back Vehicle results");
-        		res.send(JSON.stringify(result, null, 2));
-    			});
-		});
-	})
+	expressApp.get('/vehicles', require('../controllers/vehicles.js').getVehicles)
 
 	/* TODO, remove from list when complete */
 
-	//(POST) Dealership(s)
 	//(POST) vehicles to Dealership(s)
 	//(DELETE) Remove vehicles from Dealership(s)
 	//(GET) A Dealership (by ID)

frontend/test/test_http_dealers.js

@@ -8,7 +8,7 @@
 r = require('rethinkdb');
 var assert = require('assert');
 var request = require('request');
-var db = require('./dbutils');
+var db = require('../db/dbutils');
 var dbConnect = db.connect();
 
 var apihost = process.env.FRONTEND_HOST || 'localhost'
@@ -45,6 +45,24 @@ describe('HTTPTests for Dealerships', function() {
       });
     });
 
+    it('/dealerships POST should return HTTP 201 Created', function () {
+      request({
+        url: util.format('http://%s:%s/dealerships', apihost, apiport),
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        json: {
+          name: 'New dealer',
+          phone: '555-999-1122',
+          addr: '123 Street, City, State, ######-####'
+        }
+    }, function (err, res, body) {
+        if (err) throw (err);
+        assert.strictEqual(res.statusCode, 201)
+      })
+    })
+
   });
   /*end tests*/
 });