awscli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBjNDc0NmJmYzY0NzA5ZWE0M2Q0ODllNmIwMWI5MDY5ZjE3MjM1ZQ==
+    MjlmNjJhN2FmMDg3MTE5ZWEyNmQwZDI1MjQ2MTBkY2Y5MWIxNjQyYQ==
   data.tar.gz: !binary |-
-    NjA1MDA0NjJiYzJhNGM5NmFlMTdlN2ViYTBkYmQ1N2U5MzU0MWRhZQ==
+    NDk3MDBiZmQ5ODZjMzI2Y2NkNGM0ZmFlMTEyYmM2N2U5NjkwMzAxMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWNiZTg4MGMyOWNlZjIxMTY3MjE3MzYzZmU2NzQ0OTczYWZkOGExMjkxMzlj
-    OWU0NzY1MjBmNjhmNWRiZDY3ODI4NjRhYTY0ZjZiZWUxMzVkNmFhMDdlOWJm
-    NWM0MjIxZGEyMzEyY2M2M2I5NmVkZDE0YzcwNTUyYTc4ZmU2OGU=
+    M2ZlYmY2NjI4MGFhNjZjOWYzNDFjMjMxMTJjMGNlMmViMDgyNDEzOTJlYzE4
+    YzI2MmJhNGNjOGI1Yzg0YzFkZTM1ZjI0NjY1MjBkMDRlNGQ5MTdiYmViNjM4
+    NGNhMjZjN2IyMGY4MDg4ZDI3NzJjMGM3NTM5NWM1MzllYTJlOTM=
   data.tar.gz: !binary |-
-    ZTYxYzBjYjM5YzQ4M2UwMWFhMGI0ZTEwNTEyODE1ZmFiNThhMjE2NGU2MmNj
-    YzI4YmViZTliNjYwZjA4MzkwYmJjNjg5NTExMDI1Zjc4ZWUwNjE5YThkNzQ3
-    MDVjZWVjYzkzODVkZTE1OWU0N2QxZWQ2MTc0NTM4YzA0N2E3NDY=
+    NWMxZjRkNDBhNDg4OTUyOTdkYTQ5YTE5MmNhZjg3NWM0NDNmNGE5OWY5YmFi
+    ODEwOWViMDBmM2QxMjc2YjdmMDYxZWI5M2Y0Y2VkMjkxYTU0MGUzOGY5MjU3
+    NzM5MWRkZmFiZDFiNTQ0M2RmYmEwNDE2MThhYWZiM2JkMjA5NDg=

data/lib/awscli.rb

@@ -3,7 +3,7 @@ begin
   require 'thor'
   require 'thor/group'
   require 'fog'
-  require 'highline'
+  require 'highline/import'
   require 'yaml'
 rescue LoadError
   puts "Failed to load gems: fog, highline, thor"

data/lib/awscli/cli/s3/directories.rb

@@ -26,6 +26,13 @@ module AwsCli
           @s3.delete options[:key]
         end
 
+        desc "delete_rec", "Delete the bucket and all its contents"
+        method_option :key, :aliases => "-k", :type => :string, :required => true, :desc => "name of the bucket to delete"
+        def delete_rec
+          create_s3_object
+          @s3.delete_rec options[:key]
+        end
+
         desc "set_acl", "Change access control list for an S3 bucket"
         method_option :key, :aliases => "-k", :type => :string, :required => true, :desc => "name of the bucket to change acl"
         method_option :acl, :aliases => "-a", :type => :string, :required => true, :desc => "Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']"

data/lib/awscli/s3.rb

@@ -1,5 +1,6 @@
 module Awscli
   module S3
+    require 'thread'
 
     class Files
       def initialize connection, options = {}
@@ -78,10 +79,74 @@ module Awscli
       def delete dir_name
         dir = @@conn.directories.get(dir_name)
         abort "Cannot find bucket #{dir_name}" unless dir
+        #check if the dir is empty or not
+        abort "Bucket is not empty, use rec_delete to force delete bucket" if dir.files.length != 0
         dir.destroy
         puts "Deleted Bucket: #{dir_name}"
       end
 
+      def delete_rec dir_name
+        #Forked from https://gist.github.com/bdunagan/1383301
+        data_queue = Queue.new
+        semaphore = Mutex.new
+        threads = Array.new
+        total_listed = 0
+        total_deleted = 0
+        thread_count = 20 #num_of_threads to perform deletion
+        dir = @@conn.directories.get(dir_name)
+        abort "Cannot find bucket #{dir_name}" unless dir
+        if dir.files.length != 0
+          if agree("Are you sure want to delete all the objects in the bucket ?  ", true)
+            puts
+            puts "==Deleting all the files in '#{dir_name}'=="
+            #fetch files in the bucket
+            threads << Thread.new do
+              Thread.current[:name] = "get files"
+              puts "...started thread '#{Thread.current[:name]}'...\n"
+              # Get all the files from this bucket. Fog handles pagination internally
+              dir.files.all.each do |file|
+                data_queue.enq(file) #add the file into the queue
+                total_listed += 1
+              end
+              # Add a final EOF message to signal the deletion threads to stop.
+              thread_count.times {data_queue.enq(:EOF)}
+            end
+            # Delete all the files in the queue until EOF with N threads.
+            thread_count.times do |count|
+              threads << Thread.new(count) do |number|
+                Thread.current[:name] = "delete files(#{number})"
+                puts "...started thread '#{Thread.current[:name]}'...\n"
+                # Dequeue until EOF.
+                file = nil
+                while file != :EOF
+                  # Dequeue the latest file and delete it. (Will block until it gets a new file.)
+                  file = data_queue.deq
+                  file.destroy if file != :EOF
+                  # Increment the global synchronized counter.
+                  semaphore.synchronize {total_deleted += 1}
+                  puts "Deleted #{total_deleted} out of #{total_listed}\n" if (rand(100) == 1)
+                end
+              end
+            end
+            # Wait for the threads to finish.
+            threads.each do |t|
+              begin
+                t.join
+              rescue RuntimeError => e
+                puts "Failure on thread #{t[:name]}: #{e.message}"
+              end
+            end
+            #finally delete the bucket it self
+            dir.destroy
+            puts "Deleted bucket: #{dir_name} and all its contents"
+          end
+        else
+          #empty bucket
+          dir.destroy
+          puts "Deleted bucket: #{dir_name}"
+        end
+      end
+
       def get_acl dir_name
         dir = @@conn.directories.get(dir_name)
         abort "Cannot find bucket #{dir_name}" unless dir

data/lib/awscli/version.rb

@@ -1,3 +1,3 @@
 module Awscli
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awscli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ashrith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake