cf-s3-invalidator 0.3.7 → 0.3.8

data/README.md

@@ -1,8 +1,8 @@
 # Invalidator for AWS S3-based Cloudfront distributions
 
 [![Build Status](https://secure.travis-ci.org/laurilehmijoki/cf-s3-invalidator.png)]
-
 (http://travis-ci.org/laurilehmijoki/cf-s3-invalidator)
+
 If your Amazon Web Services Cloudfront distribution is based on AWS S3, then
 this library may be useful to you.
 

data/bin/cf-s3-inv

@@ -89,8 +89,8 @@ class UI
 
     def sample_conf_file
       sample = <<-EOF
-    s3_key: YOUR_AWS_S3_ACCESS_KEY_ID
-    s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+    aws_key: YOUR_AWS_ACCESS_KEY_ID
+    aws_secret: YOUR_AWS_SECRET_ACCESS_KEY
     cloudfront_distribution_id: YOUR_CLOUDFRONT_DISTRIBUTION_ID
       EOF
     end
@@ -132,31 +132,33 @@ class UI
   end
 end
 
-class Orchestrator
-  def initialize
-    @options = UI.new.parse_or_print_help
-    @cf = CloudfrontClient.new(
-      @options[:key], @options[:secret], @options[:distribution])
-  end
+module CloudfrontS3Invalidator
+  class Orchestrator
+    def initialize
+      @options = UI.new.parse_or_print_help
+      @cf = CloudfrontClient.new(
+        @options[:key], @options[:secret], @options[:distribution])
+    end
 
-  def resolve_s3_bucket_name
-    @s3_bucket_name = @cf.get_s3_bucket_name
-    if @s3_bucket_name
-      puts "Resolving S3 bucket name... Got #{@s3_bucket_name.yellow}"
-    else
-      puts
-        "The Cloudfront distribution is not based on an S3 bucket".red
-      exit
+    def resolve_s3_bucket_name
+      @s3_bucket_name = @cf.get_s3_bucket_name
+      if @s3_bucket_name
+        puts "Resolving S3 bucket name... Got #{@s3_bucket_name.yellow}"
+      else
+        puts
+          "The Cloudfront distribution is not based on an S3 bucket".red
+        exit
+      end
     end
-  end
 
-  def invalidate_cf_dist
-    s3_object_keys = S3Loader.new(
-      @options[:key], @options[:secret]).list_keys(@s3_bucket_name)
-    @cf.invalidate(s3_object_keys)
+    def invalidate_cf_dist
+      s3_object_keys = S3Loader.new(
+        @options[:key], @options[:secret]).list_keys(@s3_bucket_name)
+      @cf.invalidate(s3_object_keys)
+    end
   end
 end
 
-orchestrator = Orchestrator.new
+orchestrator = CloudfrontS3Invalidator::Orchestrator.new
 orchestrator.resolve_s3_bucket_name
 orchestrator.invalidate_cf_dist

data/cf-s3-invalidator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'cf-s3-invalidator'
-  s.version       = '0.3.7'
+  s.version       = '0.3.8'
   s.license       = 'MIT'
   s.summary       = 'A tool for invalidating AWS S3-based Cloudfront distributions'
   s.description   =

data/lib/cf-s3-invalidator.rb

@@ -0,0 +1,2 @@
+require 's3_loader'
+require 'cloudfront_client'

data/lib/cloudfront_client.rb

@@ -5,85 +5,87 @@ require 'net/https'
 require 'base64'
 require 'colored'
 
-class CloudfrontClient
-  def initialize(aws_account, aws_secret, distribution)
-    @aws_account = aws_account
-    @aws_secret = aws_secret
-    @distribution = distribution
-  end
+module CloudfrontS3Invalidator
+  class CloudfrontClient
+    def initialize(aws_account, aws_secret, distribution)
+      @aws_account = aws_account
+      @aws_secret = aws_secret
+      @distribution = distribution
+    end
 
-  def invalidate(items)
-    items = to_cf_keys(items)
-    body = %|
-      <InvalidationBatch>
-        <Paths>
-          <Quantity>#{items.length}</Quantity>
-          <Items>
-            #{to_xml items}
-          </Items>
-        </Paths>
-        <CallerReference>#{Time.now.utc.to_i}</CallerReference>
-      </InvalidationBatch>
-    |
-    res = sign_and_call(
-      "https://cloudfront.amazonaws.com/2012-05-05/distribution/#{@distribution}/invalidation",
-      Net::HTTP::Post,
-      body)
-    print_invalidation_result(res, items)
-  end
+    def invalidate(items)
+      items = to_cf_keys(items)
+      body = %|
+        <InvalidationBatch>
+          <Paths>
+            <Quantity>#{items.length}</Quantity>
+            <Items>
+              #{to_xml items}
+            </Items>
+          </Paths>
+          <CallerReference>#{Time.now.utc.to_i}</CallerReference>
+        </InvalidationBatch>
+      |
+      res = sign_and_call(
+        "https://cloudfront.amazonaws.com/2012-05-05/distribution/#{@distribution}/invalidation",
+        Net::HTTP::Post,
+        body)
+      print_invalidation_result(res, items)
+    end
 
-  def get_s3_bucket_name
-    res = sign_and_call(
-      "https://cloudfront.amazonaws.com/2012-05-05/distribution/#{@distribution}",
-      Net::HTTP::Get)
-    matches =
-      res.body.scan(/<DomainName>([\w|\.]+)\.s3\.amazonaws\.com<\/DomainName>/)
-    if matches.empty?
-      nil
-    else
-      s3_bucket_name = matches.first.first
-      s3_bucket_name
+    def get_s3_bucket_name
+      res = sign_and_call(
+        "https://cloudfront.amazonaws.com/2012-05-05/distribution/#{@distribution}",
+        Net::HTTP::Get)
+      matches =
+        res.body.scan(/<DomainName>([\w|\.]+)\.s3\.amazonaws\.com<\/DomainName>/)
+      if matches.empty?
+        nil
+      else
+        s3_bucket_name = matches.first.first
+        s3_bucket_name
+      end
     end
-  end
 
-  private
+    private
 
-  def sign_and_call(url, method, body = nil)
-    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(url)
-    req = method.new(uri.path)
-    req.initialize_http_header({
-      'x-amz-date' => date,
-      'Content-Type' => 'text/xml',
-      'Authorization' => "AWS %s:%s" % [@aws_account, digest]
-    })
-    req.body = body unless body == nil
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    res = http.request(req)
-    if res.code.to_i.between? 200, 299
-      res
-    else
-      raise "AWS API call failed. Reason:".red + "\n" + res.body
+    def sign_and_call(url, method, body = nil)
+      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(url)
+      req = method.new(uri.path)
+      req.initialize_http_header({
+        'x-amz-date' => date,
+        'Content-Type' => 'text/xml',
+        'Authorization' => "AWS %s:%s" % [@aws_account, digest]
+      })
+      req.body = body unless body == nil
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      res = http.request(req)
+      if res.code.to_i.between? 200, 299
+        res
+      else
+        raise "AWS API call failed. Reason:".red + "\n" + res.body
+      end
     end
-  end
 
-  def print_invalidation_result(http_response, items)
-    puts "Invalidating Cloudfront items..."
-    items.each do |item|
-      puts "  #{item}".yellow
+    def print_invalidation_result(http_response, items)
+      puts "Invalidating Cloudfront items..."
+      items.each do |item|
+        puts "  #{item}".yellow
+      end
+      puts "succeeded".green
     end
-    puts "succeeded".green
-  end
 
-  def to_cf_keys(s3_keys)
-    s3_keys.map { |s3_key| "/#{s3_key}" }
-  end
+    def to_cf_keys(s3_keys)
+      s3_keys.map { |s3_key| "/#{s3_key}" }
+    end
 
-  def to_xml(items)
-    items.map { |item| "<Path>#{item}</Path>" }
+    def to_xml(items)
+      items.map { |item| "<Path>#{item}</Path>" }
+    end
   end
 end

data/lib/s3_loader.rb

@@ -1,18 +1,20 @@
 require 'rubygems'
 require 'aws-sdk'
 
-class S3Loader
-  def initialize(key, secret)
-    @s3 = AWS::S3.new(
-      :access_key_id => key,
-      :secret_access_key => secret)
-  end
+module CloudfrontS3Invalidator
+  class S3Loader
+    def initialize(key, secret)
+      @s3 = AWS::S3.new(
+        :access_key_id => key,
+        :secret_access_key => secret)
+    end
 
-  def list_keys(bucket_name)
-    s3_objects = []
-    @s3.buckets[bucket_name].objects.each do |object|
-      s3_objects << object.key
+    def list_keys(bucket_name)
+      s3_objects = []
+      @s3.buckets[bucket_name].objects.each do |object|
+        s3_objects << object.key
+      end
+      s3_objects
     end
-    s3_objects
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cf-s3-invalidator
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Lauri Lehmijoki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-06 00:00:00 Z
+date: 2012-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-sdk
@@ -114,6 +114,7 @@ files:
 - features/cloudfront-s3-invalidator-no-credentials.feature
 - features/configuration-file.feature
 - features/support/env.rb
+- lib/cf-s3-invalidator.rb
 - lib/cloudfront_client.rb
 - lib/s3_loader.rb
 homepage: https://github.com/laurilehmijoki/cf-s3-invalidator