[Ruby - In Review] Restructuring generated Ruby & Azure.Ruby code int…

…o generated sub-folder (Azure#1189) * Restructuring generated Ruby & Azure.Ruby code into generated sub-folder * Update Ruby and Azure.Ruby tests to look inside generated folder * Moving version file back inside the sdkpath
sima-zhu · Jun 29, 2016 · 0c0e87b · 0c0e87b
1 parent 987e8db
commit 0c0e87b
Show file tree

Hide file tree

Showing 33 changed files with 91 additions and 58 deletions.
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_report_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_report_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/azure_report'
 
-require 'azure_report'
+require 'generated/azure_report'
 
 include AzureReportModule
 

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_special_properties_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_special_properties_spec.rb
@@ -5,7 +5,7 @@
 require 'rspec'
 require 'securerandom'
 
-require 'azure_special_properties'
+require 'generated/azure_special_properties'
 
 include AzureSpecialPropertiesModule
 

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_url_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_url_spec.rb
@@ -5,7 +5,7 @@
 require 'rspec'
 require 'securerandom'
 
-require 'subscription_id_api_version'
+require 'generated/subscription_id_api_version'
 
 include AzureUrlModule
 

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/custom_base_uri_more'
 
-require 'custom_base_url_more_options'
+require 'generated/custom_base_url_more_options'
 require 'uri'
 
 module CustomBaseUriMoreModule

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/custom_base_uri'
 
-require 'custom_base_url'
+require 'generated/custom_base_url'
 require 'uri'
 
 module CustomBaseUriModule

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_exception_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_exception_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/head_exceptions'
 
 require 'rspec'
-require 'head_exceptions'
+require 'generated/head_exceptions'
 
 include HeadExceptionsModule
 

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/head'
 
 require 'rspec'
-require 'head'
+require 'generated/head'
 
 include HeadModule
 

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/lro_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/lro_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/lro'
 
 require 'rspec'
-require 'lro'
+require 'generated/lro'
 
 include LroModule
 include LroModule::Models

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/paging_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/paging_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/paging'
 
 require 'rspec'
-require 'paging'
+require 'generated/paging'
 
 include PagingModule
 

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby/AzureRubyCodeGenerator.cs b/AutoRest/Generators/Ruby/Azure.Ruby/AzureRubyCodeGenerator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -108,13 +109,13 @@ public override async Task Generate(ServiceClient serviceClient)
             // Models
             foreach (var model in serviceClient.ModelTypes)
             {
-                if ((model.Extensions.ContainsKey(AzureExtensions.ExternalExtension) && 
-                    (bool) model.Extensions[AzureExtensions.ExternalExtension])
+                if ((model.Extensions.ContainsKey(AzureExtensions.ExternalExtension) &&
+                    (bool)model.Extensions[AzureExtensions.ExternalExtension])
                     || model.Name == "Resource" || model.Name == "SubResource")
                 {
                     continue;
                 }
-                
+
                 var modelTemplate = new ModelTemplate
                 {
                     Model = new AzureModelTemplateModel(model, serviceClient.ModelTypes),
@@ -136,28 +137,28 @@ public override async Task Generate(ServiceClient serviceClient)
             // Requirements
             var requirementsTemplate = new RequirementsTemplate
             {
-                Model = new AzureRequirementsTemplateModel(serviceClient, this.packageName ?? this.sdkName, this.ImplementationFileExtension, this.Settings.Namespace),
+                Model = new AzureRequirementsTemplateModel(serviceClient, this.packageName ?? this.sdkName, this.ImplementationFileExtension, this.Settings.Namespace, this.packageVersion),
             };
             await Write(requirementsTemplate, RubyCodeNamer.UnderscoreCase(this.packageName ?? this.sdkName) + ImplementationFileExtension);
-                
-                // Version File
-            if(this.packageVersion != null)
+
+            // Version File
+            if (this.packageVersion != null)
             {
                 var versionTemplate = new VersionTemplate
                 {
                     Model = new VersionTemplateModel(packageVersion),
                 };
-                await Write(versionTemplate, Path.Combine(sdkPath, "version" + ImplementationFileExtension));   
+                await Write(versionTemplate, Path.Combine(sdkPath, "version" + ImplementationFileExtension));
             }
-            
+
             // Module Definition File
-            if(Settings.Namespace != null)
+            if (Settings.Namespace != null)
             {
                 var modTemplate = new ModuleDefinitionTemplate
                 {
                     Model = new ModuleDefinitionTemplateModel(Settings.Namespace),
                 };
-                await Write(modTemplate, Path.Combine(sdkPath, "module_definition" + ImplementationFileExtension));   
+                await Write(modTemplate, Path.Combine(sdkPath, "module_definition" + ImplementationFileExtension));
             }
         }
     }

diff --git a/AutoRest/Generators/Ruby/Azure.Ruby/TemplateModels/AzureRequirementsTemplateModel.cs b/AutoRest/Generators/Ruby/Azure.Ruby/TemplateModels/AzureRequirementsTemplateModel.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Globalization;
 using Microsoft.Rest.Generator.ClientModel;
 using Microsoft.Rest.Generator.Ruby;
 
@@ -31,8 +32,9 @@ protected override bool ExcludeModel(CompositeType model)
         /// <param name="sdkName">The name of the generated SDK, required for proper folder structuring.</param>
         /// <param name="filesExtension">The files extension.</param>
         /// <param name="ns">The namespace of the SDK.</param>
-        public AzureRequirementsTemplateModel(ServiceClient serviceClient, string sdkName, string filesExtension, string ns)
-            : base(serviceClient, sdkName, filesExtension, ns)
+        /// <param name="packageVersion">The name of the package version to be used in creating a version.rb file.</param>
+        public AzureRequirementsTemplateModel(ServiceClient serviceClient, string sdkName, string filesExtension, string ns, string packageVersion)
+            : base(serviceClient, sdkName, filesExtension, ns, packageVersion)
         {
         }
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/array_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/array_spec.rb
@@ -4,7 +4,7 @@
 $: << 'RspecTests/Generated/array'
 
 require 'rspec'
-require 'body_array'
+require 'generated/body_array'
 require 'helper'
 
 module ArrayModule

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/bool_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/bool_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests'
 $: << 'RspecTests/Generated/boolean'
 
-require 'body_boolean'
+require 'generated/body_boolean'
 
 module BooleanModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/byte_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/byte_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/byte'
 
-require 'body_byte'
+require 'generated/body_byte'
 
 module ByteModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/complex_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/complex_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/complex'
 
 require 'base64'
-require 'body_complex'
+require 'generated/body_complex'
 
 module ComplexModule
   include ComplexModule::Models

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/date_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/date_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/date'
 
 require 'rspec'
-require 'body_date'
+require 'generated/body_date'
 
 describe DateModule::Date do
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_rfc1123_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_rfc1123_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/datetime_rfc1123'
 
 require 'rspec'
-require 'body_datetime_rfc1123'
+require 'generated/body_datetime_rfc1123'
 require_relative './helper'
 
 include DatetimeRfc1123Module

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/datetime'
 
 require 'rspec'
-require 'body_datetime'
+require 'generated/body_datetime'
 require_relative './helper'
 
 include DatetimeModule

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/dictionary_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/dictionary_spec.rb
@@ -4,7 +4,7 @@
 $: << 'RspecTests'
 
 require 'base64'
-require 'body_dictionary'
+require 'generated/body_dictionary'
 require 'helper'
 
 include DictionaryModule

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/header_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/header_spec.rb
@@ -5,7 +5,7 @@
 
 
 require "base64"
-require 'header'
+require 'generated/header'
 
 module HeaderModule
   include HeaderModule::Models

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/http_infrastructure_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/http_infrastructure_spec.rb
@@ -4,7 +4,7 @@
 $: << 'RspecTests'
 
 require 'rspec'
-require 'http_infrastructure.rb'
+require 'generated/http_infrastructure.rb'
 require 'helper'
 
 module HttpInfrastructureModule

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/integer'
 
-require 'body_integer'
+require 'generated/body_integer'
 
 include IntegerModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/model_flattening_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/model_flattening_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/model_flattening'
 
 require 'securerandom'
-require 'model_flattening'
+require 'generated/model_flattening'
 
 include ModelFlatteningModule
 include ModelFlatteningModule::Models

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/number_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/number_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/number'
 
-require 'body_number'
+require 'generated/body_number'
 
 include NumberModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/parameter_grouping_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/parameter_grouping_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/parameter_grouping'
 
 require 'rspec'
-require 'azure_parameter_grouping'
+require 'generated/azure_parameter_grouping'
 
 include ParameterGroupingModule
 include ParameterGroupingModule::Models

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_items_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_items_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/url_items'
 
-require 'url'
+require 'generated/url'
 
 include UrlModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/url'
 
-require 'url'
+require 'generated/url'
 
 include UrlModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/query_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/query_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/url_query'
 
 require 'rspec'
-require 'url'
+require 'generated/url'
 
 include UrlModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/report_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/report_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/report'
 
-require 'report'
+require 'generated/report'
 
 include ReportModule
 

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/required_optional_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/required_optional_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/required_optional'
 
-require 'required_optional'
+require 'generated/required_optional'
 
 include RequiredOptionalModule
 include RequiredOptionalModule::Models

diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/string_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/string_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/string'
 
-require 'body_string'
+require 'generated/body_string'
 
 include StringModule