bucket_list 0.3.1 → 0.4.0

data/bin/bucket_list

@@ -3,7 +3,6 @@
 begin 
   require 'bucket_list'
 rescue LoadError
-  # Cucumber seems to need this
   $:.unshift "#{File.dirname(__FILE__)}/../lib/"
   $:.unshift "#{File.dirname(__FILE__)}/../lib/bucket_list/"
   require 'bucket_list'
@@ -40,6 +39,10 @@ option_parser = OptionParser.new do |opts|
     options[:upload] = hash
   end
 
+  opts.on('-t', '--download BUCKET_NAME:FILE', Hash, 'Download FILE from BUCKET_NAME') do |hash| 
+    options[:download] = hash
+  end
+
   opts.on("-o ", "--objects BUCKET_NAME", "Show contents of BUCKET_NAME") do |bucket_name|
     options[:show_contents] = bucket_name.to_s
   end
@@ -107,6 +110,13 @@ if options[:upload]
   end
 end
 
+if options[:download]
+  options[:download].each_pair do |bucket_name, file|
+      puts "[INFO] Downloading '#{file}' from the '#{bucket_name}' bucket"
+      bucket_list.download(bucket_name, file)    
+  end
+end
+
 if options[:version]
   puts "[INFO] bucket_list version: #{bucket_list.settings['version']}"
 end

data/config/config.yml

@@ -1,3 +1,3 @@
 # bucket_list config file
 
-version: 0.3.1
+version: 0.4.0

data/lib/bucket_list/app.rb

@@ -69,6 +69,22 @@ class BucketList
     }
   end
 
+  def download(bucket_name, file, local_path="./")
+    bucket = @s3.buckets[bucket_name]
+
+    if bucket_contains_object?(bucket_name, file)
+      File.open("#{local_path}#{file}", 'w') do |f|
+        make_request {
+          bucket.objects[file].read do |chunk|
+            f.write(chunk)
+          end
+        }
+      end
+    else
+      puts "[ERROR] Sorry, a file named '#{file}' does not exist"
+    end
+  end
+
   def get_bucket_contents(bucket_name)
   	bucket_contents = Array.new
     if bucket_exists?(bucket_name)

data/lib/bucket_list/aws_helper.rb

@@ -1,4 +1,9 @@
 module AwsHelper
+
+  def log(level="INFO", message)
+    puts "[#{level}] #{message}"
+  end
+
   def make_request
   	done = false
     attempts = 0
@@ -8,26 +13,28 @@ module AwsHelper
       begin
       	yield
       	done = true
-      	puts "[INFO] Done"
+      	log("Done")
       rescue AWS::S3::Errors::NoSuchBucket => error
       	if attempts == 0
-          puts "[ERROR] #{error}"
+          log("ERROR", "#{error}")
         end
         puts "[INFO] Trying again... (#{attempts.to_i + 1}/#{max_attempts})"
         attempts = attempts + 1
         sleep 1
         next
       rescue AWS::S3::Errors::BucketAlreadyExists => error
-        puts "[ERROR] #{error}"
+        log("ERROR", "#{error}")
         exit 1
       rescue AWS::S3::Errors::AccessDenied => error
-        puts "[ERROR] #{error}"
+        log("ERROR", "#{error}")
         exit 1
+      rescue => msg 
+        log("ERROR", msg)
       end
     end
 
     if attempts >= max_attempts
-    	puts "[ERROR] Max number of attempts reached"
+    	log("ERROR", "Max no. of attempts reached")
     	exit 1
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucket_list
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.11
 description: bucket_list is a simple command line tool that can be used to manage
-  and upload files to AWS S3 buckets.
+  and transfer files to/from AWS S3 buckets.
 email: ed@victavision.co.uk
 executables:
 - bucket_list
@@ -73,7 +73,7 @@ files:
 - config/config.yml
 - config/aws_config.yml
 - bin/bucket_list
-homepage: http://ed.victavision.co.uk/blog/post/27-8-2012-bucket-list
+homepage: http://ted.victavision.co.uk/article/3
 licenses: []
 post_install_message: 
 rdoc_options: []