Merge pull request #79 from Turistforeningen/es6-rewrite

Rewritten in ES6 and require Node.JS v4 or greater

.eslintrc

@@ -0,0 +1,23 @@
+# vi:syntax=json
+{
+  "extends": "airbnb-base",
+  "env": {
+    "mocha": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "script",
+    "ecmaFeatures": {
+      "modules": false
+    }
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "no-underscore-dangle": ["error", { "allow": [
+      "_randomPath",
+      "_upload"
+    ]}],
+    "no-param-reassign": ["error", { "props": false }]
+  }
+}

.gitignore

@@ -1,26 +1 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-*.swp
-
-pids
-logs
-results
-
-node_modules/
-
 .env
-.DS_Store
-.idea
-*.iml
-
-*.sublime*
-*.sublime-project
-*.sublime-workspace
-*.cache
-*.mpc

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Den Norske Turistforening (DNT), Hans Kristian Flaatten
+Copyright (c) 2014-2016 Den Norske Turistforening (DNT), Hans Kristian Flaatten
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -3,11 +3,13 @@ AWS S3 Image Uploader
 
 **Documentation for `s3-uploader@1.1` can be found [here](https://github.com/Turistforeningen/node-s3-uploader/blob/stable/1.x/README.md).**
 
-[![Build status](https://img.shields.io/wercker/ci/54f18246d9b14636634ff908.svg "Build status")](https://app.wercker.com/project/bykey/50fbdf51cf64b01a738379a028b8a885)
+[![Build status](https://app.wercker.com/status/9c42c66dcef6429b52989b2a61c85c7b/s "wercker status")](https://app.wercker.com/project/bykey/9c42c66dcef6429b52989b2a61c85c7b)
+[![Codacy grade](https://img.shields.io/codacy/grade/17ede08ebf51447296922d6f2b1ee83c.svg "Codacy grade")](https://www.codacy.com/app/DNT/node-s3-uploader)
+[![Codacy coverage](https://img.shields.io/codacy/coverage/17ede08ebf51447296922d6f2b1ee83c.svg "Codacy coverage")](https://www.codacy.com/app/DNT/node-s3-uploader)
 [![NPM downloads](https://img.shields.io/npm/dm/s3-uploader.svg "NPM downloads")](https://www.npmjs.com/package/s3-uploader)
 [![NPM version](https://img.shields.io/npm/v/s3-uploader.svg "NPM version")](https://www.npmjs.com/package/s3-uploader)
 [![Node version](https://img.shields.io/node/v/s3-uploader.svg "Node version")](https://www.npmjs.com/package/s3-uploader)
-[![Dependency status](https://img.shields.io/david/turistforeningen/node-s3-uploader.svg "Dependency status")](https://david-dm.org/turistforeningen/node-s3-uploader)
+[![Dependency status](https://img.shields.io/david/Turistforeningen/node-s3-uploader.svg "Dependency status")](https://david-dm.org/Turistforeningen/node-s3-uploader)
 [![Join the chat](https://img.shields.io/badge/gitter-join%20chat-blue.svg "Join the chat")](https://gitter.im/Turistforeningen/node-s3-uploader)
 
 Flexible and efficient image resize, rename, and upload to Amazon S3 disk
@@ -31,11 +33,8 @@ npm install s3-uploader --save
 
 ## Requirements
 
-* Node.JS >= v0.10
+* Node.JS >= v4.0.0
 * ImageMagic >= v6.8
-* AWS credentials environment variables
-  * `AWS_ACCESS_KEY_ID`
-  * `AWS_SECRET_ACCESS_KEY`
 
 ## API
 

docker-compose.yml

@@ -1,12 +1,15 @@
-dev:
-  image: starefossen/node-imagemagick:4-6
-  working_dir: /usr/src/app
-  volumes:
-    - ".:/usr/src/app"
-  command: "npm run watch"
-  env_file: .env
-  environment:
-    - NODE_ENV=development
-    - NPM_CONFIG_LOGLEVEL=info
-    - NPM_PACKAGE_CONFIG_UNSAFE_PERM=true
-    - NPM_CONFIG_UNSAFE_PERM=true
+version: '2'
+
+services:
+  node:
+    image: starefossen/node-imagemagick:4-6
+    working_dir: /usr/src/app
+    volumes:
+      - ".:/usr/src/app"
+    env_file: .env
+    environment:
+      - NODE_ENV=development
+      - NPM_CONFIG_LOGLEVEL=silent
+      - NPM_CONFIG_PROGRESS=false
+      - NPM_CONFIG_SPIN=false
+    command: npm test