cf-s3-invalidator 0.3.8 → 0.3.9

data/bin/cf-s3-inv

@@ -9,8 +9,8 @@ unless Kernel.respond_to?(:require_relative)
 end
 require 'optparse'
 require 'yaml'
-require_relative '../lib/cloudfront_client'
-require_relative '../lib/s3_loader'
+require 'aws-sdk'
+require_relative '../lib/cf-s3-invalidator'
 
 class UI
   def initialize
@@ -152,8 +152,12 @@ module CloudfrontS3Invalidator
     end
 
     def invalidate_cf_dist
-      s3_object_keys = S3Loader.new(
-        @options[:key], @options[:secret]).list_keys(@s3_bucket_name)
+      s3 = AWS::S3.new(
+        :access_key_id => @options[:key],
+        :secret_access_key => @options[:secret])
+      s3_object_keys = s3.buckets[@s3_bucket_name].objects.map { |object|
+        object.key
+      }
       @cf.invalidate(s3_object_keys)
     end
   end

data/cf-s3-invalidator.gemspec

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

data/lib/cf-s3-invalidator.rb

@@ -1,2 +1,91 @@
-require 's3_loader'
-require 'cloudfront_client'
+require 'rubygems'
+require 'openssl'
+require 'digest/sha1'
+require 'net/https'
+require 'base64'
+require 'colored'
+
+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 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
+
+    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
+      end
+    end
+
+    def print_invalidation_result(http_response, items)
+      puts "Invalidating Cloudfront items..."
+      items.each do |item|
+        puts "  #{item}".yellow
+      end
+      puts "succeeded".green
+    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>" }
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cf-s3-invalidator
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Lauri Lehmijoki
@@ -115,8 +115,6 @@ files:
 - 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
 licenses: 
 - MIT

data/lib/cloudfront_client.rb

@@ -1,91 +0,0 @@
-require 'rubygems'
-require 'openssl'
-require 'digest/sha1'
-require 'net/https'
-require 'base64'
-require 'colored'
-
-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 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
-
-    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
-      end
-    end
-
-    def print_invalidation_result(http_response, items)
-      puts "Invalidating Cloudfront items..."
-      items.each do |item|
-        puts "  #{item}".yellow
-      end
-      puts "succeeded".green
-    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>" }
-    end
-  end
-end

data/lib/s3_loader.rb

@@ -1,20 +0,0 @@
-require 'rubygems'
-require 'aws-sdk'
-
-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
-      end
-      s3_objects
-    end
-  end
-end