elasticsearch-extensions 0.0.8 → 0.0.9

data/Rakefile

@@ -45,7 +45,7 @@ namespace :test do
     test.test_files = FileList["test/profile/**/*_test.rb"]
   end
 
-  namespace :server do
+  namespace :cluster do
     desc "Start Elasticsearch nodes for tests"
     task :start do
       $LOAD_PATH << File.expand_path('../lib', __FILE__) << File.expand_path('../test', __FILE__)

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

@@ -30,7 +30,7 @@ module Elasticsearch
       # @see Cluster#stop Cluster.stop
       #
       module Cluster
-        @@number_of_nodes = 0
+        @@number_of_nodes = (ENV['TEST_CLUSTER_NODES'] || 2).to_i
 
         # Starts a cluster
         #
@@ -88,11 +88,13 @@ module Elasticsearch
                 @@number_of_nodes.to_s.ansi(:bold, :faint) +
                 " Elasticsearch nodes..".ansi(:faint)
 
+          pids = []
+
           @@number_of_nodes.times do |n|
             n += 1
             pid = Process.spawn <<-COMMAND
               #{arguments[:command]} \
-                -D es.foreground=no \
+                -D es.foreground=yes \
                 -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)} \
@@ -104,9 +106,16 @@ module Elasticsearch
                 -D es.discovery.zen.ping.multicast.enabled=true \
                 -D es.node.test=true \
                 #{arguments[:es_params]} \
-                > /dev/null 2>&1
+                > /dev/null
             COMMAND
             Process.detach pid
+            pids << pid
+          end
+
+          # Check for proceses running
+          if `ps -p #{pids.join(' ')}`.split("\n").size < @@number_of_nodes+1
+            STDERR.puts "", "[!!!] Process failed to start (see output above)".ansi(:red)
+            exit(1)
           end
 
           wait_for_green(arguments[:port], arguments[:timeout])
@@ -207,6 +216,8 @@ module Elasticsearch
                 nil
               end
 
+              puts response.inspect if ENV['DEBUG']
+
               if response && response['status'] == status && ( @@number_of_nodes.nil? || @@number_of_nodes == response['number_of_nodes'].to_i  )
                 __print_cluster_info(port) and break
               end

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch