fog_site 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/fog_site.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fog_site"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian P O'Rourke"]
-  s.date = "2012-01-06"
+  s.date = "2012-05-29"
   s.description = "Simple utility gem for deploying static sites to S3 and CloudFront using fog."
   s.email = "bpo@somnambulance.net"
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bpo/fog_site"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "Deploys static sites to S3 using fog"
 
   if s.respond_to? :specification_version then

data/lib/fog_site.rb

@@ -110,7 +110,7 @@ class FogSite
         if local_file_md5.nil? and @site.destroy_old_files
           puts "#{path}: deleted".red
           remote_file.destroy
-          @updated_paths << ("/" + path)
+          mark_updated( "/#{path}" )
         elsif local_file_md5 == remote_file.etag
           puts "#{path}: unchanged".white
           @index.delete( path )
@@ -118,7 +118,7 @@ class FogSite
           puts "#{path}: updated".green
           write_file( path )
           @index.delete( path )
-          @updated_paths << ("/" + path)
+          mark_updated( "/#{path}" )
         end
       end
 
@@ -128,6 +128,13 @@ class FogSite
       end
     end
 
+    def mark_updated( path )
+      @updated_paths << path
+      if path =~ /\/index\.html$/
+        @updated_paths << path.sub( /index\.html$/, '' )
+      end
+    end
+
     # Push a single file out to S3.
     def write_file( path )
       @directory.files.create :key => path,
@@ -144,7 +151,7 @@ class FogSite
     end
 
     def cdn
-      @cdn ||= Fog::CDN.new( credentials )
+      @cdn ||= Fog::CDN.new( cdn_credentials )
     end
 
     def connection
@@ -159,6 +166,10 @@ class FogSite
       }.merge @site.fog_options
     end
 
+    def cdn_credentials
+      credentials.delete_if { |k, v| k == :region }
+    end
+
     def assert_not_nil( value, error )
       raise UsageError.new( error ) unless value
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog_site
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70187831489140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187831489140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70187831488440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187831488440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70187831487920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70187831487920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70187831487240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70187831487240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 description: Simple utility gem for deploying static sites to S3 and CloudFront using
   fog.
 email: bpo@somnambulance.net
@@ -89,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 881361868424467312
+      hash: -3118719801439548906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Deploys static sites to S3 using fog