asset_sync 0.1.0 → 0.1.1

data/README.md

@@ -114,7 +114,6 @@ Or via the initializer
       config.aws_region = 'eu-west-1'
     end
 
-
 ## Rake Task
 
 A rake task is installed with the generator to enhance the rails 

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        = "2011-08-22"
+  s.date        = "2011-08-24"
   s.platform    = Gem::Platform::RUBY 
   s.authors     = ["Simon Hamilton", "David Rice"]
   s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk"]

data/lib/asset_sync/config.rb

@@ -17,7 +17,7 @@ module AssetSync
     end
 
     def existing_remote_files?
-      (self.existing_remote_files) ? (self.existing_remote_files == "keep") : true 
+      (self.existing_remote_files == "keep")
     end
 
 
@@ -34,16 +34,17 @@ module AssetSync
     end
 
     def load_yml!
-      self.aws_access_key    = yml["aws_access_key"]
-      self.aws_access_secret = yml["aws_access_secret"]
-      self.aws_bucket        = yml["aws_bucket"]
-      self.aws_region        = yml["aws_region"]
+      self.aws_access_key         = yml["aws_access_key"]
+      self.aws_access_secret      = yml["aws_access_secret"]
+      self.aws_bucket             = yml["aws_bucket"]
+      self.aws_region             = yml["aws_region"]
+      self.existing_remote_files  = yml["existing_remote_files"]
 
       # TODO deprecate old style config settings
-      self.aws_access_key    = yml["access_key_id"] if yml.has_key?("access_key_id")
-      self.aws_access_secret = yml["secret_access_key"] if yml.has_key?("secret_access_key")
-      self.aws_bucket        = yml["bucket"] if yml.has_key?("bucket")
-      self.aws_region        = yml["region"] if yml.has_key?("region")
+      self.aws_access_key         = yml["access_key_id"] if yml.has_key?("access_key_id")
+      self.aws_access_secret      = yml["secret_access_key"] if yml.has_key?("secret_access_key")
+      self.aws_bucket             = yml["bucket"] if yml.has_key?("bucket")
+      self.aws_region             = yml["region"] if yml.has_key?("region")
     end
 
     def fog_options

data/lib/asset_sync/storage.rb

@@ -15,7 +15,7 @@ module AssetSync
       @bucket ||= connection.directories.get(self.config.aws_bucket)
     end
 
-    def keep_existing_remote_files
+    def keep_existing_remote_files?
       self.config.existing_remote_files?
     end
 
@@ -39,9 +39,11 @@ module AssetSync
     end
 
     def delete_extra_remote_files
+      STDERR.puts "Fetching files to flag for delete"
       remote_files = get_remote_files
       from_remote_files_to_delete = (local_files | remote_files) - (local_files & remote_files)
-
+      
+      STDERR.puts "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)
@@ -71,7 +73,7 @@ module AssetSync
     end
 
     def sync
-       delete_extra_remote_files unless keep_existing_remote_files
+       delete_extra_remote_files unless keep_existing_remote_files?
        upload_files
        STDERR.puts "Done."
     end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: asset_sync
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Simon Hamilton
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog