JavaScript/ringojs combine with ringojs-convenient (#2550)

.travis.yml

@@ -109,7 +109,6 @@ env:
     - "TESTDIR=JavaScript/koa"
     - "TESTDIR=JavaScript/nodejs"
     - "TESTDIR=JavaScript/ringojs"
-    - "TESTDIR=JavaScript/ringojs-convenient"
     - "TESTDIR=JavaScript/sailsjs"
     - "TESTDIR=Kotlin/hexagon"
     - "TESTDIR=Lua/lapis"

frameworks/JavaScript/ringojs-convenient/README.md

@@ -1,34 +0,0 @@
-# RingoJs Benchmarking Test
-
-This is the Ringojs with the Stick framework portion of the [benchmarking test suite](../) comparing a variety of web development platforms.
-
-### JSON Encoding Test
-
-* [JSON test controller/view](ringo-main.js)
-
-### Data-Store/Database Mapping Test
-
-* [DB test controller/model](ringo-main.js)
-
-## Infrastructure Software Versions
-
-The tests were run with:
-
-* [RingoJs v0.9](http://ringojs.org/)
-* [MySQL 5.5.29](https://dev.mysql.com/)
-
-## Test URLs
-### JSON Encoding Test
-
-http://localhost:8080/json
-
-### Data-Store/Database Mapping Test
-
-MySQL:
-
-http://localhost:8080/db
-
-### Variable Query Test
-
-MySQL:
-http://localhost:8080/db?queries=2

frameworks/JavaScript/ringojs-convenient/benchmark_config.json

@@ -1,29 +0,0 @@
-{
-  "framework": "ringojs-convenient",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/db/",
-      "fortune_url": "/fortune",
-      "plaintext_url": "/plaintext",
-      "update_url": "/updates/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "ringo",
-      "language": "JavaScript",
-      "flavor": "RingoJS",
-      "orm": "Micro",
-      "platform": "ringojs",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ringojs-conv",
-      "notes": "Convenient",
-      "versus": "ringojs"
-    }
-  }]
-}

frameworks/JavaScript/ringojs-convenient/source_code

@@ -1,6 +0,0 @@
-./ringojs-convenient/app/
-./ringojs-convenient/app/models.js
-./ringojs-convenient/app/views.js
-./ringojs-convenient/templates/
-./ringojs-convenient/templates/fortunes.reinhardt
-./ringojs-convenient/ringo-main.js

frameworks/JavaScript/ringojs-convenient/app/models.js → frameworks/JavaScript/ringojs/app/models.js

@@ -2,7 +2,7 @@ var {Store, Cache} = require('ringo-sqlstore');
 
 // DO NOT TOUCH THE FOLLOWING LINE.
 // THIS VARIABLE IS REGEX REPLACED BY setup.py
-var dbHost = '172.16.98.98';
+var dbHost = 'TFB-database';
 
 // create and configure store
 var connectionPool = module.singleton("connectionPool", function() {

frameworks/JavaScript/ringojs/benchmark_config.json

@@ -24,6 +24,30 @@
       "display_name": "ringojs",
       "notes": "",
       "versus": ""
+    },
+    "convenient": {
+      "setup_file": "setup-convenient",
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/db/",
+      "fortune_url": "/fortune",
+      "plaintext_url": "/plaintext",
+      "update_url": "/updates/",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "ringo",
+      "language": "JavaScript",
+      "flavor": "RingoJS",
+      "orm": "Micro",
+      "platform": "ringojs",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ringojs-conv",
+      "notes": "Convenient",
+      "versus": "ringojs"
     }
   }]
 }

frameworks/JavaScript/ringojs-convenient/setup.sh → frameworks/JavaScript/ringojs/setup-convenient.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sed -i 's|dbHost = \x27.*\x27;|dbHost = \x27'"${DBHOST}"'\x27|g' app/models.js
-
 fw_depends mysql java ringojs
 
 rm -rf $RINGOJS_HOME/packages/*
@@ -11,4 +9,4 @@ ringo-admin install orfon/reinhardt
 
 (cd $RINGOJS_HOME/packages/ringo-sqlstore/jars && curl -s -O https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar)
 
-ringo --production -J-server -J-Xmx1g -J-Xms1g ringo-main.js &
+ringo --production -J-server -J-Xmx1g -J-Xms1g ringo-convenient-main.js &