[API] Generate code from downloaded artifacts instead of checked out code

Author: picandocodigo

elasticsearch-api/README.md

@@ -55,12 +55,12 @@ the library modules have been already included**, so you just call the API metho
 ```ruby
 require 'elasticsearch'
 
-client = Elasticsearch::Client.new log: true
+client = Elasticsearch::Client.new(log: true)
 
-client.index  index: 'myindex', type: 'mytype', id: 1, body: { title: 'Test' }
+client.index(index: 'myindex', type: 'mytype', id: 1, body: { title: 'Test' })
 # => {"_index"=>"myindex", ... "created"=>true}
 
-client.search index: 'myindex', body: { query: { match: { title: 'test' } } }
+client.search(index: 'myindex', body: { query: { match: { title: 'test' } } })
 # => {"took"=>2, ..., "hits"=>{"total":5, ...}}
 ```
 
@@ -200,7 +200,7 @@ time rake test:integration
 
 We run the test suite for Elasticsearch's Rest API tests. You can read more about this in [the test runner README](https://github.com/elastic/elasticsearch-ruby/tree/master/api-spec-testing#rest-api-yaml-test-runner).
 
-The `rest_api` needs the test files from Elasticsearch. You can run the rake task to download the test artifacts in the root folder of the project. This task needs a running cluster to determine which version and build hash of Elasticsearch to use and test against. `TEST_ES_SERVER=http://localhost:9200 rake test:download_artifacts`. This will download the necessary files used for the integration tests to `./tmp`.
+The `rest_api` needs the test files from Elasticsearch. You can run the rake task to download the test artifacts in the root folder of the project. This task needs a running cluster to determine which version and build hash of Elasticsearch to use and test against. `TEST_ES_SERVER=http://localhost:9200 rake elasticsearch:download_artifacts`. This will download the necessary files used for the integration tests to `./tmp`.
 
 ## License
 

elasticsearch-api/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -22,7 +22,7 @@
   if REST_API_YAML_FILES.empty?
     logger = Logger.new($stdout)
     logger.error 'No test files found!'
-    logger.info 'Use rake rake test:download_artifacts in the root directory of the project to download the test artifacts.'
+    logger.info 'Use rake rake elasticsearch:download_artifacts in the root directory of the project to download the test artifacts.'
     exit 1
   end
 

elasticsearch-api/utils/README.md

@@ -6,7 +6,12 @@ This directory hosts The Generator, a tool that generates the classes for each A
 
 ### Generate
 
-To generate the code, you need to run (from this folder):
+To generate the code, you need to have the Elasticsearch REST API spec files in `tmp/rest-api-spec` in the root of the project. You can run a rake task from the root of the project to download the specs corresponding to the current running cluster:
+```bash
+$ rake elasticsearch:download_artifacts
+```
+
+Once the JSON files have been downloaded, you need to run (from this folder):
 ```bash
 $ thor api:code:generate
 ```

elasticsearch-api/utils/thor/generator/files_helper.rb

@@ -22,7 +22,7 @@ module Elasticsearch
   module API
     module FilesHelper
       PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
-      SRC_PATH   = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api/')
+      SRC_PATH   = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/rest-api-spec/api/')
       OSS_OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
       XPACK_OUTPUT_DIR = '../../elasticsearch-xpack/lib/elasticsearch/xpack/api/actions'.freeze
 

elasticsearch-xpack/spec/xpack/rest_api_yaml_spec.rb

@@ -22,7 +22,7 @@
   if REST_API_YAML_FILES.empty?
     logger = Logger.new($stdout)
     logger.error 'No test files found!'
-    logger.info 'Use rake rake test:download_artifacts in the root directory of the project to download the test artifacts.'
+    logger.info 'Use rake rake elasticsearch:download_artifacts in the root directory of the project to download the test artifacts.'
     exit 1
   end
 

rake_tasks/elasticsearch_tasks.rake

@@ -50,19 +50,34 @@ namespace :elasticsearch do
     end
   end
 
-  desc 'Update the submodule with Elasticsearch core repository'
-  task update: :setup do
-    sh "git --git-dir=#{CURRENT_PATH.join('tmp/elasticsearch/.git')} --work-tree=#{CURRENT_PATH.join('tmp/elasticsearch')} fetch origin --quiet"
-    begin
-      %x[git --git-dir=#{CURRENT_PATH.join('tmp/elasticsearch/.git')} --work-tree=#{CURRENT_PATH.join('tmp/elasticsearch')} pull]
-    rescue Exception => @e
-      @failed = true
-    end
-
-    STDERR.puts '', "[!] Error while pulling -- #{@e}" if @failed || !$?.success?
-
-    puts "\n", "CHANGES:", '-' * 80
-    sh "git --git-dir=#{CURRENT_PATH.join('tmp/elasticsearch/.git')} --work-tree=#{CURRENT_PATH.join('tmp/elasticsearch')} log --oneline ORIG_HEAD..HEAD | cat", :verbose => false
+  desc 'Download artifacts (tests and REST spec) for currently running cluster'
+  task :download_artifacts do
+    json_filename = CURRENT_PATH.join('tmp/artifacts.json')
+
+    # Get version number and build hash of running cluster:
+    es_info = cluster_info
+    version_number = cluster_info['number']
+    build_hash = cluster_info['build_hash']
+
+    puts "Build hash: #{build_hash}"
+    # Create ./tmp if it doesn't exist
+    Dir.mkdir(CURRENT_PATH.join('tmp'), 0700) unless File.directory?(CURRENT_PATH.join('tmp'))
+
+    # Download json file with package information for version:
+    json_url = "https://artifacts-api.elastic.co/v1/versions/#{version_number}"
+    download_file!(json_url, json_filename)
+
+    # Get the package url from the json file given the build hash
+    zip_url = package_url(json_filename, build_hash)
+
+    # Download the zip file
+    filename = CURRENT_PATH.join("tmp/#{zip_url.split('/').last}")
+    download_file!(zip_url, filename)
+
+    puts "Unzipping file #{filename}"
+    `unzip -o #{filename} -d tmp/`
+    `rm #{filename}`
+    puts 'Artifacts downloaded in ./tmp'
   end
 
   desc <<-DESC

rake_tasks/test_tasks.rake

@@ -85,36 +85,6 @@ namespace :test do
     end
   end
 
-  desc 'Download test artifacts for running cluster'
-  task :download_artifacts do
-    json_filename = CURRENT_PATH.join('tmp/artifacts.json')
-
-    # Get version number and build hash of running cluster:
-    es_info = cluster_info
-    version_number = cluster_info['number']
-    build_hash = cluster_info['build_hash']
-
-    puts "Build hash: #{build_hash}"
-    # Create ./tmp if it doesn't exist
-    Dir.mkdir(CURRENT_PATH.join('tmp'), 0700) unless File.directory?(CURRENT_PATH.join('tmp'))
-
-    # Download json file with package information for version:
-    json_url = "https://artifacts-api.elastic.co/v1/versions/#{version_number}"
-    download_file!(json_url, json_filename)
-
-    # Get the package url from the json file given the build hash
-    zip_url = package_url(json_filename, build_hash)
-
-    # Download the zip file
-    filename = CURRENT_PATH.join("tmp/#{zip_url.split('/').last}")
-    download_file!(zip_url, filename)
-
-    puts "Unzipping file #{filename}"
-    `unzip -o #{filename} -d tmp/`
-    `rm #{filename}`
-    puts 'Artifacts downloaded in ./tmp'
-  end
-
   # Returns: version_number, build_hash
   def cluster_info
     require 'elasticsearch'