solutious-rudy 0.5.1 → 0.6.0

data/rudy.gemspec

@@ -1,13 +1,38 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.5.1"
-	s.summary = "Not your grandparent's deployment tool."
+	s.version = "0.6.0"
+	s.summary = "Rudy: Not your grandparent's deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
 	s.email = "delano@solutious.com"
 	s.homepage = "http://github.com/solutious/rudy"
- 
+  
+  s.extra_rdoc_files = %w[README.rdoc Rudyfile LICENSE.txt CHANGES.txt ]
+  s.has_rdoc = true
+  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
+  s.require_paths = %w[lib]
+  s.rubygems_version = '1.1.1'
+  
+  s.add_dependency 'drydock', '>= 0.5.5'  
+  s.add_dependency 'caesars', '>= 0.5.4'  
+  s.add_dependency 'rye', '>= 0.5.1'
+  
+  s.add_dependency 'echoe'
+  s.add_dependency 'amazon-ec2', '>= 0.3.8'  # region fix
+  s.add_dependency 'net-ssh', '>=2.0.9'
+  s.add_dependency 'net-scp', '>1.0.2'
+  s.add_dependency 'net-ssh-gateway'
+  s.add_dependency 'net-ssh-multi'
+  
+  # http://bit.ly/2WaAgV
+  #s.add_runtime_dependency('xml-simple', '>= 1.0.11')
+  #s.add_dependency('xml-simple', '>= 1.0.11')
+  #s.add_development_dependency('jgre-monkeyspecdoc', '>= 0.1.0')
+  #s.add_development_dependency('thoughtbot-shoulda', '>= 0.1.0')
+  
+  s.executables = %w[ird rudy rudy-ec2 rudy-sdb rudy-s3]
+  
   # = MANIFEST =
   # git ls-files
   s.files = %w(
@@ -18,10 +43,10 @@
   Rudyfile
   bin/ird
   bin/rudy
+  bin/rudy-ec2
+  bin/rudy-s3
+  bin/rudy-sdb
   lib/annoy.rb
-  lib/aws_sdb.rb
-  lib/aws_sdb/error.rb
-  lib/aws_sdb/service.rb
   lib/console.rb
   lib/escape.rb
   lib/rudy.rb
@@ -34,43 +59,40 @@
   lib/rudy/aws/ec2/keypair.rb
   lib/rudy/aws/ec2/snapshot.rb
   lib/rudy/aws/ec2/volume.rb
+  lib/rudy/aws/ec2/zone.rb
   lib/rudy/aws/s3.rb
-  lib/rudy/aws/simpledb.rb
+  lib/rudy/aws/sdb.rb
+  lib/rudy/aws/sdb/error.rb
+  lib/rudy/backup.rb
   lib/rudy/cli.rb
-  lib/rudy/cli/addresses.rb
-  lib/rudy/cli/backups.rb
+  lib/rudy/cli/aws/ec2/addresses.rb
+  lib/rudy/cli/aws/ec2/candy.rb
+  lib/rudy/cli/aws/ec2/groups.rb
+  lib/rudy/cli/aws/ec2/images.rb
+  lib/rudy/cli/aws/ec2/instances.rb
+  lib/rudy/cli/aws/ec2/keypairs.rb
+  lib/rudy/cli/aws/ec2/snapshots.rb
+  lib/rudy/cli/aws/ec2/volumes.rb
+  lib/rudy/cli/aws/ec2/zones.rb
+  lib/rudy/cli/aws/s3/buckets.rb
+  lib/rudy/cli/aws/s3/store.rb
+  lib/rudy/cli/aws/sdb/domains.rb
+  lib/rudy/cli/candy.rb
   lib/rudy/cli/config.rb
-  lib/rudy/cli/deploy.rb
   lib/rudy/cli/disks.rb
-  lib/rudy/cli/domains.rb
-  lib/rudy/cli/groups.rb
-  lib/rudy/cli/images.rb
-  lib/rudy/cli/instances.rb
-  lib/rudy/cli/keypairs.rb
-  lib/rudy/cli/manager.rb
-  lib/rudy/cli/release.rb
+  lib/rudy/cli/machines.rb
   lib/rudy/cli/routines.rb
-  lib/rudy/cli/volumes.rb
-  lib/rudy/command/addresses.rb
-  lib/rudy/command/backups.rb
-  lib/rudy/command/disks-old.rb
-  lib/rudy/command/disks.rb
-  lib/rudy/command/domains.rb
-  lib/rudy/command/groups.rb
-  lib/rudy/command/instances.rb
-  lib/rudy/command/keypairs.rb
-  lib/rudy/command/manager.rb
-  lib/rudy/command/volumes.rb
   lib/rudy/config.rb
   lib/rudy/config/objects.rb
+  lib/rudy/disks.rb
+  lib/rudy/global.rb
   lib/rudy/huxtable.rb
-  lib/rudy/metadata/backup.rb
-  lib/rudy/metadata/disk.rb
-  lib/rudy/metadata/machine.rb
+  lib/rudy/machines.rb
+  lib/rudy/metadata.rb
   lib/rudy/routines.rb
-  lib/rudy/routines/disk_handler.rb
+  lib/rudy/routines/helpers/diskhelper.rb
+  lib/rudy/routines/helpers/scripthelper.rb
   lib/rudy/routines/release.rb
-  lib/rudy/routines/script_runner.rb
   lib/rudy/routines/shutdown.rb
   lib/rudy/routines/startup.rb
   lib/rudy/scm/svn.rb
@@ -99,42 +121,40 @@
   test/30_sdb_metadata/00_setup_test.rb
   test/30_sdb_metadata/10_disks_test.rb
   test/30_sdb_metadata/20_backups_test.rb
-  test/50_commands/00_setup_test.rb
-  test/50_commands/10_keypairs_test.rb
-  test/50_commands/20_groups_test.rb
-  test/50_commands/40_volumes_test.rb
-  test/50_commands/50_instances_test.rb
   test/coverage.txt
   test/helper.rb
-  tryouts/console_tryout.rb
-  tryouts/disks.rb
-  tryouts/nested_methods.rb
-  tryouts/session_tryout.rb
+  vendor/highline-1.5.1/CHANGELOG
+  vendor/highline-1.5.1/INSTALL
+  vendor/highline-1.5.1/LICENSE
+  vendor/highline-1.5.1/README
+  vendor/highline-1.5.1/Rakefile
+  vendor/highline-1.5.1/TODO
+  vendor/highline-1.5.1/examples/ansi_colors.rb
+  vendor/highline-1.5.1/examples/asking_for_arrays.rb
+  vendor/highline-1.5.1/examples/basic_usage.rb
+  vendor/highline-1.5.1/examples/color_scheme.rb
+  vendor/highline-1.5.1/examples/limit.rb
+  vendor/highline-1.5.1/examples/menus.rb
+  vendor/highline-1.5.1/examples/overwrite.rb
+  vendor/highline-1.5.1/examples/page_and_wrap.rb
+  vendor/highline-1.5.1/examples/password.rb
+  vendor/highline-1.5.1/examples/trapping_eof.rb
+  vendor/highline-1.5.1/examples/using_readline.rb
+  vendor/highline-1.5.1/lib/highline.rb
+  vendor/highline-1.5.1/lib/highline/color_scheme.rb
+  vendor/highline-1.5.1/lib/highline/compatibility.rb
+  vendor/highline-1.5.1/lib/highline/import.rb
+  vendor/highline-1.5.1/lib/highline/menu.rb
+  vendor/highline-1.5.1/lib/highline/question.rb
+  vendor/highline-1.5.1/lib/highline/system_extensions.rb
+  vendor/highline-1.5.1/setup.rb
+  vendor/highline-1.5.1/test/tc_color_scheme.rb
+  vendor/highline-1.5.1/test/tc_highline.rb
+  vendor/highline-1.5.1/test/tc_import.rb
+  vendor/highline-1.5.1/test/tc_menu.rb
+  vendor/highline-1.5.1/test/ts_all.rb
   )
-  s.executables = %w[rudy ird]
-  
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt CHANGES.txt]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", "Rudy: #{s.summary}", "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubygems_version = '1.1.1'
-  
-  s.add_dependency 'echoe'
-  s.add_dependency 'amazon-ec2'
-  s.add_dependency 'aws-sdb'
-  s.add_dependency 'net-ssh'
-  s.add_dependency 'net-scp'
-  s.add_dependency 'net-ssh-gateway'
-  s.add_dependency 'net-ssh-multi'
-  s.add_dependency 'drydock'
-  s.add_dependency 'caesars'
-  s.add_dependency 'rye'
-  
-  # http://bit.ly/2WaAgV
-  #s.add_runtime_dependency('xml-simple', '>= 1.0.11')
-  #s.add_dependency('xml-simple', '>= 1.0.11')
-  #s.add_development_dependency('jgre-monkeyspecdoc', '>= 0.1.0')
-  #s.add_development_dependency('thoughtbot-shoulda', '>= 0.1.0')
+
   
-    
-end
+end
+

data/support/rudy-ec2-startup

@@ -9,7 +9,7 @@
 
 # Runs when an ec2 instance startups up.
 # Grabs configuration from the run time user data and stores it locally.
-# See Rudy::CLI::Instances#start_instance for the expected yaml format.
+# See Rudy::CLI::Machines#start_instance for the expected yaml format.
 
 # Put this in /etc/init.d. Then:
 #   * chmod 755 rudy-ec2-startup
@@ -33,8 +33,8 @@ METADATA = 'http://169.254.169.254/2008-02-01/meta-data'
 
 METADATAPARAMS = ['instance-id', 'instance-type']
 
-RUDY_CONFIG_DIR=File.join('.rudy')
-RUDY_CONFIG_FILE=File.join('config')
+Rudy::CONFIG_DIR=File.join('.rudy')
+Rudy::CONFIG_FILE=File.join('config')
 
 module Rudy
   module EC2Startup
@@ -91,9 +91,9 @@ module Rudy
           # (when we're not running as that user.) 
           config[:userdata].each_pair do |n,hash|
             fileparts = (n == :root) ? ['/root'] : [user_home_dir(n)]
-            fileparts << RUDY_CONFIG_DIR
+            fileparts << Rudy::CONFIG_DIR
             dirpath = File.join(fileparts)
-            filepath = File.join(dirpath, RUDY_CONFIG_FILE)
+            filepath = File.join(dirpath, Rudy::CONFIG_FILE)
             
             # Backwards compatability
             if !File.directory?(dirpath)

data/test/05_config/00_setup_test.rb

@@ -3,18 +3,14 @@ require File.join(File.dirname(__FILE__), '..', 'helper')
 module Rudy::Test
 
   class Case_05_Config < Test::Unit::TestCase
-    include Rudy::AWS # If we include Huxtable, we won't need to grab global and config form rmach
+    include Rudy::Huxtable
     
     @@logger = STDERR #StringIO.new
-    @@rmach = Rudy::Instances.new(:logger => @@logger)
-    @@global = @@rmach.global
-    @@config = @@rmach.config
-    @@zone = @@rmach.global.zone.to_s
+    @@zone = @@global.zone.to_s
     
     context "#{name}_00 Setup" do
       should "(00) have class variables setup" do
-        stop_test !@@rmach.is_a?(Rudy::Instances), "We don't have an instance ofRudy::Instancess (#{@@rmach})"
-        stop_test !@@global.is_a?(OpenStruct), "We don't have global (#{@@global})"
+        stop_test !@@global.is_a?(Rudy::Global), "We don't have global (#{@@global})"
         stop_test !@@config.is_a?(Rudy::Config), "We don't have an instance of Rudy::Config (#{@@config})"
       end
     end

data/test/20_sdb/00_setup_test.rb

@@ -8,24 +8,9 @@ module Rudy::Test
   #
   # DO NOT RUN THIS TEST ON A PRODUCTION AWS ACCOUNT!!
   #
-  class Case_20_SimpleDB < Test::Unit::TestCase
-    include Rudy::AWS
+  class Case_20_AWS_SDB < Test::Unit::TestCase
+    include Rudy::Huxtable
     
-    @@logger = STDERR #StringIO.new
-    @@rmach = Rudy::Instances.new(:logger => @@logger)
-    @@global = @@rmach.global
-    @@config = @@rmach.config
-    @@zone = @@rmach.global.zone.to_s
-    
-    context "#{name}_00 Setup" do
-      should "(00) have class variables setup" do
-        stop_test !@@rmach.is_a?(Rudy::Instances), "We don't have an instance ofRudy::Instancess (#{@@rmach})"
-        stop_test !@@sdb.is_a?(Rudy::AWS::SimpleDB), "We don't have an instance of Rudy::AWS::EC2 (#{@@ec2})"
-      end
-      should "(01) be zone" do
-        stop_test !@@zone, "No zone"
-      end
-    end
   end
   
 end

data/test/20_sdb/10_domains_test.rb

@@ -1,25 +1,26 @@
 module Rudy::Test
-  class Case_20_SimpleDB
+  class Case_20_AWS_SDB
     
     
     def get_domain
 
     end
     
-    xcontext "#{name}_10 Domains" do
+    context "#{name}_10 Domains" do
       
       setup do
-        @domain_list = @@sdb.domains.list || []
+        @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+        @domain_list = @sdb.list_domains || []
         @domain = @domain_list.first
       end
       
       should "(10) create domain" do
         dname = 'test_' << Rudy::Utils.strand
-        assert @@sdb.domains.create(dname), "Domain not created (#{dname})"
+        assert @sdb.create_domain(dname), "Domain not created (#{dname})"
       end
       
       should "(20) list domains" do
-        domain_list = @@sdb.domains.list
+        domain_list = @sdb.list_domains
         assert domain_list.is_a?(Array), "Not an Array"
         assert !domain_list.empty?, "No Domains"
       end
@@ -36,8 +37,8 @@ module Rudy::Test
           }
         }
         
-        @@sdb.store(@domain, 'produce1', produce.call, :replace)
-        @@sdb.store(@domain, 'produce2', produce.call, :replace)
+        @sdb.put(@domain, 'produce1', produce.call, :replace)
+        @sdb.put(@domain, 'produce2', produce.call, :replace)
         
         # TODO: Need assertion here!
         
@@ -45,7 +46,7 @@ module Rudy::Test
       
       should "(40) get objects" do
         assert !@domain.nil?, "No domain"
-        item = @@sdb.get(@domain, 'produce1')
+        item = @sdb.get(@domain, 'produce1')
         assert_equal Hash, item.class # good stuff
         assert_equal ['green'], item['grapes']
       end
@@ -54,7 +55,7 @@ module Rudy::Test
         
         assert !@domain.nil?, "No domain"
         
-        items = @@sdb.query(@domain, "[ 'grapes' = 'green' ]")
+        items = @sdb.query(@domain, "[ 'grapes' = 'green' ]")
         assert items.is_a?(Array), "Not an Array"
         assert_equal 2, items.size, "More than 2 objects"
       end
@@ -63,7 +64,7 @@ module Rudy::Test
         
         assert !@domain.nil?, "No domain"
         
-        items = @@sdb.query_with_attributes(@domain, "[ 'grapes' = 'green' ]")
+        items = @sdb.query_with_attributes(@domain, "[ 'grapes' = 'green' ]")
         assert items.is_a?(Hash), "Not a Hash"
         assert_equal 2, items.keys.size, "More than 2 objects"
         assert items['produce1']['celery'].first.to_i > 1000, "Celery less than 1000"
@@ -73,7 +74,7 @@ module Rudy::Test
         assert !@domain.nil?, "No domain"
         q = "select * from #{@domain}"
 
-        items = @@sdb.select(q)
+        items = @sdb.select(q)
         assert items.is_a?(Hash), "Not a Hash"
         assert_equal 2, items.keys.size, "More than 2 objects"
         
@@ -85,13 +86,14 @@ module Rudy::Test
       should "(70) destroy objects" do
         assert !@domain.nil?, "No domain"
         q = "select * from #{@domain}"
-        items = @@sdb.select(q)
+        items = @sdb.select(q)
         assert items.is_a?(Hash), "Not a Hash"
         items.keys.each do |item|
-          assert @@sdb.destroy(@domain, item), "Not destroyed (#{item})"
+          assert @sdb.destroy(@domain, item), "Not destroyed (#{item})"
         end
+        sleep 1 # Eventual consistency. Items may still appear. 
         q = "select * from #{@domain}"
-        items = @@sdb.select(q)
+        items = @sdb.select(q)
         assert items.nil?, "Some items not destroyed (#{items})"
       end
       
@@ -100,10 +102,10 @@ module Rudy::Test
         assert !@domain.nil?, "No domain"
         
         @domain_list.each do |domain|
-          assert @@sdb.domains.destroy(domain), "Not destroyed (#{domain})"
+          assert @sdb.destroy_domain(domain), "Not destroyed (#{domain})"
         end
         
-        domain_list = @@sdb.domains.list
+        domain_list = @sdb.list_domains
         assert domain_list.empty?, "Not empty"
       end
       

data/test/25_ec2/00_setup_test.rb

@@ -9,21 +9,16 @@ module Rudy::Test
   # DO NOT RUN THIS TEST ON A PRODUCTION AWS ACCOUNT!!
   #
   class Case_25_EC2 < Test::Unit::TestCase
-    include Rudy::AWS
+    include Rudy::Huxtable
     
-    @@logger = STDERR #StringIO.new
-    @@rmach = Rudy::Instances.new(:logger => @@logger)
-    @@global = @@rmach.global
-    @@config = @@rmach.config
-    @@zone = @@rmach.global.zone.to_s
+    @@zone = @@global.zone.to_s
+
     
     context "#{name}_00 Setup" do
       should "(10) have class variables setup" do
-        stop_test !@@rmach.is_a?(Rudy::Instances), "We don't have an instance ofRudy::Instancess (#{@@rmach})"
-        stop_test !@@ec2.is_a?(Rudy::AWS::EC2), "We don't have an instance of Rudy::AWS::EC2 (#{@@ec2})"
-        stop_test !@@global.is_a?(OpenStruct), "We don't have global (#{@@global})"
+        stop_test !@@global.is_a?(Rudy::Global), "We don't have global (#{@@global})"
         stop_test !@@config.is_a?(Rudy::Config), "We don't have an instance of Rudy::Config (#{@@config})"
-        stop_test !@@rmach.config || !@@rmach.config.accounts || !@@rmach.config.accounts.aws || !@@rmach.config.accounts.aws.accountnum, "No account number"
+        stop_test !@@global.accountnum, "No account number"
       end
       should "(11) be zone" do
         stop_test !@@zone, "No zone"

data/test/25_ec2/10_keypairs_test.rb

@@ -4,11 +4,15 @@ module Rudy::Test
   class Case_25_EC2
     
     context "#{name}_10 KeyPairs" do
+      setup do
+        @@test_name ||= 'test-' << Rudy::Utils.strand
+        @ec2key = Rudy::AWS::EC2::KeyPairs.new(@@global.accesskey, @@global.secretkey, @@global.region)
+        #@ami = @@config.machines.find(@@zone.to_sym, :ami)
+      end
       
       
       should "(10) create keypair" do
-        name = 'test-' << Rudy::Utils.strand
-        keypair = @@ec2.keypairs.create(name)
+        keypair = @ec2key.create(@@test_name)
         assert keypair.is_a?(Rudy::AWS::EC2::KeyPair), "Not a KeyPair"
         assert !keypair.name.empty?, "No name"
         assert !keypair.fingerprint.empty?, "No fingerprint"
@@ -16,15 +20,19 @@ module Rudy::Test
       end
       
       should "(20) list keypairs" do
-        keypairs = @@ec2.keypairs.list || []
+        keypairs = @ec2key.list || []
         assert keypairs.size > 0, "No keypairs"
       end
       
+      should "(21) get specific keypair" do
+        assert @ec2key.get(@@test_name).is_a?(Rudy::AWS::EC2::KeyPair), "Not a KeyPair (#{@@test_name})"
+      end
+      
       should "(50) destroy keypairs" do
-        keypairs = @@ec2.keypairs.list || []
+        keypairs = @ec2key.list || []
         assert keypairs.size > 0, "No keypairs"
         keypairs.each do |kp|
-          @@ec2.keypairs.destroy(kp.name)
+          @ec2key.destroy(kp.name)
         end
       end
     end

data/test/25_ec2/20_groups_test.rb

@@ -6,49 +6,52 @@ module Rudy::Test
     def get_groups
       # Ruby 1.8 throws an undefined method error when this is at the 
       # bottom of the class
-      group_list = @@ec2.groups.list_as_hash
+      group_list = @ec2group.list_as_hash
       # "default" cannot be deleted so we exempt it
       group_list.reject { |gname,group| gname == "default" }
     end
     
     
     context "#{name}_20 Groups" do
+      setup do
+        @ec2group = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
+        @accountnum = @@config.accounts.aws.accountnum
+      end
       
       should "(00) not be existing groups" do
+        
         group_list = get_groups
-        stop_test !group_list.empty?, "Destroy the existing groups (except \"default\")"
+        stop_test !group_list.empty?, "Destroy the existing groups (#{group_list.keys.join(', ')})"
+        stop_test !@accountnum, "Need an account number for group authorization"
       end
       
       should "(01) create group with name" do
         group_list = get_groups
-        
+        test_name ||= 'test-' << Rudy::Utils.strand
         str = Rudy::Utils.strand
-        gname = "test-name-#{str}"
-        group = @@ec2.groups.create(gname)
-        assert group.is_a?(Rudy::AWS::EC2::Group), "Not a Group object"
-        assert_equal group.name, gname, "Group name not set"
-        assert_equal group.description, "Group #{gname}", "Group description not 'Group #{gname}'"
-        assert @@ec2.groups.exists?(gname), "Group #{gname} doesn't exist"
+        group = @ec2group.create(test_name)
+        assert group.is_a?(Rudy::AWS::EC2::Group), "Not a Group object (#{group.class.to_s})"
+        assert_equal group.name, test_name, "Group name not set"
+        assert_equal group.description, "Security Group #{test_name}", "Group description not 'Security Group #{test_name}'"
+        assert @ec2group.exists?(test_name), "Group #{test_name} doesn't exist"
       end
       
       should "(02) create group with name and description" do
-        group_list = get_groups
-        
+        test_name ||= 'test-' << Rudy::Utils.strand
         str = Rudy::Utils.strand
-        gname = "test-name-#{str}"
-        desc = "test-desc-#{str}"
-        group = @@ec2.groups.create(gname, desc)
+        desc = "Description for #{test_name}"
+        group = @ec2group.create(test_name, desc)
         assert group.is_a?(Rudy::AWS::EC2::Group), "Not a Group object"
-        assert_equal group.name, gname, "Group name not set"
+        assert_equal group.name, test_name, "Group name not set"
         assert_equal group.description, desc, "Group description not set"
-        assert @@ec2.groups.exists?(gname), "Group #{gname} doesn't exist"
+        assert @ec2group.exists?(test_name), "Group #{test_name} doesn't exist"
       end
       
       should "(10) list available groups" do
-        group_list = @@ec2.groups.list
+        group_list = @ec2group.list
         assert group_list.is_a?(Array), "Group list is not an Array"
 
-        group_list_hash = @@ec2.groups.list_as_hash
+        group_list_hash = @ec2group.list_as_hash
         assert group_list_hash.is_a?(Hash), "Group list is not an Hash"
 
         group_list.each do |group|
@@ -59,64 +62,53 @@ module Rudy::Test
       should "(20) authorize/revoke group rules for address" do
         external_ip_address = Rudy::Utils::external_ip_address
         external_ip_address ||= '192.168.0.1/32'
-        
-        gname = "test-" << Rudy::Utils.strand
-        group = @@ec2.groups.create(gname)
+
+        test_name ||= 'test-' << Rudy::Utils.strand
+
+        group = @ec2group.create(test_name)
         protocols = ['tcp', 'udp']
         addresses = [external_ip_address]
         ports = [[3100,3150],[3200,3250]]
-        should_have = [] # The list of address keys we're expecting in Groups#addresses
-        protocols.each do |protocol|
-          addresses.each do |address|
-            ports.each do |port|
-              should_have << "#{address}/#{protocol}"
-              ret = @@ec2.groups.authorize(gname, port[0].to_i, (port[1] || port[0]).to_i, protocol, address)
-              assert ret, "Did not authorize: #{port[0]}:#{port[1]} (#{protocol}) for #{address}"
-            end
-          end
-        end
-        group = @@ec2.groups.get(gname)
-        assert group.addresses.is_a?(Hash), "Addresses is not a hash"
-        address_diff = group.addresses.keys - should_have
-        assert address_diff.empty?, "Some addresses not created (#{address_diff.join(', ')})"
+        
+        ret = @ec2group.authorize(test_name, addresses, ports, protocols)
+        assert ret, "Authorize did not return true"
+        
+        group = @ec2group.get(test_name)
+        
+        assert group.is_a?(Rudy::AWS::EC2::Group), "Not a group (#{group})"
+        assert group.addresses.is_a?(Hash), "Addresses is not a hash (#{group.addresses})"
+        
         group.addresses.each_pair do |address,rules|
           assert rules.is_a?(Array), "Not an Array"
-          assert_equal 2, rules.size, "Not 2 rules"
-          # TODO: Check port ranges
-        end
-        
-        protocols.each do |protocol|
-          addresses.each do |address|
-            ports.each do |port|
-              should_have << "#{address}/#{protocol}"
-              ret = @@ec2.groups.revoke(gname, port[0].to_i, (port[1] || port[0]).to_i, protocol, address)
-              assert ret, "Did not revoke: #{port[0]}:#{port[1]} (#{protocol}) for #{address}"
-            end
-          end
+          assert_equal 7, rules.size, "Not 7 rules"
+          puts "TODO: Check port ranges"
         end
         
-        group = @@ec2.groups.get(gname)
+        ret = @ec2group.revoke(test_name, addresses, ports, protocols)
+        assert ret, "Revoke did not return true"
+        sleep 1 # Wait for eventual consistency
+        group = @ec2group.get(test_name)
         assert group.addresses.is_a?(Hash), "Addresses is not a hash"
         assert group.addresses.empty?, "Some addresses not revoked #{group.addresses.to_s}"
       end
       
       
       should "(21) authorize/revoke group permissions for account/group" do
-        gname = "test-" << Rudy::Utils.strand
-        group = @@ec2.groups.create(gname)
-        should_have = "#{@@rmach.config.accounts.aws.accountnum}:#{gname}"
+        test_name ||= 'test-' << Rudy::Utils.strand
+        group = @ec2group.create(test_name)
+        should_have = "#{@accountnum}:#{test_name}"
         
-        ret = @@ec2.groups.authorize_group(gname, gname, @@rmach.config.accounts.aws.accountnum)
+        ret = @ec2group.authorize_group(test_name, test_name, @accountnum)
         assert ret, "Authorize failed (#{should_have})"
-        group = @@ec2.groups.get(gname)
+        group = @ec2group.get(test_name)
         assert group.is_a?(Rudy::AWS::EC2::Group), "Not a Group object"
         assert group.groups.is_a?(Hash), "Groups is not a Hash (#{group.groups.class})"
         assert_equal should_have, group.groups.keys.first, "Authorized group is not #{should_have}"
         # TODO: Check port ranges
         
-        ret = @@ec2.groups.revoke_group(gname, gname, @@rmach.config.accounts.aws.accountnum)
+        ret = @ec2group.revoke_group(test_name, test_name, @accountnum)
         assert ret, "Revoke failed (#{should_have})"
-        group = @@ec2.groups.get(gname)
+        group = @ec2group.get(test_name)
         assert group.is_a?(Rudy::AWS::EC2::Group), "Not a Group object"
         assert group.groups.is_a?(Hash), "Groups is not a Hash (#{group.groups.class})"
         assert !group.groups.has_key?(should_have), "Still authorized for #{should_have}"
@@ -127,7 +119,7 @@ module Rudy::Test
         group_list = get_groups
         assert !group_list.empty?, "No groups"
         group_list.each_pair do |gname,group|
-          assert @@ec2.groups.destroy(group.name), "Not destroyed (#{group.name})"
+          assert @ec2group.destroy(group.name), "Not destroyed (#{group.name})"
         end
       end