lib/backup_jenkins/aws.rb in backup_jenkins-0.0.3 vs lib/backup_jenkins/aws.rb in backup_jenkins-0.0.4

@@ -15,11 +15,10 @@
 
     def backup_files
       s3_files.with_prefix(config.base_file_name)
     end
 
-    # TODO change this to use a time decay algorithm
     def remove_old_files
       puts "Looking for old files..." if config.verbose
       populate_files
       do_remove_old_files
       puts "Done." if config.verbose
@@ -30,10 +29,11 @@
         puts "Removing #{file.key}..." if config.verbose
         file.delete
       end
     end
 
+    # TODO change this to use a time decay algorithm
     def files_to_remove
       files - files.last(config.backup["backups_to_keep"])
     end
 
     def upload_file(filename, file)
@@ -46,16 +46,20 @@
     private
 
     attr_reader :config, :bucket, :files
 
     def setup_aws
-      s3 = ::AWS::S3.new(
-        access_key_id: config.aws["access_key"],
-        secret_access_key: config.aws["secret"]
-      )
+      s3 = initialize_s3_object
       @bucket = s3.buckets[config.aws["bucket_name"]]
       @bucket = s3.buckets.create(config.aws["bucket_name"]) unless @bucket.exists?
       raise "Couldn't create bucket!" unless @bucket.exists?
+    end
+
+    def initialize_s3_object
+      ::AWS::S3.new(
+        :access_key_id => config.aws["access_key"],
+        :secret_access_key => config.aws["secret"]
+      )
     end
 
     def s3_files
       bucket.objects
     end