capistrano-s3-copy 0.0.3 → 0.0.4

data/README.md

@@ -61,14 +61,28 @@ someone running:
 Of course, everyone has tweaks that they make to the standard capistrano recipe. For this reason, the script
 thats executed is generated from an ERB template.
 
+
     #!/bin/sh
 
     # Auto-scaling capistrano like deployment script Rails3 specific.
 
+    set -x
+    set -e
+
     echo "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}"
     echo "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}"
-    AWS_RELEASES_BUCKET=<%= configuration[:aws_releases_bucket] %>
 
+    if [ "${AWS_ACCESS_KEY_ID}" == "" ]; then
+      echo "Expecting the environment variable AWS_ACCESS_KEY_ID to be set"
+      exit 1
+    fi
+    
+    if [ "${AWS_SECRET_ACCESS_KEY}" == "" ]; then
+      echo "Expecting the environment variable AWS_SECRET_ACCESS_KEY to be set"
+      exit 2
+    fi
+
+    AWS_RELEASES_BUCKET=<%= configuration[:aws_releases_bucket] %>
     RAILS_ENV=<%= configuration[:rails_env] %>              # e.g. production
     DEPLOY_TO=<%= configuration[:deploy_to] %>              # e.g. /u/apps/myapp
     RELEASES_PATH=<%= configuration[:releases_path] %>      # e.g. /u/apps/myapp/releases
@@ -98,7 +112,7 @@ thats executed is generated from an ERB template.
     # mkdir -p ${SHARED_PATH}/uploads
 
     # cap deploy:update_code
-    s3cmd get ${AWS_RELEASE_BUCKET}:${S3_PACKAGE_PATH} ${DOWNLOADED_PACKAGE_PATH} 2>&1
+    s3cmd get ${AWS_RELEASES_BUCKET}:${S3_PACKAGE_PATH} ${DOWNLOADED_PACKAGE_PATH} 2>&1
     cd ${RELEASES_PATH} && ${DECOMPRESS_CMD} && rm ${DOWNLOADED_PACKAGE_PATH}
 
     # cap deploy:assets_symlink   (Rails 3.x specific)

data/lib/capistrano-s3-copy/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module S3
     module Copy
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/lib/capistrano/recipes/deploy/strategy/aws_install.sh.erb

@@ -2,8 +2,22 @@
 
 # Auto-scaling capistrano like deployment script Rails3 specific.
 
+set -x
+set -e
+
 echo "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}"
 echo "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}"
+
+if [ "${AWS_ACCESS_KEY_ID}" == "" ]; then
+  echo "Expecting the environment variable AWS_ACCESS_KEY_ID to be set"
+  exit 1
+fi
+
+if [ "${AWS_SECRET_ACCESS_KEY}" == "" ]; then
+  echo "Expecting the environment variable AWS_SECRET_ACCESS_KEY to be set"
+  exit 2
+fi
+
 AWS_RELEASES_BUCKET=<%= configuration[:aws_releases_bucket] %>
 
 RAILS_ENV=<%= configuration[:rails_env] %>              # e.g. production
@@ -35,7 +49,7 @@ chmod -R g+w ${DEPLOY_TO}
 # mkdir -p ${SHARED_PATH}/uploads
 
 # cap deploy:update_code
-s3cmd get ${AWS_RELEASE_BUCKET}:${S3_PACKAGE_PATH} ${DOWNLOADED_PACKAGE_PATH} 2>&1
+s3cmd get ${AWS_RELEASES_BUCKET}:${S3_PACKAGE_PATH} ${DOWNLOADED_PACKAGE_PATH} 2>&1
 cd ${RELEASES_PATH} && ${DECOMPRESS_CMD} && rm ${DOWNLOADED_PACKAGE_PATH}
 
 # cap deploy:assets_symlink   (Rails 3.x specific)

metadata

@@ -2,7 +2,7 @@
 name: capistrano-s3-copy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Richie McMahon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-28 00:00:00 Z
+date: 2012-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano