right-scale-api 0.0.5 → 0.0.6

data/lib/right-scale-api/base.rb

@@ -32,10 +32,10 @@ module RightScaleAPI
     # creates a new object on RightScale
     # @param opts [Hash] attributes of the created object
     def self.create opts
-      object = new opts
-      
+      object_opts = opts.reject{|k,v| ! instance_methods.include? "#{k}="}
+      object = new object_opts
       query_opts = opts_to_query_opts opts
-      
+
       result = RightScaleAPI::Client.post(object.collection_uri, :body => query_opts)
 
       if result.code.to_i != 201
@@ -47,7 +47,7 @@ module RightScaleAPI
         raise "create failed"
       end
 
-      new opts.merge(result.merge(:href =>  result.headers['location']))
+      new object_opts.merge(result.merge(:href =>  result.headers['location']))
     end
 
     # The RightScale API name for the class
@@ -113,6 +113,14 @@ module RightScaleAPI
       end
     end
 
+    def collection_uri
+      self.class.collection_uri
+    end
+    
+    def path
+      "#{collection_uri}/#{id}"
+    end
+
     protected
     
     def self.collection_uri uri=nil
@@ -122,13 +130,6 @@ module RightScaleAPI
       @collection_uri
     end
     
-    def collection_uri
-      self.class.collection_uri
-    end
-    
-    def path
-      "#{collection_uri}/#{id}"
-    end
     
     def id_from_href href
       href.split('/').last

data/lib/right-scale-api/server.rb

@@ -21,7 +21,42 @@ module RightScaleAPI
       type
       vpc_subnet_href
     )
+
+    SETTINGS = %w(
+      ec2_ssh_key_href
+      ec2_security_groups_href
+      ec2_instance_type
+      aki_image_href
+      ari_image_href
+      ec2_image_href
+      vpc_subnet_href
+      pricing
+      max_spot_price
+      locked
+      ec2_availability_zone
+      aws_platform
+      dns_name
+      private_dns_name
+      ip_address
+      private_ip_address
+      aws_id
+      cloud_id
+      aws_product_codes
+)
+
+    SETTINGS.each do |name|
+      module_eval <<-END,__FILE__, __LINE__+1
+        def #{name}
+          @#{name} ||= settings["#{name}"]
+        end
+      END
+    end
     
+    #returns the cloud region the server is in (:us_east,:us_west,:eu,:ap)
+    def region
+      RightScaleAPI::CLOUD_REGIONS.find{|k,v|v == cloud_id}.first
+    end
+
     # Starts the server
     def start
       post '/start'
@@ -41,7 +76,21 @@ module RightScaleAPI
     # for info: under Sub-resources on
     # http://support.rightscale.com/15-References/RightScale_API_Reference_Guide/02-Management/02-Servers
     def settings
-      get('/settings')['settings']
+      @settings ||= get('/settings')['settings']
+    end
+
+    def reset_settings
+      @settings = nil
+    end
+
+    def reload_settings
+      reset_settings
+      settings
+    end
+
+    def reload!
+      super
+      reload_settings
     end
 
     # Is the server operational
@@ -69,10 +118,12 @@ module RightScaleAPI
 
     # creates a blank volume and attaches it to the server
     # @param [Hash] opts Account#create_ec2_ebs_volume's opts +
-    # @option [String] :device device mount point, e.g. /dev/sdk
+    # @option opts [String] :device device mount point, e.g. /dev/sdk
+    # @option opts [String] :ec2_availability_zone (server's) availability zone to create the volume in.
+
     def attach_blank_volume opts
       device = opts.delete :device
-      opts = {:ec2_availability_zone => 'us-east-1a'}.merge opts #default to the server's avail zone
+      opts = {:ec2_availability_zone => ec2_availability_zone }.merge opts
       volume = account.create_ec2_ebs_volume opts
       attach_volume volume, device
     end

data/right-scale-api.gemspec

@@ -2,11 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{right-scale-api}
-  s.version = "0.0.5"
-
+  s.version = "0.0.6"
+  s.date = %q{2010-11-2}
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Howard"]
-  s.date = %q{2010-09-14}
   s.description = %q{A client for the RightScale API that hides some of the complexity of the API
 (It doesn't require passing around hrefs as much). Based on HTTParty
 }
@@ -20,27 +19,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.md",
      "Rakefile",
-     "VERSION",
-     "lib/right-scale-api.rb",
-     "lib/right-scale-api/account.rb",
-     "lib/right-scale-api/alert_spec.rb",
-     "lib/right-scale-api/base.rb",
-     "lib/right-scale-api/client.rb",
-     "lib/right-scale-api/deployment.rb",
-     "lib/right-scale-api/ec2_ebs_snapshot.rb",
-     "lib/right-scale-api/ec2_ebs_volume.rb",
-     "lib/right-scale-api/ec2_elastic_ip.rb",
-     "lib/right-scale-api/ec2_security_group.rb",
-     "lib/right-scale-api/ec2_ssh_key.rb",
-     "lib/right-scale-api/s3_bucket.rb",
-     "lib/right-scale-api/server.rb",
-     "lib/right-scale-api/server_template.rb",
-     "lib/right-scale-api/status.rb",
-     "right-scale-api.gemspec",
-     "spec/right-scale-api_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
+     "right-scale-api.gemspec"] + Dir["{lib,spec}/**/*"]
   s.homepage = %q{http://github.com/baroquebobcat/right-scale-api}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]

data/spec/right-scale-api_spec.rb

@@ -12,10 +12,23 @@ describe RightScaleAPI do
       subject {  Class.new(RightScaleAPI::Base).new({}) }
       it { subject.should respond_to(:href) }
     end
+
+    describe '.create' do
+      before do
+        subject.attributes []
+        RightScaleAPI::Client.stub!(:post).and_return mock('httparty response', :code => 201, :headers => {}, :merge => {})
+      end
+
+      it "doesn't send invalid attrs to the object" do
+        subject.should_not_receive(:new).with hash_including(:foo => 1)
+        subject.should_receive(:new).twice.and_return(mock('base', :collection_uri => ''))
+
+        subject.create :foo => 1, :id => 2
+      end
+    end
   end
 
   describe RightScaleAPI::Account do
-    #
     describe "#create_ec2_ebs_volume" do
       #when receive a 422
       #do stuff with error

data/spec/spec_helper.rb

@@ -3,9 +3,7 @@
 require 'rubygems'
 require 'right-scale-api'
 require 'fakeweb'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
-  FakeWeb.allow_net_connect = false
-end
+FakeWeb.allow_net_connect = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right-scale-api
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Nick Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -06:00
+date: 2010-11-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,8 +81,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
-- lib/right-scale-api.rb
+- right-scale-api.gemspec
 - lib/right-scale-api/account.rb
 - lib/right-scale-api/alert_spec.rb
 - lib/right-scale-api/base.rb
@@ -97,9 +96,8 @@ files:
 - lib/right-scale-api/server.rb
 - lib/right-scale-api/server_template.rb
 - lib/right-scale-api/status.rb
-- right-scale-api.gemspec
+- lib/right-scale-api.rb
 - spec/right-scale-api_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/baroquebobcat/right-scale-api

data/VERSION

@@ -1 +0,0 @@
-0.0.4

data/spec/spec.opts

@@ -1 +0,0 @@
---color