asset_sync 0.4.1 → 0.4.2

data/README.md

@@ -191,6 +191,8 @@ defaults: &defaults
   #  eg: Static files in public often reference non-fingerprinted application.css
   #  note: You will still need to expire them from the CDN's edge cache locations
   # always_upload: ['application.js', 'application.css']
+  # Ignored files. Useful if there are some files that are created dynamically on the server and you don't want to upload on deploy.
+  # ignored_files: ['ignore_me.js', %r(ignore_some/\d{32}\.css)]
 
 development:
   <<: *defaults

data/asset_sync.gemspec

@@ -6,7 +6,7 @@ require "asset_sync/version"
 Gem::Specification.new do |s|
   s.name        = "asset_sync"
   s.version     = AssetSync::VERSION
-  s.date        = "2012-05-04"
+  s.date        = "2012-06-02"
   s.platform    = Gem::Platform::RUBY 
   s.authors     = ["Simon Hamilton", "David Rice", "Phil McClure"]
   s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk", "pmcclure@rumblelabs.com"]

data/lib/asset_sync/asset_sync.rb

@@ -32,17 +32,21 @@ module AssetSync
     end
 
     def warn(msg)
-      STDERR.puts msg
+      stderr.puts msg
     end
 
     def log(msg)
-      STDOUT.puts msg if ENV["RAILS_GROUPS"] == "assets"
+      stdout.puts msg if ENV["RAILS_GROUPS"] == "assets"
     end
 
     def enabled?
       config.enabled?
     end
 
+    # easier to stub
+    def stderr ; STDERR ; end
+    def stdout ; STDOUT ; end
+
   end
 
 end

data/lib/asset_sync/config.rb

@@ -10,6 +10,7 @@ module AssetSync
     attr_accessor :manifest
     attr_accessor :fail_silently
     attr_accessor :always_upload
+    attr_accessor :ignored_files
     attr_accessor :enabled
 
     # FOG configuration
@@ -45,6 +46,7 @@ module AssetSync
       self.manifest = false
       self.fail_silently = false
       self.always_upload = []
+      self.ignored_files = []
       self.enabled = true
       load_yml! if yml_exists?
     end
@@ -117,6 +119,7 @@ module AssetSync
       self.manifest               = yml["manifest"] if yml.has_key?("manifest")
       self.fail_silently          = yml["fail_silently"] if yml.has_key?("fail_silently")
       self.always_upload          = yml["always_upload"] if yml.has_key?("always_upload")
+      self.ignored_files          = yml["ignored_files"] if yml.has_key?("ignored_files")
 
       # TODO deprecate the other old style config settings. FML.
       self.aws_access_key_id      = yml["aws_access_key"] if yml.has_key?("aws_access_key")

data/lib/asset_sync/storage.rb

@@ -30,6 +30,25 @@ module AssetSync
       Rails.public_path
     end
 
+    def ignored_files
+      files = []
+      Array(self.config.ignored_files).each do |ignore|
+        case ignore
+        when Regexp
+          files += self.local_files.select do |file|
+            file =~ ignore
+          end
+        when String
+          files += self.local_files.select do |file|
+            file.split('/').last == ignore
+          end
+        else
+          log "Error: please define ignored_files as string or regular expression. #{ignore} (#{ignore.class}) ignored."
+        end
+      end
+      files.uniq
+    end
+
     def local_files
       @local_files ||= get_local_files
     end
@@ -74,7 +93,7 @@ module AssetSync
       log "Fetching files to flag for delete"
       remote_files = get_remote_files
       # fixes: https://github.com/rumblelabs/asset_sync/issues/19
-      from_remote_files_to_delete = remote_files - local_files
+      from_remote_files_to_delete = remote_files - local_files - ignored_files
 
       log "Flagging #{from_remote_files_to_delete.size} file(s) for deletion"
       # Delete unneeded remote files
@@ -138,7 +157,7 @@ module AssetSync
       # get a fresh list of remote files
       remote_files = ignore_existing_remote_files? ? [] : get_remote_files
       # fixes: https://github.com/rumblelabs/asset_sync/issues/19
-      local_files_to_upload = local_files - remote_files + always_upload_files
+      local_files_to_upload = local_files - ignored_files - remote_files + always_upload_files
 
       # Upload new files
       local_files_to_upload.each do |f|

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/asset_sync_spec.rb

@@ -140,6 +140,7 @@ describe AssetSync do
 
   describe 'with fail_silent configuration' do
     before(:each) do
+      AssetSync.stub(:stderr).and_return(@stderr = StringIO.new)
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fail_silently = true
@@ -149,6 +150,11 @@ describe AssetSync do
     it "should not raise an invalid exception" do
       lambda{ AssetSync.sync }.should_not raise_error(AssetSync::Config::Invalid)
     end
+
+    it "should output a warning to stderr" do
+      AssetSync.sync
+      @stderr.string.should =~ /can't be blank/
+    end
   end
 
   describe 'with gzip_compression enabled' do

data/spec/google_spec.rb

@@ -92,6 +92,7 @@ describe AssetSync do
 
   describe 'with fail_silent configuration' do
     before(:each) do
+      AssetSync.stub(:stderr).and_return(StringIO.new)
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fail_silently = true

data/spec/storage_spec.rb

@@ -36,5 +36,19 @@ describe AssetSync::Storage do
       end
       storage.upload_files
     end
+
+    it 'should allow to ignore files' do
+      @config.ignored_files = ['local_image1.jpg', /local_stylesheet\d\.css/]
+
+      storage = AssetSync::Storage.new(@config)
+      storage.stub(:local_files).and_return(@local_files)
+      storage.stub(:get_remote_files).and_return(@remote_files)
+      File.stub(:file?).and_return(true) # Pretend they all exist
+
+      (@local_files - @remote_files - storage.ignored_files + storage.always_upload_files).each do |file|
+        storage.should_receive(:upload_file).with(file)
+      end
+      storage.upload_files
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70254273780720 !ruby/object:Gem::Requirement
+  requirement: &70223412035340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254273780720
+  version_requirements: *70223412035340
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70254273780280 !ruby/object:Gem::Requirement
+  requirement: &70223412034660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254273780280
+  version_requirements: *70223412034660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70254273779760 !ruby/object:Gem::Requirement
+  requirement: &70223412033020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254273779760
+  version_requirements: *70223412033020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70254273779320 !ruby/object:Gem::Requirement
+  requirement: &70223412032060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254273779320
+  version_requirements: *70223412032060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70254273778800 !ruby/object:Gem::Requirement
+  requirement: &70223412031120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254273778800
+  version_requirements: *70223412031120
 description: After you run assets:precompile your compiled assets will be synchronised
   with your S3 bucket.
 email: