right-scale-api 0.0.4 → 0.0.5

data/.gitignore

@@ -3,3 +3,4 @@
 *~
 .DS_Store
 pkg/*
+*.gem

data/Rakefile

@@ -2,42 +2,24 @@ require 'rubygems'
 require 'rake'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "right-scale-api"
-    gem.summary = %Q{A RightScale API gem that doesn't suck.(mostly)}
-    gem.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
-}
-    gem.email = "ndh@baroquebobcat.com"
-    gem.homepage = "http://github.com/baroquebobcat/right-scale-api"
-    gem.authors = ["Nick Howard"]
-    gem.add_dependency "httparty", "~> 0.6.0"
-    gem.add_dependency "activesupport"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
   end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
 
-task :default => :spec
+  task :spec => :check_dependencies
 
+  task :default => :spec
+rescue LoadError
+  puts 'install rspec'
+end
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

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

@@ -1,13 +1,19 @@
 module RightScaleAPI
   class Account < Base
-    
+    attributes [:id, :href]
     collection_uri "/api/acct"  
     
+    # Creates a method for each passed symbol
+    # that grabs the list of objects matching it
+    # takes options that are added as query params
+    # also does some munging of the opts
+    # in particular, :region => :us_east/:us_west/:eu/:ap 
+    # will map to the proper cloud_id, so you don't have to remember them
     def self.sub_resources *resources
       resources.each do |resource|
         module_eval %(
-                      def #{resource}
-                        get('/#{resource}.xml')['#{resource}'].map do |attrs|
+                      def #{resource} query_opts={}
+                        get('/#{resource}.xml', :query => #{resource.to_s.classify}.opts_to_query_opts(query_opts) )['#{resource}'].map do |attrs|
                           #{resource.to_s.classify}.new attrs.merge(:account => self)
                         end
                       end
@@ -31,6 +37,7 @@ module RightScaleAPI
     # @option opts [String] :description The description of the deployment
     # @option opts [String :default_ec2_availability_zone the default availability zone for the deployment e.g. us-east-1a
     # @option opts [String] :default_vpc_subnet_href
+    # @option opts [Symbol] :region (:us_east) The region to create the IP in. One of :us_east, :eu, :us_west, :ap 
     def create_deployment opts
       Deployment.create opts.merge :account => self
     end
@@ -38,7 +45,7 @@ module RightScaleAPI
     # Creates an EC2 EBS Elastic IP
     # @param [Hash] opts ip attributes
     # @option opts [String] :nickname The nickname of the ip
-    # @option opts [Fixnum] :cloud_id the cloud identifier default 1   (1 = us-east; 2 = eu; 3 = us-west, 4 = ap) 
+    # @option opts [Symbol] :region (:us_east) The region to create the IP in. One of :us_east, :eu, :us_west, :ap 
     def create_ec2_elastic_ip opts
       Ec2ElasticIp.create opts.merge :account => self
     end
@@ -49,20 +56,23 @@ module RightScaleAPI
     # @option opts [String] :description
     # @option opts [Fixnum] :aws_size The size of the volume in gigabytes*
     # @option opts [String] :ec2_availability_zone name of the availability zone e.g. us-east-1a*
+    # @option opts [Symbol] :region (:us_east) The region to create the IP in. One of :us_east, :eu, :us_west, :ap 
     def create_ec2_ebs_volume opts
       Ec2EbsVolume.create opts.merge :account => self
     end
 
     # Creates an EC2 Instance
     # @param [Hash] opts server attributes
-    # @option [RightScaleAPI::ServerTemplate] opts :server_template the server template to use*
-    # @option [[RightScaleAPI::Deployment] opts :deployment 
+    # @option opts [RightScaleAPI::ServerTemplate]  :server_template the server template to use*
+    # @option opts [[RightScaleAPI::Deployment]  :deployment the deployment to add the instance to.
+    # @option opts [Symbol] :region (:us_east) The region to create the IP in. One of :us_east, :eu, :us_west, :ap 
     def create_server opts
       Server.create opts.merge :account => self
     end
 
     # Gets an EC2 ssh key.
-    # Currently you can't get a list of ssh keys through the API, so you need to get the id through the web interface.
+    # Currently you can't get a list of ssh keys through the API,
+    # so you need to get the id through the web interface.
     # https://my.rightscale.com/clouds/1/ec2_ssh_keys
     # @param id the id of the ssh key to get
     def get_ec2_ssh_key id
@@ -71,11 +81,18 @@ module RightScaleAPI
 
     class SubResource < Base
       attr_accessor :account
-
+      
       def collection_uri
-        account.path + "/" + self.class.api_name.pluralize
+        "#{account.path}/#{self.class.api_name.pluralize}"
+      end
+      
+      protected
+      
+      def self.opts_to_query_opts opts
+        super(opts).tap{|o|o.delete "account"}
       end
+      
     end
-
+    
   end
 end

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

@@ -1,8 +1,6 @@
 module RightScaleAPI
   class Base
     
-    attr_accessor :id, :href
-    
     # attributes that directly correspond to the api's
     # @param [Array<Symbol>] attrs a list of attributes an object type has
     def self.attributes attrs=nil
@@ -23,7 +21,7 @@ module RightScaleAPI
       @attributes
     end
     
-    attributes [:tags, :created_at, :updated_at,:errors, :nickname]
+    attributes [:id, :href, :tags, :created_at, :updated_at,:errors, :nickname]
 
     # gets an object by id
     # @param id [Fixnum]
@@ -38,7 +36,7 @@ module RightScaleAPI
       
       query_opts = opts_to_query_opts opts
       
-      result = RightScaleAPI::Client.post(object.collection_uri, :body => {api_name => query_opts})
+      result = RightScaleAPI::Client.post(object.collection_uri, :body => query_opts)
 
       if result.code.to_i != 201
         p object.collection_uri
@@ -129,7 +127,7 @@ module RightScaleAPI
     end
     
     def path
-      collection_uri + "/" + id
+      "#{collection_uri}/#{id}"
     end
     
     def id_from_href href
@@ -143,6 +141,11 @@ module RightScaleAPI
     def self.opts_to_query_opts opts
       query_opts = opts.dup
       
+      if query_opts[:region]
+        val = query_opts.delete :region
+        query_opts[:cloud_id] = RightScaleAPI::CLOUD_REGIONS[val.to_sym]
+      end
+      
       relations = attributes.select {|a|a.to_s.include? '_href'}
       relations.each do |r|
         r_name = r.to_s.sub('_href','').to_sym
@@ -150,7 +153,11 @@ module RightScaleAPI
           query_opts[r] = query_opts.delete(r_name).href
         end
       end
-      query_opts.delete_if {|k,v| ! attributes.include? k.to_sym }
+
+      attrs = query_opts.dup.delete_if {|k,v| ! attributes.include? k.to_sym }
+      query_opts.dup.delete_if {|k,v| attributes.include? k.to_sym }
+
+      query_opts[api_name] = attrs
 
       query_opts
     end

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

@@ -3,7 +3,6 @@ module RightScaleAPI
     attributes %w(
       ec2_instance_id
       public_ip
-      cloud_id
       server_href
       instance_href
       )

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

@@ -4,7 +4,6 @@ module RightScaleAPI
       aki_image_href
       ari_image_href
       associate_eip_at_launch
-      cloud_id
       current_instance_href
       deployment_href
       ec2_availability_zone

data/lib/right-scale-api.rb

@@ -7,6 +7,13 @@ module RightScaleAPI
   API_VERSION = '1.0'
   BASE_URI = "https://my.rightscale.com/"
 
+  CLOUD_REGIONS = {
+    :us_east => 1,
+    :eu      => 2,
+    :us_west => 3,
+    :ap      => 4
+  }
+
   def self.login *args
     Client.login *args
   end

data/right-scale-api.gemspec

@@ -1,11 +1,8 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{right-scale-api}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Howard"]
@@ -54,23 +51,8 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.6.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<httparty>, ["~> 0.6.0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<httparty>, ["~> 0.6.0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
+  s.add_runtime_dependency(%q<httparty>, ["~> 0.6.0"])
+  s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+  s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right-scale-api
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nick Howard