Merge branch 'develop' into aws

bin/cli.js

@@ -23,6 +23,8 @@ var cli = meow({
         '  --allow-domain       Only allow requests to given (comma-separated) domains.',
         '  --no-externals       Block all domains except the main one.',
         '  --reporter           The output format: "json" or "xml". Default is "json".',
+        '  --local-storage      Ability to set a local storage, key-value pairs (e.g. "bar=foo;domain=url")',
+        '  --session-storage    Ability to set a session storage, key-value pairs (e.g. "bar=foo;domain=url")',
         ''
     ].join('\n'),
     pkg: require('../package.json')
@@ -74,6 +76,10 @@ options.blockDomain =  cli.flags.blockDomain || null;
 options.allowDomain =  cli.flags.allowDomain || null;
 options.noExternals =  cli.flags.noExternals || null;
 
+// Storage injection
+options.localStorage = cli.flags.localStorage;
+options.sessionStorage = cli.flags.sessionStorage;
+
 // Output format
 if (cli.flags.reporter && cli.flags.reporter !== 'json' && cli.flags.reporter !== 'xml') {
     console.error('Incorrect parameters: reporter has to be "json" or "xml"');

lib/tools/phantomas/phantomasWrapper.js

@@ -42,6 +42,8 @@ var PhantomasWrapper = function() {
             'block-domain': task.options.blockDomain,
             'allow-domain': task.options.allowDomain,
             'no-externals': task.options.noExternals,
+            'local-storage': task.options.localStorage,
+            'session-storage': task.options.sessionStorage,
 
             // Mandatory
             'analyze-css': true,