Changed the way elasticsearch/elasticsearch repository is embedded

Instead of using a submodule, do a regular Git clone in the `tmp` directory.

Changed the `rake setup` task to do a clone, if the repository doesn't exist yet.

Updated all the other tasks.

Author: karmi

.gitmodules

@@ -23,7 +23,9 @@ end
 
 desc "Setup the project"
 task :setup do
-  sh "git submodule update --init --recursive"
+  unless File.exists?('./tmp/elasticsearch')
+    sh "git clone [email protected]:elasticsearch/elasticsearch.git tmp/elasticsearch"
+  end
 end
 
 desc "Alias for `bundle:install`"
@@ -54,21 +56,19 @@ end
 namespace :elasticsearch do
   desc "Update the submodule with Elasticsearch core repository"
   task :update do
-    sh "git submodule foreach git reset --hard"
-    puts
-    sh "git --git-dir=#{__current__.join('support/elasticsearch/.git')} --work-tree=#{__current__.join('support/elasticsearch')} fetch origin --verbose"
+    sh "git --git-dir=#{__current__.join('tmp/elasticsearch/.git')} --work-tree=#{__current__.join('tmp/elasticsearch')} fetch origin --verbose"
     begin
-      puts %x[git --git-dir=#{__current__.join('support/elasticsearch/.git')} --work-tree=#{__current__.join('support/elasticsearch')} pull --verbose]
+      puts %x[git --git-dir=#{__current__.join('tmp/elasticsearch/.git')} --work-tree=#{__current__.join('tmp/elasticsearch')} pull --verbose]
     rescue Exception => @exception
       @failed = true
     end
 
     if @failed || !$?.success?
-      STDERR.puts "", "[!] Error while pulling. #{@exception}"
+      STDERR.puts "", "[!] Error while pulling -- #{@exception}"
     end
 
     puts "\n", "CHANGES:", '-'*80
-    sh "git --git-dir=#{__current__.join('support/elasticsearch/.git')} --work-tree=#{__current__.join('support/elasticsearch')} log --oneline ORIG_HEAD..HEAD | cat", :verbose => false
+    sh "git --git-dir=#{__current__.join('tmp/elasticsearch/.git')} --work-tree=#{__current__.join('tmp/elasticsearch')} log --oneline ORIG_HEAD..HEAD | cat", :verbose => false
   end
 
   desc <<-DESC
@@ -85,11 +85,11 @@ namespace :elasticsearch do
     puts '-'*80
 
     branch = args[:branch] || 'origin/master'
-    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*/, '')
+    current_branch = `git --git-dir=#{__current__.join('tmp/elasticsearch/.git')} --work-tree=#{__current__.join('tmp/elasticsearch')} branch --no-color`.split("\n").select { |b| b =~ /^\*/ }.first.gsub(/^\*\s*/, '')
     begin
       sh <<-CODE
         mkdir -p #{__current__.join('tmp/builds')} && \
-        cd #{__current__.join('support/elasticsearch')} && \
+        cd #{__current__.join('tmp/elasticsearch')} && \
         git fetch origin --quiet && \
         git checkout #{branch} && \
         mvn clean && \
@@ -106,7 +106,7 @@ namespace :elasticsearch do
 
   desc "Display the info for all branches in the Elasticsearch submodule"
   task :status do
-    sh "git --git-dir=#{__current__.join('support/elasticsearch/.git')} --work-tree=#{__current__.join('support/elasticsearch')} branch -v -v", :verbose => false
+    sh "git --git-dir=#{__current__.join('tmp/elasticsearch/.git')} --work-tree=#{__current__.join('tmp/elasticsearch')} branch -v -v", :verbose => false
   end
 
   desc "Display the list of builds"
@@ -119,8 +119,8 @@ namespace :elasticsearch do
 
   desc "Display the history of the 'rest-api-spec' repo"
   task :changes do
-    STDERR.puts "Log: #{__current__.join('support/elasticsearch')}/rest-api-spec", ""
-    sh "git --git-dir=#{__current__.join('support/elasticsearch/.git')} --work-tree=#{__current__.join('support/elasticsearch')} log --pretty=format:'%C(yellow)%h%Creset %s \e[2m[%ar by %an]\e[0m' -- rest-api-spec", :verbose => false
+    STDERR.puts "Log: #{__current__.join('tmp/elasticsearch')}/rest-api-spec", ""
+    sh "git --git-dir=#{__current__.join('tmp/elasticsearch/.git')} --work-tree=#{__current__.join('tmp/elasticsearch')} log --pretty=format:'%C(yellow)%h%Creset %s \e[2m[%ar by %an]\e[0m' -- rest-api-spec", :verbose => false
   end
 end
 

Rakefile

@@ -5,7 +5,7 @@ def __current__
 end
 
 def git_specs(command, options={})
-  sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} #{command}", options
+  sh "git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} #{command}", options
 end
 
 task(:default) { system "rake --tasks" }
@@ -44,7 +44,7 @@ namespace :test do
   task :integration do
     require 'elasticsearch'
 
-    branches = `git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} branch --no-color`
+    branches = `git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} branch --no-color`
 
     current_branch = branches.
       split("\n").
@@ -98,7 +98,7 @@ namespace :test do
       end
 
       # Path to the API specs
-      ENV['TEST_REST_API_SPEC'] = __current__.join('../support/elasticsearch/rest-api-spec/test/').to_s
+      ENV['TEST_REST_API_SPEC'] = __current__.join('../tmp/elasticsearch/rest-api-spec/test/').to_s
 
       # Run the task
       args = [t.ruby_opts_string, t.run_code, t.file_list_string, t.option_list].join(' ')

elasticsearch-api/Rakefile

@@ -261,7 +261,7 @@ class YamlTestCase < ::Test::Unit::TestCase; end
 include Elasticsearch::YamlTestSuite
 
 PATH    = Pathname(ENV['TEST_REST_API_SPEC'] || \
-          File.expand_path('../../../../support/elasticsearch/rest-api-spec/test', __FILE__))
+          File.expand_path('../../../../tmp/elasticsearch/rest-api-spec/test', __FILE__))
 suites  = Dir.glob(PATH.join('*')).map { |d| Pathname(d) }
 suites  = suites.select { |s| s.to_s =~ Regexp.new(ENV['FILTER']) } if ENV['FILTER']