simple-s3 1.0.17 → 1.0.18

data/lib/simple-s3/simple-s3.rb

@@ -29,6 +29,10 @@ class SimpleS3
     self.config['s3_bucket_endpoint']
   end
 
+  def self.s3_server
+    self.config['s3_server']
+  end
+
   def self.cloudfront_distribution_id
     self.config['cloudfront_distribution_id']
   end
@@ -69,20 +73,26 @@ class SimpleS3
     metadata    = config['metadata'] || {}
     metadata[:access] ||= 'public-read'
 
-    endpoint = self.s3_bucket_endpoint.to_s
-    if endpoint.length > 0
-      puts "Simple-S3: Changing the bucket endpoint to: '#{endpoint}'"
-      AWS::S3::DEFAULT_HOST.replace(endpoint)
-    end
-
     files = self.get_files(config)
 
     raise 'Simple-S3: No files found' if files.length == 0
 
-    AWS::S3::Base.establish_connection!(
+    s3_options = {
       :access_key_id     => self.s3_access_key,
       :secret_access_key => self.s3_secret_key
-    )
+    }
+
+    endpoint = self.s3_bucket_endpoint.to_s
+    if endpoint.length > 0
+      puts "Simple-S3: Changing the bucket endpoint to: '#{endpoint}'"
+      s3_options[:server] = endpoint
+    end
+
+    begin
+      AWS::S3::Base.establish_connection!(s3_options)
+    rescue Exception => e
+      raise 'Simple-S3: Unable to establish connection to AWS (this may because of an invalid bucket name)'
+    end
 
     files.each do |file|
       path = File.expand_path(file)

data/lib/simple-s3/version.rb

@@ -1,3 +1,3 @@
 class SimpleS3
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

data/make_gem.sh

@@ -0,0 +1,4 @@
+rm ./*.gem
+gem build simple-s3.gemspec
+mv ./simple-s3*.gem ./simple-s3.gem
+gem push simple-s3.gem

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 17
-  version: 1.0.17
+  - 18
+  version: 1.0.18
 platform: ruby
 authors: 
 - Matias Niemela
@@ -45,6 +45,7 @@ files:
 - lib/simple-s3.rb
 - lib/simple-s3/simple-s3.rb
 - lib/simple-s3/version.rb
+- make_gem.sh
 - simple-s3.gemspec
 has_rdoc: true
 homepage: https://github.com/yearofmoo/simple-s3