ggoodale-rackspace_cloud 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rackspace_cloud/base.rb

@@ -10,11 +10,13 @@ module RackspaceCloud
 
     def connect
       RackspaceCloud.request_authorization(@user, @access_key)
+      RackspaceCloud.check_version_compatibility
       RackspaceCloud.populate_flavors
       RackspaceCloud.populate_images
+      RackspaceCloud.get_limits
     end
 
-    def servers
+    def servers(force_refresh=false)
       RackspaceCloud.request("/servers/detail")["servers"].collect {|server_json|
         RackspaceCloud::Server.new(server_json)
       }
@@ -32,6 +34,10 @@ module RackspaceCloud
       RackspaceCloud::Server.new(RackspaceCloud.request("/servers", :method => :post, :data => new_server_data)['server'])
     end
 
+    def api_version
+      RackspaceCloud::API_VERSION
+    end
+
     protected
 
     def validate_config(config)

data/lib/rackspace_cloud/image.rb

@@ -1,6 +1,9 @@
 module RackspaceCloud
   class Image
-    attr_reader :name, :created, :updated, :status, :rackspace_id
+
+    MAX_RACKSPACE_IMAGE_ID = 10 # the highest id in use by a standard rackspace image (vs. a user backup)
+
+    attr_reader :name, :created, :updated, :status, :progress, :rackspace_id
     
     class << self
       def lookup_by_id(id)
@@ -9,11 +12,12 @@ module RackspaceCloud
     end
     
     def initialize(image_json)
-      @rackspace_id = image_json['id']
-      @name         = image_json['name']
-      @created      = image_json['created']
-      @updated      = image_json['updated']
-      @status       = image_json['status']
+      populate(image_json)
+    end
+
+    def delete
+      raise RuntimeError, "Can't delete Rackspace standar images" if @rackspace_id <= MAX_RACKSPACE_IMAGE_ID
+      RackspaceCloud.request("/images/#{@rackspace_id}", :method => :delete)
     end
     
     def to_i
@@ -21,6 +25,19 @@ module RackspaceCloud
     end
     
     def refresh
+      populate(RackspaceCloud.request("/images/#{@rackspace_id}")['image'])
+      RackspaceCloud::IMAGES[@rackspace_id] = self
+    end
+
+    protected
+
+    def populate(image_json)
+      @rackspace_id = image_json['id']
+      @name         = image_json['name']
+      @created      = DateTime.parse(image_json['created'])
+      @updated      = DateTime.parse(image_json['updated'])
+      @status       = image_json['status']
+      @progress     = image_json['progress']
     end
   end
 end

data/lib/rackspace_cloud/server.rb

@@ -42,6 +42,21 @@ module RackspaceCloud
       RackspaceCloud.request("/servers/#{@rackspace_id}", :method => :delete)
     end
 
+    def update_server_name(new_name)
+      RackspaceCloud.request("/servers/#{@rackspace_id}", :method => :put, :data => {"server" => {"name" => new_name}})
+    end
+
+    def update_admin_password(new_password)
+      RackspaceCloud.request("/servers/#{@rackspace_id}", :method => :put, :data => {"server" => {"adminPass" => new_password}})
+    end
+
+    def save_as_image(name)
+      image_json = RackspaceCloud.request("/images", :method => :post, :data => {'image' => {'name' => name, 'serverId' => @rackspace_id}})['image']
+      new_image = RackspaceCloud::Image.new(image_json)
+      RackspaceCloud::IMAGES[new_image.rackspace_id] = new_image
+      new_image
+    end
+
     # update this server's status and progress by calling /servers/<id>
     def refresh
       populate(RackspaceCloud.request("/servers/#{@rackspace_id}")['server'])

data/lib/rackspace_cloud.rb

@@ -9,6 +9,7 @@ Dir[File.join(File.dirname(__FILE__), 'rackspace_cloud/**/*.rb')].sort.each { |l
 
 module RackspaceCloud
   
+  class APIVersionError    < StandardError; end
   class ConfigurationError < StandardError; end
   class AuthorizationError < StandardError; end
   
@@ -21,6 +22,10 @@ module RackspaceCloud
    
   protected
 
+  def RackspaceCloud.check_version_compatibility
+    #This should eventually check the versions and raise an APIVersionError if there's a mismatch.
+  end
+
   # storage for the lists of flavors and images we request at auth time
   FLAVORS = {}
   def RackspaceCloud.populate_flavors
@@ -37,6 +42,12 @@ module RackspaceCloud
     end
     nil
   end
+  
+  LIMITS = {}
+  def RackspaceCloud.get_limits
+    LIMITS.merge!(request("/limits")['limits'])
+    nil
+  end
 
   def RackspaceCloud.request_authorization(user, access_key)
     session = Patron::Session.new
@@ -55,33 +66,40 @@ module RackspaceCloud
       @auth_token = response.headers['X-Auth-Token']
       @@authorized = true
     else 
-      raise AuthorizationError, "Error during authorization: #{curl.response_code}"
+      raise AuthorizationError, "Error during authorization: #{response.status}"
     end
     nil
   end
 
   def RackspaceCloud.request(path, options={})
     raise RuntimeError, "Please authorize before using by calling connect()" unless defined?(@@authorized) && @@authorized
-    session = Patron::Session.new
-    session.base_url = @server_management_url
-    session.headers['X-Auth-Token'] = @auth_token
-    session.headers["User-Agent"] = "rackspacecloud_ruby_gem"
-    session.timeout = 10
+    @session ||= begin
+      s = Patron::Session.new
+      s.base_url = @server_management_url
+      s.headers['X-Auth-Token'] = @auth_token
+      s.headers["User-Agent"] = "rackspacecloud_ruby_gem"
+      s.timeout = 10
+      s
+    end
     response = case options[:method]
     when :post
-      session.headers['Accept'] = "application/json"
-      session.headers['Content-Type'] = "application/json"
-      session.post("#{path}", options[:data].to_json)
+      @session.headers['Accept'] = "application/json"
+      @session.headers['Content-Type'] = "application/json"
+      @session.post("#{path}", options[:data].to_json)
+    when :put
+      @session.headers['Content-Type'] = "application/json"
+      @session.put("#{path}", options[:data].to_json)      
     when :delete
-      session.delete("#{path}")
+      @session.delete("#{path}")
     else      
-      session.get("#{path}.json")
+      @session.get("#{path}.json")
     end
 
     case response.status
     when 200, 202, 204
       JSON.parse(response.body) unless response.body.empty?
     else
+      puts response.body
       raise RuntimeError, "Error fetching #{path}: #{response.status}"
     end
   end

data/rackspace_cloud.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackspace_cloud}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Goodale"]
-  s.date = %q{2009-07-21}
+  s.date = %q{2009-07-22}
   s.description = %q{Gem enabling the management of Rackspace Cloud Server instances.}
   s.email = %q{grant@moreblinktag.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ggoodale-rackspace_cloud
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Grant Goodale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency