elasticsearch-api 0.4.5 → 0.4.6

data/Rakefile

@@ -1,15 +1,26 @@
 require "bundler/gem_tasks"
 
-__current__ = Pathname( File.expand_path('..', __FILE__) )
+def __current__
+  Pathname( File.expand_path('..', __FILE__) )
+end
+
+def git_specs(command, options={})
+  sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} #{command}", options
+end
 
-desc "Run unit tests"
-task :default => 'test:unit'
-task :test    => 'test:unit'
+task(:default) { system "rake --tasks" }
+task  :test    => 'test:unit'
 
 # ----- Test tasks ------------------------------------------------------------
 
 require 'rake/testtask'
 namespace :test do
+
+  desc "Update the repository with YAML tests"
+  task :update do
+    git_specs "fetch origin --verbose", :verbose => true
+  end
+
   task :ci_reporter do
     ENV['CI_REPORTS'] ||= 'tmp/reports'
     if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
@@ -33,7 +44,19 @@ namespace :test do
   task :integration do
     require 'elasticsearch'
 
-    current_branch = `git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} branch --no-color`.split("\n").select { |b| b =~ /^\*/ }.first.gsub(/^\*\s*/, '')
+    branches = `git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} branch --no-color`
+
+    current_branch = branches
+      .split("\n")
+      .select { |b| b =~ /^\*/ }
+      .reject { |b| b =~ /detached/ }
+      .map    { |b| b.gsub(/^\*\s*/, '') }
+      .first
+
+    unless current_branch
+      STDERR.puts "[!] Unable to determine current branch, defaulting to 'master'"
+      current_branch = 'master'
+    end
 
     # Define the task
     t = Rake::TestTask.new(:integration) do |test|
@@ -42,6 +65,7 @@ namespace :test do
       test.test_files = FileList["test/integration/yaml_test_runner.rb", "test/integration/**/*_test.rb"]
     end
 
+    # Check if a test cluster is running
     begin
       client = Elasticsearch::Client.new host: "localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}"
       es_version_info = client.info['version']
@@ -52,12 +76,24 @@ namespace :test do
       cluster_running = false
     end
 
-    checkout_server_build = ENV['TEST_NO_SPEC_CHECKOUT'].nil? ? true : false
-    checkout_build_hash   = ENV['TEST_BUILD_HASH'] || build_hash
+    checkout_specs_version = ENV['TEST_NO_CHECKOUT'].nil? ? true : false
+    checkout_build_hash    = ENV['TEST_BUILD_REF'] || build_hash
 
     begin
-      # Checkout the branch corresponding to the build
-      sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} checkout #{checkout_build_hash} --force --quiet" if cluster_running && checkout_server_build
+      unless checkout_specs_version
+        STDERR.puts '-'*80, "YAML tests: Not switching, TEST_NO_CHECKOUT=y", '-'*80
+      end
+
+      if checkout_specs_version && !checkout_build_hash
+        STDERR.puts "[!] Cannot determine checkout build hash -- server not running or TEST_BUILD_REF not specified"
+        exit(1)
+      end
+
+      if checkout_specs_version && checkout_build_hash
+        # Checkout the commit corresponding to the running server build, or passed TEST_BUILD_REF
+        STDERR.puts '-'*80, "YAML tests: Switching to [\e[1m#{checkout_build_hash}\e[0m]", '-'*80
+        git_specs "checkout #{checkout_build_hash} --force --quiet"
+      end
 
       # Path to the API specs
       ENV['TEST_REST_API_SPEC'] = __current__.join('../support/elasticsearch/rest-api-spec/test/').to_s
@@ -74,14 +110,15 @@ namespace :test do
       end
 
     ensure
-      sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} checkout #{current_branch}", :verbose => false if cluster_running && checkout_server_build
+      git_specs "checkout --force --quiet #{current_branch}" if checkout_specs_version
     end
   end
 
-  Rake::TestTask.new(:all) do |test|
+  desc "Run unit and integration tests"
+  task :all do
     Rake::Task['test:ci_reporter'].invoke if ENV['CI']
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb", "test/integration/yaml_test_runner.rb"]
+    Rake::Task['test:unit'].invoke
+    Rake::Task['test:integration'].invoke
   end
 
   namespace :cluster do

data/elasticsearch-api.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ci_reporter"
 
   # Gems for testing integrations
-  s.add_development_dependency "multi_json"
   s.add_development_dependency "jbuilder"
   s.add_development_dependency "jsonify"
   s.add_development_dependency "hashie"

data/lib/elasticsearch/api/actions/cluster/node_hot_threads.rb

@@ -33,7 +33,7 @@ module Elasticsearch
             :type ]
 
           method = 'GET'
-          path   = Utils.__pathify '_cluster/nodes', Utils.__listify(arguments[:node_id]), 'hot_threads'
+          path   = Utils.__pathify '_nodes', Utils.__listify(arguments[:node_id]), 'hot_threads'
 
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil

data/lib/elasticsearch/api/actions/cluster/node_info.rb

@@ -46,7 +46,7 @@ module Elasticsearch
             :transport ]
 
           method = 'GET'
-          path   = Utils.__pathify '_cluster/nodes', Utils.__listify(arguments[:node_id])
+          path   = Utils.__pathify '_nodes', Utils.__listify(arguments[:node_id])
 
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil

data/lib/elasticsearch/api/actions/cluster/node_shutdown.rb

@@ -23,7 +23,7 @@ module Elasticsearch
             :exit ]
 
           method = 'POST'
-          path   = Utils.__pathify '_cluster/nodes', Utils.__listify(arguments[:node_id]), '_shutdown'
+          path   = Utils.__pathify '_nodes', Utils.__listify(arguments[:node_id]), '_shutdown'
 
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "0.4.5"
+    VERSION = "0.4.6"
   end
 end

data/test/unit/cluster/node_hot_threads_test.rb

@@ -10,7 +10,7 @@ module Elasticsearch
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'GET', method
-            assert_equal '_cluster/nodes/hot_threads', url
+            assert_equal '_nodes/hot_threads', url
             assert_equal Hash.new, params
             assert_nil   body
             true
@@ -21,7 +21,7 @@ module Elasticsearch
 
         should "send :node_id correctly" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_cluster/nodes/foo/hot_threads', url
+            assert_equal '_nodes/foo/hot_threads', url
             true
           end.returns(FakeResponse.new)
 
@@ -30,7 +30,7 @@ module Elasticsearch
 
         should "URL-escape the parts" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_cluster/nodes/foo%5Ebar/hot_threads', url
+            assert_equal '_nodes/foo%5Ebar/hot_threads', url
             true
           end.returns(FakeResponse.new)
 

data/test/unit/cluster/node_info_test.rb

@@ -10,7 +10,7 @@ module Elasticsearch
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'GET', method
-            assert_equal '_cluster/nodes', url
+            assert_equal '_nodes', url
             assert_equal Hash.new, params
             assert_nil   body
             true
@@ -21,7 +21,7 @@ module Elasticsearch
 
         should "send :node_id correctly" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_cluster/nodes/foo', url
+            assert_equal '_nodes/foo', url
             true
           end.returns(FakeResponse.new)
 
@@ -30,7 +30,7 @@ module Elasticsearch
 
         should "send multiple :node_id-s correctly" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_cluster/nodes/A,B,C', url
+            assert_equal '_nodes/A,B,C', url
             true
           end.returns(FakeResponse.new).twice
 

data/test/unit/cluster/node_shutdown_test.rb

@@ -10,7 +10,7 @@ module Elasticsearch
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'POST', method
-            assert_equal '_cluster/nodes/_shutdown', url
+            assert_equal '_nodes/_shutdown', url
             assert_equal Hash.new, params
             assert_nil   body
             true
@@ -21,7 +21,7 @@ module Elasticsearch
 
         should "send :node_id correctly" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_cluster/nodes/foo/_shutdown', url
+            assert_equal '_nodes/foo/_shutdown', url
             true
           end.returns(FakeResponse.new)
 
@@ -30,7 +30,7 @@ module Elasticsearch
 
         should "send multiple :node_id-s correctly" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_cluster/nodes/A,B,C/_shutdown', url
+            assert_equal '_nodes/A,B,C/_shutdown', url
             true
           end.returns(FakeResponse.new).twice
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -219,22 +219,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  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: jbuilder
   requirement: !ruby/object:Gem::Requirement