syncassets_r2 0.3.1 → 0.4.0

data/README.rdoc

@@ -1,4 +1,4 @@
-This rake task will update (delete and copy) all the files under /public on s3, be patient
+This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.
 
 The rake task will verify if the local file exist on s3 and 
 if the local file have been modified since the upload to s3.

data/Rakefile

@@ -15,8 +15,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "syncassets_r2"
   gem.homepage = "http://github.com/uokesita/syncassets_r2"
   gem.license = "MIT"
-  gem.summary = %Q{This rake task will update (delete and copy) all the files under /public on s3, be patient}
-  gem.description = %Q{This rake task will update (delete and copy) all the files under /public on s3, be patient}
+  gem.summary = %q{This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.}
+  gem.description = %q{This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.}
   gem.email = "osledybazo@gmail.com"
   gem.authors = ["Osledy Bazo"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/syncassets_r2.rb

@@ -27,6 +27,12 @@ class Credentials
     def self.bucket
       Auth.root[Auth.env]['bucket']
     end
+    def self.distribution_ids
+      unless Auth.root[Auth.env]['distribution_ids'].nil?
+        return Auth.root[Auth.env]['distribution_ids'].gsub(' ','').split(',')
+      end
+      []
+    end
   rescue
     puts"syncassets_r3 : AWS Access Key Id needs a subscription for the service."
   end

data/lib/tasks/syncassets_r2.rake

@@ -1,12 +1,12 @@
 require 'fog'
 require 'syncassets_r2'
+
 namespace :syncassets do
 
   desc "Synchronize public folder with s3" 
-  task :sync_s3_public_assets do
+  task :sync_s3_public_assets, :directory do |t, args|
     puts "#########################################################"
-    puts "##      This rake task will update (delete and copy)     "
-    puts "##      all the files under /public on s3, be patient    "
+    puts "##          Syncing folders and files with S3          ##"
     puts "#########################################################"
 
     @fog = Fog::Storage.new( :provider              => 'AWS', 
@@ -18,6 +18,7 @@ namespace :syncassets do
 
     @files_for_invalidation = []
     @distribution_ids       = []
+    @root_directory         = "#{args[:directory]}"
 
     get_distribution_ids
     upload_directory
@@ -32,14 +33,19 @@ namespace :syncassets do
 
   def get_distribution_ids
     get_cdn_connection
-
-    distributions = @cdn.get_distribution_list()
-    distributions.body["DistributionSummary"].each do |distribution|
-      @distribution_ids << distribution["Id"]
+    
+    if Credentials.distribution_ids.empty?
+      distributions = @cdn.get_distribution_list()
+      distributions.body["DistributionSummary"].each do |distribution|
+        @distribution_ids << distribution["Id"]
+      end
+    else
+      @distribution_ids = Credentials.distribution_ids
     end
   end
 
-  def upload_directory(asset='/')
+  def upload_directory(asset = @root_directory || '/')
+    
     Dir.entries(File.join(Rails.root, 'public', asset)).each do |file|
       next if file =~ /\A\./
       
@@ -52,7 +58,13 @@ namespace :syncassets do
   end
 
   def upload_file asset, file
-    file_name   = asset == "/" ? file : "#{asset}/#{file}".sub('/','')
+
+    if @root_directory.blank?
+      file_name   = asset == "/" ? file : "#{asset}/#{file}".sub('/','')
+    else
+      file_name   = asset == "/" ? file : "#{asset}/#{file}"
+    end
+
     remote_file = get_remote_file(file_name)
 
     if check_timestamps(file_name, remote_file)
@@ -84,18 +96,27 @@ namespace :syncassets do
   end
 
   def queue_file_for_invalidation asset, file
-    path_to_file = asset == "/" ? "#{asset}#{file}" : "#{asset}/#{file}"
+    if @root_directory.blank?
+      path_to_file = asset == "/" ? "#{asset}#{file}" : "#{asset}/#{file}"
+    else
+      path_to_file = asset == "/" ? "/#{asset}#{file}" : "/#{asset}/#{file}"
+    end
     @files_for_invalidation << path_to_file
     puts "Queued for invalidation: #{path_to_file}"
+    if @files_for_invalidation.size == 200
+      invalidate_files
+    end
   end
 
   def invalidate_files
-    get_cdn_connection
-
-    @distribution_ids.each do |id|
-      puts "Invalidating files of distribution #{id}"
-      @cdn.post_invalidation(id, @files_for_invalidation, caller_reference = Time.now.to_i.to_s)
-      puts "Invalidation list queued"
+    unless @files_for_invalidation.size < 1
+      get_cdn_connection
+      @distribution_ids.each do |id|
+        puts "Invalidating files of distribution #{id}"
+        @cdn.post_invalidation(id, @files_for_invalidation, caller_reference = Time.now.to_i.to_s)
+        puts "Invalidation list queued"
+      end
+      @files_for_invalidation.clear
     end
   end
 

data/syncassets_r2.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{syncassets_r2}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Osledy Bazo"]
-  s.date = %q{2011-05-11}
-  s.description = %q{This rake task will update (delete and copy) all the files under /public on s3, be patient}
+  s.date = %q{2011-09-15}
+  s.description = %q{This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.}
   s.email = %q{osledybazo@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -34,15 +34,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/uokesita/syncassets_r2}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{This rake task will update (delete and copy) all the files under /public on s3, be patient}
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.}
   s.test_files = [
     "test/helper.rb",
     "test/test_syncassets_r2.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: syncassets_r2
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Osledy Bazo
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:30
+date: 2011-09-15 00:00:00 -04:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  name: fog
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +32,10 @@ dependencies:
         - 2
         version: 0.7.2
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: fog
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: shoulda
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +46,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: shoulda
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +62,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: bundler
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,10 +78,10 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,7 +92,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-description: This rake task will update (delete and copy) all the files under /public on s3, be patient
+  prerelease: false
+  name: rcov
+description: This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.
 email: osledybazo@gmail.com
 executables: []
 
@@ -147,10 +147,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: This rake task will update (delete and copy) all the files under /public on s3, be patient
+summary: This rake task will update (delete and copy) all the files under a directory to S3, by default is the public directory but you can pass as argument the path to the folder.
 test_files: 
 - test/helper.rb
 - test/test_syncassets_r2.rb