stuartpreston-azure-sdk-for-ruby 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5627f9f51067de61dfecc5c42a6fb848691b6b
-  data.tar.gz: 03fd7234dbe25d2705b6765f3bdffb6f4bfda7c9
+  metadata.gz: 79011371187700f252d099c2dba1361b7f578111
+  data.tar.gz: 46bcd38a6c7e472619b6d901e521439ae8a2268e
 SHA512:
-  metadata.gz: 0ea894a519dac09200d87612edad6a079ab2329385586e3f0a173ac090002fd6cb87de7fca6a943fafd848545fa36fa7fb145db36a96cc183eea847742b19201
-  data.tar.gz: 9ca113237450f9e9d061d11de6a7a387a316c2886a4585c410a56a679ce819323f44b9088a44bab87f7e06fbe15afa949c19fd09ee06cdb52713cc6949940f32
+  metadata.gz: 87a9c90eb7bc23b5b233472cb707c4feab18fdfff8e57dd2cbbed83f385e49b53ae1bd825b2a006d46e0dafc2a40da053df51544c484ac054520ff781c0a8b80
+  data.tar.gz: cec3895e035c7313890b8cde60bcf55cc09cc7e564a20d09b5259ab6e349d66805c6697a0403eac29461bd9d6446c6d3dab63f4769df2770b401b61e105b51c2

data/ChangeLog.txt

@@ -1,3 +1,16 @@
+2014.03.12 - version 0.6.7 (stuartpreston-azure-sdk-for-ruby)
+* Support for .pfx and .publishsettings as certificate sources
+
+2014.03.09 - version 0.6.6 (stuartpreston-azure-sdk-for-ruby)
+* Support for A10 and A11 Virtual Machine role sizes
+
+2013.03.03 - version 0.6.5 (stuartpreston-azure-sdk-for-ruby)
+* Support for D, DS and G Virtual Machine role sizes
+* Disabling Ruby 1.9 incompatibilities
+* Fix serialization for Add Role/Create Virtual Machines
+* Support creation of VM roles from User images
+* Fix to support endpoint creation when User image used
+
 2014.05.06 - version 0.6.4
 * Upgraded Service Management Versioning to 2014-04-01
 * Created separate API for add role

data/lib/azure/base_management/base_management_service.rb

@@ -31,13 +31,28 @@ module Azure
     class BaseManagementService
       def initialize
         validate_configuration
-        cert_file = File.read(Azure.config.management_certificate)
+        cert_file = nil
         begin
           if Azure.config.management_certificate =~ /(pem)$/
+            cert_file = File.read(Azure.config.management_certificate)
             certificate_key = OpenSSL::X509::Certificate.new(cert_file)
             private_key = OpenSSL::PKey::RSA.new(cert_file)
-          else
-          # Parse pfx content
+          elsif Azure.config.management_certificate =~ /(pfx)$/
+            # Parse pfx content
+            File.open(Azure.config.management_certificate, "rb") do |f|
+                cert_file = f.read
+            end
+            cert_content = OpenSSL::PKCS12.new(Base64.decode64(cert_file))
+            certificate_key = OpenSSL::X509::Certificate.new(
+              cert_content.certificate.to_pem
+            )
+            private_key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
+          elsif Azure.config.management_certificate =~ /(publishsettings)$/
+            # Parse publishsettings content
+            publish_settings = Nokogiri::XML(File.open(Azure.config.management_certificate, "r"))
+            subscription_id = Azure.config.subscription_id
+            xpath = "//PublishData/PublishProfile/Subscription[@Id='#{subscription_id}']/@ManagementCertificate"
+            cert_file = publish_settings.xpath(xpath).text
             cert_content = OpenSSL::PKCS12.new(Base64.decode64(cert_file))
             certificate_key = OpenSSL::X509::Certificate.new(
               cert_content.certificate.to_pem
@@ -68,8 +83,8 @@ module Azure
         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)$/
+        error_message = 'Management certificate expects a .pem, .pfx or .publishsettings file.'
+        raise error_message unless m_cert =~ /(pem|pfx|publishsettings)$/
       end
 
       # Public: Gets a list of regional data center locations from the server
@@ -231,4 +246,4 @@ module Azure
       end
     end
   end
-end
+end

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 6 unless defined? MINOR
-    UPDATE = 6 unless defined? UPDATE
+    UPDATE = 7 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stuartpreston-azure-sdk-for-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri