azure 0.7.0.pre → 0.7.0.pre2

data/Rakefile

@@ -68,7 +68,9 @@ namespace :test do
   end
 
   Rake::TestTask.new :integration do |t|
-    t.pattern = 'test/integration/**/*_test.rb'
+    t.test_files = Dir['test/integration/**/*_test.rb'].reject do |path|
+      path.include?('database')
+    end
     t.verbose = true
     t.libs = %w(lib test)
   end

data/azure.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.version = Azure::Version
   s.authors     = ['Microsoft Corporation', 'AppFog']
   s.email       = 'azureruby@microsoft.com'
-  s.description = 'Windows Azure Client Library for Ruby'
-  s.summary     = 'Official ruby client library to consume Windows Azure services.'
+  s.description = 'Microsoft Azure Client Library for Ruby'
+  s.summary     = 'Official ruby client library to consume Microsoft Azure services.'
   s.homepage    = 'http://github.com/azure/azure-sdk-for-ruby'
   s.license     = 'Apache License, Version 2.0'
   s.files       = `git ls-files`.split("\n")
@@ -31,17 +31,21 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency('nokogiri', '~> 1.6')
-  s.add_runtime_dependency('mime-types', '~> 1.0')
-  s.add_runtime_dependency('json', '~> 1.8')
-  s.add_runtime_dependency('uuid', '~> 2.0')
-  s.add_runtime_dependency('systemu', '~> 2.6')
-  s.add_runtime_dependency('thor', '~> 0.19')
+  s.add_runtime_dependency('addressable',             '~> 2.3')
+  s.add_runtime_dependency('faraday',                 '~> 0.9')
+  s.add_runtime_dependency('faraday_middleware',      '~> 0.10')
+  s.add_runtime_dependency('json',                    '~> 1.8')
+  s.add_runtime_dependency('mime-types',              '~> 2.0')
+  s.add_runtime_dependency('nokogiri',                '~> 1.6')
+  s.add_runtime_dependency('systemu',                 '~> 2.6')
+  s.add_runtime_dependency('thor',                    '~> 0.19')
+  s.add_runtime_dependency('uuid',                    '~> 2.0')
 
-  s.add_development_dependency('rake', '~> 10.0')
-  s.add_development_dependency('minitest', '~> 5')
-  s.add_development_dependency('minitest-reporters', '~> 1')
-  s.add_development_dependency('mocha', '~> 1.0')
-  s.add_development_dependency('timecop', '~> 0.7')
-  s.add_development_dependency('dotenv', '~> 2.0' )
+  s.add_development_dependency('dotenv',              '~> 2.0')
+  s.add_development_dependency('minitest',            '~> 5')
+  s.add_development_dependency('minitest-reporters',  '~> 1')
+  s.add_development_dependency('mocha',               '~> 1.0')
+  s.add_development_dependency('rake',                '~> 10.0')
+  s.add_development_dependency('timecop',             '~> 0.7')
+  s.add_development_dependency('yard',                '~> 0.8')
 end

data/lib/azure.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-module Azure; end
 
 require 'rubygems'
 require 'nokogiri'
@@ -20,41 +19,128 @@ require 'base64'
 require 'openssl'
 require 'uri'
 require 'rexml/document'
+require 'addressable/uri'
+require 'faraday'
+require 'faraday_middleware'
 
-require 'azure/core'
-require 'azure/blob/blob_service'
-require 'azure/queue/queue_service'
-require 'azure/service_bus/service_bus_service'
-require 'azure/service_bus/empty_rule_action'
-require 'azure/service_bus/sql_rule_action'
-require 'azure/service_bus/sql_filter'
-require 'azure/service_bus/true_filter'
-require 'azure/service_bus/correlation_filter'
-require 'azure/table/table_service'
-require 'azure/table/batch'
-require 'azure/table/query'
-require 'azure/core/utility'
-require 'azure/base_management/management_http_request'
-require 'azure/base_management/sql_management_http_request'
-require 'azure/base_management/base_management_service'
-require 'azure/virtual_machine_image_management/virtual_machine_image_management_service'
-require 'azure/virtual_machine_management/virtual_machine_management_service'
-require 'azure/storage_management/storage_management_service'
-require 'azure/cloud_service_management/cloud_service_management_service'
-require 'azure/base_management/location'
-require 'azure/sql_database_management/sql_database_management_service'
-require 'azure/virtual_network_management/virtual_network_management_service'
-
-# add some aliases for convenience
-Azure::BlobService = Azure::Blob::BlobService
-Azure::QueueService = Azure::Queue::QueueService
-Azure::TableService = Azure::Table::TableService
-Azure::ServiceBusService = Azure::ServiceBus::ServiceBusService
-Azure::VirtualMachineImageManagementService = Azure::VirtualMachineImageManagement::VirtualMachineImageManagementService
-Azure::BaseManagementService = Azure::BaseManagement::BaseManagementService
-Azure::CloudServiceManagementService = Azure::CloudServiceManagement::CloudServiceManagementService
-Azure::StorageManagementService = Azure::StorageManagement::StorageManagementService
-Azure::VirtualMachineManagementService = Azure::VirtualMachineManagement::VirtualMachineManagementService
-Azure::SqlDatabaseManagementService = Azure::SqlDatabaseManagement::SqlDatabaseManagementService
-Azure::VirtualNetworkManagementService = Azure::VirtualNetworkManagement::VirtualNetworkManagementService
-Azure::Loggerx = Azure::Core::Logger
+module Azure
+  autoload :Client,                           'azure/client'
+  autoload :ClientServices,                   'azure/client_services'
+  autoload :Configurable,                     'azure/configurable'
+  autoload :Default,                          'azure/default'
+  autoload :HttpClient,                       'azure/http_client'
+  autoload :Version,                          'azure/version'
+
+  # helpers because the naming is far too verbose
+  autoload :BaseManagementService,                    'azure/base_management/base_management_service'
+  autoload :CloudServiceManagementService,            'azure/cloud_service_management/cloud_service_management_service'
+  autoload :SqlDatabaseManagementService,             'azure/sql_database_management/sql_database_management_service'
+  autoload :StorageManagementService,                 'azure/storage_management/storage_management_service'
+  autoload :VirtualMachineImageManagementService,     'azure/virtual_machine_image_management/virtual_machine_image_management_service'
+  autoload :VirtualMachineManagementService,          'azure/virtual_machine_management/virtual_machine_management_service'
+  autoload :VirtualNetworkManagementService,          'azure/virtual_network_management/virtual_network_management_service'
+
+  module BaseManagement
+    autoload :ManagementHttpRequest,          'azure/base_management/management_http_request'
+    autoload :SqlManagementHttpRequest,       'azure/base_management/sql_management_http_request'
+    autoload :BaseManagementService,          'azure/base_management/base_management_service'
+    autoload :Location,                       'azure/base_management/location'
+    autoload :AffinityGroup,                  'azure/base_management/affinity_group'
+    autoload :Serialization,                  'azure/base_management/serialization'
+  end
+
+  module Blob
+    autoload :BlobService,                    'azure/blob/blob_service'
+    autoload :Blob,                           'azure/blob/blob'
+    autoload :Block,                          'azure/blob/block'
+    autoload :Container,                      'azure/blob/container'
+    autoload :Serialization,                  'azure/blob/serialization'
+  end
+
+  module CloudServiceManagement
+    autoload :CloudServiceManagementService,    'azure/cloud_service_management/cloud_service_management_service'
+    autoload :CloudService,                     'azure/cloud_service_management/cloud_service'
+  end
+
+  module Core
+    autoload :Utility,                        'azure/core/utility'
+    autoload :Error,                          'azure/core/error'
+    autoload :Service,                        'azure/core/service'
+    autoload :FilteredService,                'azure/core/filtered_service'
+    autoload :SignedService,                  'azure/core/signed_service'
+  end
+
+  module Queue
+    autoload :QueueService,                   'azure/queue/queue_service'
+    autoload :Message,                        'azure/queue/message'
+    autoload :Queue,                          'azure/queue/queue'
+  end
+
+  module ServiceBus
+    autoload :ServiceBusService,        'azure/service_bus/service_bus_service'
+    autoload :EmptyRuleAction,          'azure/service_bus/empty_rule_action'
+    autoload :SqlRuleAction,            'azure/service_bus/sql_rule_action'
+    autoload :SqlFilter,                'azure/service_bus/sql_filter'
+    autoload :TrueFilter,               'azure/service_bus/true_filter'
+    autoload :CorrelationFilter,        'azure/service_bus/correlation_filter'
+  end
+
+  module SqlDatabaseManagement
+    autoload :SqlDatabaseManagementService,     'azure/sql_database_management/sql_database_management_service'
+    autoload :Serialization,                    'azure/sql_database_management/serialization'
+    autoload :SqlServer,                        'azure/sql_database_management/sql_server'
+  end
+
+  module StorageManagement
+    autoload :StorageManagementService,         'azure/storage_management/storage_management_service'
+    autoload :Serialization,                    'azure/storage_management/serialization'
+    autoload :StorageAccount,                   'azure/storage_management/storage_account'
+  end
+
+  module Table
+    autoload :TableService,             'azure/table/table_service'
+    autoload :Batch,                    'azure/table/batch'
+    autoload :Query,                    'azure/table/query'
+  end
+
+  module VirtualMachineImageManagement
+    autoload :VirtualMachineImageManagementService, 'azure/virtual_machine_image_management/virtual_machine_image_management_service'
+    autoload :Serialization,                        'azure/virtual_machine_image_management/serialization'
+    autoload :VirtualMachineImage,                  'azure/virtual_machine_image_management/virtual_machine_image'
+    autoload :VirtualMachineDisk,                   'azure/virtual_machine_image_management/virtual_machine_disk'
+  end
+
+  module VirtualMachineManagement
+    autoload :VirtualMachineManagementService,  'azure/virtual_machine_management/virtual_machine_management_service'
+    autoload :Serialization,                    'azure/virtual_machine_management/serialization'
+    autoload :VirtualMachine,                   'azure/virtual_machine_management/virtual_machine'
+  end
+
+  module VirtualNetworkManagement
+    autoload :VirtualNetworkManagementService,  'azure/virtual_network_management/virtual_network_management_service'
+    autoload :Serialization,                    'azure/virtual_network_management/serialization'
+    autoload :VirtualNetwork,                   'azure/virtual_network_management/virtual_network'
+  end
+
+  class << self
+    include Azure::Configurable
+
+    # API client based on configured options {Configurable}
+    #
+    # @return [Azure::Client] API wrapper
+    def client(options = {})
+      @client = Azure::Client.new(options) unless defined?(@client) && @client.same_options?(options)
+      @client
+    end
+
+    private
+
+    def method_missing(method_name, *args, &block)
+      return super unless client.respond_to?(method_name)
+      client.send(method_name, *args, &block)
+    end
+
+  end
+
+  Azure.setup
+end

data/lib/azure/base_management/base_management_service.rb

@@ -19,80 +19,67 @@ require 'azure/base_management/affinity_group'
 
 module Azure
   module BaseManagement
-    class BaseManagementService
-      def initialize
-        validate_configuration
-        cert_file = Azure.config.management_certificate
 
-        if File.file?(cert_file) && cert_file =~ /(pem)$/
-          cert_file = File.read(Azure.config.management_certificate)
-        else
-          cert_file = File.binread(Azure.config.management_certificate)
-        end
+    # The base for all Azure management services
+    # @!attribute [rw] client
+    #   The client contains the configuration scope and the ability to produce http agents.
+    #   defaults to global client.
+    #   @see Azure.client
+    #   @return [Azure::Client]
+    class BaseManagementService
 
-        begin
-          if Azure.config.management_certificate =~ /(pem)$/
-            certificate_key = OpenSSL::X509::Certificate.new(cert_file)
-            private_key = OpenSSL::PKey::RSA.new(cert_file)
-          else
-          # Parse pfx content
-            cert_content = OpenSSL::PKCS12.new(cert_file)
-            certificate_key = OpenSSL::X509::Certificate.new(
-              cert_content.certificate.to_pem
-            )
-            private_key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
-          end
-        rescue Exception => e
-          raise "Management certificate not valid. Error: #{e.message}"
-        end
+      attr_accessor :client
 
-        Azure.configure do |config|
-          config.http_certificate_key = certificate_key
-          config.http_private_key = private_key
-        end
+      # @param options  [Hash] options including :client
+      def initialize(options = {})
+        @client = options[:client] || Azure.client
+        validate_configuration!
       end
 
-      def validate_configuration
-        subs_id = Azure.config.subscription_id
+      # Validate the configuration of the service.
+      # @return [void]
+      def validate_configuration!
+        subs_id = @client.subscription_id
         error_message = 'Subscription ID not valid.'
-        raise error_message if subs_id.nil? || subs_id.empty?
+        raise ArgumentError.new(error_message) if subs_id.nil? || subs_id.empty?
 
-        m_ep = Azure.config.management_endpoint
+        m_ep = @client.management_endpoint
         error_message = 'Management endpoint not valid.'
-        raise error_message if m_ep.nil? || m_ep.empty?
-
-        m_cert = Azure.config.management_certificate
-        error_message = "Could not read from file '#{m_cert}'."
-        raise error_message unless test('r', m_cert)
-
-        m_cert = Azure.config.management_certificate
-        error_message = 'Management certificate expects a .pem or .pfx file.'
-        raise error_message unless m_cert =~ /(pem|pfx)$/
+        raise ArgumentError.new(error_message) if m_ep.nil? || m_ep.empty?
       end
 
-      # Public: Gets a list of regional data center locations from the server
-      #
-      # Returns an array of Azure::BaseManagement::Location objects
+      # Gets a list of regional data center locations from the server
+      # @return [Array<Azure::BaseManagement::Location>]
       def list_locations
-        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, '/locations')
+        request = @client.management_request(:get, '/locations')
         response = request.call
         Serialization.locations_from_xml(response)
       end
 
-      # Public: Gets a lists the affinity groups associated with
+      # Gets a list of role sizes associated with the
+      # specified subscription.
+      # @return [Array<String>]
+      def list_role_sizes
+        role_sizes = []
+        locations = list_locations
+        locations.each do | location |
+         role_sizes << location.role_sizes
+        end
+        role_sizes.flatten.uniq.compact.sort
+      end
+
+      # Gets a lists the affinity groups associated with
       # the specified subscription.
-      #
-      # See http://msdn.microsoft.com/en-us/library/azure/ee460797.aspx
-      #
-      # Returns an array of Azure::BaseManagement::AffinityGroup objects
+      # @see http://msdn.microsoft.com/en-us/library/azure/ee460797.aspx
+      # @return [Array<Azure::BaseManagement::AffinityGroup>]
       def list_affinity_groups
         request_path = '/affinitygroups'
-        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
+        request = @client.management_request(:get, request_path)
         response = request.call
         Serialization.affinity_groups_from_xml(response)
       end
 
-      # Public: Creates a new affinity group for the specified subscription.
+      # Creates a new affinity group for the specified subscription.
       #
       # ==== Attributes
       #
@@ -108,9 +95,9 @@ module Azure
       # * +:description+   - String. A description for the affinity group.
       # (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715317.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715317.aspx
       #
-      # Returns:  None
+      # @return [void]
       def create_affinity_group(name, location, label, options = {})
         if name.nil? || name.strip.empty?
           raise 'Affinity Group name cannot be empty'
@@ -118,8 +105,7 @@ module Azure
           raise Azure::Error::Error.new(
             'ConflictError',
             409,
-            "An affinity group #{name}"\
-            " already exists in the current subscription."
+            "An affinity group #{name} already exists in the current subscription."
           )
         else
           validate_location(location)
@@ -128,13 +114,13 @@ module Azure
                                                      label,
                                                      options)
           request_path = '/affinitygroups'
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:post, request_path, body)
+          request = @client.management_request(:post, request_path, body)
           request.call
           Azure::Loggerx.info "Affinity Group #{name} is created."
         end
       end
 
-      # Public: updates the label and/or the description for an affinity group
+      # Updates the label and/or the description for an affinity group
       # for the specified subscription.
       #
       # ==== Attributes
@@ -149,52 +135,52 @@ module Azure
       # * +:description+   - String. A description for the affinity group.
       # (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715316.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715316.aspx
       #
-      # Returns:  None
+      # @return [void]
       def update_affinity_group(name, label, options = {})
         raise 'Label name cannot be empty' if label.nil? || label.empty?
         if affinity_group(name)
           body = Serialization.resource_to_xml(label, options)
           request_path = "/affinitygroups/#{name}"
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:put, request_path, body)
+          request = @client.management_request(:put, request_path, body)
           request.call
           Azure::Loggerx.info "Affinity Group #{name} is updated."
         end
       end
 
-      # Public: Deletes an affinity group in the specified subscription
+      # Deletes an affinity group in the specified subscription
       #
       # ==== Attributes
       #
       # * +name+       - String. Affinity Group name.
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715314.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715314.aspx
       #
-      # Returns:  None
+      # @return [void]
       def delete_affinity_group(name)
         if affinity_group(name)
           request_path = "/affinitygroups/#{name}"
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:delete, request_path)
+          request = @client.management_request(:delete, request_path)
           request.call
           Azure::Loggerx.info "Deleted affinity group #{name}."
         end
       end
 
-      # Public: returns the system properties associated with the specified
+      # Returns the system properties associated with the specified
       # affinity group.
       #
       # ==== Attributes
       #
       # * +name+       - String. Affinity Group name.
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/ee460789.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/ee460789.aspx
       #
-      # Returns:  Azure::BaseManagement::AffinityGroup object
+      # @return  [Azure::BaseManagement::AffinityGroup]
       def get_affinity_group(name)
         if affinity_group(name)
           request_path = "/affinitygroups/#{name}"
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path)
+          request = @client.management_request(:get, request_path)
           response = request.call
           Serialization.affinity_group_from_xml(response)
         end
@@ -230,3 +216,5 @@ module Azure
     end
   end
 end
+
+Azure::BaseManagementService = Azure::BaseManagement::BaseManagementService