cloudservers 0.3.0 → 0.4.0

data/README.rdoc

@@ -26,8 +26,11 @@ See the class definitions for documentation on specific methods and operations.
   require 'rubygems'
   require 'cloudservers'
 
-  # Log into the Cloud Servers system
-  cs = CloudServers::Connection.new(:username => USERNAME, :api_key => API_KEY)	
+  # Log into the Cloud Servers
+  cs = CloudServers::Connection.new(:username => USERNAME, :api_key => API_KEY)
+
+  # Log into the Cloud Servers UK
+  cs = CloudServers::Connection.new(:username => USERNAME, :api_key => API_KEY, :auth_url => CloudServers::AUTH_UK)
 
   # Get a listing of all current servers
   >> cs.servers
@@ -80,7 +83,7 @@ See the class definitions for documentation on specific methods and operations.
 
 == Authors
 
-By H. Wade Minter <wade.minter@rackspace.com> and Mike Mayo <mike.mayo@rackspace.com>
+By H. Wade Minter <minter@lunenburg.org>, Mike Mayo <mike.mayo@rackspace.com>, and Dan Prince <dan.prince@rackspace.com>
 
 == License
 

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gemspec.description = "A Ruby API to version 1.0 of the Rackspace Cloud Servers product."
     gemspec.email = "minter@lunenburg.org"
     gemspec.homepage = "http://github.com/rackspace/cloudservers"
-    gemspec.authors = ["H. Wade Minter","Mike Mayo","Dan Prince"]
+    gemspec.authors = ["H. Wade Minter","Mike Mayo", "Dan Prince"]
     gemspec.add_dependency 'json'
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/cloudservers.gemspec

@@ -1,55 +1,53 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cloudservers}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["H. Wade Minter", "Mike Mayo", "Dan Prince"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2011-01-05}
   s.description = %q{A Ruby API to version 1.0 of the Rackspace Cloud Servers product.}
   s.email = %q{minter@lunenburg.org}
   s.extra_rdoc_files = [
     "README.rdoc",
-     "TODO"
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "COPYING",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "cloudservers.gemspec",
-     "lib/cloudservers.rb",
-     "lib/cloudservers/authentication.rb",
-     "lib/cloudservers/connection.rb",
-     "lib/cloudservers/entity_manager.rb",
-     "lib/cloudservers/exception.rb",
-     "lib/cloudservers/flavor.rb",
-     "lib/cloudservers/image.rb",
-     "lib/cloudservers/server.rb",
-     "lib/cloudservers/shared_ip_group.rb",
-     "test/cloudservers_authentication_test.rb",
-     "test/cloudservers_connection_test.rb",
-     "test/cloudservers_exception_test.rb",
-     "test/cloudservers_servers_test.rb",
-     "test/test_helper.rb"
+    "COPYING",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "cloudservers.gemspec",
+    "lib/cloudservers.rb",
+    "lib/cloudservers/authentication.rb",
+    "lib/cloudservers/connection.rb",
+    "lib/cloudservers/entity_manager.rb",
+    "lib/cloudservers/exception.rb",
+    "lib/cloudservers/flavor.rb",
+    "lib/cloudservers/image.rb",
+    "lib/cloudservers/server.rb",
+    "lib/cloudservers/shared_ip_group.rb",
+    "test/cloudservers_authentication_test.rb",
+    "test/cloudservers_connection_test.rb",
+    "test/cloudservers_exception_test.rb",
+    "test/cloudservers_servers_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/rackspace/cloudservers}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rackspace Cloud Servers Ruby API}
   s.test_files = [
     "test/cloudservers_authentication_test.rb",
-     "test/cloudservers_connection_test.rb",
-     "test/cloudservers_exception_test.rb",
-     "test/cloudservers_servers_test.rb",
-     "test/test_helper.rb"
+    "test/cloudservers_connection_test.rb",
+    "test/cloudservers_exception_test.rb",
+    "test/cloudservers_servers_test.rb",
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/cloudservers/authentication.rb

@@ -1,6 +1,6 @@
 module CloudServers
   class Authentication
-    
+
     # Performs an authentication to the Rackspace Cloud authorization servers.  Opens a new HTTP connection to the API server,
     # sends the credentials, and looks for a successful authentication.  If it succeeds, it sets the svrmgmthost,
     # svrmgtpath, svrmgmtport, svrmgmtscheme, authtoken, and authok variables on the connection.  If it fails, it raises
@@ -11,9 +11,11 @@ module CloudServers
       path = '/v1.0'
       hdrhash = { "X-Auth-User" => connection.authuser, "X-Auth-Key" => connection.authkey }
       begin
-        server = Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new('auth.api.rackspacecloud.com',443)
-        server.use_ssl = true
-        server.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        server = Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new(connection.auth_host,connection.auth_port)
+        if connection.auth_scheme == "https"
+          server.use_ssl = true
+          server.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
         server.start
       rescue
         raise CloudServers::Exception::Connection, "Unable to connect to #{server}"

data/lib/cloudservers/connection.rb

@@ -9,6 +9,9 @@ module CloudServers
     attr_accessor :svrmgmtpath
     attr_accessor :svrmgmtport
     attr_accessor :svrmgmtscheme
+    attr_reader   :auth_host
+    attr_reader   :auth_port
+    attr_reader   :auth_scheme
     attr_reader   :proxy_host
     attr_reader   :proxy_port
     
@@ -26,6 +29,7 @@ module CloudServers
     #
     #   :username - Your Rackspace Cloud username *required*
     #   :api_key - Your Rackspace Cloud API key *required*
+    #   :auth_url - Configurable auth_url endpoint.
     #   :retry_auth - Whether to retry if your auth token expires (defaults to true)
     #   :proxy_host - If you need to connect through a proxy, supply the hostname here
     #   :proxy_port - If you need to connect through a proxy, supply the port here
@@ -34,6 +38,19 @@ module CloudServers
     def initialize(options = {:retry_auth => true}) 
       @authuser = options[:username] || (raise Exception::Authentication, "Must supply a :username")
       @authkey = options[:api_key] || (raise Exception::Authentication, "Must supply an :api_key")
+      @auth_url = options[:auth_url] || @auth_url = CloudServers::AUTH_USA
+
+      auth_uri=nil
+      begin
+        auth_uri=URI.parse(@auth_url)
+      rescue Exception => e
+        raise Exception::InvalidArgument, "Invalid :auth_url parameter: #{e.message}"
+      end
+      raise Exception::InvalidArgument, "Invalid :auth_url parameter." if auth_uri.nil? or auth_uri.host.nil?
+      @auth_host = auth_uri.host
+      @auth_port = auth_uri.port
+      @auth_scheme = auth_uri.scheme
+
       @retry_auth = options[:retry_auth]
       @proxy_host = options[:proxy_host]
       @proxy_port = options[:proxy_port]

data/lib/cloudservers/exception.rb

@@ -49,6 +49,8 @@ module CloudServers
     end
     class MissingArgument             < StandardError # :nodoc:
     end
+    class InvalidArgument             < StandardError # :nodoc:
+    end
     class TooManyPersonalityItems     < StandardError # :nodoc:
     end
     class PersonalityFilePathTooLong  < StandardError # :nodoc:
@@ -69,9 +71,9 @@ module CloudServers
         fault = nil
         info = nil
         JSON.parse(response.body).each_pair do |key, val|
-			fault=key
-			info=val
-		end
+            fault=key
+            info=val
+        end
         exception_class = self.const_get(fault[0,1].capitalize+fault[1,fault.length])
         raise exception_class.new(info["message"], response.code, response.body)
       rescue NameError

data/lib/cloudservers.rb

@@ -2,7 +2,7 @@
 # 
 # == Cloud Servers API
 # ==== Connects Ruby Applications to Rackspace's {Cloud Servers service}[http://www.rackspacecloud.com/cloud_hosting_products/servers]
-# By H. Wade Minter <minter@lunenburg.org> and Mike Mayo <mike.mayo@rackspace.com>
+# By H. Wade Minter <minter@lunenburg.org>, Mike Mayo <mike.mayo@rackspace.com>, and Dan Prince <dan.prince@rackspace.com>
 #
 # See COPYING for license information.
 # Copyright (c) 2009, Rackspace US, Inc.
@@ -13,10 +13,13 @@
 # CloudServers::Connection class.
 #
 # The CloudServers class is the base class.  Not much of note aside from housekeeping happens here.
-# To create a new CloudServers connection, use the CloudServers::Connection.new('user_name', 'api_key') method.
+# To create a new CloudServers connection, use the CloudServers::Connection.new(:username => USERNAME, :api_key => API_KEY)
 
 module CloudServers
 
+  AUTH_USA = "https://auth.api.rackspacecloud.com"
+  AUTH_UK = "https://lon.auth.api.rackspacecloud.com"
+
   VERSION = IO.read(File.dirname(__FILE__) + '/../VERSION')
   require 'net/http'
   require 'net/https'

data/test/cloudservers_authentication_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 class CloudserversAuthenticationTest < Test::Unit::TestCase
  
@@ -8,7 +9,7 @@ class CloudserversAuthenticationTest < Test::Unit::TestCase
     server = mock(:use_ssl= => true, :verify_mode= => true, :start => true, :finish => true)
     server.stubs(:get).returns(response)
     Net::HTTP.stubs(:new).returns(server)
-    connection = stub(:authuser => 'bad_user', :authkey => 'bad_key', :authok= => true, :authtoken= => true, :svrmgmthost= => "", :svrmgmtpath= => "", :svrmgmtpath => "", :svrmgmtport= => "", :svrmgmtscheme= => "", :proxy_host => nil, :proxy_port => nil)
+    connection = stub(:authuser => 'myuser', :authkey => 'bad_key', :auth_host => "a.b.c", :auth_port => "443", :auth_scheme => "https", :authok= => true, :authtoken= => true, :svrmgmthost= => "", :svrmgmtpath= => "", :svrmgmtpath => "", :svrmgmtport= => "", :svrmgmtscheme= => "", :proxy_host => nil, :proxy_port => nil)
     result = CloudServers::Authentication.new(connection)
     assert_equal result.class, CloudServers::Authentication
   end
@@ -19,7 +20,7 @@ class CloudserversAuthenticationTest < Test::Unit::TestCase
     server = mock(:use_ssl= => true, :verify_mode= => true, :start => true)
     server.stubs(:get).returns(response)
     Net::HTTP.stubs(:new).returns(server)
-    connection = stub(:authuser => 'bad_user', :authkey => 'bad_key', :authok= => true, :authtoken= => true, :proxy_host => nil, :proxy_port => nil)
+    connection = stub(:authuser => 'bad_user', :authkey => 'bad_key', :auth_host => "a.b.c", :auth_port => "443", :auth_scheme => "https", :authok= => true, :authtoken= => true, :proxy_host => nil, :proxy_port => nil)
     assert_raises(CloudServers::Exception::Authentication) do
       result = CloudServers::Authentication.new(connection)
     end
@@ -27,7 +28,7 @@ class CloudserversAuthenticationTest < Test::Unit::TestCase
     
   def test_bad_hostname
     Net::HTTP.stubs(:new).raises(CloudServers::Exception::Connection)
-    connection = stub(:authuser => 'bad_user', :authkey => 'bad_key', :authok= => true, :authtoken= => true, :proxy_host => nil, :proxy_port => nil)
+    connection = stub(:authuser => 'bad_user', :authkey => 'bad_key', :auth_host => "a.b.c", :auth_port => "443", :auth_scheme => "https", :authok= => true, :authtoken= => true, :proxy_host => nil, :proxy_port => nil)
     assert_raises(CloudServers::Exception::Connection) do
       result = CloudServers::Authentication.new(connection)
     end

data/test/cloudservers_connection_test.rb

@@ -1,6 +1,12 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 class CloudServersConnectionTest < Test::Unit::TestCase
+
+  def setup
+    connection = stub()
+    CloudServers::Authentication.stubs(:new).returns(connection)
+  end
   
   def test_init_connection_no_credentials
     assert_raises(CloudServers::Exception::Authentication) do
@@ -13,5 +19,21 @@ class CloudServersConnectionTest < Test::Unit::TestCase
       conn = CloudServers::Connection.new(:username => "test_account")
     end
   end
+
+  def test_init_connection_bad_auth_url
+    assert_raises(CloudServers::Exception::InvalidArgument) do
+      conn = CloudServers::Connection.new(:username => "test_account", :api_key => "AABBCCDD11", :auth_url => "***")
+    end
+  end
+
+  def test_init_connection
+      conn = CloudServers::Connection.new(:username => "test_account", :api_key => "AABBCCDD11", :auth_url => "https://a.b.c")
+      assert_not_nil conn, "Connection.new returned nil."
+  end
+
+  def test_init_connection_with_custom_auth_url
+      conn = CloudServers::Connection.new(:username => "test_account", :api_key => "AABBCCDD11", :auth_url => CloudServers::AUTH_UK)
+      assert_not_nil conn, "Connection.new returned nil."
+  end
     
 end

data/test/cloudservers_exception_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 class CloudServersExceptionTest < Test::Unit::TestCase
   

data/test/cloudservers_servers_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 class CloudServersServersTest < Test::Unit::TestCase
 
@@ -70,15 +71,15 @@ json_response = %{{
   def test_get_server
 
     server=get_test_server
-    assert "sample-server", server.name
-    assert "2", server.imageId
-    assert "1", server.flavorId
-    assert "e4d909c290d0fb1ca068ffaddf22cbd0", server.hostId
-    assert "BUILD", server.status
-    assert "60", server.progress
-    assert "67.23.10.132", server.addresses[:public][0]
-    assert "67.23.10.131", server.addresses[:public][1]
-    assert "10.176.42.16", server.addresses[:private][1]
+    assert_equal "sample-server", server.name
+    assert_equal 2, server.imageId
+    assert_equal 1, server.flavorId
+    assert_equal "e4d909c290d0fb1ca068ffaddf22cbd0", server.hostId
+    assert_equal "BUILD", server.status
+    assert_equal 60, server.progress
+    assert_equal "67.23.10.132", server.addresses[:public][0]
+    assert_equal "67.23.10.131", server.addresses[:public][1]
+    assert_equal "10.176.42.16", server.addresses[:private][0]
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudservers
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -04:00
+date: 2011-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,6 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
-- .gitignore
 - COPYING
 - README.rdoc
 - Rakefile
@@ -70,8 +69,8 @@ homepage: http://github.com/rackspace/cloudservers
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,2 +0,0 @@
-pkg/
-doc/