bucket_list 0.1.0 → 0.2.0

data/bin/bucket_list

@@ -13,14 +13,17 @@ require 'optparse'
 options  = {}
 
 option_parser = OptionParser.new do |opts|
-
-  # Allow app to take a comma-separated list of hashes
-  # E.g. bucket:file,bucket:file
   opts.accept(Hash) do |string|
     hash = {}
     string.split(',').each do |pair|
       key,value = pair.split(/:/)
-      hash[key] = value
+      if hash.key?(key)
+        orig_value = hash[key]
+        new_value = [hash[key], value]
+        hash[key] = new_value
+      else
+        hash[key] = value
+      end
     end
     hash
   end
@@ -33,7 +36,7 @@ option_parser = OptionParser.new do |opts|
     options[:delete_bucket] = bucket_name.to_s
   end
 
-  opts.on('-u', '--upload BUCKET_NAME:FILE',Hash, 'Upload FILE to BUCKET_NAME') do |hash| 
+  opts.on('-u', '--upload BUCKET_NAME:FILE', Hash, 'Upload FILE to BUCKET_NAME') do |hash| 
     options[:upload] = hash
   end
 
@@ -56,7 +59,9 @@ end
 
 option_parser.parse!
 
-bucket_list = BucketList.new
+unless options[:help]
+  bucket_list = BucketList.new
+end
 
 if options[:create_bucket]
   puts "[INFO] About to create a new S3 bucket named '#{options[:create_bucket]}'"
@@ -90,8 +95,15 @@ end
 
 if options[:upload]
   options[:upload].each_pair do |bucket_name, file|
-    puts "[INFO] Uploading '#{file}' to the '#{bucket_name}' bucket"
-    bucket_list.upload_file_to_bucket(bucket_name, file)
+    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)
+      end
+    else
+      puts "[INFO] Uploading '#{file}' to the '#{bucket_name}' bucket"
+      bucket_list.upload_file_to_bucket(bucket_name, file)
+    end
   end
 end
 

data/config/config.yml

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

data/lib/bucket_list/app.rb

@@ -21,7 +21,20 @@ class BucketList
     end
   end
 
-  def bucket_exists?(bucket_name)
+  def bucket_exists?(bucket_name, bucket_should_exist=true)
+    timeout = 10
+    polling_interval = 0.5 
+    time_limit = Time.now + timeout
+    
+    while Time.now < time_limit
+      if bucket_should_exist
+        break if @s3.buckets[bucket_name].exists?
+      else
+        break if !@s3.buckets[bucket_name].exists?
+      end
+      sleep polling_interval
+    end
+
     @s3.buckets[bucket_name].exists?
   end
 
@@ -36,9 +49,8 @@ class BucketList
   end
 
   def create_bucket(bucket_name)
-    if !bucket_exists?(bucket_name)
+    if !bucket_exists?(bucket_name, false)
       @s3.buckets.create(bucket_name)
-      wait_for_bucket(bucket_name, true)
       puts "[INFO] Bucket created"
     else
       puts "[ERROR] Sorry, a bucket named '#{bucket_name}' already exists"
@@ -52,13 +64,26 @@ class BucketList
   end
 
   def delete_bucket(bucket_name)
-    if bucket_exists?(bucket_name)
-    	bucket = s3.buckets[bucket_name]
-      bucket.delete!
-      wait_for_bucket(bucket_name, false)
-      puts "[INFO] The bucket '#{bucket_name}' has been deleted"
-    else
-      puts "[ERROR] Sorry, a bucket named '#{bucket_name}' does not exist"
+    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
   end
 
@@ -120,15 +145,4 @@ class BucketList
     end
   end
 
-  def wait_for_bucket(bucket_name, exist_bool)
-    if exist_bool
-      until bucket_exists?(bucket_name) do
-        sleep 1
-      end  
-    else
-      until !bucket_exists?(bucket_name) do
-        sleep 1
-      end  
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucket_list
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -97,4 +97,3 @@ signing_key:
 specification_version: 3
 summary: Command line app for talking to AWS S3
 test_files: []
-has_rdoc: