springboard 0.18.7 → 0.18.7.1

data/Rakefile

@@ -18,6 +18,7 @@ EOS
   end
 end
 
+desc "Clean data from vendor/elasticsearch"
 task :clean do
   sh "rm -rf vendor/elasticsearch/logs vendor/elasticsearch/data"
 end

data/bin/springboard

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+
+# Not using optparse or trollop because they raise on unknown args, and 
+# we want to pass all unknown args to elasticsearch.
+args = ARGV.join(" ")
+
+config_directory_arg = /-c\s+(\S+)\s?/
+
+if dir = args.slice!(config_directory_arg)
+
+  conf = config_directory_arg.match(dir){ |m| Pathname.new(m[1]) }
+
+  raise "Must provide the configuration directory." unless conf.directory?
+
+  ENV['ES_JAVA_OPTS'] = "-Des.path.conf=#{conf.to_s}"
+
+  if es_include = conf.children(false).detect { |p| p.to_s == "elasticsearch.in.sh" }
+    ENV['ES_INCLUDE'] = (conf + es_include).to_s
+  end
+end
+
+exec (Pathname.new(File.dirname(__FILE__)) + "../vendor/elasticsearch/bin/elasticsearch").realpath.to_s, args.strip

data/lib/springboard/generators/config_generator.rb

@@ -10,6 +10,9 @@ module Springboard
         template "elasticsearch.yml", "config/elasticsearch/elasticsearch.yml"
         copy_file "logging.yml", "config/elasticsearch/logging.yml"
         copy_file "elasticsearch.in.sh", "config/elasticsearch/elasticsearch.in.sh"
+        say "Run elasticsearch with springboard -c config/elasticsearch to use your new config."
+        say "Check here for more configuration options:"
+        say "  https://github.com/elasticsearch/elasticsearch/blob/master/config/elasticsearch.yml"
       end
 
 

data/lib/springboard/generators/templates/elasticsearch.yml

@@ -3,5 +3,10 @@ cluster.name: <%= application_name %>
 path.data: db/elasticsearch
 path.logs: log
 
+# disable cluster discovery
 discovery.zen.ping.multicast.enabled: false
 discovery.zen.ping.unicast.hosts: []
+
+# disable index sharding and replication
+index.number_of_shards: 1
+index.number_of_replicas: 0

data/lib/springboard/version.rb

@@ -1,3 +1,3 @@
 module Springboard
-  VERSION = "0.18.7"
+  VERSION = "0.18.7.1"
 end

metadata

@@ -1,41 +1,32 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: springboard
-version: !ruby/object:Gem::Version 
-  hash: 89
+version: !ruby/object:Gem::Version
+  version: 0.18.7.1
   prerelease: 
-  segments: 
-  - 0
-  - 18
-  - 7
-  version: 0.18.7
 platform: ruby
-authors: 
+authors:
 - Grant Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies: []
-
 description: Run elasticsearch as a gem binary
-email: 
+email:
 - grantr@gmail.com
-executables: 
-- elasticsearch
+executables:
 - es_plugin
+- springboard
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/elasticsearch
 - bin/es_plugin
+- bin/springboard
 - lib/springboard.rb
 - lib/springboard/generators/USAGE
 - lib/springboard/generators/config_generator.rb
@@ -78,37 +69,27 @@ files:
 - vendor/elasticsearch/lib/sigar/sigar-1.6.4.jar
 homepage: http://github.com/grantr/springboard
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Packages up elasticsearch in a gem and adds a ruby executable to run it easily with relative config paths. Makes elasticsearch dead simple to develop with.
+summary: Packages up elasticsearch in a gem and adds a ruby executable to run it easily
+  with relative config paths. Makes elasticsearch dead simple to develop with.
 test_files: []
-
-has_rdoc: 

data/bin/elasticsearch

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-
-# Not using optparse or trollop because they raise on unknown args, and 
-# we want to pass all unknown args to elasticsearch.
-args = ARGV.join(" ")
-if args =~ /(-c [\w\/]+)/
-  conf = Pathname.new(args.slice!($1).sub("-c ",''))
-  conf = Pathname.new(File.expand_path(conf, Dir.pwd)) if conf.relative?
-  ENV['ES_JAVA_OPTS'] = "-Des.path.conf=#{conf}"
-
-  if es_include = conf.entries.detect { |p| p.to_s == "elasticsearch.in.sh" }
-    ENV['ES_INCLUDE'] = es_include.expand_path conf
-  end
-end
-
-exec File.expand_path("../vendor/elasticsearch/bin/elasticsearch",  File.dirname(__FILE__)), args.strip