maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into template_vistype

Browse source
This commit is contained in:
Spencer Alger 2014-11-03 12:15:57 -07:00
parent 66bacfaa3c 3c39cc9b0b
commit 8a8944881b
6 changed files with 71 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -10,9 +10,10 @@ script:
notifications:
email:
- rashid.khan@elasticsearch.com
- spencer.alger@elasticsearch.com
hipchat:
rooms:
secure: a2FERvICecrUAR62vP4vrUCTG3haRzf6kSzDDzGu6SICEXWLRrK0xeNQDpdwDAfzFmaIJ6txpkmInvEFeNPYNngTgEDyfhqdIa/lW0Ermdg+1hL0dK6QJiVmT1V6LDB2mgtaTTmfontxJqq7P2tmr0zz8ny4Eqq3lUnwPxYFNNo=
secure: AFhp0iboaeshokQnzRvoKPElb/JOvZ09X9mi58KbxI4iYlQ1nysvudV1b7YG8wxV9av3twgvfbcgzAoHyKhC2MZJDLzDHnZFn8r2OQXzjYpFxJuhAVirO4Weo0wi2Z78/OkxQo87gWYFa24qc8urR/Dfor4WdoWfCsJU8tQ7t5I=
format: html
on_success: change
template:

9
Gemfile Normal file
View file

@ -0,0 +1,9 @@
source "https://rubygems.org"
gem 'sinatra', :require => 'sinatra/base'
gem 'sinatra-contrib'
gem 'puma'
gem 'warbler'
gem 'elasticsearch'
gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
gem 'colorize'

59
Gemfile.lock Normal file
View file

@ -0,0 +1,59 @@
GEM
remote: https://rubygems.org/
specs:
backports (3.6.0)
colorize (0.7.3)
elasticsearch (1.0.4)
elasticsearch-api (= 1.0.4)
elasticsearch-transport (= 1.0.4)
elasticsearch-api (1.0.4)
multi_json
elasticsearch-transport (1.0.4)
faraday
multi_json
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
jruby-jars (1.7.13)
jruby-rack (1.1.16)
multi_json (1.10.1)
multipart-post (2.0.0)
puma (2.9.0)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack-protection (1.5.3)
rack
rack-reverse-proxy (0.4.4)
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
rake (10.1.0)
rubyzip (1.1.6)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sinatra-contrib (1.4.2)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (~> 1.3)
tilt (1.4.1)
warbler (1.4.4)
jruby-jars (>= 1.5.6, < 2.0)
jruby-rack (>= 1.0.0)
rake (>= 0.9.6)
rubyzip (>= 0.9, < 1.2)
PLATFORMS
ruby
DEPENDENCIES
colorize
elasticsearch
puma
rack-reverse-proxy
sinatra
sinatra-contrib
warbler

2
src/server/Gemfile
View file

@ -3,7 +3,5 @@ source "https://rubygems.org"
gem 'sinatra', :require => 'sinatra/base'
gem 'sinatra-contrib'
gem 'puma'
gem 'warbler'
gem 'elasticsearch'
gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
gem 'colorize'

22
src/server/Gemfile.lock
View file

@ -3,20 +3,7 @@ GEM
specs:
backports (3.6.0)
colorize (0.7.3)
elasticsearch (1.0.4)
elasticsearch-api (= 1.0.4)
elasticsearch-transport (= 1.0.4)
elasticsearch-api (1.0.4)
multi_json
elasticsearch-transport (1.0.4)
faraday
multi_json
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
jruby-jars (1.7.13)
jruby-rack (1.1.16)
multi_json (1.10.1)
multipart-post (2.0.0)
puma (2.9.0)
rack (>= 1.1, < 2.0)
puma (2.9.0-java)
@ -28,8 +15,6 @@ GEM
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
rake (10.1.0)
rubyzip (1.1.6)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
@ -42,11 +27,6 @@ GEM
sinatra (~> 1.4.0)
tilt (~> 1.3)
tilt (1.4.1)
warbler (1.4.4)
jruby-jars (>= 1.5.6, < 2.0)
jruby-rack (>= 1.0.0)
rake (>= 0.9.6)
rubyzip (>= 0.9, < 1.2)
PLATFORMS
java
@ -54,9 +34,7 @@ PLATFORMS
DEPENDENCIES
colorize
elasticsearch
puma
rack-reverse-proxy
sinatra
sinatra-contrib
warbler

2
tasks/install_gems.js
View file

@ -3,7 +3,7 @@ var join = require('path').join;
module.exports = function (grunt) {
grunt.registerTask('install_gems', 'Install Ruby Gems', function () {
var done = this.async();
var gemfile = join(grunt.config.get('src'), 'server', 'Gemfile');
var gemfile = join(grunt.config.get('root'), 'Gemfile');
var jrubyPath = grunt.config.get('jrubyPath');
var jruby = jrubyPath + '/bin/jruby -S';
var command = jruby + ' gem install bundler && ' + jruby + ' bundle install --gemfile ' + gemfile;