refactor: Unified and simplified package.json and version handling

apiaryio · Aug 18, 2016 · 621bd4f · 621bd4f
1 parent bcb5234
commit 621bd4f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 19 deletions.
diff --git a/src/dredd-command.coffee b/src/dredd-command.coffee
@@ -5,13 +5,12 @@ fs = require 'fs'
 spawnArgs = require 'spawn-args'
 {spawn} = require('child_process')
 
-parsePackageJson = require './parse-package-json'
 Dredd = require './dredd'
 interactiveConfig = require './interactive-config'
 configUtils = require './config-utils'
 logger = require './logger'
 
-version = parsePackageJson path.join(__dirname, '../package.json')
+packageData = require('../package.json')
 
 TERM_TIMEOUT = 1000
 TERM_RETRY = 500
@@ -178,7 +177,7 @@ class DreddCommand
 
     # show version
     else if @argv.version is true
-      console.log version
+      console.log("#{packageData.name} v#{packageData.version}")
       return @_processExit(0)
 
   loadDreddFile: ->

diff --git a/src/parse-package-json.coffee b/src/parse-package-json.coffee
diff --git a/src/reporters/apiary-reporter.coffee b/src/reporters/apiary-reporter.coffee
@@ -6,7 +6,7 @@ url = require 'url'
 clone = require 'clone'
 generateUuid = require('node-uuid').v4
 
-packageConfig = require './../../package.json'
+packageData = require './../../package.json'
 logger = require './../logger'
 
 CONNECTION_ERRORS = ['ECONNRESET', 'ENOTFOUND', 'ESOCKETTIMEDOUT', 'ETIMEDOUT', 'ECONNREFUSED', 'EHOSTUNREACH', 'EPIPE']
@@ -222,7 +222,7 @@ class ApiaryReporter
       path: path
       method: method
       headers:
-        'User-Agent': "Dredd REST Reporter/" + packageConfig['version'] + " (" + system + ")"
+        'User-Agent': "Dredd REST Reporter/" + packageData.version + " (" + system + ")"
         'Content-Type': 'application/json'
         'Content-Length': Buffer.byteLength(postData, 'utf8')
 

diff --git a/src/transaction-runner.coffee b/src/transaction-runner.coffee
@@ -12,7 +12,7 @@ clone = require 'clone'
 flattenHeaders = require './flatten-headers'
 addHooks = require './add-hooks'
 sortTransactions = require './sort-transactions'
-packageConfig = require './../package.json'
+packageData = require './../package.json'
 logger = require './logger'
 
 
@@ -293,8 +293,7 @@ class TransactionRunner
     if not flatHeaders['User-Agent']
       system = os.type() + ' ' + os.release() + '; ' + os.arch()
       flatHeaders['User-Agent'] = "Dredd/" + \
-        packageConfig.version + \
-        " (" + system + ")"
+        packageData.version + " (" + system + ")"
 
     # Parse and add headers from the config to the transaction
     if configuration.options.header.length > 0

diff --git a/test/integration/dredd-command-test.coffee b/test/integration/dredd-command-test.coffee
@@ -7,7 +7,6 @@ bodyParser = require 'body-parser'
 
 proxyquire = require('proxyquire').noCallThru()
 
-packageJson = require '../../package.json'
 loggerStub = require '../../src/logger'
 configUtils = require '../../src/config-utils'
 

diff --git a/test/integration/dredd-test.coffee b/test/integration/dredd-test.coffee
@@ -7,7 +7,6 @@ bodyParser = require 'body-parser'
 
 proxyquire = require('proxyquire').noCallThru()
 
-packageJson = require '../../package.json'
 loggerStub = require '../../src/logger'
 
 PORT = 9876

diff --git a/test/unit/dredd-command-test.coffee b/test/unit/dredd-command-test.coffee
@@ -4,7 +4,7 @@ express = require 'express'
 proxyquire = require('proxyquire').noCallThru()
 
 options = require '../../src/options'
-packageJson = require '../../package.json'
+packageData = require '../../package.json'
 
 childProcessStub = require 'child_process'
 loggerStub = require '../../src/logger'
@@ -253,7 +253,7 @@ describe "DreddCommand class", () ->
           done()
 
       it 'prints out version', ->
-        assert.include stdout, "#{packageJson.name} v#{packageJson.version}"
+        assert.include stdout, "#{packageData.name} v#{packageData.version}"
 
     describe '"init" (nodejs)', ->
       before (done) ->