simple-s3 1.0.18 → 1.0.20

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

@@ -29,10 +29,6 @@ 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
@@ -77,19 +73,20 @@ class SimpleS3
 
     raise 'Simple-S3: No files found' if files.length == 0
 
-    s3_options = {
+    new_endpoint = self.s3_bucket_endpoint.to_s
+    if new_endpoint.length > 0
+      old_endpoint = AWS::S3::DEFAULT_HOST.to_s
+      puts "Simple-S3: Changing the bucket endpoint from '#{old_endpoint}' to '#{new_endpoint}'"
+      AWS::S3::DEFAULT_HOST.replace(new_endpoint)
+    end
+
+    s3_auth_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)
+      AWS::S3::Base.establish_connection!(s3_auth_options)
     rescue Exception => e
       raise 'Simple-S3: Unable to establish connection to AWS (this may because of an invalid bucket name)'
     end

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

@@ -0,0 +1,158 @@
+class SimpleS3
+
+  def self.config
+    if @config.nil?
+      path = './simple-s3.yml'
+      raise "Simple-S3: Config file not found #{path}" unless File.exist?(path)
+      @config = YAML.load_file(path)
+    end
+    @config
+  end
+
+  def self.default_exclude_files
+    ['simple-s3.yml', '.git', '.rvmrc', 'Gemfile', 'Gemfile.lock', '.gitignore', '.gitmodules']
+  end
+
+  def self.s3_access_key
+    self.config['s3_access_key']
+  end
+
+  def self.s3_secret_key
+    self.config['s3_secret_key']
+  end
+
+  def self.s3_bucket
+    self.config['s3_bucket']
+  end
+
+<<<<<<< HEAD
+  def self.s3_bucket_endpoint
+    self.config['s3_bucket_endpoint']
+=======
+  def self.s3_server
+    self.config['s3_server']
+>>>>>>> 1326402ed8d3c30b23ca21c2c20d19337e6a9c8f
+  end
+
+  def self.cloudfront_distribution_id
+    self.config['cloudfront_distribution_id']
+  end
+
+  def self.run!
+    self.upload!
+    self.invalidate!
+  end
+
+  def self.get_files(config)
+    exclude  = config['exclude_files'] || []
+    exclude |= self.default_exclude_files
+    inc      = config['include_files'] || './**/*'
+    inc = [inc] unless inc.is_a?(Array)
+
+    files = []
+    inc.each do |ii|
+      Dir[ii].each do |file|
+        path = File.expand_path(file)
+        next if File.directory?(path)
+
+        name = File.basename(file)
+        found = false
+        exclude.each do |ex|
+          found = true if file.start_with?(ex) || ex == name
+        end
+        files.push(file) unless found
+      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_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!(
+      :access_key_id     => self.s3_access_key,
+      :secret_access_key => self.s3_secret_key,
+      :server =>  self.s3_server
+    )
+
+
+    files.each do |file|
+      path = File.expand_path(file)
+      final_file = file.gsub(/^\.\//, '')
+      puts "Simple-S3: Uploading #{file} as '#{final_file}' to '#{bucket}'"
+      AWS::S3::S3Object.store(
+        final_file,
+        File.open(path),
+        bucket,
+        metadata
+      )
+    end
+
+    puts "Simple-S3: Upload Completed!"
+  end
+
+  def self.invalidate!
+    distribution = self.cloudfront_distribution_id
+    return if distribution.nil?
+
+    aws_account    = self.s3_access_key
+    aws_secret     = self.s3_secret_key
+
+    path = ['/','/*','/**/*']
+
+    date = Time.now.strftime("%a, %d %b %Y %H:%M:%S %Z")
+    digest = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), aws_secret, date)).strip
+    uri = URI.parse("https://cloudfront.amazonaws.com/2012-07-01/distribution/#{distribution}/invalidation")
+
+    path_xml = ''
+    path.each do |p|
+      path_xml += '<Path>'+p+'</Path>'
+    end
+
+    req = Net::HTTP::Post.new(uri.path)
+    req.initialize_http_header({
+      'x-amz-date' => date,
+      'Content-Type' => 'text/xml',
+      'Authorization' => "AWS %s:%s" % [aws_account, digest]
+    })
+
+    xml = '<InvalidationBatch xmlns="http://cloudfront.amazonaws.com/doc/2012-07-01/">' +
+          ' <Paths>' +
+          '  <Quantity>' + path.length.to_s + '</Quantity>' + 
+          '  <Items>' +
+          path_xml + 
+          '  </Items>' +
+          ' </Paths>' +
+          ' <CallerReference>SOMETHING_SPECIAL_' + Time.now.utc.to_i.to_s + '</CallerReference>' +
+          '</InvalidationBatch>'
+    req.body = xml
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    res = http.request(req)
+    
+    # it was successful if response code was a 201
+    if res.code == '201'
+      puts 'Simple-S3: Invalidation Successful'
+    else
+      raise res.body.to_s
+    end
+  end
+
+end

data/lib/simple-s3/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 20
+  version: 1.0.20
 platform: ruby
 authors: 
 - Matias Niemela
@@ -44,6 +44,7 @@ files:
 - bin/simple-s3
 - lib/simple-s3.rb
 - lib/simple-s3/simple-s3.rb
+- lib/simple-s3/simple-s3.rb.orig
 - lib/simple-s3/version.rb
 - make_gem.sh
 - simple-s3.gemspec