Refines input yml and adds validation build.

Author: rioki

README.md

@@ -1,28 +1,30 @@
 # s3put
 
-Upload a file to a s3 bucket. 
+[Wercker] step to upload a file to [Amazon S3]. 
 
 You can use application and deployment variables in wercker.
 
-View this step in the [wercker directory](#TODO)
+View this step in the [wercker directory][wd]
 
 Current status on wercker:
 
-TODO
+[![wercker status](https://app.wercker.com/status/576477b5c41a585aa848dbcc6bfe58f9/m "wercker status")](https://app.wercker.com/project/bykey/576477b5c41a585aa848dbcc6bfe58f9)
 
 ## Options
 
 * `key-id` (required) The Amazon Access key that will be used for authorization.
 * `key-secret` (required) The Amazon Access secret that will be used for authorization.
-* `bucket-url` (required) The url of the bucket to sync to, like: `s3://born2code.net`
-* `source-file` (required) The local file to upload to s3.
-* `dest-file` (required) The name of the file to upload to.
+* `url` (required) The S3 URL denoting the file's destination.
+* `file` (required) The name of the file to upload to.
 
 ## Example
 
     - s3put:
         key-id:     $KEY
         key-secret: $SECRET
-        bucket-url: $BUCKET
-        source-file: myproject-0.1.0.tar.gz
-        dest-file:   myproject-latest.tar.gz
+        file:       myproject-0.1.0.tar.gz
+        url:        s3://mybucket/myproject-latest.tar.gz
+        
+[Wercker]: http://wercker.com
+[Amazon S3]: http://aws.amazon.com/s3
+[wd]: https://app.wercker.com/#applications/5290b7c2f0bb53d73e00a03c/tab/details

run.sh

@@ -11,20 +11,16 @@ then
     fail 'missing or empty option key_secret, please check wercker.yml'
 fi
 
-if [ ! -n "$WERCKER_S3PUT_BUCKET_URL" ]
+if [ ! -n "$WERCKER_S3PUT_URL" ]
 then
     fail 'missing or empty option bucket_url, please check wercker.yml'
 fi
 
-if [ ! -n "$WERCKER_S3PUT_SOURCE_FILE" ]
+if [ ! -n "$WERCKER_S3PUT_FILE" ]
 then
     fail 'missing or empty option source_file, please check wercker.yml'
 fi
 
-if [ ! -n "$WERCKER_S3PUT_DEST_FILE" ]
-then
-    fail 'missing or empty option dest_file, please check wercker.yml'
-fi
 
 if ! type s3cmd &> /dev/null ;
 then
@@ -48,16 +44,13 @@ echo "access_key=$WERCKER_S3PUT_KEY_ID" >> .s3cfg
 echo "secret_key=$WERCKER_S3PUT_KEY_SECRET" >> .s3cfg
 debug "generated .s3cfg for key $WERCKER_S3PUT_KEY_ID"
 
-source_file="$WERCKER_ROOT/$WERCKER_S3PUT_SOURCE_FILE"
-dest_file="$WERCKER_S3PUT_BUCKET_URL/$WERCKER_S3PUT_DEST_FILE"
-
 info 'starting s3 upload'
 
 # TODO make public an option
 
 set +e
-debug "s3cmd put --acl-public --verbose '$source_file' '$dest_file'"
-sync_output=$(s3cmd sync --acl-public --verbose "$source_file" "$dest_file")
+debug "s3cmd put --acl-public --verbose '$WERCKER_S3PUT_FILE' '$WERCKER_S3PUT_URL'"
+sync_output=$(s3cmd put --acl-public --verbose "$WERCKER_S3PUT_FILE" "$WERCKER_S3PUT_URL")
 
 if [[ $? -ne 0 ]];then
     warning $sync_output

wercker-step.yml

@@ -1,3 +1,3 @@
 name: s3put
-version: 0.0.1
+version: 0.0.2
 description: s3put step

wercker.yml

@@ -0,0 +1,4 @@
+box: default
+build: 
+    steps:
+        - validate-wercker-step