lib/heirloom/artifact/artifact_uploader.rb in heirloom-0.1.0 vs lib/heirloom/artifact/artifact_uploader.rb in heirloom-0.1.1

@@ -7,52 +7,30 @@
       @logger = args[:logger]
     end
 
     def upload(args)
       id = args[:id]
-      name = args[:name]
       file = args[:file]
-      key = "#{id}.tar.gz"
+      key_folder = args[:name]
+      key_name = "#{id}.tar.gz"
+      name = args[:name]
       public_readable = args[:public_readable]
 
       @config.regions.each do |region|
         bucket = "#{@config.bucket_prefix}-#{region}"
 
         s3_uploader = Uploader::S3.new :config => @config,
+                                       :logger => @logger,
                                        :region => region
 
-        s3_uploader.upload_file :file => file,
-                                :bucket => bucket,
-                                :key_name => key,
-                                :key_folder => name,
+        s3_uploader.upload_file :bucket          => bucket,
+                                :file            => file,
+                                :id              => id,
+                                :key_folder      => key_folder,
+                                :key_name        => key_name,
+                                :name            => name,
                                 :public_readable => public_readable
-        sdb.put_attributes name, id, { "#{region}-s3-url" => 
-                                       "s3://#{bucket}/#{name}/#{key}" }
-
-        @logger.info "Uploading s3://#{bucket}/#{name}/#{key}"
-
-        sdb.put_attributes name, id, { "#{region}-http-url" => 
-                                       "http://#{s3_endpoints[region]}/#{bucket}/#{name}/#{key}" }
-        @logger.info "Uploading http://#{s3_endpoints[region]}/#{bucket}/#{name}/#{key}"
-
-        sdb.put_attributes name, id, { "#{region}-https-url" => 
-                                       "https://#{s3_endpoints[region]}/#{bucket}/#{name}/#{key}" }
-        @logger.info "Uploading https://#{s3_endpoints[region]}/#{bucket}/#{name}/#{key}"
       end
-    end
-
-    private
-
-    def s3_endpoints
-      {
-        'us-east-1' => 's3.amazonaws.com',
-        'us-west-1' => 's3-us-west-1.amazonaws.com',
-        'us-west-2' => 's3-us-west-2.amazonaws.com'
-      }
-    end
-
-    def sdb
-      @sdb ||= AWS::SimpleDB.new :config => @config
     end
 
   end
 end