elasticsearch-extensions 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b7b3061fef7f7c6741547566298952a9d3cd30
-  data.tar.gz: c886b9cf1e4d612967124f8fb5bec6fe82c2729a
+  metadata.gz: e107c0460b65ea557da0d707c1d04876e5c09148
+  data.tar.gz: 24c97d1fb54ceddc82bfb832ba8e4e7b4f53107f
 SHA512:
-  metadata.gz: 907242c0b88d063acd24e1967077b4b2697fd32825630619ae0a1525acb5906fb234ce2b114bf222b4035be08726d2fa51fc9ade9d9f9fbcfb5422d6ff17292d
-  data.tar.gz: 44c49a14eea1c7ad742225a2274be9bd8b5302fb6dd338204da9592e947075d21006ff4fdbffca158113c21873f2f6144270a21ecf4c68d803dc23dd97ee2879
+  metadata.gz: 111ae93ac52d93ad54240d735a0d8373d075d25fb3769c830be10024f422a5b9fb803f033e1f9bb03e58cd660678f9fda44f7c6d97b404a493a44216871dd3bc
+  data.tar.gz: 6912205e7419ed78da8520fe15138cea7c4b759209bdc047fcde678b724e78e0d61c4d3de910a5d093f440f04c68dc17b7beae44a7b3e4d349a32e08bc2b262a

data/README.md

@@ -25,7 +25,7 @@ Display a table with the output of the `_analyze` API:
 
 Allows to programatically start and stop an Elasticsearch cluster suitable for isolating tests.
 
-HTTP service is running on ports `9250-*` by default, and the cluster runs in-memory only.
+The HTTP service is running on ports `9250-*` by default.
 
 Start and stop the default cluster:
 

data/elasticsearch-extensions.gemspec

@@ -51,6 +51,10 @@ Gem::Specification.new do |s|
     s.add_development_dependency "cane"
   end
 
+  if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
+    s.add_development_dependency "test-unit", '~> 2'
+  end
+
   # Gems for testing integrations
   s.add_development_dependency "patron"
   s.add_development_dependency "oj"

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

@@ -1,5 +1,6 @@
 require 'timeout'
 require 'net/http'
+require 'fileutils'
 require 'uri'
 require 'json'
 require 'ansi'
@@ -69,21 +70,27 @@ 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[:cluster_name] ||= (ENV['TEST_CLUSTER_NAME'] || 'elasticsearch_test').chomp
           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]      ||= (ENV['TEST_CLUSTER_TIMEOUT'] || 30).to_i
 
+          # Make sure `cluster_name` is not dangerous
+          if arguments[:cluster_name] =~ /^[\/\\]?$/
+            raise ArgumentError, "The `cluster_name` parameter cannot be empty string or a slash"
+          end
+
           if running? :on => arguments[:port], :as => arguments[:cluster_name]
             print "[!] Elasticsearch cluster already running".ansi(:red)
             wait_for_green(arguments[:port], arguments[:timeout])
             return false
           end
 
+          # Wipe out data for this cluster name
+          FileUtils.rm_rf "#{arguments[:path_data]}/#{arguments[:cluster_name]}"
+
           print "Starting ".ansi(:faint) +
                 @@number_of_nodes.to_s.ansi(:bold, :faint) +
                 " Elasticsearch nodes..".ansi(:faint)
@@ -98,8 +105,6 @@ module Elasticsearch
                 -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=#{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.cluster.routing.allocation.disk.threshold_enabled=false \
@@ -154,10 +159,10 @@ module Elasticsearch
           pids  = nodes['nodes'].map { |id, info| info['process']['id'] }
 
           unless pids.empty?
-            print "Stopping Elasticsearch nodes... ".ansi(:faint)
+            print "\nStopping Elasticsearch nodes... ".ansi(:faint)
             pids.each_with_index do |pid, i|
               begin
-                print "stopped PID #{pid}. ".ansi(:green) if Process.kill 'KILL', pid
+                print "stopped PID #{pid}. ".ansi(:green) if Process.kill 'INT', pid
               rescue Exception => e
                 print "[#{e.class}] PID #{pid} not found. ".ansi(:red)
               end

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

data/test/backup/unit/backup_test.rb

@@ -89,6 +89,7 @@ class Elasticsearch::Extensions::BackupTest < Test::Unit::TestCase
         .expects(:search)
         .with do |params|
           assert_equal 'test', params[:index]
+          true # Thanks, Ruby 2.2
         end
         .returns({"_scroll_id" => "abc123"})
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi