elasticsearch-extensions 0.0.6 → 0.0.7

data/elasticsearch-extensions.gemspec

@@ -34,6 +34,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ruby-prof"
   s.add_development_dependency "ci_reporter"
 
+  if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+    s.add_development_dependency "json"
+  end
+
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "simplecov"
     s.add_development_dependency "cane"

data/lib/elasticsearch/extensions/test/cluster.rb

@@ -69,6 +69,11 @@ module Elasticsearch
           arguments[:command]      ||= ENV['TEST_CLUSTER_COMMAND'] || 'elasticsearch'
           arguments[:port]         ||= (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
           arguments[:cluster_name] ||= ENV['TEST_CLUSTER_NAME'] || 'elasticsearch_test'
+          arguments[:gateway_type] ||= 'none'
+          arguments[:index_store]  ||= 'memory'
+          arguments[:path_data]    ||= ENV['TEST_CLUSTER_DATA'] || '/tmp'
+          arguments[:es_params]    ||= ENV['TEST_CLUSTER_PARAMS'] || ''
+          arguments[:path_work]    ||= '/tmp'
           arguments[:node_name]    ||= 'node'
           arguments[:timeout]      ||= 30
 
@@ -84,18 +89,20 @@ module Elasticsearch
 
           @@number_of_nodes.times do |n|
             n += 1
-            pidfile = File.expand_path("tmp/elasticsearch-#{n}.pid", Dir.pwd)
             pid = Process.spawn <<-COMMAND
               #{arguments[:command]} \
-                -D es.foreground=yes \
+                -D es.foreground=no \
                 -D es.cluster.name=#{arguments[:cluster_name]} \
                 -D es.node.name=#{arguments[:node_name]}-#{n} \
                 -D es.http.port=#{arguments[:port].to_i + (n-1)} \
-                -D es.gateway.type=none \
-                -D es.index.store.type=memory \
+                -D es.gateway.type=#{arguments[:gateway_type]} \
+                -D es.index.store.type=#{arguments[:index_store]} \
+                -D es.path.data=#{arguments[:path_data]} \
+                -D es.path.work=#{arguments[:path_work]} \
                 -D es.network.host=0.0.0.0 \
                 -D es.discovery.zen.ping.multicast.enabled=true \
-                -D es.pidfile=#{pidfile} \
+                -D es.node.test=true \
+                #{arguments[:es_params]} \
                 > /dev/null 2>&1
             COMMAND
             Process.detach pid

data/lib/elasticsearch/extensions/test/cluster/tasks.rb

@@ -0,0 +1,13 @@
+require 'elasticsearch/extensions/test/cluster'
+
+namespace :elasticsearch do
+  desc "Start Elasticsearch cluster for tests"
+  task :start do
+    Elasticsearch::Extensions::Test::Cluster.start
+  end
+
+  desc "Stop Elasticsearch cluster for tests"
+  task :stop do
+    Elasticsearch::Extensions::Test::Cluster.stop
+  end
+end

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -255,6 +255,7 @@ files:
 - lib/elasticsearch/extensions/ansi/helpers.rb
 - lib/elasticsearch/extensions/ansi/response.rb
 - lib/elasticsearch/extensions/test/cluster.rb
+- lib/elasticsearch/extensions/test/cluster/tasks.rb
 - lib/elasticsearch/extensions/test/profiling.rb
 - lib/elasticsearch/extensions/test/startup_shutdown.rb
 - lib/elasticsearch/extensions/version.rb