kibana-sinatra 3.0.0.0 → 3.0.1.0

data/lib/kibana/sinatra/version.rb

@@ -1,5 +1,5 @@
 module Kibana
   module Sinatra
-    VERSION = "3.0.0.0"
+    VERSION = "3.0.1.0"
   end
 end

data/lib/kibana/views/config.erb

@@ -23,6 +23,11 @@ function (Settings) {
      * the same host. By default this will attempt to reach ES at the same host you have
      * kibana installed on. You probably want to set it to the FQDN of your
      * elasticsearch host
+     *
+     * Note: this can also be an object if you want to pass options to the http client. For example:
+     *
+     *  +elasticsearch: {server: "http://localhost:9200", withCredentials: true}+
+     *
      */
     elasticsearch: "<%= elasticsearch_url %>",
 

data/lib/tasks/update.rb

@@ -5,9 +5,11 @@ require 'zip'
 
 desc "Update kibana from upstream"
 task :update do
+  raise "You must set the KIBANA_VERSION environment variable." unless ENV['KIBANA_VERSION']
+
   asset_path = File.expand_path(File.dirname(__FILE__) + "/../kibana/assets")
-  download_url = 'https://github.com/elasticsearch/kibana/archive/master.zip'
-  download_file = "/tmp/#{UUID.new.generate}_master.zip"
+  download_url = "https://github.com/elasticsearch/kibana/archive/v#{ENV['KIBANA_VERSION']}.zip"
+  download_file = "/tmp/#{UUID.new.generate}_#{ENV['KIBANA_VERSION']}.zip"
   tmp_path = "/tmp/#{UUID.new.generate}"
   
   # Remove kibana assets
@@ -16,7 +18,7 @@ task :update do
   # Create the tmp folder
   FileUtils.mkdir(tmp_path)
 
-  # Download latest kibana from github
+  # Download kibana from github
   File.open(download_file, "wb") do |file|
     file.write open(download_url).read
   end
@@ -25,7 +27,7 @@ task :update do
   unzip_file download_file, tmp_path
 
   # Copy src contents to asset folder
-  FileUtils.mv "#{tmp_path}/kibana-master/src", asset_path
+  FileUtils.mv "#{tmp_path}/kibana-#{ENV['KIBANA_VERSION']}/src", asset_path
 
   # Delete tmp folder and downloaded file
   FileUtils.rm_rf(tmp_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kibana-sinatra
 version: !ruby/object:Gem::Version
-  version: 3.0.0.0
+  version: 3.0.1.0
 platform: ruby
 authors:
 - Ian Neubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler