cf-s3-invalidator 0.3.9 → 0.4.0

data/bin/cf-s3-inv

@@ -10,6 +10,8 @@ end
 require 'optparse'
 require 'yaml'
 require 'aws-sdk'
+require 'simple-cloudfront-invalidator'
+require 'colored'
 require_relative '../lib/cf-s3-invalidator'
 
 class UI
@@ -136,12 +138,12 @@ 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
+      cf = CloudfrontS3Invalidator::CloudfrontClient.new(
+        @options[:key], @options[:secret], @options[:distribution])
+      @s3_bucket_name = cf.get_s3_bucket_name
       if @s3_bucket_name
         puts "Resolving S3 bucket name... Got #{@s3_bucket_name.yellow}"
       else
@@ -158,7 +160,9 @@ module CloudfrontS3Invalidator
       s3_object_keys = s3.buckets[@s3_bucket_name].objects.map { |object|
         object.key
       }
-      @cf.invalidate(s3_object_keys)
+      simple_cf = SimpleCloudfrontInvalidator::CloudfrontClient.new(
+        @options[:key], @options[:secret], @options[:distribution])
+      puts simple_cf.invalidate(s3_object_keys)
     end
   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.9'
+  s.version       = '0.4.0'
   s.license       = 'MIT'
   s.summary       = 'A tool for invalidating AWS S3-based Cloudfront distributions'
   s.description   =
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/laurilehmijoki/cf-s3-invalidator'
 
   s.add_dependency 'aws-sdk'
+  s.add_dependency 'simple-cloudfront-invalidator'
   s.add_dependency 'colored', '= 1.2'
 
   s.add_development_dependency 'cucumber'

data/lib/cf-s3-invalidator.rb

@@ -13,26 +13,6 @@ module CloudfrontS3Invalidator
       @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}",
@@ -71,21 +51,5 @@ module CloudfrontS3Invalidator
         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: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Lauri Lehmijoki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-08 00:00:00 Z
+date: 2012-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-sdk
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: colored
+  name: simple-cloudfront-invalidator
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: colored
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -45,11 +59,11 @@ dependencies:
         - 2
         version: "1.2"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,11 +73,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,11 +87,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,7 +103,7 @@ dependencies:
         - 7
         version: 0.4.7
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: |-
   This lib fetches the names of all objects on an Amazon Web
       Services S3 bucket. Then it calls the Cloudfront invalidation REST API on the