Merge pull request #42 from andrerod/dev

Fixing issue #2 and #33

examples/blobuploader/package.json

@@ -6,5 +6,6 @@
       "express": ">= 2.4.7"
     , "ejs": ">= 0.4.3"
     , "formidable": ">= 1.0.6"
+    , "azure": ">= 0.5.1"
   }
 }

examples/blobuploader/server.js

@@ -1,6 +1,12 @@
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var express = require('express');
 var formidable = require('formidable');
-var azure = require('./../../lib/azure');
 var helpers = require('./helpers.js');
 
 var app = module.exports = express.createServer();

examples/blog/blog.js

@@ -1,4 +1,10 @@
-var azure = require('./../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var ServiceClient = azure.ServiceClient;
 var TableQuery = azure.TableQuery;
 var uuid = require('node-uuid');

examples/blog/package.json

@@ -7,5 +7,6 @@
     , "stylus": ">= 0.0.1"
     , "ejs": ">= 0.4.3"
     , "node-uuid": ">= 1.2.0"
+    , "azure": ">= 0.5.1"
   }
 }

examples/samples/blobuploaddownloadsample.js

@@ -6,13 +6,18 @@
 * 3. Demonstrate making requests using AccessConditions.
 */
 
-var azure = require('../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var BlobConstants = azure.Constants.BlobConstants;
 var ServiceClient = azure.ServiceClient;
 var CloudBlobClient = azure.CloudBlobClient;
 
 var util = require('util');
-var path = require('path');
 var fs = require('fs');
 
 var container = 'updownsample';

examples/samples/continuationsample.js

@@ -16,7 +16,13 @@
 *
 */
 
-var azure = require('../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var BlobConstants = azure.Constants.BlobConstants;
 var ServiceClient = azure.ServiceClient;
 var CloudBlobClient = azure.CloudBlobClient;

examples/samples/leaseblobsample.js

@@ -13,7 +13,13 @@
 *
 */
 
-var azure = require('../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var BlobConstants = azure.Constants.BlobConstants;
 var ServiceClient = azure.ServiceClient;
 var CloudBlobClient = azure.CloudBlobClient;

examples/samples/retrypolicysample.js

@@ -8,7 +8,13 @@
 * sent if users immediately recreate a container after delete it.
 */
 
-var azure = require('../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var BlobConstants = azure.Constants.BlobConstants;
 var ServiceClient = azure.ServiceClient;
 var CloudBlobClient = azure.CloudBlobClient;

examples/samples/sassample.js

@@ -20,7 +20,13 @@
 * c. Use both shared access signatures to read that blob (Expect a failure from the "Read" permission shared access signature since it has already expired.).
 */
 
-var azure = require('../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var BlobConstants = azure.Constants.BlobConstants;
 var ServiceClient = azure.ServiceClient;
 var CloudBlobClient = azure.CloudBlobClient;

examples/samples/snapshotsample.js

@@ -18,7 +18,13 @@
 * 8. List all snapshots for this blob.
 */
 
-var azure = require('../../lib/azure');
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var BlobConstants = azure.Constants.BlobConstants;
 var ServiceClient = azure.ServiceClient;
 var CloudBlobClient = azure.CloudBlobClient;

examples/tasklist/home.js

@@ -1,4 +1,11 @@
-var TableQuery = require('./../../lib/azure').TableQuery;
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
+var TableQuery = azure.TableQuery;
 
 module.exports = Home;
 var uuid = require('node-uuid');

examples/tasklist/package.json

@@ -7,5 +7,6 @@
     , "ejs": ">= 0.4.3"
     , "jade": ">= 0.18.0"
     , "node-uuid": "> = 1.2.0"
+    , "azure": ">= 0.5.1"
   }
 }

examples/tasklist/server.js

@@ -1,8 +1,14 @@
 // Module dependencies.
+var path = require('path');
+if (path.existsSync('./../../lib/azure.js')) {
+  azure = require('./../../lib/azure');
+} else {
+  azure = require('azure');
+}
+
 var express = require('express');
 var uuid = require('node-uuid');
 var Home = require('./home');
-var azure = require('./../../lib/azure');
 var ServiceClient = azure.ServiceClient;
 
 var app = module.exports = express.createServer();

lib/services/serviceclient.js

@@ -677,7 +677,8 @@ ServiceClient.isEmulated = function (host) {
     return true;
   }
 
-  return process.env[ServiceClient.EnvironmentVariables.EMULATED] ? true : false;
+  return (!azureutil.isNull(process.env[ServiceClient.EnvironmentVariables.EMULATED]) &&
+          process.env[ServiceClient.EnvironmentVariables.EMULATED] !== 'false');
 };
 
 // Other functions

package.json

@@ -17,8 +17,7 @@
         "mime": ">= 1.2.4"
     },
     "devDependencies": {
-        "nodeunit": ">= 0.6.4",
-        "jshint": ">= 0.5.2"
+        "nodeunit": ">= 0.6.4"
     },
     "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node",
     "repository": {