springboard 0.90.12 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d877b199685dcf17d16131870b802da333df91e
-  data.tar.gz: 0088054665b634497e29a03a186d83a44d11fd86
+  metadata.gz: a8735e73c3295b10dc670dd6fd3b7002445a6c9c
+  data.tar.gz: 516a00632355fd4583afc4df0df9517f1e1f4781
 SHA512:
-  metadata.gz: 1fd5b3a2a8e279991fad3f1df922d7dee4935b34496a4ef9ad574c83cee99ed87f781524d4176343b81e4c226d279649948f7a47c2d21fbb9e0ae35c6931a603
-  data.tar.gz: 2afd14ecdfc5dd31fff7606fb2b703e0a388a2ff9eb297f5fdb6027f8d957830c4ac5bdb41e4d5f49dd02e21a584fcb8b7c864929b1c03d34c95d96820f000cc
+  metadata.gz: e19ed0649ad5b9ff193267c50e452390ff77f9d628f0e64eeb731fcf37b4ae5a85bbf6e632bb810e0047b9d64c6ca8c47f5bc722468082f11a3bd5b49319a490
+  data.tar.gz: 9994e16e3b6e2c4f85a8b78b20e914671794ba3d0c54b90407fa20e80da2efaabedcf93e46e7389896ad2bd75282cfb96c4972cb1a83c0fe92142e8637c6b70a

data/lib/springboard/generators/templates/elasticsearch.in.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-0.90.12.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
+ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-1.0.1.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
 
 if [ "x$ES_MIN_MEM" = "x" ]; then
     ES_MIN_MEM=256m

data/lib/springboard/version.rb

@@ -1,3 +1,3 @@
 module Springboard
-  VERSION = "0.90.12"
+  VERSION = "1.0.1"
 end

data/vendor/elasticsearch/NOTICE.txt

@@ -1,5 +1,5 @@
-ElasticSearch
-Copyright 2009-2014 ElasticSearch and Shay Banon
+Elasticsearch
+Copyright 2009-2014 Elasticsearch
 
 This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).

data/vendor/elasticsearch/README.textile

@@ -1,10 +1,10 @@
-h1. ElasticSearch
+h1. Elasticsearch
 
 h2. A Distributed RESTful Search Engine
 
 h3. "http://www.elasticsearch.org":http://www.elasticsearch.org
 
-ElasticSearch is a distributed RESTful search engine built for the cloud. Features include:
+Elasticsearch is a distributed RESTful search engine built for the cloud. Features include:
 
 * Distributed and Highly Available Search Engine.
 ** Each index is fully sharded with a configurable number of shards.
@@ -32,12 +32,12 @@ ElasticSearch is a distributed RESTful search engine built for the cloud. Featur
 
 h2. Getting Started
 
-First of all, DON'T PANIC. It will take 5 minutes to get the gist of what ElasticSearch is all about.
+First of all, DON'T PANIC. It will take 5 minutes to get the gist of what Elasticsearch is all about.
 
 h3. Installation
 
-* "Download":http://www.elasticsearch.org/download and unzip the ElasticSearch official distribution.
-* Run @bin/elasticsearch -f@ on unix, or @bin/elasticsearch.bat@ on windows.
+* "Download":http://www.elasticsearch.org/download and unzip the Elasticsearch official distribution.
+* Run @bin/elasticsearch@ on unix, or @bin/elasticsearch.bat@ on windows.
 * Run @curl -X GET http://localhost:9200/@.
 * Start more servers ...
 
@@ -52,7 +52,7 @@ curl -XPUT 'http://localhost:9200/twitter/tweet/1' -d '
 { 
     "user": "kimchy", 
     "postDate": "2009-11-15T13:12:00", 
-    "message": "Trying out Elastic Search, so far so good?" 
+    "message": "Trying out Elasticsearch, so far so good?" 
 }'
 
 curl -XPUT 'http://localhost:9200/twitter/tweet/2' -d '
@@ -80,7 +80,7 @@ Let's find all the tweets that @kimchy@ posted:
 curl -XGET 'http://localhost:9200/twitter/tweet/_search?q=user:kimchy&pretty=true'
 </pre>
 
-We can also use the JSON query language ElasticSearch provides instead of a query string:
+We can also use the JSON query language Elasticsearch provides instead of a query string:
 
 <pre>
 curl -XGET 'http://localhost:9200/twitter/tweet/_search?pretty=true' -d '
@@ -121,7 +121,7 @@ h3. Multi Tenant - Indices and Types
 
 Maan, that twitter index might get big (in this case, index size == valuation). Let's see if we can structure our twitter system a bit differently in order to support such large amount of data.
 
-ElasticSearch support multiple indices, as well as multiple types per index. In the previous example we used an index called @twitter@, with two types, @user@ and @tweet@.
+Elasticsearch support multiple indices, as well as multiple types per index. In the previous example we used an index called @twitter@, with two types, @user@ and @tweet@.
 
 Another way to define our simple twitter system is to have a different index per user (though note that an index has an overhead). Here is the indexing curl's in this case:
 
@@ -132,7 +132,7 @@ curl -XPUT 'http://localhost:9200/kimchy/tweet/1' -d '
 { 
     "user": "kimchy", 
     "postDate": "2009-11-15T13:12:00", 
-    "message": "Trying out Elastic Search, so far so good?" 
+    "message": "Trying out Elasticsearch, so far so good?" 
 }'
 
 curl -XPUT 'http://localhost:9200/kimchy/tweet/2' -d '
@@ -186,17 +186,17 @@ h3. Distributed, Highly Available
 
 Let's face it, things will fail....
 
-ElasticSearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replica. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
+Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replica. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
 
-In order to play with Elastic Search distributed nature, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
+In order to play with Elasticsearch distributed nature, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
 
 h3. Where to go from here?
 
-We have just covered a very small portion of what ElasticSearch is all about. For more information, please refer to: .
+We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the "elasticsearch.org":http://www.elasticsearch.org website.
 
 h3. Building from Source
 
-ElasticSearch uses "Maven":http://maven.apache.org for its build system.
+Elasticsearch uses "Maven":http://maven.apache.org for its build system.
 
 In order to create a distribution, simply run the @mvn clean package
 -DskipTests@ command in the cloned directory.
@@ -211,7 +211,7 @@ h1. License
 <pre>
 This software is licensed under the Apache 2 license, quoted below.
 
-Copyright 2009-2013 Shay Banon and ElasticSearch <http://www.elasticsearch.org>
+Copyright 2009-2014 Elasticsearch <http://www.elasticsearch.org>
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of

data/vendor/elasticsearch/bin/elasticsearch

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # OPTIONS:
-#   -f: start in the foreground
+#   -d: daemonize, start in the background
 #   -p <filename>: log the pid to a file (useful to kill it later)
 
 # CONTROLLING STARTUP:
@@ -127,7 +127,7 @@ esac
 launch_service()
 {
     pidpath=$1
-    foreground=$2
+    daemonized=$2
     props=$3
     es_parms="-Delasticsearch"
 
@@ -135,23 +135,39 @@ launch_service()
         es_parms="$es_parms -Des.pidfile=$pidpath"
     fi
 
-    # The es-foreground option will tell ElasticSearch not to close stdout/stderr, but it's up to us not to background.
-    if [ "x$foreground" != "x" ]; then
+    # The es-foreground option will tell Elasticsearch not to close stdout/stderr, but it's up to us not to daemonize.
+    if [ "x$daemonized" = "x" ]; then
         es_parms="$es_parms -Des.foreground=yes"
         exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS $es_parms -Des.path.home="$ES_HOME" -cp "$ES_CLASSPATH" $props \
-                org.elasticsearch.bootstrap.ElasticSearch
+                org.elasticsearch.bootstrap.Elasticsearch
         # exec without running it in the background, makes it replace this shell, we'll never get here...
         # no need to return something
     else
-        # Startup ElasticSearch, background it, and write the pid.
+        # Startup Elasticsearch, background it, and write the pid.
         exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS $es_parms -Des.path.home="$ES_HOME" -cp "$ES_CLASSPATH" $props \
-                    org.elasticsearch.bootstrap.ElasticSearch <&- &
+                    org.elasticsearch.bootstrap.Elasticsearch <&- &
         return $?
     fi
 }
 
+# Parse any long getopt options and put them into properties before calling getopt below
+# Be dash compatible to make sure running under ubuntu works
+ARGV=""
+while [ $# -gt 0 ]
+do
+    case $1 in
+      --*=*) properties="$properties -Des.${1#--}"
+           shift 1
+           ;;
+      --*) properties="$properties -Des.${1#--}=$2"
+           shift 2
+           ;;
+      *) ARGV="$ARGV $1" ; shift
+    esac
+done
+
 # Parse any command line options.
-args=`getopt vfhp:D:X: "$@"`
+args=`getopt vdhp:D:X: $ARGV`
 eval set -- "$args"
 
 while true; do
@@ -165,12 +181,12 @@ while true; do
             pidfile="$2"
             shift 2
         ;;
-        -f)
-            foreground="yes"
+        -d)
+            daemonized="yes"
             shift
         ;;
         -h)
-            echo "Usage: $0 [-f] [-h] [-p pidfile]"
+            echo "Usage: $0 [-d] [-h] [-p pidfile]"
             exit 0
         ;;
         -D)
@@ -193,6 +209,6 @@ while true; do
 done
 
 # Start up the service
-launch_service "$pidfile" "$foreground" "$properties"
+launch_service "$pidfile" "$daemonized" "$properties"
 
 exit $?

data/vendor/elasticsearch/bin/elasticsearch.in.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-0.90.12.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
+ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-1.0.1.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
 
 if [ "x$ES_MIN_MEM" = "x" ]; then
     ES_MIN_MEM=256m

data/vendor/elasticsearch/config/elasticsearch.yml

@@ -1,4 +1,4 @@
-##################### ElasticSearch Configuration Example #####################
+##################### Elasticsearch Configuration Example #####################
 
 # This file contains an overview of various configuration settings,
 # targeted at operations staff. Application developers should
@@ -7,7 +7,7 @@
 # The installation procedure is covered at
 # <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
 #
-# ElasticSearch comes with reasonable defaults for most settings,
+# Elasticsearch comes with reasonable defaults for most settings,
 # so you can try it out without bothering with configuration.
 #
 # Most of the time, these defaults are just fine for running a production
@@ -72,7 +72,7 @@
 # node.data: false
 
 # Use the Cluster Health API [http://localhost:9200/_cluster/health], the
-# Node Info API [http://localhost:9200/_cluster/nodes] or GUI tools
+# Node Info API [http://localhost:9200/_nodes] or GUI tools
 # such as <http://www.elasticsearch.org/overview/marvel/>,
 # <http://github.com/karmi/elasticsearch-paramedic>,
 # <http://github.com/lukas-vlcek/bigdesk> and
@@ -130,7 +130,7 @@
 # The "number_of_replicas" can be increased or decreased anytime,
 # by using the Index Update Settings API.
 #
-# ElasticSearch takes care about load balancing, relocating, gathering the
+# Elasticsearch takes care about load balancing, relocating, gathering the
 # results from nodes, etc. Experiment with different settings to fine-tune
 # your setup.
 
@@ -176,7 +176,7 @@
 
 ################################### Memory ####################################
 
-# ElasticSearch performs poorly when JVM starts swapping: you should ensure that
+# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
 # it _never_ swaps.
 #
 # Set this property to true to lock the memory:
@@ -185,15 +185,15 @@
 
 # Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
 # to the same value, and that the machine has enough memory to allocate
-# for ElasticSearch, leaving enough memory for the operating system itself.
+# for Elasticsearch, leaving enough memory for the operating system itself.
 #
-# You should also make sure that the ElasticSearch process is allowed to lock
+# You should also make sure that the Elasticsearch process is allowed to lock
 # the memory, eg. by using `ulimit -l unlimited`.
 
 
 ############################## Network And HTTP ###############################
 
-# ElasticSearch, by default, binds itself to the 0.0.0.0 address, and listens
+# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
 # on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
 # communication. (the range means that if the port is busy, it will automatically
 # try the next port).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: springboard
 version: !ruby/object:Gem::Version
-  version: 0.90.12
+  version: 1.0.1
 platform: ruby
 authors:
 - Grant Rodgers
@@ -60,7 +60,7 @@ files:
 - vendor/elasticsearch/bin/plugin
 - vendor/elasticsearch/config/elasticsearch.yml
 - vendor/elasticsearch/config/logging.yml
-- vendor/elasticsearch/lib/elasticsearch-0.90.12.jar
+- vendor/elasticsearch/lib/elasticsearch-1.0.1.jar
 - vendor/elasticsearch/lib/jna-3.3.0.jar
 - vendor/elasticsearch/lib/jts-1.12.jar
 - vendor/elasticsearch/lib/log4j-1.2.17.jar