asset_sync 0.3.0 → 0.3.1

data/lib/asset_sync/asset_sync.rb

@@ -22,17 +22,19 @@ module AssetSync
 
     def sync
       if config.fail_silently?
-        self.log config.errors.full_messages.join(', ') unless config && config.valid?
+        self.warn config.errors.full_messages.join(', ') unless config && config.valid?
       else
         raise Config::Invalid.new(config.errors.full_messages.join(', ')) unless config && config.valid?
       end
       self.storage.sync if config && config.valid?
     end
 
-  private
+    def warn(msg)
+      STDERR.puts msg
+    end
 
     def log(msg)
-      STDERR.puts msg
+      STDOUT.puts msg if ENV["RAILS_GROUPS"] == "assets"
     end
 
   end

data/lib/asset_sync/engine.rb

@@ -7,10 +7,10 @@ class Engine < Rails::Engine
     app_yaml = File.join(Rails.root, 'config/asset_sync.yml')
 
     if File.exists?( app_initializer )
-      # STDERR.puts "AssetSync: using #{app_initializer}"
+      AssetSync.log "AssetSync: using #{app_initializer}"
       load app_initializer
     elsif !File.exists?( app_initializer ) && !File.exists?( app_yaml )
-      # STDERR.puts "AssetSync: using default configuration from built-in initializer"
+      AssetSync.log "AssetSync: using default configuration from built-in initializer"
       AssetSync.configure do |config|
         config.fog_provider = ENV['FOG_PROVIDER']
         config.fog_directory = ENV['FOG_DIRECTORY']
@@ -27,9 +27,9 @@ class Engine < Rails::Engine
       end
     end
 
-    # if File.exists?( app_yaml )
-    # STDERR.puts "AssetSync: YAML file found #{app_yaml} settings will be merged into the configuration"
-    # end
+    if File.exists?( app_yaml )
+      AssetSync.log "AssetSync: YAML file found #{app_yaml} settings will be merged into the configuration"
+    end
   end
 
 end

data/lib/asset_sync/storage.rb

@@ -18,6 +18,10 @@ module AssetSync
       @bucket ||= connection.directories.get(self.config.fog_directory, :prefix => self.config.assets_prefix)
     end
 
+    def log(msg)
+      AssetSync.log(msg)
+    end
+
     def keep_existing_remote_files?
       self.config.existing_remote_files?
     end
@@ -34,13 +38,13 @@ module AssetSync
       if self.config.manifest
         if File.exists?(self.config.manifest_path)
           yml = YAML.load(IO.read(self.config.manifest_path))
-          STDERR.puts "Using: Manifest #{self.config.manifest_path}"
+          log "Using: Manifest #{self.config.manifest_path}"
           return yml.values.map { |f| File.join(self.config.assets_prefix, f) }
         else
-          STDERR.puts "Warning: manifest.yml not found at #{self.config.manifest_path}"
+          log "Warning: manifest.yml not found at #{self.config.manifest_path}"
         end
       end
-      STDERR.puts "Using: Directory Search of #{path}/#{self.config.assets_prefix}"
+      log "Using: Directory Search of #{path}/#{self.config.assets_prefix}"
       Dir["#{path}/#{self.config.assets_prefix}/**/**"].map { |f| f[path.length+1,f.length-path.length] }
     end
 
@@ -55,18 +59,18 @@ module AssetSync
 
     def delete_file(f, remote_files_to_delete)
       if remote_files_to_delete.include?(f.key)
-        STDERR.puts "Deleting: #{f.key}"
+        log "Deleting: #{f.key}"
         f.destroy
       end
     end
 
     def delete_extra_remote_files
-      STDERR.puts "Fetching files to flag for delete"
+      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
 
-      STDERR.puts "Flagging #{from_remote_files_to_delete.size} file(s) for deletion"
+      log "Flagging #{from_remote_files_to_delete.size} file(s) for deletion"
       # Delete unneeded remote files
       bucket.files.each do |f|
         delete_file(f, from_remote_files_to_delete)
@@ -89,7 +93,7 @@ module AssetSync
       if config.gzip? && File.extname(f) == ".gz"
         # Don't bother uploading gzipped assets if we are in gzip_compression mode
         # as we will overwrite file.css with file.css.gz if it exists.
-        STDERR.puts "Ignoring: #{f}"
+        log "Ignoring: #{f}"
         ignore = true
       elsif config.gzip? && File.exists?(gzipped)
         original_size = File.size("#{path}/#{f}")
@@ -105,13 +109,13 @@ module AssetSync
             :content_type     => mime,
             :content_encoding => 'gzip'
           })
-          STDERR.puts "Uploading: #{gzipped} in place of #{f} saving #{percentage}%"
+          log "Uploading: #{gzipped} in place of #{f} saving #{percentage}%"
         else
           percentage = ((original_size.to_f/gzipped_size.to_f)*100).round(2)
-          STDERR.puts "Uploading: #{f} instead of #{gzipped} (compression increases this file by #{percentage}%)"
+          log "Uploading: #{f} instead of #{gzipped} (compression increases this file by #{percentage}%)"
         end
       else
-        STDERR.puts "Uploading: #{f}"
+        log "Uploading: #{f}"
       end
 
       file = bucket.files.create( file ) unless ignore
@@ -132,9 +136,10 @@ module AssetSync
 
     def sync
       # fixes: https://github.com/rumblelabs/asset_sync/issues/19
-       upload_files
-       delete_extra_remote_files unless keep_existing_remote_files?
-       STDERR.puts "Done."
+      log "AssetSync: Syncing."
+      upload_files
+      delete_extra_remote_files unless keep_existing_remote_files?
+      log "AssetSync: Done."
     end
 
   end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70330270051360 !ruby/object:Gem::Requirement
+  requirement: &70246151754820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330270051360
+  version_requirements: *70246151754820
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70330270050940 !ruby/object:Gem::Requirement
+  requirement: &70246151754400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330270050940
+  version_requirements: *70246151754400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330270050520 !ruby/object:Gem::Requirement
+  requirement: &70246151753980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330270050520
+  version_requirements: *70246151753980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70330270050100 !ruby/object:Gem::Requirement
+  requirement: &70246151753560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330270050100
+  version_requirements: *70246151753560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70330270049680 !ruby/object:Gem::Requirement
+  requirement: &70246151753140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330270049680
+  version_requirements: *70246151753140
 description: After you run assets:precompile your compiled assets will be synchronised
   with your S3 bucket.
 email: