syncassets_r3 0.0.0 → 0.1.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 the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory
 
 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.
@@ -8,7 +8,26 @@ if the local file have been modified since the upload to s3.
 In your Gemfile
   gem 'syncassets_r3'
 
-In your config/S3.yml
-  aws_access_key: YOUR_ACCESS_KEY
-  aws_secret_access_key: YOUR_SECRET_ACCESS_KEY
-  aws_bucket_name: YOUR_BUCKET_NAME
+In your config/aws.yml
+  development:
+    access_key_id:     'YOUR_ACCESS_KEY'
+    secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+    bucket:            'YOUR_BUCKET_NAME'
+  test:
+    access_key_id:     'YOUR_ACCESS_KEY'
+    secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+    bucket:            'YOUR_BUCKET_NAME'
+  production:
+    access_key_id:     'YOUR_ACCESS_KEY'
+    secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+    bucket:            'YOUR_BUCKET_NAME'
+
+Running the task
+  rake syncassets:sync_s3_public_assets
+  # this will sync all the folders and files under the /public directory of your app
+
+  rake syncassets:sync_s3_public_assets[javascripts]
+  # this will sync all the folders and files under the /public/javascripts directory of your app
+  
+  rake syncassets:sync_s3_public_assets[javascripts/some_folder]
+  # this will sync all the folders and files under the /public/javascripts/some_folder directory of your app

data/Rakefile

@@ -15,8 +15,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "syncassets_r3"
   gem.homepage = "http://github.com/uokesita/syncassets_r3"
   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 the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory}
+  gem.description = %Q{This rake task will update (delete and copy) all the files under the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory}
   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.0.0
+0.1.0

data/lib/syncassets_r3.rb

@@ -1 +1,43 @@
 require 'railtie' if defined?(Rails)
+
+class Auth
+  def self.root
+    rails_root = Rails.root
+    YAML::load(IO.read(File.join(rails_root, 'config', 'aws.yml')))
+  end
+  def self.env
+    rails_env = Rails.env
+  end
+end
+
+
+class Credentials
+  def initialize
+# TRIED USING THE INITIALIZE FOR THOSE YAML LOADING DOWN THERE
+# BUT IT WAS GIVING ME CRAP AND HAD TO DUPLICATE THE LINE
+# MY GUEST IS THAT IT IS B/C THEY ARE CLASS METHODS
+# TODO: RESEARCH HOW TO REFACTOR OUT
+  end
+
+  begin
+    def self.key
+      Auth.root[Auth.env]['access_key_id']
+    end
+    def self.secret
+      Auth.root[Auth.env]['secret_access_key']
+    end
+    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
+end
+
+

data/lib/tasks/syncassets_r3.rake

@@ -1,24 +1,50 @@
 require 'fog'
+
 namespace :syncassets do
 
-  desc "Synchronize public folder with s3" 
-  task :sync_s3_public_assets do
+  desc "This rake task will update (delete and copy) all the files under the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory" 
+  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 "#########################################################"
 
-    @settings = YAML.load_file(File.join(Rails.root, 'config', 's3.yml'))
     @fog = Fog::Storage.new( :provider              => 'AWS', 
-                             :aws_access_key_id     => @settings['aws_access_key'], 
-                             :aws_secret_access_key => @settings['aws_secret_access_key'], 
+                             :aws_access_key_id     => Credentials.key, 
+                             :aws_secret_access_key => Credentials.secret, 
                              :persistent            => false )
-    @directory = @fog.directories.create( :key => @settings['aws_bucket_name'] )
 
+    @directory = @fog.directories.create( :key => Credentials.bucket )
+
+    @files_for_invalidation = []
+    @distribution_ids       = []
+    @root_directory         = "#{args[:directory]}"
+
+    get_distribution_ids
     upload_directory
+    invalidate_files
+  end
+
+  def get_cdn_connection
+    @cdn = Fog::CDN.new( :provider              => 'AWS',
+                         :aws_access_key_id     => Credentials.key,
+                         :aws_secret_access_key => Credentials.secret )
   end
 
-  def upload_directory(asset='/')
+  def get_distribution_ids
+    get_cdn_connection
+    
+    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 = @root_directory || '/')
+    
     Dir.entries(File.join(Rails.root, 'public', asset)).each do |file|
       next if file =~ /\A\./
       
@@ -31,13 +57,20 @@ 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)
       destroy_file(remote_file)
       file_u = @directory.files.create(:key => "#{file_name}", :body => open(File.join(Rails.root, 'public', asset, file )), :public => true )
-      puts "copied #{file_name}"
+      queue_file_for_invalidation(asset, file)
+      puts "Copied: #{file_name}"
     end
   end
 
@@ -46,7 +79,7 @@ namespace :syncassets do
   end
   
   def check_timestamps local_file, remote_file
-    puts "verifing file: #{local_file}"
+    puts "Verifing file: #{local_file}"
     local  = File.mtime(File.join(Rails.root, 'public', local_file))
     unless remote_file.nil?
       return local > remote_file.last_modified
@@ -57,7 +90,32 @@ namespace :syncassets do
   def destroy_file remote_file
     unless remote_file.nil?
       remote_file.destroy
-      puts "delete on s3 #{remote_file.key}"
+      puts "Delete on s3: #{remote_file.key}"
+    end
+  end
+
+  def queue_file_for_invalidation 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
+    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_r3.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{syncassets_r3}
-  s.version = "0.0.0"
+  s.version = "0.1.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-03}
-  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 the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory}
   s.email = %q{osledybazo@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -36,15 +36,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/uokesita/syncassets_r3}
   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 the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory}
   s.test_files = [
     "test/helper.rb",
     "test/test_syncassets_r3.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_r3
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 0
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Osledy Bazo
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -04:30
+date: 2011-09-15 00:00:00 -04:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: shoulda
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +30,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: shoulda
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +46,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: bundler
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +62,10 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,7 +76,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-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 the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory
 email: osledybazo@gmail.com
 executables: []
 
@@ -133,10 +133,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 the public directory to S3, by default is the public directory but you can pass as argument the path to the folder inside the public directory
 test_files: 
 - test/helper.rb
 - test/test_syncassets_r3.rb