simple-s3 1.0.13 → 1.0.16

data/.gitignore

@@ -1 +1,2 @@
 .DS_Store
+*.gem

data/README.md

@@ -4,7 +4,14 @@ A super simple uploader for S3 using Ruby.
 
 ## Installation
 
-Install as a gem using `gem install simple-s3`.
+Install as a gem using `gem install simple-s3` or place a `Gemfile` within your website directory with the following info:
+
+```gemfile
+source :rubygems
+gem "simple-s3"
+``` 
+
+Then run `bundle install` or `rvmsudo bundle install` if you're using **RVM**.
 
 ## Usage
 

data/lib/simple-s3.rb

@@ -5,6 +5,7 @@ require 'digest/md5'
 require 'digest/sha1'
 require 'net/https'
 require 'base64'
+puts "doing it"
 
 %w{simple-s3 version}.each do |file|
   require File.dirname(__FILE__) + "/simple-s3/#{file}"

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

@@ -25,6 +25,10 @@ class SimpleS3
     self.config['s3_bucket']
   end
 
+  def self.s3_endpoint
+    self.config['s3_endpoint']
+  end
+
   def self.cloudfront_distribution_id
     self.config['cloudfront_distribution_id']
   end
@@ -34,16 +38,10 @@ class SimpleS3
     self.invalidate!
   end
 
-  def self.upload!
-    bucket      = self.s3_bucket
-    raise 'Simple-S3: Bucket not defined' if bucket.length == 0
-
-    exclude     = config['exclude_files'] || []
+  def self.get_files(config)
+    exclude  = config['exclude_files'] || []
     exclude |= self.default_exclude_files
-    inc         = config['include_files'] || './**/*'
-    metadata    = config['metadata'] || {}
-    metadata[:access] ||= 'public-read'
-
+    inc      = config['include_files'] || './**/*'
     inc = [inc] unless inc.is_a?(Array)
 
     files = []
@@ -61,6 +59,23 @@ class SimpleS3
       end
     end
 
+    files
+  end
+
+  def self.upload!
+    bucket      = self.s3_bucket
+    raise 'Simple-S3: Bucket not defined' if bucket.length == 0
+
+    metadata    = config['metadata'] || {}
+    metadata[:access] ||= 'public-read'
+
+    endpoint = self.s3_endpoint.to_s
+    if endpoint.length > 0
+      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!(

data/lib/simple-s3/version.rb

@@ -1,3 +1,3 @@
 class SimpleS3
-  VERSION = "1.0.13"
+  VERSION = "1.0.16"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 16
+  version: 1.0.16
 platform: ruby
 authors: 
 - Matias Niemela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-29 00:00:00 -04:00
+date: 2012-12-30 00:00:00 -05:00
 default_executable: simple-s3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ files:
 - lib/simple-s3.rb
 - lib/simple-s3/simple-s3.rb
 - lib/simple-s3/version.rb
-- simple-s3.gem
 - simple-s3.gemspec
 has_rdoc: true
 homepage: https://github.com/yearofmoo/simple-s3