Merge pull request Azure#33 from hovsepm/merge-from-public

Merge from latest public branch

.jshintignore

@@ -1,7 +1,9 @@
 lib/common/node_modules/*
+lib/services/legacyStorage/node_modules/*
 lib/services/computeManagement/node_modules/*
 lib/services/management/node_modules/*
 lib/services/networkManagement/node_modules/*
+lib/services/monitoring/node_modules/*
 lib/services/scheduler/node_modules/*
 lib/services/schedulerManagement/node_modules/*
 lib/services/serviceBusManagement/node_modules/*

.jshintrc

@@ -23,6 +23,6 @@
   "strict": false,
   "trailing": true,
   "undef": true,
-  "unused": true,
+  "unused": false,
   "shadow": true
-}
+}

.npmignore

@@ -8,6 +8,7 @@ node_modules/
 lib/common/
 lib/services/computeManagement/
 lib/services/management/
+lib/services/monitoring/
 lib/services/networkManagement/
 lib/services/scheduler/
 lib/services/schedulerManagement/
@@ -17,6 +18,7 @@ lib/services/storageManagement/
 lib/services/storeManagement/
 lib/services/subscriptionManagement/
 lib/services/webSiteManagement/
+lib/services/legacyStorage/
 
 # Test folder #
 test/

.travis.yml

@@ -3,13 +3,13 @@ node_js:
   - "0.11"
   - "0.10"
   - "0.8"
-  - "0.6"
+
 
 matrix:
   allow_failures:
-    - node_js: "0.6"
     - node_js: "0.11"
 
 # setup links to submodules
 before_install:
-  npm run-script setup
+  - npm install -g npm@1.4.9
+  - npm run-script setup

ChangeLog.txt

@@ -1,3 +1,17 @@
+2014.04.29 Version 0.9.6
+* Fixing missing dependencies in submodules
+
+2014.04.29 Version 0.9.5
+* Turning on monitoring and scheduler features in rollup package
+* Fixing references to monitoring client in azure.js
+
+2014.04.29 Version 0.9.4
+* Added Monitoring and Scheduler clients
+* Regeneration / update of all management clients
+* Trimming extra spaces in urls
+* Added "skipEncoding" option when writing blobs
+* Returning status codes on management library errors
+
 2013.01.30 Version 0.8.1
 * Added web jobs APIs
 * Support for expiration in template messages in Notification Hubs

README.md

@@ -1,8 +1,8 @@
-# Windows Azure SDK for Node.js
+# Microsoft Azure SDK for Node.js
 
-[![NPM version](https://badge.fury.io/js/azure.png)](http://badge.fury.io/js/azure) [![Build Status](https://travis-ci.org/WindowsAzure/azure-sdk-for-node.png?branch=master)](https://travis-ci.org/WindowsAzure/azure-sdk-for-node)
+[![NPM version](https://badge.fury.io/js/azure.png)](http://badge.fury.io/js/azure) [![Build Status](https://travis-ci.org/Azure/azure-sdk-for-node.png?branch=master)](https://travis-ci.org/Azure/azure-sdk-for-node)
 
-This project provides a Node.js package that makes it easy to consume and manage Windows Azure Services.
+This project provides a Node.js package that makes it easy to consume and manage Microsoft Azure Services.
 
 # Features
 
@@ -15,24 +15,24 @@ This project provides a Node.js package that makes it easy to consume and manage
     * Topic
     * Notification Hub
 * Service Runtime
-* [Core management](https://github.com/WindowsAzure/azure-sdk-for-node/blob/master/lib/services/management/README.md)
-* [Compute management](https://github.com/WindowsAzure/azure-sdk-for-node/blob/master/lib/services/computeManagement/README.md)
+* [Core management](https://github.com/Azure/azure-sdk-for-node/blob/master/lib/services/management/README.md)
+* [Compute management](https://github.com/Azure/azure-sdk-for-node/blob/master/lib/services/computeManagement/README.md)
     * Virtual Machine
     * Cloud Service
-* [Web Site management](https://github.com/WindowsAzure/azure-sdk-for-node/blob/master/lib/services/webSiteManagement/README.md)
-* [Virtual Network managment](https://github.com/WindowsAzure/azure-sdk-for-node/blob/dev/lib/services/networkManagement/README.md)
-* [Storage Account management](https://github.com/WindowsAzure/azure-sdk-for-node/blob/master/lib/services/storageManagement/README.md)
-* [SQL Database management](https://github.com/WindowsAzure/azure-sdk-for-node/blob/master/lib/services/sqlManagement/README.md)
-* [Service Bus management](https://github.com/WindowsAzure/azure-sdk-for-node/blob/master/lib/services/serviceBusManagement/README.md)
+* [Web Site management](https://github.com/Azure/azure-sdk-for-node/blob/master/lib/services/webSiteManagement/README.md)
+* [Virtual Network managment](https://github.com/Azure/azure-sdk-for-node/blob/dev/lib/services/networkManagement/README.md)
+* [Storage Account management](https://github.com/Azure/azure-sdk-for-node/blob/master/lib/services/storageManagement/README.md)
+* [SQL Database management](https://github.com/Azure/azure-sdk-for-node/blob/master/lib/services/sqlManagement/README.md)
+* [Service Bus management](https://github.com/Azure/azure-sdk-for-node/blob/master/lib/services/serviceBusManagement/README.md)
 * HDInsight management
 
 # Getting Started
 
 ## Install from npm
 
-We provide both fine-grained modules for different Windows Azure services which you can install separately, and an all-up module which contains everything.
+We provide both fine-grained modules for different Microsoft Azure services which you can install separately, and an all-up module which contains everything.
 
-**Notice**: we haven't provided fine-grained modules for every supported Windows Azure services yet. This will come soon.
+**Notice**: we haven't provided fine-grained modules for every supported Microsoft Azure services yet. This will come soon.
 
 ### Install the all-up module
 
@@ -418,16 +418,16 @@ azure.RoleEnvironment.getRoles(function(error, roles) {
 
 # Need Help?
 
-* [Windows Azure Forums on MSDN and Stack Overflow](http://go.microsoft.com/fwlink/?LinkId=234489)
+* [Microsoft Azure Forums on MSDN and Stack Overflow](http://go.microsoft.com/fwlink/?LinkId=234489)
 * IRC channel on freenode: node-azure
 
 # Learn More
 
-* [Windows Azure Node.js Developer Center](http://www.windowsazure.com/en-us/develop/nodejs/)
+* [Microsoft Azure Node.js Developer Center](http://azure.microsoft.com/en-us/develop/nodejs/)
 * [API reference](http://dl.windowsazure.com/nodedocs/)
-* [Windows Azure Cross-Platform CLI](http://github.com/windowsazure/azure-sdk-tools-xplat)
+* [Microsoft Azure Cross-Platform CLI](http://github.com/azure/azure-sdk-tools-xplat)
 
 # Contribute
 
-* If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
-* If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-sdk-for-node/issues) section of the project.
+* If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.com/guidelines.html).
+* If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-node/issues) section of the project.

gruntfile.js

@@ -32,24 +32,45 @@ module.exports = function(grunt) {
         destDir: 'lib/services/management/lib',
         output: 'ManagementClient.js'
       },
+      'Microsoft.WindowsAzure.Management.Monitoring.Specification.dll' : [
+        {
+          clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.AlertsClient',
+          destDir: 'lib/services/monitoring/lib',
+          output: 'alertsClient.js'
+        },
+        {
+          clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Autoscale.AutoscaleClient',
+          destDir: 'lib/services/monitoring/lib',
+          output: 'autoscaleClient.js'
+        },
+        {
+          clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Metrics.MetricsClient',
+          destDir: 'lib/services/monitoring/lib',
+          output: 'metricsClient.js'
+        },
+        {
+          clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Events.EventsClient',
+          destDir: 'lib/services/monitoring/lib',
+          output: 'eventsClient.js'
+        }
+      ],
       'Microsoft.WindowsAzure.Management.Network.Specification.dll' : {
         clientType: 'Microsoft.WindowsAzure.Management.Network.NetworkManagementClient',
         destDir: 'lib/services/networkManagement/lib',
         output: 'networkManagementClient.js'
       },
-      // TODO: Commenting out until hydra supports TimeSpan for Javascript
-      // 'Microsoft.WindowsAzure.Management.Scheduler.Specification.dll' : [
-      //   {
-      //     clientType: 'Microsoft.WindowsAzure.Management.Scheduler.SchedulerManagementClient',
-      //     destDir: 'lib/services/schedulerManagement/lib',
-      //     output: 'schedulerManagementClient.js'
-      //   },
-      //   {
-      //     clientType: 'Microsoft.WindowsAzure.Scheduler.SchedulerClient',
-      //     destDir: 'lib/services/scheduler/lib',
-      //     output: 'schedulerClient.js'
-      //   }
-      // ],
+      'Microsoft.WindowsAzure.Management.Scheduler.Specification.dll' : [
+        {
+          clientType: 'Microsoft.WindowsAzure.Management.Scheduler.SchedulerManagementClient',
+          destDir: 'lib/services/schedulerManagement/lib',
+          output: 'schedulerManagementClient.js'
+        },
+        {
+          clientType: 'Microsoft.WindowsAzure.Scheduler.SchedulerClient',
+          destDir: 'lib/services/scheduler/lib',
+          output: 'schedulerClient.js'
+        }
+      ],
       'Microsoft.WindowsAzure.Management.ServiceBus.Specification.dll' : {
         clientType: 'Microsoft.WindowsAzure.Management.ServiceBus.ServiceBusManagementClient',
         destDir: 'lib/services/serviceBusManagement/lib',
@@ -94,35 +115,7 @@ module.exports = function(grunt) {
         clientType: 'Microsoft.Azure.Gallery.GalleryClient',
         destDir: 'lib/services/gallery/lib',
         output: 'galleryClient.js'
-      },
-      'Microsoft.WindowsAzure.Management.Monitoring.Specification.dll': [
-        {
-          clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Events.EventsClient',
-          destDir: 'lib/services/monitoring/lib',
-          output: 'eventsClient.js'
-        },
-        // TODO: Turn back on once hydra supports timespans for javascript
-        // {
-        //   clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.AlertsClient',
-        //   destDir: 'lib/services/monitoring/lib',
-        //   output: 'alertsClient.js'
-        // },
-        // {
-        //   clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Autoscale.AutoscaleClient',
-        //   destDir: 'lib/services/monitoring/lib',
-        //   output: 'autoscaleClient.js'
-        // },
-        // {
-        //   clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Metrics.MetricsClient',
-        //   destDir: 'lib/services/monitoring/lib',
-        //   output: 'metricsClient.js'
-        // },
-        // {
-        //   clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Usages.UsagesClient',
-        //   destDir: 'lib/services/monitoring/lib',
-        //   output: 'usagesClient.js'
-        // }
-      ]
+      }
     },
 
     //jsdoc config
@@ -136,6 +129,10 @@ module.exports = function(grunt) {
                   "lib/services/computeManagement/lib/computeManagementClient.js",
                   "lib/services/hdinsight/hdinsightservice.js",
                   "lib/services/management/lib/managementClient.js",
+                  "lib/services/monitoring/lib/autoscaleClient.js",
+                  "lib/services/monitoring/lib/alertsClient.js",
+                  "lib/services/monitoring/lib/metricsClient.js",
+                  "lib/services/monitoring/lib/eventsClient.js",
                   "lib/services/networkManagement/lib/virtualNetworkManagementClient.js",
                   "lib/services/queue/queueservice.js",
                   "lib/services/scm/scmservice.js",