Merge pull request #1 from spalger/pr/4434

convert format changing to match date_range

.eslintignore

@@ -0,0 +1,2 @@
+src/fixtures
+optimize

.eslintrc

@@ -0,0 +1,69 @@
+---
+parser: babel-eslint
+
+env:
+  es6: true
+  amd: true
+  node: true
+  mocha: true
+  browser: true
+
+
+rules:
+  block-scoped-var: 2
+  camelcase: [ 2, { properties: never } ]
+  comma-dangle: 0
+  comma-style: [ 2, last ]
+  consistent-return: 0
+  curly: [ 2, multi-line ]
+  dot-location: [ 2, property ]
+  dot-notation: [ 2, { allowKeywords: true } ]
+  eqeqeq: [ 2, allow-null ]
+  guard-for-in: 2
+  indent: [ 2, 2, { SwitchCase: 1 } ]
+  key-spacing: [ 0, { align: value } ]
+  max-len: [ 2, 140, 2, { ignoreComments: true, ignoreUrls: true } ]
+  new-cap: [ 2, { capIsNewExceptions: [ Private ] } ]
+  no-bitwise: 0
+  no-caller: 2
+  no-cond-assign: 0
+  no-debugger: 2
+  no-empty: 2
+  no-eval: 2
+  no-extend-native: 2
+  no-extra-parens: 0
+  no-irregular-whitespace: 2
+  no-iterator: 2
+  no-loop-func: 2
+  no-multi-spaces: 0
+  no-multi-str: 2
+  no-nested-ternary: 2
+  no-new: 0
+  no-path-concat: 0
+  no-proto: 2
+  no-return-assign: 0
+  no-script-url: 2
+  no-sequences: 2
+  no-shadow: 0
+  no-trailing-spaces: 2
+  no-undef: 2
+  no-underscore-dangle: 0
+  no-unused-expressions: 0
+  no-unused-vars: 0
+  no-use-before-define: [ 2, nofunc ]
+  no-with: 2
+  one-var: [ 2, never ]
+  quotes: [ 2, single ]
+  semi-spacing: [ 2, { before: false, after: true } ]
+  semi: [ 2, always ]
+  space-after-keywords: [ 2, always ]
+  space-before-blocks: [ 2, always ]
+  space-before-function-paren: [ 2, { anonymous: always, named: never } ]
+  space-in-parens: [ 2, never ]
+  space-infix-ops: [ 2, { int32Hint: false } ]
+  space-return-throw-case: [ 2 ]
+  space-unary-ops: [ 2 ]
+  strict: [ 2, never ]
+  valid-typeof: 2
+  wrap-iife: [ 2, outside ]
+  yoda: 0

.gitignore

@@ -2,14 +2,13 @@
 .DS_Store
 .node_binaries
 node_modules
-bower_components
-**/*.css
 trash
-build
+bundles
 target
 .jruby
 .idea
 *.iml
 *.log
 esvm
 .htpasswd
+installedPlugins

.node-version

@@ -1 +1 @@
-0.10.x
+iojs-v2.4

.travis.yml

@@ -1,13 +1,17 @@
 language: node_js
-node_js: '0.12'
+node_js: 'iojs-v2.4'
 install: npm install
-script: npm test
+script: ./node_modules/.bin/grunt travis
 sudo: false
 cache:
   directories:
   - esvm
   - node_modules
-  - src/kibana/bower_components
+before_cache:
+- rm -rf esvm/*/logs esvm/data_dir
+before_script:
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 notifications:
   email:
   - [email protected]

CONTRIBUTING.md

@@ -10,50 +10,49 @@ Please make sure you have signed the [Contributor License Agreement](http://www.
 
 ### Development Environment Setup
 
-- Install node.js (we recommend using [nvm](https://github.com/creationix/nvm))
+- Clone the kibana repo and move into it
 
   ```sh
-  ## follow directions at https://github.com/creationix/nvm, then
-  nvm install 0.10
+  git clone https://github.com/elastic/kibana.git kibana
+  cd kibana
   ```
 
-- Install grunt and bower globally (as root if not using nvm)
+- Install the version of node.js listed in the `.node-version` file (this is made easy with tools like [nvm](https://github.com/creationix/nvm) and [avn](https://github.com/wbyoung/avn))
 
   ```sh
-  npm install -g grunt-cli bower
+  nvm install "$(cat .node-version)"
   ```
 
-- Clone the kibana repo and move into it
+- Install dependencies
 
   ```sh
-  git clone https://github.com/elastic/kibana.git kibana
-  cd kibana
+  npm install
   ```
 
-- Install node and bower dependencies
+- Start elasticsearch, you can use [esvm](https://github.com/simianhacker/esvm) to make that easier.
 
   ```sh
-  npm install && bower install
+  grunt esvm:dev:keepalive
   ```
 
 - Start the development server.
 
   ```sh
-  grunt dev # use the "--with-es" flag to install & start elasticsearch too
+  ./bin/kibana --dev
   ```
 
 #### Linting
 
-A note about linting: We use both [jshint](http://jshint.com/) and [jscs](http://jscs.info/) to check that the [styleguide](STYLEGUIDE.md) is being followed. They run in a pre-commit hook and as a part of the tests, but most contributors integrate these linters with their code editors for real-time feedback.
+A note about linting: We use [eslint](http://eslint.org) to check that the [styleguide](STYLEGUIDE.md) is being followed. It runs in a pre-commit hook and as a part of the tests, but most contributors integrate it with their code editors for real-time feedback.
 
-Here are some hints for setting up the linters in your favorite editor:
+Here are some hints for getting eslint setup in your favorite editor:
 
-| Editor | JSHint | JSCS |
+| Editor | Plugin |
 | --- | --- | --- |
-| Sublime | [SublimeLinter-jshint](https://github.com/SublimeLinter/SublimeLinter-jshint#installation) | [SublimeLinter-jscs](https://github.com/SublimeLinter/SublimeLinter-jscs#installation) |
-| Atom | [linter-jshint](https://github.com/AtomLinter/linter-jshint#installation) | [linter-jscs](https://github.com/AtomLinter/linter-jscs#installation) |
-| IntelliJ | Settings » Languages & Frameworks » JavaScript » Code Quality Tools » JSHint (be sure to check "Use config files") | « |
-| vi | ask @simianhacker | « |
+| Sublime | [SublimeLinter-eslint](https://github.com/SublimeLinter/SublimeLinter-eslint#installation) |
+| Atom | [linter-eslint](https://github.com/AtomLinter/linter-eslint#installation) |
+| IntelliJ | Settings » Languages & Frameworks » JavaScript » Code Quality Tools » ESLint |
+| vi | [scrooloose/syntastic](https://github.com/scrooloose/syntastic) |
 
 
 ### Testing and building
@@ -65,7 +64,7 @@ Before running the tests you will need to install the projects dependencies as d
 Once that is complete just run:
 
 ```sh
-grunt test build
+./node_modules/.bin/grunt test build
 ```
 
 Distributable, built packages can be found in `target/` after the build completes.