From 510e05b8d95146ecf7951969748650f7cdf6ce00 Mon Sep 17 00:00:00 2001
From: Michael Klein <michael@firstiwaslike.com>
Date: Sun, 21 Feb 2016 16:39:05 +0100
Subject: [PATCH] Remove remaining `path.join` for win-compatibility

---
 index.js                      |  4 ++--
 lib/s3.js                     | 17 +++++++----------
 lib/util/join-uri-segments.js |  7 +++++++
 3 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 lib/util/join-uri-segments.js

diff --git a/index.js b/index.js
index 3dc9a10..606a320 100644
--- a/index.js
+++ b/index.js
@@ -1,8 +1,8 @@
 /* jshint node: true */
 'use strict';
-var path             = require('path');
 var DeployPluginBase = require('ember-cli-deploy-plugin');
 var S3               = require('./lib/s3');
+var joinUriSegments  = require('./lib/util/join-uri-segments');
 
 module.exports = {
   name: 'ember-cli-deploy-s3-index',
@@ -43,7 +43,7 @@ module.exports = {
         var filePattern    = this.readConfig('filePattern');
         var gzippedFiles   = this.readConfig('gzippedFiles');
         var allowOverwrite = this.readConfig('allowOverwrite');
-        var filePath    = path.join(distDir, filePattern);
+        var filePath       = joinUriSegments(distDir, filePattern);
 
         var options = {
           bucket: bucket,
diff --git a/lib/s3.js b/lib/s3.js
index 48a7ce9..159113a 100644
--- a/lib/s3.js
+++ b/lib/s3.js
@@ -1,12 +1,13 @@
 /* jshint node: true */
 'use strict';
 
-var AWS        = require('aws-sdk');
-var CoreObject = require('core-object');
-var Promise    = require('ember-cli/lib/ext/promise');
-var fs         = require('fs');
-var readFile   = Promise.denodeify(fs.readFile);
-var mime       = require('mime-types');
+var AWS             = require('aws-sdk');
+var CoreObject      = require('core-object');
+var Promise         = require('ember-cli/lib/ext/promise');
+var fs              = require('fs');
+var readFile        = Promise.denodeify(fs.readFile);
+var mime            = require('mime-types');
+var joinUriSegments = require('./util/join-uri-segments');
 
 function headObject(client, params) {
   return new Promise(function(resolve, reject) {
@@ -24,10 +25,6 @@ function headObject(client, params) {
   });
 }
 
-function joinUriSegments(prefix, uri) {
-  return prefix === '' ? uri : [prefix, uri].join('/');
-}
-
 module.exports = CoreObject.extend({
   init: function(options) {
     var plugin = options.plugin;
diff --git a/lib/util/join-uri-segments.js b/lib/util/join-uri-segments.js
new file mode 100644
index 0000000..55aebfb
--- /dev/null
+++ b/lib/util/join-uri-segments.js
@@ -0,0 +1,7 @@
+/* jshint node: true */
+'use strict';
+function joinUriSegments(prefix, uri) {
+  return prefix === '' ? uri : [prefix, uri].join('/');
+}
+
+module.exports = joinUriSegments;