Bump to v0.2.0

+# 0.2.0
+
+Add definition aws_tar_extract to abstract reloading of backups.
+
 # 0.1.0
 # 0.1.0
 
 
 Initial release of backup-file2s3
 Initial release of backup-file2s3

@@ -2,6 +2,8 @@
 
 
 Installs a script that backs up one or more directories into an S3 bucket. Also sets up the cronjob to regularly run said script.
 Installs a script that backs up one or more directories into an S3 bucket. Also sets up the cronjob to regularly run said script.
 
 
+There is also a definition `aws_tar_extract` to recover those backup files and unpack them.
+
 ## Supported Platforms
 ## Supported Platforms
 
 
 Ubuntu 14.04
 Ubuntu 14.04
@@ -61,6 +63,19 @@ Include `backup-file2s3` in your node's `run_list`:
 }
 }
 ```
 ```
 
 
+### aws_tar_extract
+
+The following example will get `mydir.tar.gz` from the provided S3 region and bucket and unpack it into the `/opt/src`.
+
+```ruby
+aws_tar_extract 'mydir' do
+  region     'us-east-1'
+  bucket     'my-bucket'
+  target_dir '/opt/src'
+  creates    '/ops/src/mydir/index.html'
+end
+```
+
 ## License and Authors
 ## License and Authors
 
 
 Author:: Earth U. (<sysadmin@chromedia.com>)
 Author:: Earth U. (<sysadmin@chromedia.com>)

+#
+# Author:: Earth U (<sysadmin@chromedia.com>)
+# Cookbook Name:: backup-file2s3
+# Definition :: aws_tar_extract
+#
+# Copyright 2016, Chromedia Far East, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Gets a tarball from AWS S3, then unpack it into a directory.
+# Parameters (all mandatory):
+#   :name | :file => The name of the backup tarball, without the extension
+#   :region       => AWS region
+#   :bucket       => AWS bucket
+#   :target_dir   => Where the tarball is to be unpacked. If not
+#                    exists, it will be created
+#   :creates      => A file path used for idempotency
+
+define :aws_tar_extract,
+       :file       => nil, # default is params[:name]
+       :region     => 'us-east-1',
+       :bucket     => nil,
+       :target_dir => nil,
+       :creates    => nil do
+  file = params[:file] || params[:name]
+
+  tmp_dir = ::File.join(Chef::Config[:file_cache_path], 'backups')
+  filetgz = "#{tmp_dir}/#{file}.tar.gz"
+
+  include_recipe 'awscli'
+  include_recipe 'tar'
+
+  [ tmp_dir, params[:target_dir] ].each do |ndir|
+    directory ndir do
+      recursive true
+    end
+  end
+
+  unless ::File.exist?(params[:creates])
+    awscli_s3_file filetgz do
+      region  params[:region]
+      bucket  params[:bucket]
+      key     "#{file}.tar.gz"
+    end
+
+    tar_extract filetgz do
+      action     :extract_local
+      target_dir params[:target_dir]
+      creates    params[:creates]
+    end
+  end
+end

@@ -4,9 +4,10 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 license          'Apache License'
 description      'Creates a script to backup directories into an S3 bucket.'
 description      'Creates a script to backup directories into an S3 bucket.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.0'
+version          '0.2.0'
 
 
 depends 'awscli', '~> 1.0.1'
 depends 'awscli', '~> 1.0.1'
 depends 'cron', '~> 1.7.4'
 depends 'cron', '~> 1.7.4'
+depends 'tar', '~> 0.7.0'
 
 
 supports 'ubuntu', '>= 14.04'
 supports 'ubuntu', '>= 14.04'

@@ -6,6 +6,10 @@
 
 
 set -e
 set -e
 
 
+suffix=.backup_file_to_s3
+[ -f /tmp/*"$suffix" ] && exit 200
+tmp_file=$( mktemp --suffix "$suffix" )
+
 log_dir=<%= @log_dir %>
 log_dir=<%= @log_dir %>
 if [[ ! -d "$log_dir" ]] ; then
 if [[ ! -d "$log_dir" ]] ; then
     mkdir -p "$log_dir"
     mkdir -p "$log_dir"
@@ -98,8 +102,9 @@ for dirx in "${tar_dirs[@]}" ; do
         tar_dir "$dirx"
         tar_dir "$dirx"
         upload_to_s3 "$dirx"
         upload_to_s3 "$dirx"
     else
     else
-        echo "$(date) : WARNING : Directory ${dirx} does not exist"
+        echo "$(date) : WARNING : Directory ${dirx} does not exist. Skipping."
     fi
     fi
 done
 done
 
 
+rm "$tmp_file"
 echo "$(date) : Done"
 echo "$(date) : Done"