elasticsearch-extensions 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7248c6fbddfe31ef013db4c097d59ba4427df2e3
-  data.tar.gz: 565df7537b10de2a83cbf0181a65b7580901ba83
+  metadata.gz: 8bda497e1ccc47c049c768553dd2a5abeab9c2c0
+  data.tar.gz: 22b39cc0d3a681d4247dd1f680ab0b03186dd6e4
 SHA512:
-  metadata.gz: 5d56926d940b28be59070ab4d98adaba0beedb9228ca8df892db425e9066342bb54b29ed6f4ef7b94b6f1d94214df876e451aae3313092ef1c277b20d8241266
-  data.tar.gz: 397ab511b86ae27c15c77037df6c8d598e618299bf1683d7927c0cb6bc72823e7a212285ae052c7d1d613bdabdd6518fcdcb74a3f7a3ed4c4b5436117f859158
+  metadata.gz: 692fc9fed953ce3c5bfce9e4c736ec93a495c6da474003a6e7123edae6f62eefcfb9f5ac3aedb199b7d4d68110d3e21c5ec283844f68ff8f621f0d47f01681ac
+  data.tar.gz: 64ea85038c2195bb9eeecf3cc6c8eea2c9f9bf6c0abfa79f3bd370079b7c4940fa8db9b28c4f6f404cfcb942941ba9a0914d630af0ca4abc8f12c5fcad978748

data/Rakefile

@@ -23,14 +23,16 @@ namespace :test do
     Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/**/unit/**/*_test.rb"]
-    # test.verbose = true
-    # test.warning = true
+    test.verbose = false
+    test.warning = false
   end
 
   Rake::TestTask.new(:integration) do |test|
     Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/**/integration/**/*_test.rb"]
+    test.verbose = false
+    test.warning = false
   end
 
   Rake::TestTask.new(:all) do |test|

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

@@ -83,7 +83,7 @@ module Elasticsearch
 
           COMMANDS = {
             '0.90' => lambda { |arguments, node_number|
-              <<-COMMAND.gsub(/                /, '')
+              <<-COMMAND.gsub(/                /, '').gsub(/\n$/, '')
                 #{arguments[:command]} \
                 -f \
                 -D es.cluster.name=#{arguments[:cluster_name]} \
@@ -102,14 +102,13 @@ module Elasticsearch
                 -D es.node.bench=true \
                 -D es.path.repo=/tmp \
                 -D es.repositories.url.allowed_urls=http://snapshot.test* \
-                -D es.logger.level=DEBUG \
-                #{arguments[:es_params]} \
-                > /dev/null
+                -D es.logger.level=#{ENV['DEBUG'] ? 'DEBUG' : 'INFO'} \
+                #{arguments[:es_params]}
               COMMAND
               },
 
             '1.0' => lambda { |arguments, node_number|
-              <<-COMMAND.gsub(/                /, '')
+              <<-COMMAND.gsub(/                /, '').gsub(/\n$/, '')
                 #{arguments[:command]} \
                 -D es.foreground=yes \
                 -D es.cluster.name=#{arguments[:cluster_name]} \
@@ -129,13 +128,12 @@ module Elasticsearch
                 -D es.path.repo=/tmp \
                 -D es.repositories.url.allowed_urls=http://snapshot.test* \
                 -D es.logger.level=#{ENV['DEBUG'] ? 'DEBUG' : 'INFO'} \
-                #{arguments[:es_params]} \
-                > /dev/null
+                #{arguments[:es_params]}
               COMMAND
               },
 
             '2.0' => lambda { |arguments, node_number|
-              <<-COMMAND.gsub(/                /, '')
+              <<-COMMAND.gsub(/                /, '').gsub(/\n$/, '')
                 #{arguments[:command]} \
                 -D es.foreground=yes \
                 -D es.cluster.name=#{arguments[:cluster_name]} \
@@ -151,14 +149,13 @@ module Elasticsearch
                 -D es.node.attr.testattr=test \
                 -D es.path.repo=/tmp \
                 -D es.repositories.url.allowed_urls=http://snapshot.test* \
-                -D es.logger.level=DEBUG \
-                #{arguments[:es_params]} \
-                > /dev/null
+                -D es.logger.level=#{ENV['DEBUG'] ? 'DEBUG' : 'INFO'} \
+                #{arguments[:es_params]}
               COMMAND
               },
 
             '5.0' => lambda { |arguments, node_number|
-              <<-COMMAND.gsub(/                /, '')
+              <<-COMMAND.gsub(/                /, '').gsub(/\n$/, '')
                 #{arguments[:command]} \
                 -E cluster.name=#{arguments[:cluster_name]} \
                 -E node.name=#{arguments[:node_name]}-#{node_number} \
@@ -174,9 +171,8 @@ module Elasticsearch
                 -E repositories.url.allowed_urls=http://snapshot.test* \
                 -E discovery.zen.minimum_master_nodes=#{arguments[:number_of_nodes]-1} \
                 -E node.max_local_storage_nodes=#{arguments[:number_of_nodes]} \
-                -E logger.level=DEBUG \
-                #{arguments[:es_params]} \
-                > /dev/null
+                -E logger.level=#{ENV['DEBUG'] ? 'DEBUG' : 'INFO'} \
+                #{arguments[:es_params]}
               COMMAND
             }
           }
@@ -194,7 +190,7 @@ module Elasticsearch
           # @option arguments [String]  :path_work    Path to the directory with auxiliary files
           # @option arguments [String]  :path_logs    Path to the directory with log files
           # @option arguments [Boolean] :multicast_enabled Whether multicast is enabled (default: true)
-          # @option arguments [Integer] :timeout      Timeout when starting the cluster (default: 30)
+          # @option arguments [Integer] :timeout      Timeout when starting the cluster (default: 60)
           # @option arguments [String]  :network_host The host that nodes will bind on and publish to
           # @option arguments [Boolean] :clear_cluster Wipe out cluster content on startup (default: true)
           # @option arguments [Boolean] :quiet         Disable printing to STDERR (default: false)
@@ -215,7 +211,7 @@ module Elasticsearch
             @arguments[:path_logs]         ||= ENV.fetch('TEST_CLUSTER_LOGS',      '/tmp/log/elasticsearch')
             @arguments[:es_params]         ||= ENV.fetch('TEST_CLUSTER_PARAMS',    '')
             @arguments[:multicast_enabled] ||= ENV.fetch('TEST_CLUSTER_MULTICAST', 'true')
-            @arguments[:timeout]           ||= ENV.fetch('TEST_CLUSTER_TIMEOUT',   30).to_i
+            @arguments[:timeout]           ||= ENV.fetch('TEST_CLUSTER_TIMEOUT',   60).to_i
             @arguments[:number_of_nodes]   ||= ENV.fetch('TEST_CLUSTER_NODES',     2).to_i
             @arguments[:network_host]      ||= ENV.fetch('TEST_CLUSTER_NETWORK_HOST', __default_network_host)
             @arguments[:quiet]             ||= ! ENV.fetch('QUIET', '').empty?
@@ -268,7 +264,10 @@ module Elasticsearch
 
             arguments[:number_of_nodes].times do |n|
               n += 1
+
               command =  __command(version, arguments, n)
+              command += '> /dev/null' unless ENV['DEBUG']
+
               __log command.gsub(/ {1,}/, ' ').ansi(:bold) if ENV['DEBUG']
 
               pid = Process.spawn(command)
@@ -362,7 +361,7 @@ module Elasticsearch
           # @return Boolean
           #
           def wait_for_green
-            __wait_for_status('green', 60)
+            __wait_for_status('green', arguments[:timeout])
           end
 
           # Returns the major version of Elasticsearch
@@ -584,8 +583,9 @@ module Elasticsearch
                       'Nodes:   '.ljust(20).ansi(:faint) + health['number_of_nodes'].to_s.ansi(:faint)].join("\n")
 
             nodes['nodes'].each do |id, info|
-              m = id == master ? '*' : '+'
-              result << ''.ljust(20) +
+              m = id == master ? '*' : '-'
+              result << "\n" +
+                        ''.ljust(20) +
                         "#{m} ".ansi(:faint) +
                         "#{info['name'].ansi(:bold)} ".ansi(:faint) +
                         "| version: #{info['version'] rescue 'N/A'}, ".ansi(:faint) +

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.24"
+    VERSION = "0.0.25"
   end
 end

data/test/test/cluster/unit/cluster_test.rb

@@ -24,7 +24,7 @@ class Elasticsearch::Extensions::TestClusterTest < Test::Unit::TestCase
       setup do
         Elasticsearch::Extensions::Test::Cluster::Cluster.any_instance.stubs(:__default_network_host).returns('_local_')
 
-        @subject = Elasticsearch::Extensions::Test::Cluster::Cluster.new
+        @subject = Elasticsearch::Extensions::Test::Cluster::Cluster.new(number_of_nodes: 1)
         @subject.stubs(:__remove_cluster_data).returns(true)
       end
 
@@ -262,11 +262,7 @@ class Elasticsearch::Extensions::TestClusterTest < Test::Unit::TestCase
           File.expects(:exist?).with('/foo/bar/bin/elasticsearch').returns(true)
 
           Process.stubs(:wait)
-          Process.expects(:spawn)
-            .with do |command, options|
-              assert_equal "/foo/bar/bin/elasticsearch --version", command
-            end
-            .returns(123)
+          Process.expects(:spawn).returns(123)
           Process.expects(:kill).with('INT', 123)
 
           IO.any_instance.expects(:read)
@@ -288,11 +284,7 @@ class Elasticsearch::Extensions::TestClusterTest < Test::Unit::TestCase
           File.expects(:exist?).with('/foo/bar/bin/elasticsearch').returns(true)
 
           Process.stubs(:wait)
-          Process.expects(:spawn)
-            .with do |command, options|
-              assert_equal "/foo/bar/bin/elasticsearch --version", command
-            end
-            .returns(123)
+          Process.expects(:spawn).returns(123)
           Process.expects(:kill).with('INT', 123)
 
           IO.any_instance.expects(:read).returns('Version: FOOBAR')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi