fog 1.10.0 → 1.10.1

data/lib/fog/rackspace/examples/storage/create_private_directory.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates creating a container with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Cloud Files service
+service = Fog::Storage.new({
+  :provider             => 'Rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+  })
+  
+  
+# prompt for directory name
+directory_name = get_user_input "\nEnter name of directory to create"
+
+# create directory
+directory = service.directories.create :key => directory_name
+
+# reload directory to refresh information
+directory.reload
+
+puts "\n Directory #{directory.key} was created."
+puts "To delete the container please execute the delete_directory.rb script\n\n"
+  
+  

data/lib/fog/rackspace/examples/storage/delete_directory.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates deleting a container with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_directory(directories)
+  abort "\nThere are not any directories to delete in the Chicago region. Try running create_directory.rb\n\n" if directories.empty?
+  
+  puts "\nSelect Directory To Delete:\n\n"
+  directories.each_with_index do |dir, i|
+    puts "\t #{i}. #{dir.key} [#{dir.count} objects]"
+  end
+
+  delete_str = get_user_input "\nEnter Directory Number"
+  directories[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Cloud Files service
+service = Fog::Storage.new({
+  :provider             => 'Rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+  })
+  
+# retrieve directories  
+directories = service.directories
+  
+# prompt for directory
+directory = select_directory(directories)
+
+puts "\nNow deleting #{directory.key}"
+
+# delete files if necessary
+directory.files.each do |f| 
+  puts "\tDeleting file #{f.key}"
+  f.destroy
+end
+
+# delete directory
+directory.destroy
+
+puts "\tDone\n\n"  

data/lib/fog/rackspace/examples/storage/delete_file.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates deleting a file from a container with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_directory(directories)
+  abort "\nThere are not any directories with files to delete in the Chicago region. Try running create_file.rb\n\n" if directories.empty?
+  
+  puts "\nSelect Directory:\n\n"
+  directories.each_with_index do |dir, i|
+    puts "\t #{i}. #{dir.key} [#{dir.count} objects]"
+  end
+
+  delete_str = get_user_input "\nEnter Directory Number"
+  directories[delete_str.to_i]
+end
+
+def select_file(files)
+  puts "\nSelect File:\n\n"
+  files.each_with_index do |file, i|
+    puts "\t #{i}. #{file.key}"
+  end
+
+  delete_str = get_user_input "\nEnter File Number"
+  files[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Cloud Files service
+service = Fog::Storage.new({
+  :provider             => 'Rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+  })
+  
+# retrieve directories with files
+directories = service.directories.select {|s| s.count > 0}
+  
+# prompt for directory
+directory = select_directory(directories)
+
+# list of files for directory
+files = directory.files
+
+# prompt for file to delete
+file = select_file(files)
+
+# delete file
+file.destroy
+
+puts "\nFile #{file.key} was successfully deleted"

data/lib/fog/rackspace/examples/storage/download_file.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates downloading a file with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_directory(directories)
+  abort "\nThere are not any directories with files in the Chicago region. Try running create_file.rb\n\n" if directories.empty?
+  
+  puts "\nSelect Directory:\n\n"
+  directories.each_with_index do |dir, i|
+    puts "\t #{i}. #{dir.key} [#{dir.count} objects]"
+  end
+
+  delete_str = get_user_input "\nEnter Directory Number"
+  directories[delete_str.to_i]
+end
+
+def select_file(files)
+  puts "\nSelect File:\n\n"
+  files.each_with_index do |file, i|
+    puts "\t #{i}. #{file.key}"
+  end
+
+  delete_str = get_user_input "\nEnter File Number"
+  files[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Cloud Files service
+service = Fog::Storage.new({
+  :provider             => 'Rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+  })
+  
+# retrieve directories with files
+directories = service.directories.select {|s| s.count > 0}
+  
+# prompt for directory
+directory = select_directory(directories)
+
+# list of files for directory
+files = directory.files
+
+# prompt for file to download
+file = select_file(files)
+
+# download file
+filename = File.join(File.dirname(__FILE__), "downloaded-#{file.key}")
+File.open(filename, 'w') do | f |
+  directory.files.get(file.key) do | data, remaining, content_length |
+    f.syswrite data
+  end
+end
+
+puts "\nFile #{file.key} was successfully downloaded to #{filename}"

data/lib/fog/rackspace/examples/storage/lorem.txt

@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/lib/fog/rackspace/examples/storage/storage_metadata.rb

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates creating a file on the CDN network with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+def print_metadata(object)
+  object.metadata.each_pair do |key, value|
+    puts "\t#{key}: #{value}"
+  end
+  puts "\n"
+end
+
+# create Cloud Files service
+service = Fog::Storage.new({
+  :provider             => 'Rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+  })
+  
+
+# create directory
+puts "Creating directory 'metadata-tester'"
+directory = service.directories.create :key => "metadata-tester"
+
+# initial metadata
+puts "Initial Container Metadata\n"                                
+print_metadata directory
+
+# adding metadata
+puts "Adding Container Metadata"
+directory.metadata["environment"] = "demo"
+directory.save
+print_metadata directory
+
+# update metadata
+puts "Updating Container Metadata"
+directory.metadata["environment"] = "test"
+directory.save
+print_metadata directory
+
+# upload file
+puts "Uploading file"
+upload_file = File.join(File.dirname(__FILE__), "lorem.txt")
+file = directory.files.create :key => 'sample.txt', :body => File.open(upload_file, "r")
+
+# initial metadata
+puts "Initial File Metadata\n"                                
+print_metadata file
+
+# adding metadata
+puts "Adding File Metadata"
+file.metadata["preview"] = "true"
+file.save
+print_metadata file
+
+# update metadata
+puts "Updating File Metadata"
+file.metadata["preview"] = "false"
+file.save
+print_metadata file
+
+puts "To delete the directory and file please execute the delete_directory.rb script\n\n"
+
+
+
+
+

data/lib/fog/rackspace/examples/storage/upload_file.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates creating a file on the CDN network with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Cloud Files service
+service = Fog::Storage.new({
+  :provider             => 'Rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+  })
+  
+# prompt for directory name
+directory_name = get_user_input "\nEnter name of directory to create"
+
+# create directory with CDN service
+directory = service.directories.create :key => directory_name, :public => true
+
+# upload file
+upload_file = File.join(File.dirname(__FILE__), "lorem.txt")
+file = directory.files.create :key => 'sample.txt', :body => File.open(upload_file, "r")
+
+puts "You should not be able to view this file via CDN at #{file.public_url}"
+puts "To delete the container and associated file please execute the delete_directory.rb script\n\n"
+  

data/lib/fog/rackspace/identity.rb

@@ -7,7 +7,7 @@ module Fog
       UK_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0'
 
       requires :rackspace_username, :rackspace_api_key
-      recognizes :rackspace_auth_url
+      recognizes :rackspace_auth_url, :rackspace_region
 
       model_path 'fog/rackspace/models/identity'
       model :user
@@ -18,6 +18,7 @@ module Fog
       collection :credentials
       model :tenant
       collection :tenants
+      model :service_catalog
 
       request_path 'fog/rackspace/requests/identity'
       request :create_token
@@ -33,15 +34,20 @@ module Fog
       request :delete_user
 
       class Mock
+        attr_reader :service_catalog
+        
         def request
           Fog::Mock.not_implemented
         end
       end
 
       class Real
+        attr_reader :service_catalog, :auth_token
+        
         def initialize(options={})
           @rackspace_username = options[:rackspace_username]
           @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_region = options[:rackspace_region]
           @rackspace_auth_url = options[:rackspace_auth_url] || US_ENDPOINT
 
           uri = URI.parse(@rackspace_auth_url)
@@ -55,7 +61,7 @@ module Fog
 
           authenticate
         end
-
+        
         def request(params)
           begin
             parameters = params.merge!({
@@ -72,9 +78,10 @@ module Fog
             response
           end
         end
-
+        
         def authenticate
           data = self.create_token(@rackspace_username, @rackspace_api_key).body
+          @service_catalog = ServiceCatalog.from_response(self, data)
           @auth_token = data['access']['token']['id']
         end
       end

data/lib/fog/rackspace/load_balancers.rb

@@ -9,14 +9,16 @@ module Fog
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
       class BadRequest < Fog::Rackspace::Errors::BadRequest; end
 
-      DFW_ENDPOINT = 'https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/'
-      ORD_ENDPOINT = 'https://ord.loadbalancers.api.rackspacecloud.com/v1.0/'
-      LON_ENDPOINT = 'https://lon.loadbalancers.api.rackspacecloud.com/v1.0/'
+      DFW_ENDPOINT = 'https://dfw.loadbalancers.api.rackspacecloud.com/v1.0'
+      ORD_ENDPOINT = 'https://ord.loadbalancers.api.rackspacecloud.com/v1.0'
+      LON_ENDPOINT = 'https://lon.loadbalancers.api.rackspacecloud.com/v1.0'
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url
       recognizes :rackspace_auth_token
       recognizes :rackspace_lb_endpoint
+      recognizes :rackspace_load_balancers_url
+      recognizes :rackspace_region
 
       model_path 'fog/rackspace/models/load_balancers'
       collection :load_balancers
@@ -87,7 +89,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
         include Shared
 
         def initialize(options={})
@@ -98,7 +100,7 @@ module Fog
 
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
         include Shared
 
         def initialize(options={})
@@ -107,16 +109,13 @@ module Fog
           @rackspace_auth_url = options[:rackspace_auth_url]
           @rackspace_must_reauthenticate = false
           @connection_options     = options[:connection_options] || {}
-          uri = URI.parse(options[:rackspace_lb_endpoint] || DFW_ENDPOINT)
-          @host       = uri.host
-          @persistent = options[:persistent] || false
-          @path       = uri.path.end_with?('/') ? uri.path.chop : uri.path
-          @port       = uri.port
-          @scheme     = uri.scheme
+
+          setup_custom_endpoint(options)
 
           authenticate
 
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
 
         def request(params)
@@ -126,10 +125,10 @@ module Fog
               :headers  => {
                 'Content-Type' => 'application/json',
                 'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
+                'X-Auth-Token' => auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}"
+              :host     => endpoint_uri.host,
+              :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
             raise NotFound.slurp error
@@ -148,15 +147,74 @@ module Fog
 
         def authenticate
           options = {
-            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_api_key => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
             :rackspace_auth_url => @rackspace_auth_url
           }
+          super(options)
+        end
+
+        def service_name
+          :cloudLoadBalancers
+        end
+
+        def region
+          @rackspace_region
+        end
+
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_load_balancers_url)
+        end
+
+        private
+
+        def setup_custom_endpoint(options)
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_load_balancers_url] || options[:rackspace_lb_endpoint])
+
+          if v2_authentication?
+            case @rackspace_endpoint
+            when DFW_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :dfw
+            when ORD_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :ord
+            when LON_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :lon
+            else
+              # we are actually using a custom endpoint
+              @rackspace_region = options[:rackspace_region] || :dfw
+            end
+          else
+            #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
+             @rackspace_endpoint ||= DFW_ENDPOINT
+          end
+        end
+
+        def deprecation_warnings(options)
+          Fog::Logger.deprecation("The :rackspace_lb_endpoint option is deprecated. Please use :rackspace_load_balancers_url for custom endpoints") if options[:rackspace_lb_endpoint]
+
+          if [DFW_ENDPOINT, ORD_ENDPOINT, LON_ENDPOINT].include?(@rackspace_endpoint) && v2_authentication?
+            regions = @identity_service.service_catalog.display_service_regions(service_name)
+            Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid regions for :rackspace_region are #{regions}.")
+          end
+        end
+
+        def append_tenant_v1(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
+
+          endpoint = @rackspace_endpoint || credentials['X-Server-Management-Url'] || DFW_ENDPOINT
+          @uri = URI.parse(endpoint)
+          @uri.path = "#{@uri.path}/#{account_id}"
+        end
+
+        def authenticate_v1(options)
           credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          append_tenant_v1 credentials
           @auth_token = credentials['X-Auth-Token']
-          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
-          @path = "#{@path}/#{account_id}"
         end
+
       end
     end
   end