gooddata_s3 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3008837b2c97e8eef0f74a6df411dcdacf1f7d52
-  data.tar.gz: c42602c488fdb20c853e8f9c316085339ff133de
+  metadata.gz: bf21433f8b5c3aa67545ac281ed48d0718c81cf2
+  data.tar.gz: e003a0fe9b34af3e586fe4efd26eb80654a873bb
 SHA512:
-  metadata.gz: a2dcfb85141f8ef2199f03e73ee3a0246d408f0f605f5d976a1f80e8ff2fc178552104b72708f435cddb13f120bc38377c288bca9a278abc6a677d0c42ab55f8
-  data.tar.gz: 698505440bc89495c108fbb1b62a4b1136f496e4c44945776c6c7ae6bedc0aa6774e08cb9e039ffdd87fcbbaa5968fb477b54f4c80dcd583adf55c43b21bfa33
+  metadata.gz: 61ccf70b048d8d9dfd963ea7cb7eaa60d714e18c383dd5839281a63b398fb01a391230c5f1e5a88814f778648bd033443c6329b131ce56ef00ea7ab81026335c
+  data.tar.gz: 0bc85e02ba1bfe189ab0e7b9c9c230d400904dee38e323f67c924d5da74b9d7f584d0c9bca93eefa79c1b11647598f5771c4325405384fb1132e7b5b81d2b013

data/lib/gooddata_s3/client.rb

@@ -26,15 +26,34 @@ class GoodDataS3::Client
 
     @s3 = AWS::S3::Client.new(region: 'us-east-1')
 
-    bucket_exists = @s3.list_buckets.include? @bucket_name
+    begin
+
+      bucket_exists = @s3.list_buckets.include? @bucket_name
+
+      if bucket_exists == false
+        bucket = @s3.create_bucket(:bucket_name => @bucket_name)
+      else
+        bucket = bucket_exists
+      end
+
+    rescue Exception => exp
+      puts "#{Time.now} => Attempted to list all buckets, recieved: #{exp}"
+      puts "#{Time.now} => Failed to access all buckets and/or create bucket, ensuring minimal write acccess to \"#{@bucket_name}\""
+
+      # Create and upload test file.
+      test_access_file = SecureRandom.hex
+      puts "#{Time.now} Creating test file \"#{test_access_file}\""
+      file = File.open(test_access_file, 'w+')
+      file.puts 'test'
+      self.upload(test_access_file)
+
+      # Remove test file from remote and local
+      self.delete(test_access_file)
+      file = File.delete(test_access_file) if File.exists?(test_access_file)
 
-    if bucket_exists == false
-      bucket = @s3.create_bucket(:bucket_name => @bucket_name)
-    else
-      bucket = bucket_exists
     end
 
-    puts "#{Time.now} => Connected to S3 Bucket: \"#{@bucket_name}\""
+    puts "#{Time.now} => Sucessfully authenticated read/write to S3 Bucket: \"#{@bucket_name}\""
     unless @directories.empty?
       puts "#{Time.now} => Assigned default directory location: \"#{@directories.join('/')}\""
     end
@@ -213,7 +232,7 @@ class GoodDataS3::Client
 
   alias :include? :exists?
 
-  def delete file_path
+  def delete file_path, config = {}
 
     begin
 
@@ -236,6 +255,8 @@ class GoodDataS3::Client
 
       end
 
+      key = "/#{key}" unless key[0] == '/'
+
       puts "#{Time.now} => Deleting from S3 Bucket (#{@bucket_name}): \"#{key}\""
       @s3.delete_object(bucket_name: @bucket_name, key: key)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata_s3
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Patrick McConlogue