Merge pull request #30 from alexbuijs/master

Add configuration option for file prefixes when deploying. Thanks to @alexbuijs .

dist/deploy.js

@@ -77,6 +77,7 @@
       secret: credentials.secret,
       region: config.s3region,
       bucket: config.s3bucket,
+      prefix: config.s3prefix,
       acl: 'public-read',
       headers: {
         CacheControl: 'no-cache, no-store, must-revalidate',

dist/init.js

@@ -42,6 +42,12 @@ var s3bucket = {
   message: 'Name must be only letters, numbers, or dashes'
 };
 
+var s3prefix = {
+  description: 'Path in S3 bucket (optional for cordova-hcp deploy)',
+  pattern: /^[a-zA-Z\-\s0-9\.\/]+\/$/,
+  message: 'Path must be only letters, numbers, spaces, forward slashes or dashes and must end with a forward slash'
+};
+
 var s3region = {
   description: 'Amazon S3 region (required for cordova-hcp deploy)',
   pattern: /^(us-east-1|us-west-2|us-west-1|eu-west-1|eu-central-1|ap-southeast-1|ap-southeast-2|ap-northeast-1|sa-east-1)$/,
@@ -71,6 +77,7 @@ var schema = {
   properties: {
     name: name,
     s3bucket: s3bucket,
+    s3prefix: s3prefix,
     s3region: s3region,
     ios_identifier: iosIdentifier,
     android_identifier: androidIdentifier,
@@ -107,7 +114,7 @@ function execute(context) {
 
 function validateBucket(result) {
   if (!result.s3bucket) {
-    return _lodash2['default'].omit(result, ['s3region', 's3bucket']);
+    return _lodash2['default'].omit(result, ['s3region', 's3bucket', 's3prefix']);
   }
 
   return result;
@@ -116,17 +123,24 @@ function validateBucket(result) {
 function getUrl(_ref) {
   var region = _ref.s3region;
   var bucket = _ref.s3bucket;
+  var path = _ref.s3prefix;
 
   if (!bucket) {
     return (0, _utils.getInput)(_prompt2['default'], urlSchema);
   }
 
-  return { content_url: getContentUrl(region, bucket) };
+  return { content_url: getContentUrl(region, bucket, path) };
 }
 
-function getContentUrl(region, bucket) {
+function getContentUrl(region, bucket, path) {
   var url = region === 'us-east-1' ? 's3.amazonaws.com' : 's3-' + region + '.amazonaws.com';
-  return 'https://' + url + '/' + bucket;
+  url = 'https://' + url + '/' + bucket;
+
+  if (path) {
+    url += '/' + path;
+  }
+
+  return url;
 }
 
 function done(err) {

src/deploy.js

@@ -71,6 +71,7 @@
       secret: credentials.secret,
       region: config.s3region,
       bucket: config.s3bucket,
+      prefix: config.s3prefix,
       acl: 'public-read',
       headers: {
         CacheControl: 'no-cache, no-store, must-revalidate',

src/init.js

@@ -23,6 +23,12 @@ const s3bucket = {
   message: 'Name must be only letters, numbers, or dashes',
 };
 
+const s3prefix = {
+  description: 'Path in S3 bucket (optional for cordova-hcp deploy)',
+  pattern: /^[a-zA-Z\-\s0-9\.\/]+\/$/,
+  message: 'Path must be only letters, numbers, spaces, forward slashes or dashes and must end with a forward slash',
+};
+
 const s3region = {
   description: 'Amazon S3 region (required for cordova-hcp deploy)',
   pattern: /^(us-east-1|us-west-2|us-west-1|eu-west-1|eu-central-1|ap-southeast-1|ap-southeast-2|ap-northeast-1|sa-east-1)$/,
@@ -52,6 +58,7 @@ const schema = {
   properties: {
     name,
     s3bucket,
+    s3prefix,
     s3region,
     ios_identifier: iosIdentifier,
     android_identifier: androidIdentifier,
@@ -88,23 +95,29 @@ export function execute(context) {
 
 function validateBucket(result) {
   if (!result.s3bucket) {
-    return _.omit(result, ['s3region', 's3bucket']);
+    return _.omit(result, ['s3region', 's3bucket', 's3prefix']);
   }
 
   return result;
 }
 
-function getUrl({ s3region: region, s3bucket: bucket }) {
+function getUrl({ s3region: region, s3bucket: bucket, s3prefix: path }) {
   if (!bucket) {
     return getInput(prompt, urlSchema);
   }
 
-  return { content_url: getContentUrl(region, bucket) };
+  return { content_url: getContentUrl(region, bucket, path) };
 }
 
-function getContentUrl(region, bucket) {
-  const url = region === 'us-east-1' ? 's3.amazonaws.com' : `s3-${region}.amazonaws.com`;
-  return `https://${url}/${bucket}`;
+function getContentUrl(region, bucket, path) {
+  let url = region === 'us-east-1' ? 's3.amazonaws.com' : `s3-${region}.amazonaws.com`;
+  url = `https://${url}/${bucket}`
+
+  if (path) {
+    url += `/${path}`;
+  }
+
+  return url;
 }
 
 function done(err) {

test/init.test.js

@@ -6,6 +6,7 @@ const withBucket = {
   name: 'name',
   s3region: 'us-east-1',
   s3bucket: 'bucket',
+  prefix: 'pre/fix/',
   ios_identifier: 'ios',
   android_identifier: 'android',
   update: 'resume',
@@ -19,10 +20,11 @@ const expectedContentWithBucket = {
   name: 'name',
   s3region: 'us-east-1',
   s3bucket: 'bucket',
+  prefix: 'pre/fix/',
   ios_identifier: 'ios',
   android_identifier: 'android',
   update: 'resume',
-  content_url: 'https://s3.amazonaws.com/bucket'
+  content_url: 'https://s3.amazonaws.com/bucket/pre/fix/'
 };
 
 describe('init', () => {
@@ -51,10 +53,11 @@ describe('init', () => {
         "name": "name",
         "s3region": "us-east-1",
         "s3bucket": "bucket",
+        "prefix": "pre/fix/",
         "ios_identifier": "ios",
         "android_identifier": "android",
         "update": "resume",
-        "content_url": "https://s3.amazonaws.com/bucket"
+        "content_url": "https://s3.amazonaws.com/bucket/pre/fix/"
       };
 
       var content = JSON.parse(writeFile.args[0][1]);