cloudservers 0.4.0 → 0.4.1

data/CHANGELOG

@@ -0,0 +1,9 @@
+================================================================================
+ 0.4.1 (2011/02/02)
+================================================================================
+  o Support creation of personalities without using the local filesystem.
+
+================================================================================
+ 0.4.0 (2011/01/05)
+================================================================================
+  o Configurable :auth_url support. Add constants for Cloud Servers USA and UK.

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.summary = "Rackspace Cloud Servers Ruby API"
     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.homepage = "https://github.com/rackspace/ruby-cloudservers"
     gemspec.authors = ["H. Wade Minter","Mike Mayo", "Dan Prince"]
     gemspec.add_dependency 'json'
   end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/cloudservers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudservers}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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{2011-01-05}
+  s.date = %q{2011-02-02}
   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 = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "TODO"
   ]
   s.files = [
+    "CHANGELOG",
     "COPYING",
     "README.rdoc",
     "Rakefile",
@@ -38,7 +39,7 @@ Gem::Specification.new do |s|
     "test/cloudservers_servers_test.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/rackspace/cloudservers}
+  s.homepage = %q{https://github.com/rackspace/ruby-cloudservers}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rackspace Cloud Servers Ruby API}

data/lib/cloudservers/connection.rb

@@ -150,8 +150,10 @@ module CloudServers
     # API level.
     #
     # The "Personality" option allows you to include up to five files, of 10Kb or less in size, that will be placed on the created server.
-    # For :personality, pass a hash of the form {'local_path' => 'server_path'}.  The file located at local_path will be base64-encoded
-    # and placed at the location identified by server_path on the new server.
+    # For :personality, you may pass either
+    # a. a hash of the form {'local_path' => 'server_path'}.  The file contents of the file located at local_path will
+    #    be placed at the location identified by server_path on the new server.
+    # b. an array of items like {:path => "/path/on/server", :contents=>"contents of file on server"}
     #
     # Returns a CloudServers::Server object.  The root password is available in the adminPass instance method.
     #
@@ -329,7 +331,7 @@ module CloudServers
           end
           @http[server].start
         rescue
-          raise ConnectionException, "Unable to connect to #{server}"
+          raise CloudServers::Exception::ConnectionException, "Unable to connect to #{server}"
         end
       end
     end
@@ -339,17 +341,32 @@ module CloudServers
       return if options.nil?
       require 'base64'
       data = []
-      itemcount = 0
-      options.each do |localpath,svrpath|
-        raise CloudServers::Exception::TooManyPersonalityItems, "Personality files are limited to a total of #{MAX_PERSONALITY_ITEMS} items" if itemcount >= MAX_PERSONALITY_ITEMS
-        raise CloudServers::Exception::PersonalityFilePathTooLong, "Server-side path of #{svrpath} exceeds the maximum length of #{MAX_SERVER_PATH_LENGTH} characters" if svrpath.size > MAX_SERVER_PATH_LENGTH
-        raise CloudServers::Exception::PersonalityFileTooLarge, "Local file #{localpath} exceeds the maximum size of #{MAX_PERSONALITY_FILE_SIZE} bytes" if File.size(localpath) > MAX_PERSONALITY_FILE_SIZE
-        b64 = Base64.encode64(IO.read(localpath))
-        data.push({:path => svrpath, :contents => b64})
-        itemcount += 1
+      # transform simplified personality option
+      if options.is_a? Hash
+        options.each_pair do |localpath, svrpath|
+          data.push(:path => svrpath, :contents => IO.read(localpath))
+        end
+      else
+        data = options
       end
-      return data
-    end
+
+      if data.size > MAX_PERSONALITY_ITEMS
+        raise CloudServers::Exception::TooManyPersonalityItems,
+              "Personality files are limited to a total of #{MAX_PERSONALITY_ITEMS} items"
+      end
+      data.each do |item|
+        path = item[:path]
+        contents = item[:contents]
+        if contents.size > MAX_PERSONALITY_FILE_SIZE
+          raise CloudServers::Exception::PersonalityFileTooLarge,
+                "Data for #{path} exceeds the maximum size of #{MAX_PERSONALITY_FILE_SIZE} bytes"
+        elsif path.size > MAX_SERVER_PATH_LENGTH
+          raise CloudServers::Exception::PersonalityFilePathTooLong,
+                "Server-side path of #{path} exceeds the maximum length of #{MAX_SERVER_PATH_LENGTH} characters"
         
+        end
+        item[:contents] = Base64.encode64(contents)
+      end
+    end
   end
 end

data/test/cloudservers_servers_test.rb

@@ -1,8 +1,34 @@
 $:.unshift File.dirname(__FILE__)
 require 'test_helper'
+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
@@ -136,6 +162,75 @@ json_response = %{{
 
   end
 
+  def test_create_server_requires_name
+
+    assert_raises(CloudServers::Exception::MissingArgument) do
+        @conn.create_server(:imageId => 2, :flavorId => 2)
+    end
+
+  end
+
+  def test_create_server_requires_image_id
+
+    assert_raises(CloudServers::Exception::MissingArgument) do
+        @conn.create_server(:name => "test1", :flavorId => 2)
+    end
+
+  end
+
+  def test_create_server_requires_flavor_id
+
+    assert_raises(CloudServers::Exception::MissingArgument) do
+        @conn.create_server(:name => "test1", :imageId => 2)
+    end
+
+  end
+
+  def test_create_server_with_local_file_personality
+
+    response = mock()
+    response.stubs(:code => "200", :body => CREATE_SERVER_JSON)
+    @conn.stubs(:csreq).returns(response)
+
+    tmp = Tempfile.open('ruby_cloud_servers')
+    tmp.write("hello")
+    tmp.flush
+
+    server = @conn.create_server(:name => "sample-server", :imageId => 2, :flavorId => 2, :metadata => {'Racker' => 'Fanatical'}, :personality => {tmp.path => '/root/tmp.jpg'})
+
+    assert_equal "blah", server.adminPass
+
+  end
+
+  def test_create_server_with_personalities
+
+    response = mock()
+    response.stubs(:code => "200", :body => 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 => ""}])
+
+    assert_equal "blah", server.adminPass
+
+  end
+
+  def test_too_many_personalities
+
+    personalities=[
+        {:path => "/tmp/test1.txt", :contents => ""},
+        {:path => "/tmp/test2.txt", :contents => ""},
+        {:path => "/tmp/test3.txt", :contents => ""},
+        {:path => "/tmp/test4.txt", :contents => ""},
+        {:path => "/tmp/test5.txt", :contents => ""},
+        {:path => "/tmp/test6.txt", :contents => ""}
+    ]
+
+    assert_raises(CloudServers::Exception::TooManyPersonalityItems) do
+        @conn.create_server(:name => "sample-server", :imageId => 2, :flavorId => 2, :metadata => {'Racker' => 'Fanatical'}, :personality => personalities)
+    end
+
+  end
+
 private
   def get_test_server
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudservers
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -05:00
+date: 2011-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- CHANGELOG
 - COPYING
 - README.rdoc
 - Rakefile
@@ -65,7 +66,7 @@ files:
 - test/cloudservers_servers_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/rackspace/cloudservers
+homepage: https://github.com/rackspace/ruby-cloudservers
 licenses: []
 
 post_install_message: