asset_sync 0.2.2 → 0.2.3

data/README.md

@@ -184,6 +184,10 @@ Or add to a traditional unix system
 * **rackspace\_username**: your Rackspace username
 * **rackspace\_api\_key**: your Rackspace API Key.
 
+#### Rackspace Optional
+
+* **rackspace\_auth\_url**: Rackspace auth URL, for Rackspace London use: lon.auth.api.rackspacecloud.com
+
 ## Amazon S3 Multiple Region Support
 
 If you are using anything other than the US buckets with S3 then you'll want to set the **region**. For example with an EU bucket you could set the following with YAML.

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-11-29"
+  s.date        = "2011-12-06"
   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/config.rb

@@ -19,7 +19,7 @@ module AssetSync
     attr_accessor :aws_access_key_id, :aws_secret_access_key
 
     # Rackspace
-    attr_accessor :rackspace_username, :rackspace_api_key
+    attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
 
     validates :existing_remote_files, :inclusion => { :in => %w(keep delete) }
 
@@ -84,6 +84,7 @@ module AssetSync
       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_auth_url    = yml["rackspace_auth_url"] if yml.has_key?("rackspace_auth_url")
       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")
@@ -116,6 +117,9 @@ module AssetSync
           :rackspace_username => rackspace_username,
           :rackspace_api_key => rackspace_api_key
         })
+
+        options.merge!({ :rackspace_auth_url => rackspace_auth_url }) if rackspace_auth_url
+
       else
         raise ArgumentError, "AssetSync Unknown provider: #{fog_provider} only AWS and Rackspace are supported currently."
       end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

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

@@ -7,6 +7,9 @@ AssetSync.configure do |config|
   config.fog_provider = 'Rackspace'
   config.rackspace_username = ENV['RACKSPACE_USERNAME']
   config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
+
+  # if you need to change rackspace_auth_url (e.g. if you need to use Rackspace London)
+  # config.rackspace_auth_url = "lon.auth.api.rackspacecloud.com"
   <%- end -%>
   config.fog_directory = ENV['FOG_DIRECTORY']
   

data/lib/generators/asset_sync/templates/asset_sync.yml

@@ -7,6 +7,8 @@ defaults: &defaults
   fog_provider: 'Rackspace'
   rackspace_username: "<%= rackspace_username %>"
   rackspace_api_key: "<%= rackspace_api_key %>"
+  # if you need to change rackspace_auth_url (e.g. if you need to use Rackspace London)
+  # rackspace_auth_url: "lon.auth.api.rackspacecloud.com"
   <%- end -%>
   fog_directory: "<%= app_name %>-assets"
   # You may need to specify what region your storage bucket is in

data/spec/rackspace_spec.rb

@@ -16,7 +16,7 @@ describe AssetSync, 'using Rackspace with initializer' do
     end
   end
 
-  it "should configure provider as AWS" do
+  it "should configure provider as Rackspace" do
     AssetSync.config.fog_provider.should == 'Rackspace'
     AssetSync.config.should be_rackspace
   end
@@ -45,6 +45,14 @@ describe AssetSync, 'using Rackspace with initializer' do
     AssetSync.config.existing_remote_files.should == "keep"
   end
 
+  it "should configure existing_remote_files" do
+    AssetSync.config.existing_remote_files.should == "keep"
+  end
+
+  it "should default rackspace_auth_url to false" do
+    AssetSync.config.rackspace_auth_url.should be_false
+  end
+
 end
 
 

metadata

@@ -2,7 +2,7 @@
 name: asset_sync
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Simon Hamilton
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog