cloudservers 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+================================================================================
+ 0.4.2 (2012/01/13)
+================================================================================
+  o Test fixtures.
+  o Fix issue with paths, applicable for ruby 1.9.
+  o Change ConnectionException to Connection.
+  o Accept all 20x status codes to support OpenStack.
+
 ================================================================================
  0.4.1 (2011/02/02)
 ================================================================================

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/cloudservers.gemspec

@@ -1,11 +1,8 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require './lib/cloudservers/version'
 
 Gem::Specification.new do |s|
   s.name = %q{cloudservers}
-  s.version = "0.4.1"
+  s.version = CloudServers::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["H. Wade Minter", "Mike Mayo", "Dan Prince"]
@@ -22,7 +19,6 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "TODO",
-    "VERSION",
     "cloudservers.gemspec",
     "lib/cloudservers.rb",
     "lib/cloudservers/authentication.rb",
@@ -33,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/cloudservers/image.rb",
     "lib/cloudservers/server.rb",
     "lib/cloudservers/shared_ip_group.rb",
+    "lib/cloudservers/version.rb",
     "test/cloudservers_authentication_test.rb",
     "test/cloudservers_connection_test.rb",
     "test/cloudservers_exception_test.rb",

data/lib/cloudservers/authentication.rb

@@ -21,7 +21,7 @@ module CloudServers
         raise CloudServers::Exception::Connection, "Unable to connect to #{server}"
       end
       response = server.get(path,hdrhash)
-      if (response.code == "204")
+      if (response.code =~ /^20./)
         connection.authtoken = response["x-auth-token"]
         connection.svrmgmthost = URI.parse(response["x-server-management-url"]).host
         connection.svrmgmtpath = URI.parse(response["x-server-management-url"]).path

data/lib/cloudservers/connection.rb

@@ -86,7 +86,7 @@ module CloudServers
       retry
     rescue CloudServers::Exception::ExpiredAuthToken
       raise CloudServers::Exception::Connection, "Authentication token expired and you have requested not to retry" if @retry_auth == false
-      CloudFiles::Authentication.new(self)
+      CloudServers::Authentication.new(self)
       retry
     end
     
@@ -331,7 +331,7 @@ module CloudServers
           end
           @http[server].start
         rescue
-          raise CloudServers::Exception::ConnectionException, "Unable to connect to #{server}"
+          raise CloudServers::Exception::Connection, "Unable to connect to #{server}"
         end
       end
     end

data/lib/cloudservers/server.rb

@@ -10,7 +10,6 @@ module CloudServers
     attr_reader   :hostId
     attr_reader   :imageId
     attr_reader   :flavorId
-    attr_reader   :metadata
     attr_accessor :adminPass
     
     # This class is the representation of a single Cloud Server object.  The constructor finds the server identified by the specified
@@ -54,7 +53,6 @@ module CloudServers
       @hostId    = data["hostId"]
       @imageId   = data["imageId"]
       @flavorId  = data["flavorId"]
-      @metadata  = data["metadata"]
       true
     end
     alias :refresh :populate

data/lib/cloudservers/version.rb

@@ -0,0 +1,3 @@
+module CloudServers
+  VERSION = '0.4.2'
+end

data/lib/cloudservers.rb

@@ -20,7 +20,6 @@ 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'
   require 'uri'
@@ -34,6 +33,7 @@ module CloudServers
   end
 
   $:.unshift(File.dirname(__FILE__))
+  require 'cloudservers/version'
   require 'cloudservers/authentication'
   require 'cloudservers/connection'
   require 'cloudservers/server'

data/test/cloudservers_servers_test.rb

@@ -4,31 +4,6 @@ require 'tempfile'
 
 class CloudServersServersTest < Test::Unit::TestCase
 
-CREATE_SERVER_JSON = %{{
-  "server" : {
-      "id" : 1234,
-      "name" : "sample-server",
-      "imageId" : 2,
-      "flavorId" : 1,
-      "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
-      "adminPass" : "blah",
-      "status" : "BUILD",
-      "progress" : 60,
-      "addresses" : {
-          "public" : [
-               "67.23.10.132"
-          ],
-          "private" : [
-               "10.176.42.16"
-          ]
-      },
-      "metadata" : {
-          "Racker" : "Fanatical"
-      }
-  }
-}}
-
-
   include TestConnection
 
   def setup
@@ -37,53 +12,8 @@ CREATE_SERVER_JSON = %{{
   
   def test_list_servers
 
-json_response = %{{
-  "servers" : [
-      {
-     "id" : 1234,
-      "name" : "sample-server",
-      "imageId" : 2,
-      "flavorId" : 1,
-      "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
-      "status" : "BUILD",
-      "progress" : 60,
-      "addresses" : {
-          "public" : [
-              "67.23.10.132",
-              "67.23.10.131"
-          ],
-          "private" : [
-              "10.176.42.16"
-          ]
-      },
-      "metadata" : {
-          "Server Label" : "Web Head 1",
-          "Image Version" : "2.1"
-      }
-      },
-      {
-    "id" : 5678,
-      "name" : "sample-server2",
-      "imageId" : 2,
-      "flavorId" : 1,
-      "hostId" : "9e107d9d372bb6826bd81d3542a419d6",
-      "status" : "ACTIVE",
-      "addresses" : {
-          "public" : [
-              "67.23.10.133"
-          ],
-          "private" : [
-              "10.176.42.17"
-          ]
-      },
-      "metadata" : {
-          "Server Label" : "DB 1"
-      }
-      }
-  ]
-}}
     response = mock()
-    response.stubs(:code => "200", :body => json_response)
+    response.stubs(:code => "200", :body => fixture('list_servers.json'))
 
     @conn.stubs(:csreq).returns(response)
     servers=@conn.list_servers
@@ -189,7 +119,7 @@ json_response = %{{
   def test_create_server_with_local_file_personality
 
     response = mock()
-    response.stubs(:code => "200", :body => CREATE_SERVER_JSON)
+    response.stubs(:code => "200", :body => fixture('create_server.json'))
     @conn.stubs(:csreq).returns(response)
 
     tmp = Tempfile.open('ruby_cloud_servers')
@@ -205,7 +135,7 @@ json_response = %{{
   def test_create_server_with_personalities
 
     response = mock()
-    response.stubs(:code => "200", :body => CREATE_SERVER_JSON)
+    response.stubs(:code => "200", :body => fixture('create_server.json'))
     @conn.stubs(:csreq).returns(response)
 
     server = @conn.create_server(:name => "sample-server", :imageId => 2, :flavorId => 2, :metadata => {'Racker' => 'Fanatical'}, :personality => [{:path => '/root/hello.txt', :contents => "Hello there!"}, {:path => '/root/.ssh/authorized_keys', :contents => ""}])
@@ -234,33 +164,8 @@ json_response = %{{
 private
   def get_test_server
 
-json_response = %{{
-  "server" : {
-      "id" : 1234,
-      "name" : "sample-server",
-      "imageId" : 2,
-      "flavorId" : 1,
-      "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
-      "status" : "BUILD",
-      "progress" : 60,
-      "addresses" : {
-          "public" : [
-               "67.23.10.132",
-               "67.23.10.131"
-          ],
-          "private" : [
-               "10.176.42.16"
-          ]
-      },
-      "metadata" : {
-          "Server Label" : "Web Head 1",
-          "Image Version" : "2.1"
-      }
-  }
-}}
-
     response = mock()
-    response.stubs(:code => "200", :body => json_response)
+    response.stubs(:code => "200", :body => fixture('test_server.json'))
 
     @conn=get_test_connection
 

data/test/fixtures/create_server.json

@@ -0,0 +1,23 @@
+{
+  "server" : {
+      "id" : 1234,
+      "name" : "sample-server",
+      "imageId" : 2,
+      "flavorId" : 1,
+      "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
+      "adminPass" : "blah",
+      "status" : "BUILD",
+      "progress" : 60,
+      "addresses" : {
+          "public" : [
+               "67.23.10.132"
+          ],
+          "private" : [
+               "10.176.42.16"
+          ]
+      },
+      "metadata" : {
+          "Racker" : "Fanatical"
+      }
+  }
+}

data/test/fixtures/list_servers.json

@@ -0,0 +1,45 @@
+{
+  "servers" : [
+      {
+     "id" : 1234,
+      "name" : "sample-server",
+      "imageId" : 2,
+      "flavorId" : 1,
+      "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
+      "status" : "BUILD",
+      "progress" : 60,
+      "addresses" : {
+          "public" : [
+              "67.23.10.132",
+              "67.23.10.131"
+          ],
+          "private" : [
+              "10.176.42.16"
+          ]
+      },
+      "metadata" : {
+          "Server Label" : "Web Head 1",
+          "Image Version" : "2.1"
+      }
+      },
+      {
+    "id" : 5678,
+      "name" : "sample-server2",
+      "imageId" : 2,
+      "flavorId" : 1,
+      "hostId" : "9e107d9d372bb6826bd81d3542a419d6",
+      "status" : "ACTIVE",
+      "addresses" : {
+          "public" : [
+              "67.23.10.133"
+          ],
+          "private" : [
+              "10.176.42.17"
+          ]
+      },
+      "metadata" : {
+          "Server Label" : "DB 1"
+      }
+      }
+  ]
+}

data/test/fixtures/test_server.json

@@ -0,0 +1,24 @@
+{
+  "server" : {
+      "id" : 1234,
+      "name" : "sample-server",
+      "imageId" : 2,
+      "flavorId" : 1,
+      "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
+      "status" : "BUILD",
+      "progress" : 60,
+      "addresses" : {
+          "public" : [
+               "67.23.10.132",
+               "67.23.10.131"
+          ],
+          "private" : [
+               "10.176.42.16"
+          ]
+      },
+      "metadata" : {
+          "Server Label" : "Web Head 1",
+          "Image Version" : "2.1"
+      }
+  }
+}

data/test/test_helper.rb

@@ -19,3 +19,11 @@ def get_test_connection
 end
 
 end
+
+def fixture_path
+  File.expand_path("../fixtures", __FILE__)
+end
+
+def fixture(file)
+  File.read(fixture_path + '/' + file)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudservers
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -05:00
+date: 2012-01-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,10 +60,14 @@ files:
 - lib/cloudservers/image.rb
 - lib/cloudservers/server.rb
 - lib/cloudservers/shared_ip_group.rb
+- lib/cloudservers/version.rb
 - test/cloudservers_authentication_test.rb
 - test/cloudservers_connection_test.rb
 - test/cloudservers_exception_test.rb
 - test/cloudservers_servers_test.rb
+- test/fixtures/create_server.json
+- test/fixtures/list_servers.json
+- test/fixtures/test_server.json
 - test/test_helper.rb
 has_rdoc: true
 homepage: https://github.com/rackspace/ruby-cloudservers