asset_sync 0.1.10 → 0.2.0

data/README.md

@@ -7,6 +7,10 @@ bucket, optionally deleting unused files and only uploading the files it needs t
 
 This was initially built and is intended to work on [Heroku](http://heroku.com)
 
+## Upgrading?
+
+If you are upgrading from a version of asset_sync **< 0.2.0** (i.e. 0.1.x). All of the references to config variables have changed to reference those used in **Fog**. Ensure to backup your `asset\_sync.rb` or `asset\_sync.yml` files and re-run the generator. You may also then need to update your ENV configuration variables (or you can change the ones that are referenced).
+
 ## KNOWN ISSUES (IMPORTANT)
 
 We are currently trying to talk with Heroku to iron these out.
@@ -26,7 +30,7 @@ This means the *RAILS_ENV* you have set via *heroku:config* is not used.
 
     AssetSync.configure do |config|
       ...
-      config.aws_bucket = 'app-assets'
+      config.fog_directory = 'app-assets'
       config.existing_remote_files = "keep"
     end
 
@@ -37,9 +41,9 @@ Currently when heroku runs `rake assets:precompile` during deployment. It does n
 **Workaround:** you could just hardcode your AWS credentials in the initializer or yml
 
     AssetSync.configure do |config|
-      config.aws_access_key = 'xxx'
-      config.aws_access_secret = 'xxx'
-      config.aws_bucket = 'mybucket'
+      config.aws_access_key_id_id = 'xxx'
+      config.aws_secret_access_key = 'xxx'
+      config.fog_directory = 'mybucket'
     end
 
 ## Installation
@@ -50,7 +54,7 @@ Add the gem to your Gemfile
 
 > The following steps are now optional as of version **0.1.7** there is a built-in initializer [lib/engine.rb](https://github.com/rumblelabs/asset_sync/blob/master/lib/asset_sync/engine.rb)
 
-Generate the rake task and config files
+Generate the rake task and config file
 
     rails g asset_sync:install
     
@@ -58,6 +62,11 @@ If you would like to use a YAML file for configuration instead of the default (R
 
     rails g asset_sync:install --use-yml
 
+The default *provider* is `AWS` but you can pick which one you need.
+
+    rails g asset_sync:install --provider=Rackspace
+    rails g asset_sync:install --provider=AWS
+
 ## Configuration
 
 Configure __config/environments/production.rb__ to use Amazon
@@ -65,7 +74,7 @@ S3 as the asset host and ensure precompiling is enabled.
 
     # config/environments/production.rb
     config.action_controller.asset_host = Proc.new do |source, request|
-      request.ssl? ? "https://#{ENV['AWS_BUCKET']}.s3.amazonaws.com" : "http://#{ENV['AWS_BUCKET']}.s3.amazonaws.com"
+      request.ssl? ? "https://#{ENV['FOG_DIRECTORY']}.s3.amazonaws.com" : "http://#{ENV['FOG_DIRECTORY']}.s3.amazonaws.com"
     end
 
 We support two methods of configuration.
@@ -84,15 +93,22 @@ The recommend way to configure **asset_sync** is by using environment variables
 The generator will create a Rails initializer at `config/initializers/asset_sync.rb`.
 
     AssetSync.configure do |config|
-      config.aws_access_key = ENV['AWS_ACCESS_KEY']
-      config.aws_access_secret = ENV['AWS_ACCESS_SECRET']
-      config.aws_bucket = ENV['AWS_BUCKET']
-      config.existing_remote_files = "keep"
+      config.fog_provider = 'AWS'
+      config.fog_directory = ENV['FOG_DIRECTORY']
+      config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+      config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+
+      # Don't delete files from the store
+      # config.existing_remote_files = "keep"
+      #
       # Increase upload performance by configuring your region
-      # config.aws_region = "eu-west-1"
+      # config.fog_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.
+      #
+      # 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
 
@@ -102,62 +118,85 @@ The generator will create a Rails initializer at `config/initializers/asset_sync
 If you used the `--use-yml` flag, the generator will create a YAML file at `config/asset_sync.yml`.
 
     defaults: &defaults
-      aws_access_key: "<%= ENV['AWS_ACCESS_KEY'] %>"
-      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
+      fog_provider: "AWS"
+      fog_directory: "rails-app-assets"
+      aws_access_key_id: "<%= ENV['AWS_ACCESS_KEY_ID'] %>"
+      aws_secret_access_key: "<%= ENV['AWS_SECRET_ACCESS_KEY'] %>"
+      # You may need to specify what region your storage bucket is in
+      # fog_region: "eu-west-1"
+      existing_remote_files: keep # Existing pre-compiled assets on S3 will be kept
+      # To delete existing remote files.
+      # existing_remote_files: delete
       # Automatically replace files with their equivalent gzip compressed version
-      # gzip_compression = true
-
+      # gzip_compression: true
 
     development:
       <<: *defaults
-      aws_bucket: "rails-app-development"
-      existing_remote_files: keep # Existing pre-compiled assets on S3 will be kept
 
     test:
       <<: *defaults
-      aws_bucket: "rails-app-test"
-
-    staging:
-      <<: *defaults
-      aws_bucket: "rails-app-staging"
 
     production:
       <<: *defaults
-      aws_bucket: "rails-app-production"
-      # Existing pre-compiled assets on S3 will be deleted
-      # existing_remote_files: delete
 
 ### Environment Variables
 
 Add your Amazon S3 configuration details to **heroku**
 
-    heroku config:add AWS_ACCESS_KEY=xxxx
-    heroku config:add AWS_ACCESS_SECRET=xxxx
-    heroku config:add AWS_BUCKET=xxxx
+    heroku config:add AWS_ACCESS_KEY_ID=xxxx
+    heroku config:add AWS_SECRET_ACCESS_KEY=xxxx
+    heroku config:add FOG_DIRECTORY=xxxx
 
 Or add to a traditional unix system
 
-    export AWS_ACCESS_KEY=xxxx
-    export AWS_ACCESS_SECRET=xxxx
-    export AWS_BUCKET=xxxx
+    export AWS_ACCESS_KEY_ID=xxxx
+    export AWS_SECRET_ACCESS_KEY=xxxx
+    export FOG_DIRECTORY=xxxx
 
 ### Available Configuration Options
 
-* **aws\_access\_key**: your Amazon S3 access key
-* **aws\_access\_secret**: your Amazon S3 access secret
-* **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**
+#### AssetSync
+
+* **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
+#### Required (Fog)
+* **fog\_provider**: your storage provider *AWS* (S3) or *Rackspace* (Cloud Files)
+* **fog\_directory**: your bucket name
 
-With the `gzip_compression` option enabled, when uploading your assets. If a file has a gzip compressed equivalent we will replace that asset with the compressed version and sets the correct headers for S3 to serve it. For example, if you have a file **master.css** and it was compressed to **master.css.gz** we will upload the **.gz** file to S3 in place of the uncompressed file.
+#### Optional
 
-If the compressed file is actually larger than the uncompressed file we will ignore this rule and upload the standard uncompressed version.
+* **fog\_region**: the region your storage bucket is in e.g. *eu-west-1*
+
+#### AWS
+
+* **aws\_access\_key\_id**: your Amazon S3 access key
+* **aws\_secret\_access\_key**: your Amazon S3 access secret
+
+#### Rackspace
+
+* **rackspace\_username**: your Rackspace username
+* **rackspace\_api\_key**: your Rackspace API Key.
+
+
+#### Required (Fog)
+* **fog\_provider**: your storage provider *AWS* (S3) or *Rackspace* (Cloud Files)
+* **fog\_directory**: your bucket name
+
+#### Optional
+
+* **fog\_region**: the region your storage bucket is in e.g. *eu-west-1*
+
+#### AWS
+
+* **aws\_access\_key\_id**: your Amazon S3 access key
+* **aws\_secret\_access\_key**: your Amazon S3 access secret
+
+#### Rackspace
+
+* **rackspace\_username**: your Rackspace username
+* **rackspace\_api\_key**: your Rackspace API Key.
 
 
 ## Amazon S3 Multiple Region Support
@@ -172,9 +211,16 @@ Or via the initializer
 
     AssetSync.configure do |config|
       # ...
-      config.aws_region = 'eu-west-1'
+      config.fog_region = 'eu-west-1'
     end
 
+## Automatic gzip compression
+
+With the `gzip_compression` option enabled, when uploading your assets. If a file has a gzip compressed equivalent we will replace that asset with the compressed version and sets the correct headers for S3 to serve it. For example, if you have a file **master.css** and it was compressed to **master.css.gz** we will upload the **.gz** file to S3 in place of the uncompressed file.
+
+If the compressed file is actually larger than the uncompressed file we will ignore this rule and upload the standard uncompressed version.
+
+
 ## Rake Task
 
 A rake task is included in asset\_sync to enhance the rails precompile task by automatically running after it:

data/asset_sync.gemspec

@@ -6,13 +6,13 @@ require "asset_sync/version"
 Gem::Specification.new do |s|
   s.name        = "asset_sync"
   s.version     = AssetSync::VERSION
-  s.date        = "2011-11-05"
+  s.date        = "2011-11-15"
   s.platform    = Gem::Platform::RUBY 
   s.authors     = ["Simon Hamilton", "David Rice"]
   s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk"]
   s.homepage    = "https://github.com/rumblelabs/asset_sync"
-  s.summary     = %q{Synchronises Assets in a Rails 3 application and S3/Cloudfront}
-  s.description = %q{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.}
+  s.summary     = %q{Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and Rackspace Cloudfiles}
+  s.description = %q{After you run assets:precompile your compiled assets will be synchronised with your S3 bucket.}
 
   s.rubyforge_project = "asset_sync"
 

data/lib/asset_sync/config.rb

@@ -4,22 +4,34 @@ module AssetSync
 
     class Invalid < StandardError; end
 
-    attr_accessor :provider
-    attr_accessor :aws_access_key, :aws_access_secret
-    attr_accessor :aws_bucket
-    attr_accessor :aws_region
-    attr_accessor :existing_remote_files
+    # AssetSync
+    attr_accessor :existing_remote_files # What to do with your existing remote files? (keep or delete)
     attr_accessor :gzip_compression
     attr_accessor :manifest
 
-    validates :aws_access_key,        :presence => true
-    validates :aws_access_secret,     :presence => true
-    validates :aws_bucket,            :presence => true
-    validates :existing_remote_files, :inclusion => {:in => %w(keep delete)}
+    # FOG configuration
+    attr_accessor :fog_provider          # Currently Supported ['AWS', 'Rackspace']
+    attr_accessor :fog_directory         # e.g. 'the-bucket-name'
+    attr_accessor :fog_region            # e.g. 'eu-west-1'
+
+    # Amazon AWS
+    attr_accessor :aws_access_key_id, :aws_secret_access_key
+
+    # Rackspace
+    attr_accessor :rackspace_username, :rackspace_api_key
+
+    validates :existing_remote_files, :inclusion => { :in => %w(keep delete) }
+
+    validates :fog_provider,          :presence => true
+    validates :fog_directory,         :presence => true
+
+    validates :aws_access_key_id,     :presence => true, :if => :aws?
+    validates :aws_secret_access_key, :presence => true, :if => :aws?
+    validates :rackspace_username,    :presence => true, :if => :rackspace?
+    validates :rackspace_api_key,     :presence => true, :if => :rackspace?
 
     def initialize
-      self.provider = 'AWS'
-      self.aws_region = nil
+      self.fog_region = nil
       self.existing_remote_files = 'keep'
       self.gzip_compression = false
       self.manifest = false
@@ -39,6 +51,13 @@ module AssetSync
       (self.existing_remote_files == "keep")
     end
 
+    def aws?
+      fog_provider == 'AWS'
+    end
+
+    def rackspace?
+      fog_provider == 'Rackspace'
+    end
 
     def yml_exists?
       File.exists?(self.yml_path)
@@ -53,28 +72,48 @@ module AssetSync
     end
 
     def load_yml!
-      self.aws_access_key         = yml["aws_access_key"] if yml.has_key?("aws_access_key")
-      self.aws_access_secret      = yml["aws_access_secret"] if yml.has_key?("aws_access_secret")
-      self.aws_bucket             = yml["aws_bucket"] if yml.has_key?("aws_bucket")
-      self.aws_region             = yml["aws_region"] if yml.has_key?("aws_region")
+      self.fog_provider          = yml["fog_provider"]
+      self.fog_directory         = yml["fog_directory"]
+      self.fog_region            = yml["fog_region"]
+      self.aws_access_key_id     = yml["aws_access_key_id"]
+      self.aws_secret_access_key = yml["aws_secret_access_key"]
+      self.rackspace_username    = yml["rackspace_username"]
+      self.rackspace_api_key     = yml["rackspace_api_key"]
       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 the other old style config settings. FML.
+      self.aws_access_key_id      = yml["aws_access_key"] if yml.has_key?("aws_access_key")
+      self.aws_secret_access_key  = yml["aws_access_secret"] if yml.has_key?("aws_access_secret")
+      self.fog_directory          = yml["aws_bucket"] if yml.has_key?("aws_bucket")
+      self.fog_region             = yml["aws_region"] if yml.has_key?("aws_region")
+
       # 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_id      = yml["access_key_id"] if yml.has_key?("access_key_id")
+      self.aws_secret_access_key  = yml["secret_access_key"] if yml.has_key?("secret_access_key")
+      self.fog_directory          = yml["bucket"] if yml.has_key?("bucket")
+      self.fog_region             = yml["region"] if yml.has_key?("region")
     end
 
+
     def fog_options
-      options = {
-        :provider => provider, 
-        :aws_access_key_id => aws_access_key,
-        :aws_secret_access_key => aws_access_secret
-      }
-      options.merge!({:region => aws_region}) if aws_region
+      options = { :provider => fog_provider }
+      if aws?
+        options.merge!({
+          :aws_access_key_id => aws_access_key_id,
+          :aws_secret_access_key => aws_secret_access_key
+        })
+      elsif rackspace?
+        options.merge!({
+          :rackspace_username => rackspace_username,
+          :rackspace_api_key => rackspace_api_key
+        })
+      else
+        raise ArgumentError, "AssetSync Unknown provider: #{fog_provider} only AWS and Rackspace are supported currently."
+      end
+
+      options.merge!({:region => fog_region}) if fog_region
       return options
     end
 

data/lib/asset_sync/engine.rb

@@ -12,9 +12,15 @@ class Engine < Rails::Engine
     else
       # STDERR.puts "AssetSync: using default configuration from built-in initializer"
       AssetSync.configure do |config|
-        config.aws_access_key = ENV['AWS_ACCESS_KEY']
-        config.aws_access_secret = ENV['AWS_ACCESS_SECRET']
-        config.aws_bucket = ENV['AWS_BUCKET']
+        config.fog_provider = ENV['FOG_PROVIDER']
+        config.fog_directory = ENV['FOG_DIRECTORY']
+        config.fog_directory = ENV['FOG_REGION']
+
+        config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+        config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+
+        config.rackspace_username = ENV['RACKSPACE_USERNAME']
+        config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
         config.existing_remote_files = "keep"
       end
     end

data/lib/asset_sync/storage.rb

@@ -15,7 +15,7 @@ module AssetSync
 
     def bucket
       # fixes: https://github.com/rumblelabs/asset_sync/issues/18
-      @bucket ||= connection.directories.get(self.config.aws_bucket, :prefix => 'assets')
+      @bucket ||= connection.directories.get(self.config.fog_directory, :prefix => 'assets')
     end
 
     def keep_existing_remote_files?
@@ -45,7 +45,7 @@ module AssetSync
     end 
 
     def get_remote_files
-      raise BucketNotFound.new("AWS Bucket: #{self.config.aws_bucket} not found.") unless bucket
+      raise BucketNotFound.new("#{self.config.fog_provider} Bucket: #{self.config.fog_directory} not found.") unless bucket
       # fixes: https://github.com/rumblelabs/asset_sync/issues/16
       #        (work-around for https://github.com/fog/fog/issues/596)
       files = []

data/lib/asset_sync/version.rb

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

data/lib/generators/asset_sync/install_generator.rb

@@ -4,18 +4,35 @@ module AssetSync
     desc "Install a config/asset_sync.yml and the asset:precompile rake task enhancer"
 
     # Commandline options can be defined here using Thor-like options:
-    class_option :use_yml, :type => :boolean, :default => false, :desc => "Use YML file instead of Rails Initializer"
+    class_option :use_yml,   :type => :boolean, :default => false, :desc => "Use YML file instead of Rails Initializer"
+    class_option :provider,  :type => :string,  :default => "AWS",  :desc => "Generate with support for 'AWS' or 'Rackspace'"
 
     def self.source_root
       @source_root ||= File.join(File.dirname(__FILE__), 'templates')
     end
 
-    def aws_access_key
-      "<%= ENV['AWS_ACCESS_KEY'] %>"
+    def aws?
+      options[:provider] == 'AWS'
     end
 
-    def aws_access_secret
-      "<%= ENV['AWS_ACCESS_SECRET'] %>"
+    def rackspace?
+      options[:provider] == 'Rackspace'
+    end
+
+    def aws_access_key_id
+      "<%= ENV['AWS_ACCESS_KEY_ID'] %>"
+    end
+
+    def aws_secret_access_key
+      "<%= ENV['AWS_SECRET_ACCESS_KEY'] %>"
+    end
+
+    def rackspace_username
+      "<%= ENV['RACKSPACE_USERNAME'] %>"
+    end
+
+    def rackspace_api_key
+      "<%= ENV['RACKSPACE_API_KEY'] %>"
     end
 
     def app_name
@@ -34,8 +51,5 @@ module AssetSync
       end
     end
 
-    # def generate_rake_task
-    #   template "asset_sync.rake", "lib/tasks/asset_sync.rake"
-    # end
   end
 end

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

@@ -1,12 +1,25 @@
 AssetSync.configure do |config|
-  config.aws_access_key = ENV['AWS_ACCESS_KEY']
-  config.aws_access_secret = ENV['AWS_ACCESS_SECRET']
-  config.aws_bucket = ENV['AWS_BUCKET']
-  config.existing_remote_files = "keep"
+  <%- if aws? -%>
+  config.fog_provider = 'AWS'
+  config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+  config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+  <%- elsif rackspace? -%>
+  config.fog_provider = 'Rackspace'
+  config.rackspace_username = ENV['RACKSPACE_USERNAME']
+  config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
+  <%- end -%>
+  config.fog_directory = ENV['FOG_DIRECTORY']
+  
   # Increase upload performance by configuring your region
-  # config.aws_region = "eu-west-1"
+  # config.fog_region = 'eu-west-1'
+  #
+  # Don't delete files from the store
+  # config.existing_remote_files = "keep"
+  #
   # 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.
+  #
+  # 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/lib/generators/asset_sync/templates/asset_sync.yml

@@ -1,30 +1,30 @@
 defaults: &defaults
-  aws_access_key: "<%= aws_access_key %>"
-  aws_access_secret: "<%= aws_access_secret %>"
-  # You may need to specify what region your S3 bucket is in
-  # aws_region: "eu-west-1"
+  <%- if aws? -%>
+  fog_provider: 'AWS'
+  aws_access_key_id: "<%= aws_access_key_id %>"
+  aws_secret_access_key: "<%= aws_secret_access_key %>"
+  <%- elsif rackspace? -%>
+  fog_provider: 'Rackspace'
+  rackspace_username: "<%= rackspace_username %>"
+  rackspace_api_key: "<%= rackspace_api_key %>"
+  <%- end -%>
+  fog_directory: "<%= app_name %>-assets"
+  # You may need to specify what region your storage bucket is in
+  # fog_region: "eu-west-1"
   existing_remote_files: keep
+  # To delete existing remote files.
+  # existing_remote_files: delete 
   # Automatically replace files with their equivalent gzip compressed version
   # gzip_compression = true
 
-
 development:
   <<: *defaults
-  aws_bucket: "<%= app_name %>_development"
-  # Existing pre-compiled assets on S3 will be kept
-  # existing_remote_files: keep
 
 test:
   <<: *defaults
-  aws_bucket: "<%= app_name %>_test"
 
 staging:
   <<: *defaults
-  aws_bucket: "<%= app_name %>_test"
 
 production:
   <<: *defaults
-  aws_bucket: "<%= app_name %>_production"
-  # Existing pre-compiled assets on S3 will be deleted
-  # existing_remote_files: delete 
-

data/spec/asset_sync_spec.rb

@@ -7,32 +7,38 @@ describe AssetSync, 'with initializer' do
     Rails.root = 'without_yml'
     AssetSync.config = AssetSync::Config.new
     AssetSync.configure do |config|
-      config.aws_access_key = 'aaaa'
-      config.aws_access_secret = 'bbbb'
-      config.aws_bucket = 'mybucket'
-      config.aws_region = 'eu-west-1'
+      config.fog_provider = 'AWS'
+      config.aws_access_key_id = 'aaaa'
+      config.aws_secret_access_key = 'bbbb'
+      config.fog_directory = 'mybucket'
+      config.fog_region = 'eu-west-1'
       config.existing_remote_files = "keep"
     end
   end
 
+  it "should configure provider as AWS" do
+    AssetSync.config.fog_provider.should == 'AWS'
+    AssetSync.config.should be_aws
+  end
+
   it "should should keep existing remote files" do
     AssetSync.config.existing_remote_files?.should == true
   end
 
   it "should configure aws_access_key" do
-    AssetSync.config.aws_access_key.should == "aaaa"
+    AssetSync.config.aws_access_key_id.should == "aaaa"
   end
 
   it "should configure aws_access_key" do
-    AssetSync.config.aws_access_secret.should == "bbbb"
+    AssetSync.config.aws_secret_access_key.should == "bbbb"
   end
 
   it "should configure aws_access_key" do
-    AssetSync.config.aws_bucket.should == "mybucket"
+    AssetSync.config.fog_directory.should == "mybucket"
   end
 
   it "should configure aws_access_key" do
-    AssetSync.config.aws_region.should == "eu-west-1"
+    AssetSync.config.fog_region.should == "eu-west-1"
   end
 
   it "should configure aws_access_key" do
@@ -53,24 +59,24 @@ end
 describe AssetSync, 'from yml' do
 
   before(:all) do
-    Rails.root = 'with_yml'
+    Rails.root = 'aws_with_yml'
     AssetSync.config = AssetSync::Config.new
   end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.aws_access_key.should == "xxxx"
+  it "should configure aws_access_key_id" do
+    AssetSync.config.aws_access_key_id.should == "xxxx"
   end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.aws_access_secret.should == "zzzz"
+  it "should configure aws_secret_access_key" do
+    AssetSync.config.aws_secret_access_key.should == "zzzz"
   end
 
   it "should configure aws_access_key" do
-    AssetSync.config.aws_bucket.should == "rails_app_test"
+    AssetSync.config.fog_directory.should == "rails_app_test"
   end
 
   it "should configure aws_access_key" do
-    AssetSync.config.aws_region.should == "eu-west-1"
+    AssetSync.config.fog_region.should == "eu-west-1"
   end
 
   it "should configure aws_access_key" do

data/spec/{with_yml → aws_with_yml}/config/asset_sync.yml

@@ -1,20 +1,20 @@
 defaults: &defaults
-  access_key_id: "xxxx"
-  secret_access_key: "zzzz"
+  fog_provider: "AWS"
+  aws_access_key_id: "xxxx"
+  aws_secret_access_key: "zzzz"
   region: "eu-west-1"
 
 development:
   <<: *defaults
-  bucket: "rails_app_development"
+  fog_directory: "rails_app_development"
   existing_remote_files: keep
 
 test:
   <<: *defaults
-  bucket: "rails_app_test"
+  fog_directory: "rails_app_test"
   existing_remote_files: keep
 
 production:
   <<: *defaults
-  bucket: "rails_app_production"
+  fog_directory: "rails_app_production"
   existing_remote_files: delete
-

data/spec/rackspace_spec.rb

@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+
+describe AssetSync, 'using Rackspace with initializer' do
+
+  before(:all) do
+    Rails.root = 'without_yml'
+    AssetSync.config = AssetSync::Config.new
+    AssetSync.configure do |config|
+      config.fog_provider          = 'Rackspace'
+      config.fog_directory         = 'mybucket'
+      config.fog_region            = 'dunno'
+      config.rackspace_username    = 'aaaa'
+      config.rackspace_api_key     = 'bbbb'
+      config.existing_remote_files = 'keep'
+    end
+  end
+
+  it "should configure provider as AWS" do
+    AssetSync.config.fog_provider.should == 'Rackspace'
+    AssetSync.config.should be_rackspace
+  end
+
+  it "should keep existing remote files" do
+    AssetSync.config.existing_remote_files?.should == true
+  end
+
+  it "should configure rackspace_username" do
+    AssetSync.config.rackspace_username.should == "aaaa"
+  end
+
+  it "should configure rackspace_api_key" do
+    AssetSync.config.rackspace_api_key.should == "bbbb"
+  end
+
+  it "should configure fog_directory" do
+    AssetSync.config.fog_directory.should == "mybucket"
+  end
+
+  it "should configure fog_region" do
+    AssetSync.config.fog_region.should == "dunno"
+  end
+
+  it "should configure existing_remote_files" do
+    AssetSync.config.existing_remote_files.should == "keep"
+  end
+
+end
+
+
+describe AssetSync, 'using Rackspace from yml' do
+
+  before(:all) do
+    Rails.root = 'rackspace_with_yml'
+    AssetSync.config = AssetSync::Config.new
+  end
+
+  it "should keep existing remote files" do
+    AssetSync.config.existing_remote_files?.should == true
+  end
+
+  it "should configure rackspace_username" do
+    AssetSync.config.rackspace_username.should == "xxxx"
+  end
+
+  it "should configure rackspace_api_key" do
+    AssetSync.config.rackspace_api_key.should == "zzzz"
+  end
+
+  it "should configure fog_directory" do
+    AssetSync.config.fog_directory.should == "rails_app_test"
+  end
+
+  it "should configure fog_region" do
+    AssetSync.config.fog_region.should == "eu-west-1"
+  end
+
+  it "should configure existing_remote_files" do
+    AssetSync.config.existing_remote_files.should == "keep"
+  end
+
+
+end

data/spec/rackspace_with_yml/config/asset_sync.yml

@@ -0,0 +1,20 @@
+defaults: &defaults
+  fog_provider: "Rackspace"
+  rackspace_username: "xxxx"
+  rackspace_api_key: "zzzz"
+  region: "eu-west-1"
+
+development:
+  <<: *defaults
+  fog_directory: "rails_app_development"
+  existing_remote_files: keep
+
+test:
+  <<: *defaults
+  fog_directory: "rails_app_test"
+  existing_remote_files: keep
+
+production:
+  <<: *defaults
+  fog_directory: "rails_app_production"
+  existing_remote_files: delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70137703451140 !ruby/object:Gem::Requirement
+  requirement: &70139726871260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137703451140
+  version_requirements: *70139726871260
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70137703450520 !ruby/object:Gem::Requirement
+  requirement: &70139726870840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137703450520
+  version_requirements: *70139726870840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137703449900 !ruby/object:Gem::Requirement
+  requirement: &70139726870420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137703449900
+  version_requirements: *70139726870420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70137703449240 !ruby/object:Gem::Requirement
+  requirement: &70139726870000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137703449240
+  version_requirements: *70139726870000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70137703448620 !ruby/object:Gem::Requirement
+  requirement: &70139726869580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,9 +66,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  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.
+  version_requirements: *70139726869580
+description: After you run assets:precompile your compiled assets will be synchronised
+  with your S3 bucket.
 email:
 - shamilton@rumblelabs.com
 - me@davidjrice.co.uk
@@ -89,13 +89,14 @@ files:
 - lib/asset_sync/storage.rb
 - lib/asset_sync/version.rb
 - lib/generators/asset_sync/install_generator.rb
-- lib/generators/asset_sync/templates/asset_sync.rake
 - lib/generators/asset_sync/templates/asset_sync.rb
 - lib/generators/asset_sync/templates/asset_sync.yml
 - lib/tasks/asset_sync.rake
 - spec/asset_sync_spec.rb
+- spec/aws_with_yml/config/asset_sync.yml
+- spec/rackspace_spec.rb
+- spec/rackspace_with_yml/config/asset_sync.yml
 - spec/spec_helper.rb
-- spec/with_yml/config/asset_sync.yml
 homepage: https://github.com/rumblelabs/asset_sync
 licenses: []
 post_install_message: 
@@ -119,8 +120,11 @@ rubyforge_project: asset_sync
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Synchronises Assets in a Rails 3 application and S3/Cloudfront
+summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
+  Rackspace Cloudfiles
 test_files:
 - spec/asset_sync_spec.rb
+- spec/aws_with_yml/config/asset_sync.yml
+- spec/rackspace_spec.rb
+- spec/rackspace_with_yml/config/asset_sync.yml
 - spec/spec_helper.rb
-- spec/with_yml/config/asset_sync.yml

data/lib/generators/asset_sync/templates/asset_sync.rake

@@ -1,3 +0,0 @@
-Rake::Task["assets:precompile"].enhance do
-  AssetSync.sync
-end