groonga/gcs [master] Process all scenario files in the directory (Groonga-commit) - Groonga - fulltext search engine.

YUKI Hiroshi	2012-11-09 15:08:38 +0900 (Fri, 09 Nov 2012)

  New Revision: 80927494495b0e064d23c8ea70ea3ea88b0dd8db
  https://github.com/groonga/gcs/commit/80927494495b0e064d23c8ea70ea3ea88b0dd8db

  Log:
    Process all scenario files in the directory

  Modified files:
    bin/gcs-run-scenarios

  Modified: bin/gcs-run-scenarios (+44 -17)
===================================================================

--- bin/gcs-run-scenarios    2012-11-09 14:14:19 +0900 (f23c6ac)
+++ bin/gcs-run-scenarios    2012-11-09 15:08:38 +0900 (f48511f)
@@ -16,7 +16,8 @@ var commandLine = new CLI();
 commandLine
   .usage('--scenarios <path to a directory> [options]')
   .option('--scenarios <path to a directory>',
-          'Path to the scenarios directory which includes "scenarios.json".',
+          'Path to the scenarios directory which includes one or more ' +
+            '".json" scenario files.',
           String)
   .option('--document-endpoint <host:port>',
           'The host and port number of the documents/batch API.',
@@ -31,16 +32,21 @@ if (commandLine.options.documentEndpoint)
   client.docEndpoint = commandLine.options.documentEndpoint;
 
 var scenariosDir = path.resolve(process.cwd(), commandLine.options.scenarios);
-var scenariosFile = path.resolve(scenariosDir, 'scenarios.json');
 if (!commandLine.options.scenarios ||
-    !path.existsSync(scenariosFile)) {
+    !path.existsSync(scenariosDir)) {
   client.raiseFatalError('You must specify the path to a scenarios directory ' +
                          'by "--scenarios" option.');
 }
 
-console.log('Scenarios file: ' + scenariosFile);
-var scenarios = fs.readFileSync(scenariosFile);
-scenarios = JSON.parse(scenarios);
+console.log('Processing scenario files in ' + scenariosDir + '...');
+
+var scenarios = path.readdirSync(scenariosDir);
+scenarios = scenarios.filter(function(file) {
+  return /\.json$/i.test(file)
+});
+if (!scenarios.length) {
+  client.raiseFatalError('No scenario file.');
+}
 
 var statusCodeTable = {
   404: 'Not Found',
@@ -48,16 +54,34 @@ var statusCodeTable = {
   200: 'OK'
 };
 
-var resultsDirName = commandLine.options.acs ? 'results-acs' : 'results';
-var resultsDir = path.resolve(scenariosDir, resultsDirName);
-mkdirp.sync(resultsDir);
+var resultsDirNameSuffix = commandLine.options.acs ? 'results-acs' : 'results';
+
+function processScenarios(scenarios) {
+  var scenarioFileName = scenarios.shift();
+
+  console.log('Scenario file: ' + scenarioFileName);
+  var scenario = fs.readFileSync(path.resolve(scenariosDir, scenarioFileName));
+  scenario = JSON.parse(scenario);
+
+  var resultsDirName = scenarioFileName.replace(/\.json$/i, '');
+  var resultsDir = path.resolve(scenariosDir, resultsDirName + '-' + resultsDirNameSuffix);
+  mkdirp.sync(resultsDir);
+
+  processScenario(scenario, function(error) {
+    if (scenarios.length)
+      processScenarios(scenarios);
+    else
+      process.exit(0);
+  });
+}
+
+function processScenario(scenario, callback) {
+  var request = scenario.shift();
 
-function processScenario(scenarios) {
-  var scenario = scenarios.shift();
+  console.log('Processing request: ' + request.name);
 
-  console.log('Processing ' + scenario.name);
-  var filename = scenario.name.replace(/[^a-zA-Z0-9]+/g, '-') + '.txt';
-  client.rawConfigurationRequest(scenario.params.Action, scenario.params, function(error, result) {
+  var filename = request.name.replace(/[^a-zA-Z0-9]+/g, '-') + '.txt';
+  client.rawConfigurationRequest(request.params.Action, request.params, function(error, result) {
     var response = error || result;
 
     var statusCode = response.StatusCode;
@@ -77,10 +101,13 @@ function processScenario(scenarios) {
     fs.writeFile(resultPath, output);
     console.log('Wrote ' + resultPath);
 
-    if (scenarios.length)
-      processScenario(scenarios);
+    if (scenario.length)
+      processScenario(scenario);
+    else if (callback)
+      callback(null, null);
     else
       process.exit(0);
   });
 }
-processScenario(scenarios);
+
+processScenarios(scenarios);
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs [master] Process all scenario files in the directory