springboard 0.20.1 → 0.20.2

data/Rakefile

@@ -4,7 +4,7 @@ require "bundler/gem_tasks"
 desc "update elasticsearch version" 
 task :update, [:version] do |t, args|
   sh "rm -rf vendor/elasticsearch && mkdir vendor/elasticsearch"
-  sh "wget https://github.com/downloads/elasticsearch/elasticsearch/elasticsearch-#{args.version}.tar.gz"
+  sh "wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-#{args.version}.tar.gz"
   sh "tar zxvf elasticsearch-#{args.version}.tar.gz"
   sh "mv elasticsearch-#{args.version}/* vendor/elasticsearch"
   sh "rm -rf elasticsearch-#{args.version} elasticsearch-#{args.version}.tar.gz"

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

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-0.20.1.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
+ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-0.20.2.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
 
 if [ "x$ES_MIN_MEM" = "x" ]; then
     ES_MIN_MEM=256m
@@ -37,7 +37,9 @@ JAVA_OPTS="$JAVA_OPTS -Xss256k"
 JAVA_OPTS="$JAVA_OPTS -Djava.awt.headless=true"
 
 # Force the JVM to use IPv4 stack
-# JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+if [ "x$ES_USE_IPV4" != "x" ]; then
+  JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+fi
 
 JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC"
 JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC"
@@ -46,15 +48,17 @@ JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JAVA_OPTS="$JAVA_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
 
 # When running under Java 7
-#JAVA_OPTS="$JAVA_OPTS -XX:+UseCondCardMark"
-
-# GC logging options -- uncomment to enable
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCTimeStamps"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintClassHistogram"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintTenuringDistribution"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCApplicationStoppedTime"
-# JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/elasticsearch/gc.log"
+# JAVA_OPTS="$JAVA_OPTS -XX:+UseCondCardMark"
+
+# GC logging options
+if [ "x$ES_USE_GC_LOGGING" != "x" ]; then
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCTimeStamps"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintClassHistogram"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintTenuringDistribution"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCApplicationStoppedTime"
+  JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/elasticsearch/gc.log"
+fi
 
 # Causes the JVM to dump its heap on OutOfMemory.
 JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"

data/lib/springboard/version.rb

@@ -1,3 +1,3 @@
 module Springboard
-  VERSION = "0.20.1"
+  VERSION = "0.20.2"
 end

data/springboard.gemspec

@@ -15,4 +15,6 @@ Gem::Specification.new do |gem|
   gem.name          = "springboard"
   gem.require_paths = ["lib"]
   gem.version       = Springboard::VERSION
+
+  gem.add_development_dependency 'rake'
 end

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

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-0.20.1.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
+ES_CLASSPATH=$ES_CLASSPATH:$ES_HOME/lib/elasticsearch-0.20.2.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*
 
 if [ "x$ES_MIN_MEM" = "x" ]; then
     ES_MIN_MEM=256m
@@ -37,7 +37,9 @@ JAVA_OPTS="$JAVA_OPTS -Xss256k"
 JAVA_OPTS="$JAVA_OPTS -Djava.awt.headless=true"
 
 # Force the JVM to use IPv4 stack
-# JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+if [ "x$ES_USE_IPV4" != "x" ]; then
+  JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+fi
 
 JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC"
 JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC"
@@ -46,15 +48,17 @@ JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JAVA_OPTS="$JAVA_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
 
 # When running under Java 7
-#JAVA_OPTS="$JAVA_OPTS -XX:+UseCondCardMark"
-
-# GC logging options -- uncomment to enable
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCTimeStamps"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintClassHistogram"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintTenuringDistribution"
-# JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCApplicationStoppedTime"
-# JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/elasticsearch/gc.log"
+# JAVA_OPTS="$JAVA_OPTS -XX:+UseCondCardMark"
+
+# GC logging options
+if [ "x$ES_USE_GC_LOGGING" != "x" ]; then
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCTimeStamps"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintClassHistogram"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintTenuringDistribution"
+  JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCApplicationStoppedTime"
+  JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/elasticsearch/gc.log"
+fi
 
 # Causes the JVM to dump its heap on OutOfMemory.
 JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: springboard
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
-dependencies: []
+date: 2013-02-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Packages up elasticsearch in a gem and adds a ruby executable to run
   it easily with relative config paths.\n                         Makes elasticsearch
   dead simple to develop with."
@@ -47,15 +63,15 @@ files:
 - vendor/elasticsearch/bin/plugin
 - vendor/elasticsearch/config/elasticsearch.yml
 - vendor/elasticsearch/config/logging.yml
-- vendor/elasticsearch/lib/elasticsearch-0.20.1.jar
+- vendor/elasticsearch/lib/elasticsearch-0.20.2.jar
 - vendor/elasticsearch/lib/jna-3.3.0.jar
 - vendor/elasticsearch/lib/jts-1.12.jar
 - vendor/elasticsearch/lib/log4j-1.2.17.jar
-- vendor/elasticsearch/lib/lucene-analyzers-3.6.1.jar
-- vendor/elasticsearch/lib/lucene-core-3.6.1.jar
-- vendor/elasticsearch/lib/lucene-highlighter-3.6.1.jar
-- vendor/elasticsearch/lib/lucene-memory-3.6.1.jar
-- vendor/elasticsearch/lib/lucene-queries-3.6.1.jar
+- vendor/elasticsearch/lib/lucene-analyzers-3.6.2.jar
+- vendor/elasticsearch/lib/lucene-core-3.6.2.jar
+- vendor/elasticsearch/lib/lucene-highlighter-3.6.2.jar
+- vendor/elasticsearch/lib/lucene-memory-3.6.2.jar
+- vendor/elasticsearch/lib/lucene-queries-3.6.2.jar
 - vendor/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so
 - vendor/elasticsearch/lib/sigar/libsigar-amd64-linux.so
 - vendor/elasticsearch/lib/sigar/libsigar-amd64-solaris.so
@@ -97,4 +113,3 @@ signing_key:
 specification_version: 3
 summary: Run elasticsearch as a gem binary
 test_files: []
-has_rdoc: