bucket_list 0.2.0 → 0.3.0

data/bin/bucket_list

@@ -98,11 +98,11 @@ if options[:upload]
     if file.class.eql?(Array)
       file.each do |f|
         puts "[INFO] Uploading '#{f}' to the '#{bucket_name}' bucket"
-        bucket_list.upload_file_to_bucket(bucket_name, f)
+        bucket_list.upload(bucket_name, f)
       end
     else
       puts "[INFO] Uploading '#{file}' to the '#{bucket_name}' bucket"
-      bucket_list.upload_file_to_bucket(bucket_name, file)
+      bucket_list.upload(bucket_name, file)
     end
   end
 end

data/config/config.yml

@@ -1,3 +1,3 @@
 # bucket_list config file
 
-version: 0.2.0
+version: 0.3.0

data/lib/bucket_list/app.rb

@@ -1,9 +1,11 @@
 require 'aws-sdk'
 require 'erb'
 require 'yaml'
+require 'aws_helper'
 
 class BucketList
   attr_accessor :s3, :settings
+  include AwsHelper
 
   def initialize
     if keys_available?
@@ -40,7 +42,7 @@ class BucketList
 
   def bucket_contains_object?(bucket_name, object_name)
     bucket_contents = Array.new
-    bucket = s3.buckets[bucket_name]
+    bucket = @s3.buckets[bucket_name]
     bucket.objects['key']
     bucket.objects.each do |obj|
       bucket_contents << obj.key
@@ -49,12 +51,9 @@ class BucketList
   end
 
   def create_bucket(bucket_name)
-    if !bucket_exists?(bucket_name, false)
+    make_request {
       @s3.buckets.create(bucket_name)
-      puts "[INFO] Bucket created"
-    else
-      puts "[ERROR] Sorry, a bucket named '#{bucket_name}' already exists"
-    end
+    }
   end
 
   def keys_available?
@@ -64,34 +63,17 @@ class BucketList
   end
 
   def delete_bucket(bucket_name)
-    bucket = s3.buckets[bucket_name]
-    bucket_deleted = false
-    timeout = false
-    attempts = 0
-    max_attempts = 10
-    until bucket_deleted || (attempts >= max_attempts)
-      begin
-        bucket.delete!
-        bucket_deleted = true
-        puts "[INFO] The bucket '#{bucket_name}' has been deleted"
-      rescue AWS::S3::Errors::NoSuchBucket => error
-        puts "[ERROR] #{error}"
-        puts "[INFO] Trying again... (#{attempts.to_i + 1}/#{max_attempts} remaining)"
-        attempts = attempts + 1
-        sleep 1
-        next
-      rescue AWS::S3::Errors::AccessDenied => error
-        puts "[ERROR] #{error}"
-        exit 1
-      end
-    end
+    bucket = @s3.buckets[bucket_name]
+    make_request {
+      bucket.delete!
+    }
   end
 
   def get_bucket_contents(bucket_name)
   	bucket_contents = Array.new
     if bucket_exists?(bucket_name)
     	if get_number_of_bucket_contents(bucket_name) > 0
-    	  bucket = s3.buckets[bucket_name]
+    	  bucket = @s3.buckets[bucket_name]
         bucket.objects['key']
         bucket.objects.each do |obj|
           bucket_contents << obj.key
@@ -112,7 +94,7 @@ class BucketList
 
   def get_number_of_bucket_contents(bucket_name)
     if bucket_exists?(bucket_name)
-    	bucket = s3.buckets[bucket_name]
+    	bucket = @s3.buckets[bucket_name]
       bucket.objects.count
     else
       puts "[ERROR] Sorry, a bucket named '#{bucket_name}' does not exist"
@@ -127,22 +109,35 @@ class BucketList
     my_buckets
   end
 
-  def upload_file_to_bucket(bucket_name, file)
-    if bucket_exists?(bucket_name)
-    	bucket = s3.buckets[bucket_name]
-
-    	basename = File.basename(file)
-    	o = bucket.objects[basename]
-    	o.write(:file => file)
+  def upload(bucket_name, file)
+    bucket = @s3.buckets[bucket_name]
 
-      until bucket_contains_object?(bucket_name, basename) do
-        sleep 1
+    if File.directory?(file)
+      Dir["#{file}/*"].each do |file|
+        if !File.directory?(file) # No support for sub dirs (yet)
+          puts file
+          upload_file(bucket, file)
+        end
       end
-    	puts "[INFO] Uploaded '#{file}' to the '#{bucket_name}' bucket"
-    	puts "[INFO] Access file at '#{o.url_for(:read)}'"
     else
-    	puts "[ERROR] Sorry, a bucket named '#{bucket_name}' does not exist"
+      upload_file(bucket, file)
     end
   end
 
+  def upload_file(bucket, file)
+    basename = File.basename(file)
+    o = bucket.objects[basename]
+
+    make_request {
+      o.write(:file => file, :content_type => 'text/plain')
+
+      until bucket_contains_object?(bucket.name, basename) do
+        sleep 1
+      end
+    }
+    
+    puts "[INFO] Uploaded '#{file}' to the '#{bucket.name}' bucket"
+    puts "[INFO] Access file at '#{o.url_for(:read)}'"
+  end
+
 end

data/lib/bucket_list/aws_helper.rb

@@ -0,0 +1,34 @@
+module AwsHelper
+  def make_request
+  	done = false
+    attempts = 0
+    max_attempts = 10
+
+    until done || (attempts >= max_attempts)
+      begin
+      	yield
+      	done = true
+      	puts "[INFO] Done"
+      rescue AWS::S3::Errors::NoSuchBucket => error
+      	if attempts == 0
+          puts "[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}"
+        exit 1
+      rescue AWS::S3::Errors::AccessDenied => error
+        puts "[ERROR] #{error}"
+        exit 1
+      end
+    end
+
+    if attempts >= max_attempts
+    	puts "[ERROR] Max number of attempts reached"
+    	exit 1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucket_list
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -69,6 +69,7 @@ extra_rdoc_files: []
 files:
 - lib/bucket_list.rb
 - lib/bucket_list/app.rb
+- lib/bucket_list/aws_helper.rb
 - config/config.yml
 - config/aws_config.yml
 - bin/bucket_list