Provide owner/ repo as cli arguments

matchilling · matchilling · commit 6140a3e8f834 · 2019-05-11T00:36:41.000+02:00
diff --git a/.env.example b/.env.example
@@ -1,4 +1,2 @@
-GITHUB_USER_NAME=facebook
-GITHUB_REPO_NAME=react
 GITHUB_TOKEN=create a new token here https://github.com/settings/tokens/new
 DATABASE_PATH=path to your sqlite3 database
diff --git a/README.md b/README.md
@@ -32,13 +32,6 @@ The pull request size calculated based on the total lines of code changed (`tota
 ## Usage
 
 ```sh
-# The user and repo name you want to collect and display metrics
-#   e.g. https://github.com/facebook/react
-#   GITHUB_USER_NAME=facebook
-#   GITHUB_REPO_NAME=react
-$ export GITHUB_USER_NAME=github-user-name
-$ export GITHUB_REPO_NAME=github-repo-name
-
 # Create a personal access tokens (https://github.com/settings/tokens/new)
 $ export GITHUB_TOKEN=github-token
 
@@ -48,10 +41,12 @@ $ export DATABASE_PATH=data/github.db
 $ npm install
 
 # Collect data from GitHub
-$ npm start collect
+# npm start collect <owner> <repository>
+$ npm start collect facebook react
 
 # Push data to graphite
-$ npm start export | nc localhost 2003
+# npm start export <owner> <repository>
+$ npm start export facebook react | nc localhost 2003
 
 # The generated time series will be written to `stdout`.
 # github.github-user-name.repository-name.pull_requests.size_m.time_to_merge 3450 1554125772
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
-    command: bash -c "npm start collect && npm start export:toGraphite | nc graphite 2003"
+    command: bash -c "npm test"
     depends_on:
       - graphite
     tty: true
@@ -14,8 +14,6 @@ services:
       - ./data:/opt/github-metrics/data
       - ./src:/opt/github-metrics/src
     environment:
-      GITHUB_USER_NAME: ${GITHUB_USER_NAME}
-      GITHUB_REPO_NAME: ${GITHUB_REPO_NAME}
       GITHUB_TOKEN: ${GITHUB_TOKEN}
       DATABASE_PATH: ${DATABASE_PATH}
 
diff --git a/src/cli.js b/src/cli.js
@@ -8,27 +8,25 @@ const pkg = require('../package.json');
 
 program
   .version(pkg.version)
-  .command('collect')
-  .action(async () => {
+  .command('collect <owner> <repository>')
+  .action(async (owner, repository) => {
     const database = new Database(getOrFail('DATABASE_PATH'), {
       fileMustExist: true,
     });
     const githubClient = new GitHub({
       token: getOrFail('GITHUB_TOKEN'),
     });
 
-    const githubUserName = getOrFail('GITHUB_USER_NAME');
-    const githubRepoName = getOrFail('GITHUB_REPO_NAME');
     const { numberOfPullRequestProcessed, lastCursor } = await collector(
       database,
       githubClient,
-      githubUserName,
-      githubRepoName
+      owner,
+      repository
     );
 
     process.stdout.write(
-      `Stats for "${githubUserName}-${githubRepoName}":\n` +
-        `  Url "https://github.com/${githubUserName}/${githubRepoName}/pulls?utf8=&#10003;&q=is%3Apr+is%3Amerged":\n` +
+      `Stats for "${owner}-${repository}":\n` +
+        `  Url "https://github.com/${owner}/${repository}/pulls?utf8=&#10003;&q=is%3Apr+is%3Amerged":\n` +
         `  Number of processed pull requests: ${numberOfPullRequestProcessed}\n` +
         `  Last cursor: ${lastCursor}\n`
     );
@@ -40,17 +38,13 @@ program
 
 program
   .version(pkg.version)
-  .command('export:toGraphite')
-  .action(async () => {
+  .command('export:toGraphite <owner> <repository>')
+  .action(async (owner, repository) => {
     const database = new Database(getOrFail('DATABASE_PATH'), {
       fileMustExist: true,
     });
 
-    await graphiteExporter(
-      database,
-      getOrFail('GITHUB_USER_NAME'),
-      getOrFail('GITHUB_REPO_NAME')
-    );
+    await graphiteExporter(database, owner, repository);
 
     if (database.open) {
       database.close();
