elasticsearch 0.4.1 → 0.4.2

data/elasticsearch.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "> 1"
   s.add_development_dependency "rake"
 
+  s.add_development_dependency "elasticsearch-extensions"
+
   s.add_development_dependency "ansi"
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module Elasticsearch
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/integration/client_integration_test.rb

@@ -5,12 +5,13 @@ module Elasticsearch
   module Test
     class ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
       startup do
-        Elasticsearch::TestCluster.start if ENV['SERVER'] and not Elasticsearch::TestCluster.running?
+        Elasticsearch::Extensions::Test::Cluster.start if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
       end
 
       context "Elasticsearch client" do
         setup do
-          system "curl -X DELETE http://localhost:9250/_all > /dev/null 2>&1"
+          @port  = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
+          system "curl -X DELETE http://localhost:#{@port}/_all > /dev/null 2>&1"
 
           @logger =  Logger.new(STDERR)
           @logger.formatter = proc do |severity, datetime, progname, msg|
@@ -23,7 +24,7 @@ module Elasticsearch
             ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
           end
 
-          @client = Elasticsearch::Client.new host: 'localhost:9250', logger: @logger
+          @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: @logger
         end
 
         should "perform the API methods" do

data/test/test_helper.rb

@@ -16,25 +16,26 @@ require 'require-prof' if ENV["REQUIRE_PROF"]
 require 'elasticsearch'
 RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 
-require '../elasticsearch-transport/lib/elasticsearch/transport/extensions/test_cluster'
-require '../elasticsearch-transport/test/test_extensions'
+require 'elasticsearch/extensions/test/cluster'
+require 'elasticsearch/extensions/test/startup_shutdown'
+require 'elasticsearch/extensions/test/profiling'
 
 module Elasticsearch
   module Test
     class IntegrationTestCase < ::Test::Unit::TestCase
-      extend IntegrationTestStartupShutdown
+      extend Elasticsearch::Extensions::Test::StartupShutdown
 
-      shutdown { Elasticsearch::TestCluster.stop if ENV['SERVER'] && started? }
+      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
       context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
     end
   end
 
   module Test
     class ProfilingTest < ::Test::Unit::TestCase
-      extend IntegrationTestStartupShutdown
-      extend ProfilingTestSupport
+      extend Elasticsearch::Extensions::Test::StartupShutdown
+      extend Elasticsearch::Extensions::Test::Profiling
 
-      shutdown { Elasticsearch::TestCluster.stop if ENV['SERVER'] && started? }
+      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
       context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch-extensions
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement