renamed top-level namespace to AWSAPI, to prevent conflicts with offi…

…cial Amazon AWS SDK gem, which also defines AWS::EC2 but as a class not a module

amazon-ec2.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "AWS/version"
+require "AWSAPI/version"
 
 Gem::Specification.new do |s|
   s.name        = "amazon-ec2"
-  s.version     = AWS::VERSION
+  s.version     = AWSAPI::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Glenn Rempe"]
   s.email       = ["glenn@rempe.us"]

bin/awshell

@@ -15,7 +15,7 @@ require 'irb'
 # CREDITS : Credit for this bit of shameful ripoff coolness
 # goes to Marcel Molina and his AWS::S3 gem.  Thanks!
 
-require File.dirname(__FILE__) + '/../lib/AWS'
+require File.dirname(__FILE__) + '/../lib/AWSAPI'
 
 setup = File.dirname(__FILE__) + '/setup'
 
@@ -69,7 +69,7 @@ def welcome!
     returns : Pretty Print a Hash describing your EC2 images
     >> @ec2.describe_images(:owner_id => ['self'])
 
-    returns : an Array of AWS::Response objects, each an EC2 image and its data
+    returns : an Array of AWSAPI::Response objects, each an EC2 image and its data
     >> @ec2.describe_images(:owner_id => ['self']).imagesSet.item
     >> @ec2.describe_images(:owner_id => ['self']).imagesSet.item[0]
 MESSAGE

bin/ec2-gem-example.rb

@@ -34,10 +34,10 @@
 # test different servers by running something like:
 # export EC2_URL='https://ec2.amazonaws.com';./bin/ec2-gem-example.rb
 if ENV['EC2_URL']
-  ec2 = AWS::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['EC2_URL']).host )
+  ec2 = AWSAPI::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['EC2_URL']).host )
 else
   # default server is US ec2.amazonaws.com
-  ec2 = AWS::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
+  ec2 = AWSAPI::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
 end
 
 puts "----- ec2.methods.sort -----"
@@ -68,9 +68,9 @@
 # ELB examples
 # Autoscaling examples
 if ENV['ELB_URL']
-  elb = AWS::ELB::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['ELB_URL']).host )
+  elb = AWSAPI::ELB::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['ELB_URL']).host )
 else
-  elb = AWS::ELB::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
+  elb = AWSAPI::ELB::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
 end
 
 puts "----- creating an elastic load balancer -----"
@@ -88,9 +88,9 @@
 
 # Autoscaling examples
 if ENV['AS_URL']
-  as = AWS::Autoscaling::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['AS_URL']).host )
+  as = AWSAPI::Autoscaling::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['AS_URL']).host )
 else
-  as = AWS::Autoscaling::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
+  as = AWSAPI::Autoscaling::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
 end
 
 puts "---- creating a launch configuration group -----"

bin/ec2-gem-profile.rb

@@ -6,6 +6,6 @@
 ACCESS_KEY_ID     = ENV['AWS_ACCESS_KEY_ID']      || ENV['AMAZON_ACCESS_KEY_ID']
 SECRET_ACCESS_KEY = ENV['AWS_SECRET_ACCESS_KEY']  || ENV['AMAZON_SECRET_ACCESS_KEY']
 
-ec2 = AWS::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
+ec2 = AWSAPI::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
 
 @images = ec2.describe_images

bin/setup.rb

@@ -11,11 +11,11 @@
 
 
 
-if(AWS::ACCESS_KEY_ID and AWS::SECRET_ACCESS_KEY)
+if(AWSAPI::ACCESS_KEY_ID and AWSAPI::SECRET_ACCESS_KEY)
 
   opts = {
-    :access_key_id      => AWS::ACCESS_KEY_ID,
-    :secret_access_key  => AWS::SECRET_ACCESS_KEY
+    :access_key_id      => AWSAPI::ACCESS_KEY_ID,
+    :secret_access_key  => AWSAPI::SECRET_ACCESS_KEY
   }
 
   if ENV['EC2_URL']
@@ -30,37 +30,37 @@
         opts[:use_ssl] = false
       end
     end
-    @ec2 = AWS::EC2::Base.new(opts)
+    @ec2 = AWSAPI::EC2::Base.new(opts)
   else
-    @ec2 = AWS::EC2::Base.new(opts)
+    @ec2 = AWSAPI::EC2::Base.new(opts)
   end
 
   if ENV['ELB_URL']
     opts[:server] = URI.parse(ENV['ELB_URL']).host
-    @elb = AWS::ELB::Base.new(opts)
+    @elb = AWSAPI::ELB::Base.new(opts)
   else
-    @elb = AWS::ELB::Base.new(opts)
+    @elb = AWSAPI::ELB::Base.new(opts)
   end
 
   if ENV['AS_URL']
     opts[:server] = URI.parse(ENV['AS_URL']).host
-    @as = AWS::Autoscaling::Base.new(opts)
+    @as = AWSAPI::Autoscaling::Base.new(opts)
   else
-    @as = AWS::Autoscaling::Base.new(opts)
+    @as = AWSAPI::Autoscaling::Base.new(opts)
   end
 
   if ENV['RDS_URL']
     opts[:server] = URI.parse(ENV['RDS_URL']).host
-    @rds = AWS::RDS::Base.new(opts)
+    @rds = AWSAPI::RDS::Base.new(opts)
   else
-    @rds = AWS::RDS::Base.new(opts)
+    @rds = AWSAPI::RDS::Base.new(opts)
   end
 
   if ENV['AWS_CLOUDWATCH_URL']
     opts[:server] = URI.parse(ENV['AWS_CLOUDWATCH_URL']).host
-    @cw = AWS::Cloudwatch::Base.new(opts)
+    @cw = AWSAPI::Cloudwatch::Base.new(opts)
   else
-    @cw = AWS::Cloudwatch::Base.new(opts)
+    @cw = AWSAPI::Cloudwatch::Base.new(opts)
   end
 
   puts ""