Merge pull request #6326 from spalger/renameAllFiles

snake_case all filenames

Author: spalger

Gruntfile.js

@@ -1,18 +1,19 @@
-require('babel/register')(require('./src/optimize/babelOptions').node);
+const camelCase = require('lodash').camelCase;
+require('babel/register')(require('./src/optimize/babel_options').node);
 
 module.exports = function (grunt) {
   // set the config once before calling load-grunt-config
   // and once during so that we have access to it via
   // grunt.config.get() within the config files
-  var config = {
+  const config = {
     pkg: grunt.file.readJSON('package.json'),
     root: __dirname,
     src: __dirname + '/src',
     build: __dirname + '/build', // temporary build directory
     plugins: __dirname + '/src/plugins',
     server: __dirname + '/src/server',
     target: __dirname + '/target', // location of the compressed build targets
-    testUtilsDir: __dirname + '/src/testUtils',
+    testUtilsDir: __dirname + '/src/test_utils',
     configFile: __dirname + '/src/config/kibana.yml',
 
     karmaBrowser: (function () {

package.json

@@ -175,7 +175,7 @@
     "karma-mocha": "0.2.0",
     "karma-safari-launcher": "0.1.1",
     "license-checker": "3.1.0",
-    "load-grunt-config": "0.7.2",
+    "load-grunt-config": "0.19.1",
     "makelogs": "3.0.0-beta3",
     "marked-text-renderer": "0.1.0",
     "mocha": "2.3.0",

src/cli/cli.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
-import pkg from '../utils/packageJson';
-import Command from './Command';
+import pkg from '../utils/package_json';
+import Command from './command';
 
 let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
 let program = new Command('bin/kibana');

src/cli/cluster/cluster_manager.js

@@ -4,7 +4,7 @@ const { format: formatUrl } = require('url');
 import Hapi from 'hapi';
 const { debounce, compact, get, invoke, bindAll, once, sample, uniq } = require('lodash');
 
-import Log from '../Log';
+import Log from '../log';
 import Worker from './worker';
 import BasePathProxy from './base_path_proxy';
 
@@ -83,7 +83,7 @@ module.exports = class ClusterManager {
 
   setupWatching(extraPaths) {
     const chokidar = require('chokidar');
-    const fromRoot = require('../../utils/fromRoot');
+    const fromRoot = require('../../utils/from_root');
 
     const watchPaths = uniq(
       [

src/cli/cluster/worker.js

@@ -3,7 +3,7 @@ import cluster from 'cluster';
 let { resolve } = require('path');
 let { EventEmitter } = require('events');
 
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 let cliPath = fromRoot('src/cli');
 let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);

src/cli/Command.js src/cli/command.js

@@ -1,5 +1,5 @@
 // load the babel options seperately so that they can modify the process.env
 // before calling babel/register
-const babelOptions = require('../optimize/babelOptions').node;
+const babelOptions = require('../optimize/babel_options').node;
 require('babel/register')(babelOptions);
 require('./cli');

src/cli/index.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import expect from 'expect.js';
 
-import fromRoot from '../../../utils/fromRoot';
+import fromRoot from '../../../utils/from_root';
 import settingParser from '../setting_parser';
 
 describe('kibana cli', function () {

src/cli/Log.js src/cli/log.js

@@ -1,4 +1,4 @@
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 import settingParser from './setting_parser';
 import installer from './plugin_installer';
 import remover from './plugin_remover';

src/cli/plugin/__tests__/setting_parser.js

@@ -1,9 +1,9 @@
 import _ from 'lodash';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 import pluginDownloader from './plugin_downloader';
 import pluginCleaner from './plugin_cleaner';
 import pluginExtractor from './plugin_extractor';
-import KbnServer from '../../server/KbnServer';
+import KbnServer from '../../server/kbn_server';
 import readYamlConfig from '../serve/read_yaml_config';
 import Promise from 'bluebird';
 import { sync as rimrafSync } from 'rimraf';

src/cli/plugin/plugin.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import fs from 'fs';
 import yaml from 'js-yaml';
 
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 let legacySettingMap = {
   // server

src/cli/plugin/plugin_installer.js

@@ -3,7 +3,7 @@ const { isWorker } = require('cluster');
 const { resolve } = require('path');
 
 const cwd = process.cwd();
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 let canCluster;
 try {
@@ -126,7 +126,7 @@ module.exports = function (program) {
     }
 
     let kbnServer = {};
-    const KbnServer = require('../../server/KbnServer');
+    const KbnServer = require('../../server/kbn_server');
     try {
       kbnServer = new KbnServer(settings);
       await kbnServer.ready();

src/cli/serve/read_yaml_config.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import TestUtilsStubIndexPatternProvider from 'testUtils/stub_index_pattern';
+import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern';
 import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
 import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
 export default function stubbedLogstashIndexPatternService(Private) {

src/cli/serve/serve.js

@@ -4,8 +4,8 @@ import DirectoryNameAsMain from 'webpack-directory-name-as-main';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
 import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin';
 
-import fromRoot from '../utils/fromRoot';
-import babelOptions from './babelOptions';
+import fromRoot from '../utils/from_root';
+import babelOptions from './babel_options';
 import { inherits } from 'util';
 import { defaults, transform } from 'lodash';
 import { resolve } from 'path';

src/fixtures/stubbed_logstash_index_pattern.js

@@ -1,6 +1,6 @@
 
-import BaseOptimizer from './BaseOptimizer';
-import fromRoot from '../utils/fromRoot';
+import BaseOptimizer from './base_optimizer';
+import fromRoot from '../utils/from_root';
 import { fromNode } from 'bluebird';
 import { writeFile } from 'fs';
 

src/optimize/babelOptions.build.js src/optimize/babel_options.build.js

@@ -1,4 +1,4 @@
-import FsOptimizer from './FsOptimizer';
+import FsOptimizer from './fs_optimizer';
 module.exports = async (kbnServer, server, config) => {
   if (!config.get('optimize.enabled')) return;
 

src/optimize/babelOptions.js src/optimize/babel_options.js

@@ -21,11 +21,11 @@ module.exports = async (kbnServer, server, config) => {
    */
   switch (process.env.kbnWorkerType) {
     case 'optmzr':
-      await kbnServer.mixin(require('./optmzrRole'));
+      await kbnServer.mixin(require('./optmzr_role'));
       break;
 
     case 'server':
-      await kbnServer.mixin(require('./proxyRole'));
+      await kbnServer.mixin(require('./proxy_role'));
       break;
 
     default:

src/optimize/BaseOptimizer.js src/optimize/base_optimizer.js

@@ -1,7 +1,7 @@
 import Boom from 'boom';
 
-import BaseOptimizer from '../BaseOptimizer';
-import WeirdControlFlow from './WeirdControlFlow';
+import BaseOptimizer from '../base_optimizer';
+import WeirdControlFlow from './weird_control_flow';
 import { once, pick, size } from 'lodash';
 import { join } from 'path';
 

src/optimize/FsOptimizer.js src/optimize/fs_optimizer.js

@@ -1,6 +1,6 @@
-import LazyServer from './LazyServer';
-import LazyOptimizer from './LazyOptimizer';
-import fromRoot from '../../utils/fromRoot';
+import LazyServer from './lazy_server';
+import LazyOptimizer from './lazy_optimizer';
+import fromRoot from '../../utils/from_root';
 
 export default async (kbnServer, kibanaHapiServer, config) => {
   let server = new LazyServer(

src/optimize/index.js

@@ -3,7 +3,7 @@ module.exports = (kibana) => {
   return new kibana.Plugin({
     uiExports: {
       spyModes: [
-        'plugins/devMode/visDebugSpyPanel'
+        'plugins/dev_mode/vis_debug_spy_panel'
       ]
     }
   });

src/optimize/lazy/lazy.js

@@ -1,4 +1,4 @@
 {
-  "name": "devMode",
+  "name": "dev_mode",
   "version": "1.0.0"
 }

src/optimize/lazy/LazyOptimizer.js src/optimize/lazy/lazy_optimizer.js

@@ -1,4 +1,4 @@
-import visDebugSpyPanelTemplate from 'plugins/devMode/visDebugSpyPanel.html';
+import visDebugSpyPanelTemplate from 'plugins/dev_mode/vis_debug_spy_panel.html';
 // register the spy mode or it won't show up in the spys
 require('ui/registry/spy_modes').register(VisDetailsSpyProvider);
 

src/optimize/lazy/LazyServer.js src/optimize/lazy/lazy_server.js

@@ -3,7 +3,7 @@ import Promise from 'bluebird';
 import sinon from 'sinon';
 import url from 'url';
 
-import serverConfig from '../../../../../test/serverConfig';
+import serverConfig from '../../../../../test/server_config';
 import checkEsVersion from '../check_es_version';
 
 describe('plugins/elasticsearch', function () {

src/optimize/lazy/optmzrRole.js src/optimize/lazy/optmzr_role.js

@@ -6,7 +6,7 @@ import url from 'url';
 const NoConnections = require('elasticsearch').errors.NoConnections;
 
 import healthCheck from '../health_check';
-import serverConfig from '../../../../../test/serverConfig';
+import serverConfig from '../../../../../test/server_config';
 
 const esPort = serverConfig.servers.elasticsearch.port;
 const esUrl = url.format(serverConfig.servers.elasticsearch);

src/optimize/lazy/proxyRole.js src/optimize/lazy/proxy_role.js

@@ -3,11 +3,11 @@ import expect from 'expect.js';
 import sinon from 'sinon';
 
 import isUpgradeable from '../is_upgradeable';
-import pkg from '../../../../utils/packageJson';
+import pkg from '../../../../utils/package_json';
 let version = pkg.version;
 
 describe('plugins/elasticsearch', function () {
-  describe('lib/isUpgradeable', function () {
+  describe('lib/is_upgradeable', function () {
     let server = {
       config: _.constant({
         get: function (key) {

src/optimize/lazy/WeirdControlFlow.js src/optimize/lazy/weird_control_flow.js

@@ -2,7 +2,7 @@ import angular from 'angular';
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
 import $ from 'jquery';
 import 'ui/render_directive';
 import 'plugins/kbn_doc_views/views/table';

src/plugins/devMode/index.js src/plugins/dev_mode/index.js

@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
 import areaTemplate from 'plugins/kbn_vislib_vis_types/editors/area.html';
 
 export default function HistogramVisType(Private) {

src/plugins/devMode/package.json src/plugins/dev_mode/package.json

@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
 import histogramTemplate from 'plugins/kbn_vislib_vis_types/editors/histogram.html';
 
 export default function HistogramVisType(Private) {

src/plugins/devMode/public/ngMock.js src/plugins/dev_mode/public/ng_mock.js

@@ -3,4 +3,4 @@ visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
 visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
 visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));
 visTypes.register(require('plugins/kbn_vislib_vis_types/area'));
-visTypes.register(require('plugins/kbn_vislib_vis_types/tileMap'));
+visTypes.register(require('plugins/kbn_vislib_vis_types/tile_map'));

src/plugins/devMode/public/visDebugSpyPanel.html src/plugins/dev_mode/public/vis_debug_spy_panel.html

@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
 import lineTemplate from 'plugins/kbn_vislib_vis_types/editors/line.html';
 
 export default function HistogramVisType(Private) {

src/plugins/devMode/public/visDebugSpyPanel.js src/plugins/dev_mode/public/vis_debug_spy_panel.js

@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
 import pieTemplate from 'plugins/kbn_vislib_vis_types/editors/pie.html';
 
 export default function HistogramVisType(Private) {

src/plugins/elasticsearch/lib/__tests__/check_es_version.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import supports from 'ui/utils/supports';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
 import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json';
 import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter';
 import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html';

src/plugins/elasticsearch/lib/__tests__/findPort.js src/plugins/elasticsearch/lib/__tests__/find_port.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import $ from 'jquery';
-import Binder from 'ui/Binder';
+import Binder from 'ui/binder';
 import 'gridster';
 import uiModules from 'ui/modules';
 

src/plugins/elasticsearch/lib/__tests__/health_check.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import $ from 'jquery';
 import angular from 'angular';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
 import chrome from 'ui/chrome';
 import 'ui/directives/config';
 import 'ui/courier';

src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js

@@ -2,7 +2,7 @@
 import angular from 'angular';
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import $ from 'jquery';
 import 'ui/private';

src/plugins/kbn_doc_views/public/__tests__/doc_views.js

@@ -1,6 +1,6 @@
 
 import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
 import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
 import expect from 'expect.js';
 import 'ui/private';

src/plugins/kbn_vislib_vis_types/public/area.js

@@ -1,6 +1,6 @@
 
 import angular from 'angular';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import expect from 'expect.js';

src/plugins/kbn_vislib_vis_types/public/histogram.js

@@ -1,6 +1,6 @@
 
 import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
 

src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js

@@ -1,14 +1,14 @@
 import _ from 'lodash';
 import angular from 'angular';
 import moment from 'moment';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
 import getSort from 'ui/doc_table/lib/get_sort';
 import rison from 'ui/utils/rison';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
 import 'ui/doc_table';
 import 'ui/visualize';
 import 'ui/notify';
-import 'ui/fixedScroll';
+import 'ui/fixed_scroll';
 import 'ui/directives/validate_json';
 import 'ui/filters/moment';
 import 'ui/courier';
@@ -17,7 +17,7 @@ import 'ui/state_management/app_state';
 import 'ui/timefilter';
 import 'ui/highlight/highlight_tags';
 import 'ui/share';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
 import DocTitleProvider from 'ui/doc_title';
 import UtilsBrushEventProvider from 'ui/utils/brush_event';
 import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';

src/plugins/kbn_vislib_vis_types/public/line.js

@@ -1,5 +1,5 @@
 // Load the kibana app dependencies.
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import 'plugins/kibana/doc/index';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';

src/plugins/kbn_vislib_vis_types/public/pie.js

@@ -20,7 +20,7 @@ uiRoutes
   redirectTo: '/settings/indices'
 });
 
-require('ui/index_patterns/routeSetup/loadDefault')({
+require('ui/index_patterns/route_setup/load_default')({
   notRequiredRe: /^\/settings\//,
   whenMissingRedirectTo: '/settings/indices'
 });