elasticsearch-extensions 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4ca50bd854c095ea97403668540fcd796a75389f663a7dd9569f9aa87f22064
-  data.tar.gz: ca68b95a4c7790f52689c9d2d1cae8e084da8c8cd142916dbbd40d9fb70c0c75
+  metadata.gz: f2f31a4f9b391f84ea23e4314ec1da63b891285fcd3ea3fb8e1f49096c351284
+  data.tar.gz: 74eee6485aed24c6de222ec3b9fdb2fae9c18bfb06efa27c36afcedac73dde9d
 SHA512:
-  metadata.gz: 2b3101ac071f64380812b1921fe415c2e5e3731e87b2ca7d392d72006e1e5de771cace1731ff5d1680dafde9e66027b3f18d3c2b2a9436ce6bfd7009dadcb43a
-  data.tar.gz: 6408655db000713236af559f7a8ab832427ed3127d34e76b515cd0183abd3093bd2e6eedcc03b1c08526fb9a8f621809fb8e3314461d4cb4bdce4f1fc5d80700
+  metadata.gz: 5c1e0783284b2e4e32a4f3df18f9af16e243995072265e061b4c29d06243c1931d5d9cdcea99906e68f8017bc148e0f956cbaa59c5bd7c5d0f24f47e3d3c03e3
+  data.tar.gz: 979f5e069b5124e9913afd4033045114017f176f5d3ad327d4a7cd958cd2612d6e0b9a9dc0d595db5d25bf2a660ea3f21e0e839f15e68ecdf7dcef4564473001

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

@@ -205,7 +205,7 @@ module Elasticsearch
                 -E path.repo=/tmp \
                 -E repositories.url.allowed_urls=http://snapshot.test* \
                 -E discovery.zen.minimum_master_nodes=#{arguments[:number_of_nodes]-1} \
-                -E xpack.security.enabled=false \
+                #{'-E xpack.security.enabled=false' unless arguments[:dist] == 'oss'} \
                 -E node.max_local_storage_nodes=#{arguments[:number_of_nodes]} \
                 -E logger.level=#{ENV['DEBUG'] ? 'DEBUG' : 'INFO'} \
                 #{arguments[:es_params]}
@@ -472,7 +472,6 @@ module Elasticsearch
           #
           def __determine_version
             path_to_lib = File.dirname(arguments[:command]) + '/../lib/'
-
             version = if arguments[:version]
               arguments[:version]
             elsif File.exist?(path_to_lib) && !(jar = Dir.entries(path_to_lib).select { |f| f =~ /^elasticsearch\-\d/ }.first).nil?
@@ -530,6 +529,8 @@ module Elasticsearch
                 raise RuntimeError, "Cannot determine Elasticsearch version from [#{arguments[:command]} --version] or [#{arguments[:command]} -v]"
               end
 
+              @dist = output.match(/Build: ([a-z]+)\//)&.[](1)
+
               if(m = output.match(/Version: (\d+\.\d+.\d+).*,/))
                 m[1]
               else
@@ -564,11 +565,10 @@ module Elasticsearch
           # @return String
           #
           def __command(version, arguments, node_number)
-            if command = COMMANDS[version]
-              command.call(arguments, node_number)
-            else
-              raise ArgumentError, "Cannot find command for version [#{version}]"
-            end
+            raise ArgumentError, "Cannot find command for version [#{version}]" unless (command = COMMANDS[version])
+
+            arguments.merge!({ dist: @dist })
+            command.call(arguments, node_number)
           end
 
           # Blocks the process and waits for the cluster to be in a "green" state
@@ -670,7 +670,6 @@ module Elasticsearch
             FileUtils.rm_rf arguments[:path_data]
           end
 
-
           # Check whether process for PIDs are running
           #
           # @api private

data/lib/elasticsearch/extensions/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Extensions
-    VERSION = '0.0.32'.freeze
+    VERSION = '0.0.33'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Extensions for the Elasticsearch Rubygem