From 53d5f46fb124e9254727920a41c76dcc029b74ac Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 31 May 2017 00:01:25 +0200
Subject: [PATCH] chore: rename files

---
 index.js                                  | 10 ++++------
 lib/{commands.js => addCommand.js}        |  0
 lib/client.js                             | 16 ++++++++--------
 lib/individualCommands.js                 |  2 +-
 lib/{createClient.js => unifyOptions.js}  |  0
 lib/{writeCommands.js => writeCommand.js} |  0
 test/unify_options.spec.js                |  2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)
 rename lib/{commands.js => addCommand.js} (100%)
 rename lib/{createClient.js => unifyOptions.js} (100%)
 rename lib/{writeCommands.js => writeCommand.js} (100%)

diff --git a/index.js b/index.js
index 93683ceedd..f2fe82dfa8 100644
--- a/index.js
+++ b/index.js
@@ -2,12 +2,14 @@
 
 const Commands = require('redis-commands')
 const Errors = require('redis-errors')
+const addCommand = require('./lib/addCommand')
 const RedisClient = require('./lib/client')
-const addCommand = require('./lib/commands')
-const unifyOptions = require('./lib/createClient')
 const Multi = require('./lib/multi')
+const unifyOptions = require('./lib/unifyOptions')
 const utils = require('./lib/utils')
 
+require('./lib/individualCommands')
+
 RedisClient.debugMode = /\bredis\b/i.test(process.env.NODE_DEBUG)
 RedisClient.RedisClient = RedisClient
 RedisClient.Multi = Multi
@@ -24,7 +26,3 @@ RedisClient.createClient = function () {
 Commands.list.forEach((name) => addCommand(RedisClient.prototype, Multi.prototype, name))
 
 module.exports = RedisClient
-
-// Add all redis commands / nodeRedis api to the client
-// TODO: Change the way this is included...
-require('./lib/individualCommands')
diff --git a/lib/commands.js b/lib/addCommand.js
similarity index 100%
rename from lib/commands.js
rename to lib/addCommand.js
diff --git a/lib/client.js b/lib/client.js
index c6096289e7..3fbf86d4d6 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -3,14 +3,14 @@
 const Queue = require('denque')
 const EventEmitter = require('events')
 const net = require('net')
-const Command = require('./lib/command')
-const connect = require('./lib/connect')
-const debug = require('./lib/debug')
-const flushAndError = require('./lib/flushAndError')
-const Multi = require('./lib/multi')
-const offlineCommand = require('./lib/offlineCommand')
-const utils = require('./lib/utils')
-const normalizeAndWriteCommand = require('./lib/writeCommands')
+const Command = require('./command')
+const connect = require('./connect')
+const debug = require('./debug')
+const flushAndError = require('./flushAndError')
+const Multi = require('./multi')
+const offlineCommand = require('./offlineCommand')
+const utils = require('./utils')
+const normalizeAndWriteCommand = require('./writeCommand')
 const noop = function () {}
 var connectionId = 0
 
diff --git a/lib/individualCommands.js b/lib/individualCommands.js
index f83ca89fd0..dea459bb6b 100644
--- a/lib/individualCommands.js
+++ b/lib/individualCommands.js
@@ -5,7 +5,7 @@ const debug = require('./debug')
 const Multi = require('./multi')
 const utils = require('./utils')
 const noPasswordIsSet = /no password is set/
-const RedisClient = require('../').RedisClient
+const RedisClient = require('./client')
 
 /********************************************************************************************
  Replace built-in redis functions
diff --git a/lib/createClient.js b/lib/unifyOptions.js
similarity index 100%
rename from lib/createClient.js
rename to lib/unifyOptions.js
diff --git a/lib/writeCommands.js b/lib/writeCommand.js
similarity index 100%
rename from lib/writeCommands.js
rename to lib/writeCommand.js
diff --git a/test/unify_options.spec.js b/test/unify_options.spec.js
index a1547c212d..94137a96ba 100644
--- a/test/unify_options.spec.js
+++ b/test/unify_options.spec.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('assert')
-const unifyOptions = require('../lib/createClient')
+const unifyOptions = require('../lib/unifyOptions')
 const intercept = require('intercept-stdout')
 
 describe('createClient options', () => {