update version after merge

Author: jqnote

.gitignore

@@ -25,3 +25,5 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+.DS_Store

.npmignore

@@ -25,3 +25,5 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+.DS_Store

README.md

@@ -15,7 +15,7 @@ gulp.task('oss', function(){
         secretAccessKey: '*********',
         endpoint: 'http://oss-cn-***.aliyuncs.com',
         apiVersion: '2013-10-15',
-        prefix: 'assets/js',
+        prefix: 'assets/js', //for no prefix: prefix: ''
         bucket: 'test'
     };
     //./js/a.js -> <prefix>/a.js

index.js

@@ -39,7 +39,7 @@ function oss(option) {
         }
         var getFileKey = function(){
             return option.prefix
-                + ((!option.prefix || option.prefix[option.prefix.length - 1]) === '/' ? '' : '/')
+                + ((!option.prefix || (option.prefix[option.prefix.length - 1]) === '/') ? '' : '/')
                 + (option.versioning ? version + '/' : '')
                 + path.relative(file.base, file.path);
         };

package.json

@@ -1,36 +1,36 @@
 {
-  "name": "gulp-alioss",
-  "version": "0.1.2",
-  "description": "A plugin for Gulp that uploads files to Aliyun OSS",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/wefound/gulp-alioss"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "dependencies": {
-    "gulp-util": "~2.2.9",
-    "minimatch": "^2.0.4",
-    "moment": "~2.7.0",
-    "through2": "~0.4.0",
-    "q": "~1.0.0",
-    "aliyun-sdk": "~1.3.5"
-  },
-  "keywords": [
-    "gulp",
-    "plugin",
-    "aliyun",
-    "oss"
-  ],
-  "author": "junqiang <mail@junqiang.wang> (http://junqiang.wang)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/wefound/gulp-alioss/issues"
-  },
-  "homepage": "https://github.com/wefound/gulp-alioss"
+    "name": "gulp-alioss",
+    "version": "0.1.3",
+    "description": "A plugin for Gulp that uploads files to Aliyun OSS",
+    "main": "index.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/wefound/gulp-alioss"
+    },
+    "engines": {
+        "node": "*"
+    },
+    "dependencies": {
+        "gulp-util": "~2.2.9",
+        "minimatch": "^2.0.4",
+        "moment": "~2.7.0",
+        "through2": "~0.4.0",
+        "q": "~1.0.0",
+        "aliyun-sdk": "~1.3.5"
+    },
+    "keywords": [
+        "gulp",
+        "plugin",
+        "aliyun",
+        "oss"
+    ],
+    "author": "junqiang <mail@junqiang.wang> (http://junqiang.wang)",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/wefound/gulp-alioss/issues"
+    },
+    "homepage": "https://github.com/wefound/gulp-alioss"
 }