azure 0.6.4 → 0.7.0.pre

data/Rakefile

@@ -12,37 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "rake/testtask"
-require "rubygems/package_task"
+require 'rake/testtask'
+require 'rubygems/package_task'
+require 'dotenv/tasks'
 
-gem_spec = eval(File.read("./azure.gemspec"))
+gem_spec = eval(File.read('./azure.gemspec'))
 Gem::PackageTask.new(gem_spec) do |pkg|
   pkg.need_zip = false
   pkg.need_tar = false
 end
 
 namespace :test do
-  task :require_environment do
+  task :require_environment => :dotenv do
     unset_environment = [
-      ENV.fetch("AZURE_STORAGE_ACCOUNT",  nil),
-      ENV.fetch("AZURE_STORAGE_ACCESS_KEY",    nil),
-      # ENV.fetch("AZURE_STORAGE_TABLE_HOST",    nil),
-      # ENV.fetch("AZURE_STORAGE_BLOB_HOST",     nil),
-      # ENV.fetch("AZURE_STORAGE_QUEUE_HOST",    nil),
-      ENV.fetch("AZURE_SERVICEBUS_NAMESPACE", nil),
-      ENV.fetch("AZURE_SERVICEBUS_ACCESS_KEY", nil),
-      # ENV.fetch("AZURE_SERVICEBUS_ISSUER",     nil)
+      ENV.fetch('AZURE_STORAGE_ACCOUNT',  nil),
+      ENV.fetch('AZURE_STORAGE_ACCESS_KEY',    nil),
+      ENV.fetch('AZURE_SERVICEBUS_NAMESPACE', nil),
+      ENV.fetch('AZURE_SERVICEBUS_ACCESS_KEY', nil),
       ENV.fetch('AZURE_MANAGEMENT_CERTIFICATE', nil),
       ENV.fetch('AZURE_SUBSCRIPTION_ID', nil)
     ].include?(nil)
 
-    abort "[ABORTING] Configure your environment to run the integration tests" if unset_environment
+    abort '[ABORTING] Configure your environment to run the integration tests' if unset_environment
   end
 
   Rake::TestTask.new :unit do |t|
-    t.pattern = "test/unit/**/*_test.rb"
+    t.pattern = 'test/unit/**/*_test.rb'
     t.verbose = true
-    t.libs = ["lib", "test"]
+    t.libs = %w(lib test)
   end
 
   namespace :unit do
@@ -50,10 +47,10 @@ namespace :test do
       Rake::TestTask.new component do |t|
         t.pattern = "test/unit/#{component}/**/*_test.rb"
         t.verbose = true
-        t.libs = ["lib", "test"]
+        t.libs = %w(lib test)
       end
 
-      task component => "test:require_environment"
+      task component => 'test:require_environment'
     end
 
     component_task :affinity_group
@@ -71,9 +68,9 @@ namespace :test do
   end
 
   Rake::TestTask.new :integration do |t|
-    t.pattern = "test/integration/**/*_test.rb"
+    t.pattern = 'test/integration/**/*_test.rb'
     t.verbose = true
-    t.libs = ["lib", "test"]
+    t.libs = %w(lib test)
   end
 
   task :integration => :require_environment
@@ -83,10 +80,10 @@ namespace :test do
       Rake::TestTask.new component do |t|
         t.pattern = "test/integration/#{component}/**/*_test.rb"
         t.verbose = true
-        t.libs = ["lib", "test"]
+        t.libs = %w(lib test)
       end
 
-      task component => "test:require_environment"
+      task component => 'test:require_environment'
     end
 
     component_task :affinity_group
@@ -103,27 +100,22 @@ namespace :test do
   end
 
   task :cleanup => :require_environment do
-    $:.unshift "lib"
+    $:.unshift 'lib'
     require 'azure'
 
     Azure.configure do |config|
-      config.access_key     = ENV.fetch("AZURE_STORAGE_ACCESS_KEY")
-      config.account_name   = ENV.fetch("AZURE_STORAGE_ACCOUNT")
-      # config.table_host     = ENV.fetch("AZURE_STORAGE_TABLE_HOST")
-      # config.blob_host      = ENV.fetch("AZURE_STORAGE_BLOB_HOST")
-      # config.queue_host     = ENV.fetch("AZURE_STORAGE_QUEUE_HOST")
-
-      config.acs_namespace  = ENV.fetch("AZURE_SERVICEBUS_NAMESPACE")
-      config.sb_access_key  = ENV.fetch("AZURE_SERVICEBUS_ACCESS_KEY")
-      # config.sb_issuer      = ENV.fetch("AZURE_SERVICEBUS_ISSUER")
+      config.access_key     = ENV.fetch('AZURE_STORAGE_ACCESS_KEY')
+      config.account_name   = ENV.fetch('AZURE_STORAGE_ACCOUNT')
+      config.acs_namespace  = ENV.fetch('AZURE_SERVICEBUS_NAMESPACE')
+      config.sb_access_key  = ENV.fetch('AZURE_SERVICEBUS_ACCESS_KEY')
       config.management_certificate  = ENV.fetch('AZURE_MANAGEMENT_CERTIFICATE')
-      config.management_endpoint  = ENV.fetch("AZURE_MANAGEMENT_ENDPOINT")
-      config.sql_database_management_endpoint = ENV.fetch("AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT")
-      config.subscription_id  = ENV.fetch("AZURE_SUBSCRIPTION_ID")
+      config.management_endpoint  = ENV.fetch('AZURE_MANAGEMENT_ENDPOINT')
+      config.sql_database_management_endpoint = ENV.fetch('AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT')
+      config.subscription_id  = ENV.fetch('AZURE_SUBSCRIPTION_ID')
     end
   end
 end
 
-task :test => ["test:unit", "test:integration"]
+task :test => %w(test:unit test:integration)
 
 task :default => :test

data/azure.gemspec

@@ -12,32 +12,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "date"
+require 'date'
 
 require File.expand_path('../lib/azure/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name    = "azure"
+  s.name    = 'azure'
   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.homepage    = "http://github.com/WindowsAzure/azure-sdk-for-ruby"
+  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.homepage    = 'http://github.com/azure/azure-sdk-for-ruby'
   s.license     = 'Apache License, Version 2.0'
   s.files       = `git ls-files`.split("\n")
+  s.bindir      = 'bin'
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency('nokogiri',   "~> 1.5")
-  s.add_runtime_dependency("mime-types", "~> 1.0")
+  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_development_dependency("rake", '~> 10.0')
-  s.add_development_dependency("minitest", "~> 3.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('turn', '~> 0.9')
+  s.add_development_dependency('timecop', '~> 0.7')
+  s.add_development_dependency('dotenv', '~> 2.0' )
 end

data/bin/pfxer

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby -U
+
+require 'azure'
+require 'thor'
+require 'fileutils'
+
+module Azure
+  class Pfxer < Thor
+    desc 'transform', 'Transforms a publish settings file from Azure into a .pfx'
+
+    long_desc <<-TRANSFORM
+
+    `transform` will create a .pfx file from an Azure publish settings file. The publish settings file contains a
+    pfx, but the pfx is base64 encode within the publish settings xml structure. This is here to make that a little
+    easier.
+
+    TRANSFORM
+
+    option :in, required: true, desc: 'Path to publish settings file'
+    option :out, desc: 'Path to where you want your .pfx'
+    def transform
+      path = File.expand_path(options[:in])
+      if File.exists?(path)
+        pub_settings_xml = Nokogiri::XML(File.read(path))
+        b64_pfx = pub_settings_xml.css('PublishData PublishProfile Subscription')[0]['ManagementCertificate']
+        pfx = Base64.decode64(b64_pfx)
+        file_name = File.basename(path, '.publishsettings').downcase.gsub(' ', '_')
+        out_path = options[:out] || File.join(File.dirname(path), file_name + '.pfx')
+        File.binwrite(File.expand_path(out_path), pfx)
+      end
+    end
+  end
+end
+
+Azure::Pfxer.start(ARGV)

data/lib/azure.rb

@@ -14,6 +14,13 @@
 #--------------------------------------------------------------------------
 module Azure; end
 
+require 'rubygems'
+require 'nokogiri'
+require 'base64'
+require 'openssl'
+require 'uri'
+require 'rexml/document'
+
 require 'azure/core'
 require 'azure/blob/blob_service'
 require 'azure/queue/queue_service'
@@ -50,3 +57,4 @@ Azure::StorageManagementService = Azure::StorageManagement::StorageManagementSer
 Azure::VirtualMachineManagementService = Azure::VirtualMachineManagement::VirtualMachineManagementService
 Azure::SqlDatabaseManagementService = Azure::SqlDatabaseManagement::SqlDatabaseManagementService
 Azure::VirtualNetworkManagementService = Azure::VirtualNetworkManagement::VirtualNetworkManagementService
+Azure::Loggerx = Azure::Core::Logger

data/lib/azure/base_management/base_management_service.rb

@@ -12,33 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require 'rubygems'
-require 'nokogiri'
-require 'base64'
-require 'openssl'
-require 'uri'
-require 'rexml/document'
+
 require 'azure/base_management/serialization'
 require 'azure/base_management/location'
 require 'azure/base_management/affinity_group'
 
-include Azure::BaseManagement
-include Azure::Core::Utility
-Loggerx = Azure::Core::Logger
-
 module Azure
   module BaseManagement
     class BaseManagementService
       def initialize
         validate_configuration
-        cert_file = File.read(Azure.config.management_certificate)
+        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
+
         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(Base64.decode64(cert_file))
+            cert_content = OpenSSL::PKCS12.new(cert_file)
             certificate_key = OpenSSL::X509::Certificate.new(
               cert_content.certificate.to_pem
             )
@@ -76,7 +74,7 @@ module Azure
       #
       # Returns an array of Azure::BaseManagement::Location objects
       def list_locations
-        request = ManagementHttpRequest.new(:get, '/locations')
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, '/locations')
         response = request.call
         Serialization.locations_from_xml(response)
       end
@@ -84,12 +82,12 @@ module Azure
       # Public: Gets a lists the affinity groups associated with
       # the specified subscription.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460797.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460797.aspx
       #
       # Returns an array of Azure::BaseManagement::AffinityGroup objects
       def list_affinity_groups
         request_path = '/affinitygroups'
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.affinity_groups_from_xml(response)
       end
@@ -110,7 +108,7 @@ module Azure
       # * +:description+   - String. A description for the affinity group.
       # (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715317.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715317.aspx
       #
       # Returns:  None
       def create_affinity_group(name, location, label, options = {})
@@ -130,9 +128,9 @@ module Azure
                                                      label,
                                                      options)
           request_path = '/affinitygroups'
-          request = ManagementHttpRequest.new(:post, request_path, body)
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:post, request_path, body)
           request.call
-          Loggerx.info "Affinity Group #{name} is created."
+          Azure::Loggerx.info "Affinity Group #{name} is created."
         end
       end
 
@@ -151,7 +149,7 @@ module Azure
       # * +:description+   - String. A description for the affinity group.
       # (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715316.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715316.aspx
       #
       # Returns:  None
       def update_affinity_group(name, label, options = {})
@@ -159,9 +157,9 @@ module Azure
         if affinity_group(name)
           body = Serialization.resource_to_xml(label, options)
           request_path = "/affinitygroups/#{name}"
-          request = ManagementHttpRequest.new(:put, request_path, body)
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:put, request_path, body)
           request.call
-          Loggerx.info "Affinity Group #{name} is updated."
+          Azure::Loggerx.info "Affinity Group #{name} is updated."
         end
       end
 
@@ -171,15 +169,15 @@ module Azure
       #
       # * +name+       - String. Affinity Group name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715314.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715314.aspx
       #
       # Returns:  None
       def delete_affinity_group(name)
         if affinity_group(name)
           request_path = "/affinitygroups/#{name}"
-          request = ManagementHttpRequest.new(:delete, request_path)
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:delete, request_path)
           request.call
-          Loggerx.info "Deleted affinity group #{name}."
+          Azure::Loggerx.info "Deleted affinity group #{name}."
         end
       end
 
@@ -190,13 +188,13 @@ module Azure
       #
       # * +name+       - String. Affinity Group name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460789.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460789.aspx
       #
       # Returns:  Azure::BaseManagement::AffinityGroup object
       def get_affinity_group(name)
         if affinity_group(name)
           request_path = "/affinitygroups/#{name}"
-          request = ManagementHttpRequest.new(:get, request_path)
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path)
           response = request.call
           Serialization.affinity_group_from_xml(response)
         end

data/lib/azure/base_management/management_http_request.rb

@@ -21,6 +21,7 @@ include Azure::Core::Http
 module Azure
   module BaseManagement
     class ManagementHttpRequest < HttpRequest
+      include Azure::Core::Utility
       attr_accessor :uri, :warn, :key, :cert
 
       # Public: Creates the ManagementHttpRequest
@@ -34,11 +35,11 @@ module Azure
         super
         @warn = false
         content_length = body ? body.bytesize.to_s : '0'
-        @headers = {
-          'x-ms-version' => '2014-04-01',
-          'Content-Type' => 'application/xml',
-          'Content-Length' => content_length
-        }
+        @headers.update({
+                            'x-ms-version' => '2014-06-01',
+                            'Content-Type' => 'application/xml',
+                            'Content-Length' => content_length
+                        })
         @uri = URI.parse(Azure.config.management_endpoint + Azure.config.subscription_id + path)
         @key = Azure.config.http_private_key
         @cert = Azure.config.http_certificate_key
@@ -66,7 +67,7 @@ module Azure
       def wait_for_completion(response)
         ret_val = Nokogiri::XML response.body
         if ret_val.at_css('Error Code') && ret_val.at_css('Error Code').content == 'AuthenticationFailed'
-          Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+          Azure::Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
         end
         if response.status_code.to_i == 200 || response.status_code.to_i == 201
           return response
@@ -74,16 +75,18 @@ module Azure
           rebuild_request response
         elsif response.status_code.to_i > 201 && response.status_code.to_i <= 299
           check_completion(response.headers['x-ms-request-id'])
+        elsif response.status_code.to_i == 307
+          @uri = URI::parse (response.headers['location'])
+          call
         elsif warn && !response.success?
-          # Loggerx.warn ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
         elsif response.body
           if ret_val.at_css('Error Code') && ret_val.at_css('Error Message')
-            Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+            Azure::Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
           else
-            Loggerx.exception_message "http error: #{response.status_code}"
+            Azure::Loggerx.exception_message "http error: #{response.status_code}"
           end
         else
-          Loggerx.exception_message "http error: #{response.status_code}"
+          Azure::Loggerx.exception_message "http error: #{response.status_code}"
         end
       end
 
@@ -94,7 +97,7 @@ module Azure
       #
       # * +request_id+       - String.  x-ms-request-id response header of request
       #
-      # See: http://msdn.microsoft.com/en-us/library/windowsazure/ee460783.aspx
+      # See: http://msdn.microsoft.com/en-us/library/azure/ee460783.aspx
       #
       # Print Error or Success of Operation.
       def check_completion(request_id)
@@ -122,9 +125,9 @@ module Azure
             if status.downcase != 'succeeded'
               error_code = xml_content(ret_val, 'Operation Error Code')
               error_msg = xml_content(ret_val, 'Operation Error Message')
-              Loggerx.exception_message "#{error_code}: #{error_msg}"
+              Azure::Loggerx.exception_message "#{error_code}: #{error_msg}"
             else
-              Loggerx.success "#{status.downcase} (#{status_code})"
+              Azure::Loggerx.success "#{status.downcase} (#{status_code})"
             end
             return
           else
@@ -169,4 +172,4 @@ module Azure
       end
     end
   end
-end
+end