elasticsearch-api 7.13.3 → 8.14.0

data/utils/thor/generator/docs_helper.rb

@@ -0,0 +1,62 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Elasticsearch
+  module API
+    # Helper with file related methods for code generation
+    module DocsHelper
+      def docs(name, info)
+        info['type'] = 'String' if info['type'] == 'enum' # Rename 'enums' to 'strings'
+        info['type'] = 'Integer' if info['type'] == 'int' # Rename 'int' to 'Integer'
+        tipo = info['type'] ? info['type'].capitalize : 'String'
+        description = info['description'] ? info['description'].strip : '[TODO]'
+        options = info['options'] ? "(options: #{info['options'].join(', ').strip})" : nil
+        required = info['required'] ? '(*Required*)' : ''
+        deprecated = info['deprecated'] ? '*Deprecated*' : ''
+        optionals = [required, deprecated, options].join(' ').strip
+
+        "# @option arguments [#{tipo}] :#{name} #{description} #{optionals}\n"
+      end
+
+      def stability_doc_helper(stability)
+        return if stability == 'stable'
+
+        if stability == 'experimental'
+          <<~MSG
+            # This functionality is Experimental and may be changed or removed
+            # completely in a future release. Elastic will take a best effort approach
+            # to fix any issues, but experimental features are not subject to the
+            # support SLA of official GA features.
+          MSG
+        elsif stability == 'beta'
+          <<~MSG
+            # This functionality is in Beta and is subject to change. The design and
+            # code is less mature than official GA features and is being provided
+            # as-is with no warranties. Beta features are not subject to the support
+            # SLA of official GA features.
+          MSG
+        else
+          <<~MSG
+            # This functionality is subject to potential breaking changes within a
+            # minor version, meaning that your referencing code may break when this
+            # library is upgraded.
+          MSG
+        end
+      end
+    end
+  end
+end

data/utils/thor/generator/files_helper.rb

@@ -20,58 +20,48 @@ require_relative '../../../lib/elasticsearch/api/version.rb'
 
 module Elasticsearch
   module API
+    # Helper with file related methods for code generation
     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/')
-      OSS_OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
-      XPACK_OUTPUT_DIR = '../../elasticsearch-xpack/lib/elasticsearch/xpack/api/actions'.freeze
+      SRC_PATH   = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/rest-api-spec/api/')
+      OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
+      TESTS_DIRECTORY = "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free".freeze
 
-      TESTS_DIRECTORIES = {
-        oss: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free",
-        xpack: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/platinum"
-      }.freeze
+      class << self
+        # Only get JSON files and remove hidden files
+        def files
+          json_files = Dir.entries(SRC_PATH)
 
-      # Only get JSON files and remove hidden files
-      def self.files(api)
-        json_files = if api == :xpack
-                       xpack_files
-                     else
-                       Dir.entries(SRC_PATH) - xpack_files
-                     end
-        json_files.reject do |file|
-          File.extname(file) != '.json' ||
-            File.basename(file) == '_common.json'
-        end.map { |file| "#{SRC_PATH}#{file}" }
-      end
+          json_files.reject do |file|
+            File.extname(file) != '.json' ||
+              File.basename(file) == '_common.json'
+          end.map { |file| "#{SRC_PATH}#{file}" }
+        end
 
-      XPACK_ENDPOINTS = [
-        'autoscaling', 'cross_cluster_replication', 'ccr', 'data_frame_transform_deprecated',
-        'enrich', 'eql', 'fleet', 'ilm', 'logstash', 'migration', 'watcher', 'slm'
-      ]
-      XPACK_ENDPOINTS_REGEXP = /data_stream|ml_|reload_search_analyzers|transform|freeze|unfreeze/
+        # Path to directory to copy generated files
+        def output_dir
+          Pathname(OUTPUT_DIR)
+        end
 
-      def self.xpack_files
-        xpack_tests = Dir.entries(TESTS_DIRECTORIES[:xpack])
-        Dir.entries(SRC_PATH).map do |entry|
-          filename = entry.split('.').first
-          next if filename == 'snapshot'
+        def documentation_url(documentation_url)
+          branch = `git rev-parse --abbrev-ref HEAD`
+          return documentation_url.gsub(/\/(master|main)\//, "/current/") if branch == "main\n"
 
-          if xpack_tests.include?(filename) ||
-                                  XPACK_ENDPOINTS.include?(filename) ||
-                                  entry.match?(XPACK_ENDPOINTS_REGEXP)
-            entry
+          regex = /([0-9]{1,2}\.[0-9x]{1,2})/
+          version = Elasticsearch::API::VERSION.match(regex)[0]
+          # TODO - How do we fix this so it doesn't depend on which branch we're running from
+          if ENV['IGNORE_VERSION']
+            documentation_url.gsub(/\/(master|main)\//, "/current/")
+          else
+            documentation_url.gsub(/\/(current|master|main)\//, "/#{version}/")
           end
-        end.compact
-      end
-
-      # Path to directory to copy generated files
-      def self.output_dir(api)
-        api == :xpack ? Pathname(XPACK_OUTPUT_DIR) : Pathname(OSS_OUTPUT_DIR)
+        end
       end
 
-      def self.gem_version
-        regex = /([0-9]{1,2}\.[0-9x]{1,2})/
-        Elasticsearch::API::VERSION.match(regex)[0]
+      def cleanup_output_dir!
+        FileUtils.remove_dir(OUTPUT_DIR)
+        Dir.mkdir(OUTPUT_DIR)
       end
     end
   end

data/utils/thor/templates/_body.erb

@@ -0,0 +1,34 @@
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%-
+case @spec.endpoint_name
+when 'mtermvectors'
+-%>
+  body = if(ids = arguments.delete(:ids))
+    { :ids => ids }
+  else
+    arguments.delete(:body)
+  end
+<%- when 'cluster.reroute', 'cluster.put_settings' %>
+  body = arguments.delete(:body) || {}
+<%- when 'ml.find_file_structure' %>
+  body = Utils.__bulkify(arguments.delete(:body))
+<%- else -%>
+  body   = <%= @spec.body.nil? ? 'nil' : 'arguments.delete(:body)' %>
+<%- end -%>

data/utils/thor/templates/_documentation_top.erb

@@ -1,39 +1,56 @@
-<%- if @spec['documentation']['description'] -%>
-  <%= '  '*(@namespace_depth+3) %># <%= @spec['documentation']['description'].gsub("\n", "\n#{'  '*(@namespace_depth+3)}# ") -%>
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%- if @spec.documentation['description'] -%>
+  # <%= @spec.documentation['description'].gsub("\n", "\n  # ") -%>
 <%- else %>
-  <%= '  '*(@namespace_depth+3) %># TODO: Description
+  # TODO: Description
 <%- end %>
-<%= stability_doc_helper(@spec['stability']) -%>
-<%= '  '*(@namespace_depth+3) %>#
-<%- unless @parts.nil? || @parts.empty? %><%# URL parts -%>
-  <%- @parts.each do |name, info| -%>
-    <%= docs_helper(name, info) -%>
+<%= stability_doc_helper(@spec.stability) -%>
+#
+<%- unless @spec.path_parts.nil? || @spec.path_parts.empty? %><%# URL parts -%>
+  <%- @spec.path_parts.each do |name, info| -%>
+    <%= docs(name, info) -%>
   <%- end -%>
 <%- end -%><%# Body -%>
 <%# URL parameters -%>
-<%- @params.each do |name, info| -%>
-  <%= docs_helper(name, info) unless (!@parts.empty? && @parts.keys.include?(name)) -%>
+<%- @spec.params.each do |name, info| -%>
+  <%= docs(name, info) unless (!@spec.path_parts.empty? && @spec.path_parts.keys.include?(name)) -%>
 <%- end -%>
 # @option arguments [Hash] :headers Custom HTTP headers
-<%- if @spec['body'] -%>
-  <%- if @method_name == 'bulk' -%>
-    <%= bulk_doc_helper(@spec['body']['description']) -%>
+<%- if @spec.body -%>
+  <%- if @spec.method_name == 'bulk' -%>
+    <%= bulk_doc_helper(@spec.body['description']) -%>
   <%- else -%>
-    <%= '  '*(@namespace_depth+1) +
-    '# @option arguments [Hash] :body ' + (@spec['body']['description'] ?
-                                           @spec['body']['description'].strip : 'TODO: Description') +
-                                           (@spec['body']['required'] ? ' (*Required*)' : '') + "\n"
+    <%= '# @option arguments [Hash] :body ' + (@spec.body['description'] ?
+                                               @spec.body['description'].strip : 'TODO: Description') +
+                                              (@spec.body['required'] ? ' (*Required*)' : '') + "\n"
     -%>
   <%- end -%>
 <%- end -%>
-<% if @deprecation_note -%>
+<% if @spec.deprecation_note -%>
   #
   # *Deprecation notice*:
-  # <%=  @deprecation_note['description'] %>
-  # Deprecated since version <%=  @deprecation_note['version'] %>
+  # <%=  @spec.deprecation_note['description'] %>
+  # Deprecated since version <%=  @spec.deprecation_note['version'] %>
   #
 <% end -%>
-<%= '  '*(@namespace_depth+3) -%>#
+#
 <%# Documentation link -%>
-<%=  '  '*(@namespace_depth+3) %># @see <%= @spec['documentation']['url'] ? @spec['documentation']['url'].gsub(/\/(current|master)\//, "/#{Elasticsearch::API::FilesHelper.gem_version}/") : "[TODO]" %>
-<%= '  '*(@namespace_depth+3) %>#
+# @see <%= @spec.documentation['url'] ? Elasticsearch::API::FilesHelper.documentation_url(@spec.documentation['url']) : "[TODO]" %>
+#

data/utils/thor/templates/_method_setup.erb

@@ -1,35 +1,37 @@
-<%- if @endpoint_name == 'indices.stats' %>
-  method = HTTP_GET
-  parts  = Utils.__extract_parts arguments, ParamsRegistry.get(:stats_parts)
-  path   = Utils.__pathify Utils.__listify(arguments[:index]), '_stats', Utils.__listify(parts)
-  params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(:stats_params)
-  params[:fields] = Utils.__listify(params[:fields], :escape => false) if params[:fields]
-  params[:groups] = Utils.__listify(params[:groups], :escape => false) if params[:groups]
-<%- else %>
-  <%= '  '*(@namespace_depth+4) %>arguments = arguments.clone
-  <%- if @method_name == 'mtermvectors' -%>
-    ids = arguments.delete(:ids)
-  <%- end -%>
-  <%- if @method_name == 'search' -%>
-    arguments[:index] = UNDERSCORE_ALL if ! arguments[:index] && arguments[:type]
-  <%- end -%>
-  <%- @parts.each do |name, _| %>
-    <%- unless @method_name == 'get_field_mapping' && name == 'fields' %>
-      <%= '  '*(@namespace_depth+3) + "_#{name}" %> = arguments.delete(:<%=name %>)
-    <%- end -%>
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%- @spec.path_parts.each do |name, _| %>
+  <%- unless @spec.method_name == 'get_field_mapping' && name == 'fields' %>
+    <%= "_#{name}" %> = arguments.delete(:<%=name %>)
   <%- end -%>
+<%- end -%>
 
-  <%= '  '*(@namespace_depth+4) %>method = <%= @http_method %>
-  <%- if @method_name == 'termvectors' %>
-    endpoint = arguments.delete(:endpoint) || '_termvectors'
-  <%- end -%>
-  <%= '  '*(@namespace_depth+4) %>path   = <%= @http_path %>
-  <%- unless @params.empty? -%>
-    <%= '  '*(@namespace_depth+4) %>params = <%= __utils %>.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-  <%- else -%>
-    <%= '  '*(@namespace_depth+4) %>params = {}
-  <%- end -%>
-  <%- @specific_params.each do |param| -%>
-    <%= param %>
-  <%- end -%>
+method = <%= @spec.http_method %>
+<%- if @spec.method_name == 'termvectors' %>
+  arguments.delete(:endpoint)
+<%- end -%>
+path   = <%= @spec.http_path %>
+<%- if !@spec.params.empty? || needs_ignore_404?(@spec.endpoint_name) || needs_complex_ignore_404?(@spec.endpoint_name)-%>
+  params = Utils.process_params(arguments)
+<%- else -%>
+  params = {}
+<%- end -%>
+<%- @spec.specific_params.each do |param| -%>
+  <%= param %>
 <%- end -%>

data/utils/thor/templates/_perform_request.erb

@@ -1,38 +1,50 @@
-<%-
-case @endpoint_name
-when 'mtermvectors'
--%>
-  if ids
-    body = { :ids => ids }
-  else
-    body = arguments[:body]
-  end
-<%- when 'cluster.reroute', 'cluster.put_settings' %>
-  body = arguments[:body] || {}
-<%- when 'ml.find_file_structure' %>
-  body = <%= __utils %>.__bulkify(arguments.delete(:body))
-<%- else -%>
-  <%= '  '*(@namespace_depth+3) %>body   = <%= @spec['body'].nil? ? 'nil' : 'arguments[:body]' %>
-<%- end -%>
-<%- if ['bulk', 'msearch', 'msearch_template', 'find_structure'].include? @method_name -%>
-  <%= self.send("#{@method_name}_body_helper".to_s) %>
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%- if ['bulk', 'msearch', 'msearch_template', 'find_structure'].include? @spec.method_name -%>
+  <%= self.send("#{@spec.method_name}_body_helper".to_s) %>
   headers.merge!("Content-Type" => "application/x-ndjson")
-  <%= '  '*(@namespace_depth+4) %>perform_request(method, path, params, payload, headers).body
-<%- elsif @method_name == 'ping' -%>
+  Elasticsearch::API::Response.new(
+    perform_request(method, path, params, payload, headers, request_opts)
+  )
+<%- elsif @spec.method_name == 'ping' -%>
   <%= ping_perform_request %>
 <%- else -%>
-  <%- if needs_ignore_404?(@endpoint_name) %>
-    <%= __utils %>.__rescue_from_not_found do
-      perform_request(method, path, params, body, headers).status == 200 ? true : false
+  <%- if needs_ignore_404?(@spec.endpoint_name) %>
+    Utils.__rescue_from_not_found do
+      perform_request(method, path, params, body, headers, request_opts).status == 200 ? true : false
     end
-  <%- elsif needs_complex_ignore_404?(@endpoint_name) -%>
+  <%- elsif needs_complex_ignore_404?(@spec.endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
-      <%= __utils %>.__rescue_from_not_found { perform_request(method, path, params, body, headers).body }
+    Utils.__rescue_from_not_found {
+      Elasticsearch::API::Response.new(
+        perform_request(method, path, params, body, headers, request_opts)
+      )
+    }
     else
-      perform_request(method, path, params, body, headers).body
+    Elasticsearch::API::Response.new(
+      perform_request(method, path, params, body, headers, request_opts)
+    )
     end
   <%- else -%>
-      perform_request(method, path, params, body, headers).body
+    Elasticsearch::API::Response.new(
+      perform_request(method, path, params, body, headers, request_opts)
+    )
   <%- end -%>
 <%- end -%>
-<%= '  '*(@namespace_depth+3) %>end
+end

data/utils/thor/templates/method.erb

@@ -14,60 +14,66 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 module Elasticsearch
-<%- if @current_api == :xpack -%>
-  <%= '  '*(@namespace_depth) %>module XPack
-<%- end %>
-<%= '  '*(@namespace_depth) %>module API
-<%- @module_namespace.each_with_index do |name, i| -%>
+module API
+<%- @spec.module_namespace.each_with_index do |name, i| -%>
   <%= '  '*i %>module <%= module_name_helper(name) %>
 <%- end -%>
-<%= '  '*(@namespace_depth+2) %>module Actions
+module Actions
 <%= ERB.new(File.new("./thor/templates/_documentation_top.erb").read, trim_mode: '-').result(binding) -%>
 <%# Method definition -%>
-<%= '  '*(@namespace_depth+3) -%>def <%= @method_name %>(arguments = {})
-<%- if @endpoint_name == 'create' -%>
-  <%= '  '*(@namespace_depth+3) %>if arguments[:id]
-  <%= '  '*(@namespace_depth+3) %>  index arguments.update op_type: 'create'
-  <%= '  '*(@namespace_depth+3) %>else
-  <%= '  '*(@namespace_depth+3) %>  index arguments
-  <%= '  '*(@namespace_depth+3) %>end
-  <%= '  '*(@namespace_depth+2) %>end
+def <%= @spec.method_name %>(arguments = {})
+  request_opts = { endpoint: arguments[:endpoint] || "<%= @spec.endpoint_name %>" }
+<%- unless @spec.path_params.empty? %>
+  defined_params =<%=  @spec.path_params %>.inject({}) do |set_variables, variable|
+    set_variables[variable] = arguments[variable] if arguments.key?(variable)
+    set_variables
+  end
+  request_opts[:defined_params] = defined_params unless defined_params.empty?
+<%- end %>
+<%-    %>
+<%- if @spec.endpoint_name == 'create' -%>
+if arguments[:id]
+  index arguments.update op_type: 'create'
+else
+  index arguments
+end
+end
 <%- else -%>
-  <%- if @method_name == 'get_field_mapping' %>
+  <%- if @spec.method_name == 'get_field_mapping' %>
+    arguments = arguments.clone
     _fields = arguments.delete(:field) || arguments.delete(:fields)
     raise ArgumentError, "Required argument 'field' missing" unless _fields
   <%- else -%>
-    <%- @required_parts.each do |required| %><%# Arguments -%>
-      <%= '  '*(@namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
+    <%- @spec.required_parts.each do |required| %><%# Arguments -%>
+      <%= "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
     <%- end -%>
+    arguments = arguments.clone
     <%- end -%>
     headers = arguments.delete(:headers) || {}
+    <%- #Body %>
+    <%= ERB.new(File.new("./thor/templates/_body.erb").read, trim_mode: '-').result(binding) %>
     <%- # Method setup -%>
     <%= ERB.new(File.new("./thor/templates/_method_setup.erb").read, trim_mode: '-').result(binding) %>
     <%- # Perform request -%>
     <%= ERB.new(File.new("./thor/templates/_perform_request.erb").read, trim_mode: '-').result(binding) %>
 <%- end -%>
-<%- if @method_name.match?(/^exists\S*/) -%>
-  alias_method :<%= @method_name %>?, :<%= @method_name %>
+<%- if @spec.method_name.match?(/^exists\S*/) -%>
+  alias_method :<%= @spec.method_name %>?, :<%= @spec.method_name %>
 <%- end -%>
-<%- if @method_name == 'termvectors' %>
-
+<%- if @spec.method_name == 'termvectors' %>
   # Deprecated: Use the plural version, {#termvectors}
   #
   def termvector(arguments={})
-    termvectors(arguments.merge endpoint: '_termvector')
+    warn "[DEPRECATION] `termvector` is deprecated. Please use the plural version, `termvectors` instead."
+    termvectors(arguments.merge(endpoint: '_termvector'))
   end
 <%- end -%>
-<%# Params Registry Template -%>
-<%- unless @endpoint_name == 'create' -%>
-  <%= ERB.new(File.new("./thor/templates/_params_registry.erb").read, trim_mode: '-').result(binding) %>
-<%- end -%>
+<%- @spec.namespace_depth.downto(1) do |i| -%>
+  <%= '  '*(i-1) %>end
+<%- end if @spec.namespace_depth > 0 -%>
 
-<%- @namespace_depth.downto(1) do |i| -%>
-<%= '  '*(i-1) %>end
-<%- end if @namespace_depth > 0 -%>
     end
   end
 end

data/utils/thor/templates/test.erb

@@ -1,6 +1,19 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require 'test_helper'
 

data/utils/thor/templates/test_helper.rb

@@ -15,10 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-
-require 'rubygems' if RUBY_1_8
-
 require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
 
 require 'test/unit'