asset_sync 0.1.9 → 0.1.10

data/README.md

@@ -87,8 +87,13 @@ The generator will create a Rails initializer at `config/initializers/asset_sync
       config.aws_access_key = ENV['AWS_ACCESS_KEY']
       config.aws_access_secret = ENV['AWS_ACCESS_SECRET']
       config.aws_bucket = ENV['AWS_BUCKET']
-      # config.aws_region = 'eu-west-1'
       config.existing_remote_files = "keep"
+      # Increase upload performance by configuring your region
+      # config.aws_region = "eu-west-1"
+      # Automatically replace files with their equivalent gzip compressed version
+      # config.gzip_compression = true
+      # Use the Rails generated 'manifest.yml' file to produce the list of files to upload instead of searching the assets directory.
+      # config.manifest = true
     end
 
 
@@ -101,6 +106,10 @@ If you used the `--use-yml` flag, the generator will create a YAML file at `conf
       aws_access_secret: "<%= ENV['AWS_ACCESS_SECRET'] %>"
       # You may need to specify what region your S3 bucket is in
       # aws_region: "eu-west-1"
+      existing_remote_files: keep
+      # Automatically replace files with their equivalent gzip compressed version
+      # gzip_compression = true
+
 
     development:
       <<: *defaults
@@ -110,12 +119,16 @@ If you used the `--use-yml` flag, the generator will create a YAML file at `conf
     test:
       <<: *defaults
       aws_bucket: "rails-app-test"
-      existing_remote_files: keep
+
+    staging:
+      <<: *defaults
+      aws_bucket: "rails-app-staging"
 
     production:
       <<: *defaults
       aws_bucket: "rails-app-production"
-      existing_remote_files: delete # Existing pre-compiled assets on S3 will be deleted
+      # Existing pre-compiled assets on S3 will be deleted
+      # existing_remote_files: delete
 
 ### Environment Variables
 
@@ -138,6 +151,7 @@ Or add to a traditional unix system
 * **aws\_region**: the region your S3 bucket is in e.g. *eu-west-1*
 * **existing\_remote\_files**: what to do with previously precompiled files, options are **keep** or **delete**
 * **gzip\_compression**: when enabled, will automatically replace files that have a gzip compressed equivalent with the compressed version.
+* **manifest**: when enabled, will use the `manifest.yml` generated by Rails to get the list of local files to upload. **experimental**
 
 ## Automatic gzip compression
 

data/lib/asset_sync/config.rb

@@ -10,6 +10,7 @@ module AssetSync
     attr_accessor :aws_region
     attr_accessor :existing_remote_files
     attr_accessor :gzip_compression
+    attr_accessor :manifest
 
     validates :aws_access_key,        :presence => true
     validates :aws_access_secret,     :presence => true
@@ -21,9 +22,15 @@ module AssetSync
       self.aws_region = nil
       self.existing_remote_files = 'keep'
       self.gzip_compression = false
+      self.manifest = false
       load_yml! if yml_exists?
     end
 
+    def manifest_path
+      default = File.join(Rails.root, 'public', 'assets', 'manifest.yml')
+      Rails.application.config.assets.manifest || default
+    end
+
     def gzip?
       self.gzip_compression
     end
@@ -52,6 +59,7 @@ module AssetSync
       self.aws_region             = yml["aws_region"] if yml.has_key?("aws_region")
       self.existing_remote_files  = yml["existing_remote_files"] if yml.has_key?("existing_remote_files")
       self.gzip_compression       = yml["gzip_compression"] if yml.has_key?("gzip_compression")
+      self.manifest               = yml["manifest"] if yml.has_key?("manifest")
 
       # TODO deprecate old style config settings
       self.aws_access_key         = yml["access_key_id"] if yml.has_key?("access_key_id")

data/lib/asset_sync/storage.rb

@@ -14,7 +14,8 @@ module AssetSync
     end
 
     def bucket
-      @bucket ||= connection.directories.get(self.config.aws_bucket)
+      # fixes: https://github.com/rumblelabs/asset_sync/issues/18
+      @bucket ||= connection.directories.get(self.config.aws_bucket, :prefix => 'assets')
     end
 
     def keep_existing_remote_files?
@@ -26,12 +27,30 @@ module AssetSync
     end
 
     def local_files
-      Dir["#{path}/assets/**/**"].map { |f| f[path.length+1,f.length-path.length] }
+      @local_files ||= get_local_files 
     end
 
+    def get_local_files
+      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}"
+          return yml.values.map { |f| File.join('assets', f) }
+        else
+          STDERR.puts "Warning: manifest.yml not found at #{self.config.manifest_path}"
+        end
+      end
+      STDERR.puts "Using: Directory Search of #{path}/assets"
+      Dir["#{path}/assets/**/**"].map { |f| f[path.length+1,f.length-path.length] }
+    end 
+
     def get_remote_files
       raise BucketNotFound.new("AWS Bucket: #{self.config.aws_bucket} not found.") unless bucket
-      return bucket.files.map { |f| f.key }
+      # fixes: https://github.com/rumblelabs/asset_sync/issues/16
+      #        (work-around for https://github.com/fog/fog/issues/596)
+      files = []
+      bucket.files.each { |f| files << f.key }
+      return files
     end
 
     def delete_file(f, remote_files_to_delete)
@@ -44,7 +63,8 @@ module AssetSync
     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)
+      # 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"
       # Delete unneeded remote files
@@ -99,7 +119,8 @@ module AssetSync
     def upload_files
       # get a fresh list of remote files
       remote_files = get_remote_files
-      local_files_to_upload = (remote_files | local_files) - (remote_files & local_files)
+      # fixes: https://github.com/rumblelabs/asset_sync/issues/19
+      local_files_to_upload = local_files - remote_files
 
       # Upload new files
       local_files_to_upload.each do |f|
@@ -109,10 +130,11 @@ module AssetSync
     end
 
     def sync
-       delete_extra_remote_files unless keep_existing_remote_files?
+      # fixes: https://github.com/rumblelabs/asset_sync/issues/19
        upload_files
+       delete_extra_remote_files unless keep_existing_remote_files?
        STDERR.puts "Done."
     end
 
   end
-end
+end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/generators/asset_sync/templates/asset_sync.rb

@@ -7,4 +7,6 @@ AssetSync.configure do |config|
   # config.aws_region = "eu-west-1"
   # Automatically replace files with their equivalent gzip compressed version
   # config.gzip_compression = true
+  # Use the Rails generated 'manifest.yml' file to produce the list of files to upload instead of searching the assets directory.
+  # config.manifest = true
 end

data/spec/asset_sync_spec.rb

@@ -43,6 +43,10 @@ describe AssetSync, 'with initializer' do
     AssetSync.config.gzip_compression.should be_false
   end
 
+  it "should default manifest to false" do
+    AssetSync.config.manifest.should be_false
+  end
+
 end
 
 
@@ -77,6 +81,10 @@ describe AssetSync, 'from yml' do
     AssetSync.config.gzip_compression.should be_false
   end
 
+  it "should default manifest to false" do
+    AssetSync.config.manifest.should be_false
+  end
+  
 end
 
 describe AssetSync, 'with no configuration' do
@@ -104,4 +112,29 @@ describe AssetSync, 'with gzip_compression enabled' do
     AssetSync.config.gzip?.should be_true
   end
 
-end
+end
+
+describe AssetSync, 'with manifest enabled' do
+
+  before(:all) do
+    Rails.root = 'without_yml'
+    AssetSync.config = AssetSync::Config.new
+    AssetSync.config.manifest = true
+  end
+
+  it "config.manifest should be true" do
+    AssetSync.config.manifest.should be_true
+  end
+
+  it "config.manifest_path should default to public/assets.." do
+    pending
+    AssetSync.config.manifest_path.should =~ "public/assets/manifest.yml"
+  end
+
+  it "config.manifest_path should default to public/assets.." do
+    pending
+    Rails.app.config.assets.manifest = "/var/assets/manifest.yml"
+    AssetSync.config.manifest_path.should == "/var/assets/manifest.yml"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-11-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70129910998440 !ruby/object:Gem::Requirement
+  requirement: &70137703451140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129910998440
+  version_requirements: *70137703451140
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70129910980480 !ruby/object:Gem::Requirement
+  requirement: &70137703450520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129910980480
+  version_requirements: *70137703450520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70129910979840 !ruby/object:Gem::Requirement
+  requirement: &70137703449900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129910979840
+  version_requirements: *70137703449900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70129910979280 !ruby/object:Gem::Requirement
+  requirement: &70137703449240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129910979280
+  version_requirements: *70137703449240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70129910978860 !ruby/object:Gem::Requirement
+  requirement: &70137703448620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129910978860
+  version_requirements: *70137703448620
 description: After you run assets:precompile your assets will be synchronised with
   your S3 bucket, deleting unused files and only uploading the files it needs to.
 email: