solutious-rudy 0.5.1 → 0.6.0

data/test/25_ec2/30_addresses_test.rb

@@ -4,28 +4,31 @@ module Rudy::Test
   class Case_25_EC2
     
     context "#{name}_30 Addresses" do
+      setup do
+        @ec2add = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      end
+      
       should "(00) not be existing addresses" do
-        #p @@ec2.addresses.list
-        stop_test @@ec2.addresses.any?, "Destroy the existing addresses"
+        stop_test @ec2add.any?, "Destroy the existing addresses"
       end
       
       should "(01) create address" do
-        address = @@ec2.addresses.create
+        address = @ec2add.create
         assert address.is_a?(Rudy::AWS::EC2::Address), "Did not create"
         assert address.ipaddress.size > 0, "Address length is 0"
       end
       
       should "(10) list available addresses" do
-        assert @@ec2.addresses.any?, "No addresses"
-        assert @@ec2.addresses.list_as_hash.is_a?(Hash), "Not a Hash"
-        assert @@ec2.addresses.list.is_a?(Array), "Not an Array"
-        assert_equal 1, @@ec2.addresses.list.size, "More than one address"
+        assert @ec2add.any?, "No addresses"
+        assert @ec2add.list_as_hash.is_a?(Hash), "Not a Hash"
+        assert @ec2add.list.is_a?(Array), "Not an Array"
+        assert_equal 1, @ec2add.list.size, "More than one address"
       end
       
       should "(50) destroy address" do
-        assert @@ec2.addresses.any?, "No addresses"
-        @@ec2.addresses.list.each do |address|
-          assert @@ec2.addresses.destroy(address), "Did not destroy"
+        assert @ec2add.any?, "No addresses"
+        @ec2add.list.each do |address|
+          assert @ec2add.destroy(address), "Did not destroy"
         end
       end
       

data/test/25_ec2/40_volumes_test.rb

@@ -3,16 +3,19 @@ module Rudy::Test
   class Case_25_EC2
     
     context "#{name}_40 Volumes" do
-
+      setup do
+        @ec2vol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      end
+      
       should "(00) not be existing volumes" do
-        volume_hash = @@ec2.volumes.list_as_hash
+        volume_hash = @ec2vol.list_as_hash
         volume_hash.reject! { |volid, vol| !vol.available? }
         stop_test !volume_hash.empty?, "Destroy the existing volumes"
       end
 
       should "(10) create volume" do 
         volume_size = 2
-        volume = @@ec2.volumes.create(volume_size, @@zone)
+        volume = @ec2vol.create(volume_size, @@zone)
         assert volume.is_a?(Rudy::AWS::EC2::Volume), "Not a Volume"
         assert_equal @@zone, volume.zone, "Zone incorrect: #{volume.zone}"
         assert_equal volume_size.to_i, volume.size.to_i, "Size incorrect: #{volume.size}"
@@ -20,11 +23,11 @@ module Rudy::Test
       end
 
       should "(20) list volumes" do
-        volume_list = @@ec2.volumes.list
+        volume_list = @ec2vol.list
         assert volume_list.is_a?(Array), "Not an Array"
         assert volume_list.size > 0, "No Volumes in Array"
 
-        volume_hash = @@ec2.volumes.list_as_hash
+        volume_hash = @ec2vol.list_as_hash
         assert volume_hash.is_a?(Hash), "Not a Hash"
         assert volume_hash.keys.size > 0, "No Volumes in Hash"
 
@@ -32,11 +35,11 @@ module Rudy::Test
       end
 
       should "(50) destroy volumes" do
-        assert @@ec2.volumes.any?, "No volumes"
-        volume_list = @@ec2.volumes.list
+        assert @ec2vol.any?, "No volumes"
+        volume_list = @ec2vol.list
         volume_list.each do |vol|
           next unless vol.available?
-          assert @@ec2.volumes.destroy(vol.awsid), "Not destroyed (#{vol.awsid})"
+          assert @ec2vol.destroy(vol.awsid), "Not destroyed (#{vol.awsid})"
         end
       end
  

data/test/25_ec2/50_snapshots_test.rb

@@ -5,39 +5,44 @@ module Rudy::Test
 
        
    context "#{name}_50 Snapshots" do
+     setup do
+       @ec2vol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
+       @ec2snap = Rudy::AWS::EC2::Snapshots.new(@@global.accesskey, @@global.secretkey, @@global.region)
+     end
+     
      
      should "(00) be no snapshots" do
-       stop_test @@ec2.snapshots.any?, "Destroy existing snapshots"
+       stop_test @ec2snap.any?, "Destroy existing snapshots"
      end
      
      should "(01) create a volume to work off of" do
        @@volumes ||= []
-       @@volumes << @@ec2.volumes.create(1, @@zone)
+       @@volumes << @ec2vol.create(1, @@zone)
        stop_test !@@volumes.first.is_a?(Rudy::AWS::EC2::Volume), "No volume to work off of."
      end
      
      should "(01) create snapshot" do
        stop_test !@@volumes.first.is_a?(Rudy::AWS::EC2::Volume), "No volume to work off of."
        assert !@@volumes.first.awsid.empty?, "No volume ID"
-       @@ec2.snapshots.create(@@volumes.first.awsid)
+       @ec2snap.create(@@volumes.first.awsid)
      end
      
      should "(10) list snapshots" do
-       snap_list = @@ec2.snapshots.list
+       snap_list = @ec2snap.list
        assert snap_list.is_a?(Array), "Not an Array"
        assert snap_list.size > 0, "No Snapshots in Array"
         
-       snap_hash = @@ec2.snapshots.list_as_hash
+       snap_hash = @ec2snap.list_as_hash
        assert snap_hash.is_a?(Hash), "Not an Hash"
        assert snap_hash.keys.size > 0, "No Snapshots in Hash"
      end
      
      should "(20) create volume from snapshot" do
        volume_size = 2
-       snap_list = @@ec2.snapshots.list || []
+       snap_list = @ec2snap.list || []
        assert !snap_list.empty?, "No snapshots"
         
-       volume = @@ec2.volumes.create(volume_size, @@zone, snap_list.first.awsid)
+       volume = @ec2vol.create(volume_size, @@zone, snap_list.first.awsid)
        #puts "#{volume.awsid} #{snap_list.first.awsid}"
        
        assert volume.is_a?(Rudy::AWS::EC2::Volume), "Not a Volume"
@@ -49,18 +54,18 @@ module Rudy::Test
        @@volumes << volume # We put it here so it will be destoryed in teardown
      end
      
-     should "(50) destroy snapshots" do
-       assert @@ec2.snapshots.any?, "No snapshots"
-       snap_list = @@ec2.snapshots.list
+     should "(90) destroy snapshots" do
+       assert @ec2snap.any?, "No snapshots"
+       snap_list = @ec2snap.list
        snap_list.each do |snap|
          next unless snap.completed?
-         assert @@ec2.snapshots.destroy(snap.awsid), "Not destroyed (#{snap.awsid})"
+         assert @ec2snap.destroy(snap.awsid), "Not destroyed (#{snap.awsid})"
        end
      end
      
      should "(99) cleanup created volumes" do
        (@@volumes || []).each do |vol|
-         assert @@ec2.volumes.destroy(vol), "Volume not destoryed (#{vol.awsid})"
+         assert @ec2vol.destroy(vol), "Volume not destoryed (#{vol.awsid})"
        end
      end
    end

data/test/26_ec2_instances/00_setup_test.rb

@@ -9,19 +9,14 @@ module Rudy::Test
   # DO NOT RUN THIS TEST ON A PRODUCTION AWS ACCOUNT!!
   #
   class Case_26_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}_10 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 Rudy::Global (#{@@global})"
         stop_test !@@config.is_a?(Rudy::Config), "We don't have an instance of Rudy::Config (#{@@config})"
       end
       should "(11) be zone" do

data/test/26_ec2_instances/10_instances_test.rb

@@ -5,16 +5,18 @@ module Rudy::Test
     context "#{name}_10 Instances" do
       
       setup do
+        @ec2inst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
+        @ec2add = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
         @us_ami = @@config.machines.find(:"us-east-1b", :ami)
         @eu_ami = @@config.machines.find(:"eu-west-1b", :ami)
       end
       
       should "(10) create instance" do
-        stop_test @@ec2.instances.any?(:running), "Destroy the existing instances"
-        instances = @@ec2.instances.create('ami-235fba4a') # Amazon Getting Started AMI
+        stop_test @ec2inst.any?(:running), "Destroy the existing instances"
+        instances = @ec2inst.create(:ami => 'ami-235fba4a', :group => "default") # Amazon Getting Started AMI
         assert instances.is_a?(Array), "Not an Array of instances"
         instances.each do |instance|
-          Rudy.waiter(2, 120, @@logger) { @@ec2.instances.running?(instance) }
+          Rudy::Utils.waiter(2, 120, @@logger) { @ec2inst.running?(instance) }
           assert instance.is_a?(Rudy::AWS::EC2::Instance), "Not an Rudy::AWS::EC2::Instance object"
         end
       end
@@ -22,57 +24,57 @@ module Rudy::Test
           testnum = 20
           Rudy::AWS::EC2::Instances::KNOWN_STATES.each do |state|
       should "(#{testnum}) know instance is #{state}" do
-        instances = @@ec2.instances.list(state) || []
+        instances = @ec2inst.list(state) || []
         return skip("No instances are in #{state} state") if instances.empty?
         instances.each do |inst|
-          assert @@ec2.instances.send("#{state}?", inst) # running?(inst)
+          assert @ec2inst.send("#{state}?", inst) # running?(inst)
         end
       end
           testnum += 1
           end
       
       should "(30) list instance" do
-        assert @@ec2.instances.list.is_a?(Array), "Not an Array of instances"
-        assert @@ec2.instances.list_as_hash.is_a?(Hash), "Not a Hash of instances"
+        assert @ec2inst.list.is_a?(Array), "Not an Array of instances"
+        assert @ec2inst.list_as_hash.is_a?(Hash), "Not a Hash of instances"
       end
       
       should "(31) console" do
-        @@ec2.instances.list.each do |inst|
-          assert @@ec2.instances.console_output(inst).is_a?(String), "No console output for (#{inst.awsid})"
+        @ec2inst.list.each do |inst|
+          assert @ec2inst.console_output(inst).is_a?(String), "No console output for (#{inst.awsid})"
         end
       end
       
       should "(40) assign IP address to instance" do
         assigned = 0
-        @@ec2.instances.list.each do |instance|
+        @ec2inst.list.each do |instance|
           next if instance.terminated? || instance.shutting_down?
           assigned += 1
-          address = @@ec2.addresses.create
-          assert @@ec2.addresses.associate(instance, address), "Did not assign"
+          address = @ec2add.create
+          assert @ec2add.associate(address, instance), "Did not assign"
         end
         assert assigned > 0, "No machine running"
       end
       
       
       should "(60) restart instance" do
-        instances = @@ec2.instances.list(:running)
+        instances = @ec2inst.list(:running)
         instances.each do |instance|
-          assert @@ec2.instances.restart(instance), "Did not restart"
+          assert @ec2inst.restart(instance), "Did not restart"
         end
       end
       
       should "(99) destroy instance" do
-        Rudy.waiter(2, 60, @@logger) { @@ec2.instances.any?(:running) }
-        instances = @@ec2.instances.list(:running) 
+        assert @ec2inst.any?(:running), "No instances running"
+        instances = @ec2inst.list(:running) 
         return skip("No running instances") unless instances
         instances.each do |instance|
-          assert @@ec2.instances.destroy(instance), "Did not destroy"
+          assert @ec2inst.destroy(instance), "Did not destroy"
         end
       end
       
       should "(99) clean created addresses" do
-        (@@ec2.addresses.list || []).each do |address|
-          assert @@ec2.addresses.destroy(address), "Address not destroyed (#{address})"
+        (@ec2add.list || []).each do |address|
+          assert @ec2add.destroy(address), "Address not destroyed (#{address})"
         end
       end
       

data/test/30_sdb_metadata/00_setup_test.rb

@@ -2,20 +2,13 @@ require File.join(File.dirname(__FILE__), '..', 'helper')
 
 module Rudy::Test
   class Case_30_MetaData < Test::Unit::TestCase
-    include Rudy::AWS
+    include Rudy::Huxtable
     
     @@logger = 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 !@@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/30_sdb_metadata/10_disks_test.rb

@@ -1,24 +1,15 @@
 module Rudy::Test
   class Case_30_MetaData
-    
-    def create_disk
-      disk = Rudy::MetaData::Disk.new
-      [:region, :zone, :environment, :role, :position].each do |n|
-        disk.send("#{n}=", @@global.send(n))
-      end
-      
-      disk.path = "/rudy/disk"
-      disk.size = 10
-      disk.device = "/dev/sdh"
-      disk
-    end
+
     
     context "#{name}_10 Disks" do
       
       setup do
-        @ami = @@config.machines.find(@@zone.to_sym, :ami)
+        @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+        #@ami = @@config.machines.find(@@zone.to_sym, :ami)
       end
       
+      
       should "(00) have global setup" do
         [:region, :zone, :environment, :role, :position].each do |n|
           assert @@global.respond_to?(n), "No global #{n}"
@@ -26,70 +17,89 @@ module Rudy::Test
       end
       
       should "(01) have domain" do
-        assert @@sdb.domains.create(Rudy::RUDY_DOMAIN), "Domain not created (#{Rudy::RUDY_DOMAIN})"
+        assert @sdb.create_domain(Rudy::DOMAIN), "Domain not created (#{Rudy::DOMAIN})"
       end
       
       
       should "(10) create a disk object" do
-        disk = create_disk
+        disk = Rudy::Disk.new('/rudy/disk', 1, '/dev/sdh')
         
-        disk_name = []
-        [:region, :zone, :environment, :role, :position].each do |n|
-          disk_name << @@global.send(n)
+        disk_name_elements = []
+        [:zone, :environment, :role, :position].each do |n|
+          disk_name_elements << @@global.send(n)
         end
         
-        disk_name.shift   # don't use region in disk name, but add the disk identifier and path
-        disk_name = [Rudy.identifier(:disk), disk_name, 'rudy', 'disk'].join(Rudy::RUDY_DELIM)
+        # disk-us-east-1b-stage-app-01-rudy-disk
+        disk_name = ['disk', disk_name_elements, 'rudy', 'disk'].join(Rudy::DELIM)
         
         assert_equal disk_name, disk.name, "Unexpected disk name #{disk.name}"
         assert disk.valid?, "Disk not valid"
         
-        disk.save
       end
       
-      should "(20) list metadata" do
-        q = "select * from #{Rudy::RUDY_DOMAIN}"
+      should "(11) save a disk object" do
+        disk = Rudy::Disk.new('/rudy/disk', 1, '/dev/sdh')
+        assert disk.is_a?(Rudy::Disk), "Not a Rudy::Disk (#{disk})"
+        assert disk.save, "Did not save #{disk.name}"
+      end
+      
+      should "(20) list metadata with select" do
+        q = "select * from #{Rudy::DOMAIN}"
 
-        items = @@sdb.select(q)
+        items = @sdb.select(q)
+        #p items
         assert_equal Hash, items.class
         assert items.size > 0, "No disks"
         assert_equal @@global.zone.to_s, items.values.first['zone'].first.to_s
       end
       
       should "(22) list disk metadata with select" do
-        q = "select * from #{Rudy::RUDY_DOMAIN} where rtype = 'disk'"
-        items = @@sdb.select(q)
+        q = "select * from #{Rudy::DOMAIN} where rtype = 'disk'"
+        items = @sdb.select(q)
         assert_equal Hash, items.class
         assert items.size > 0, "No disks"
         assert_equal @@global.zone.to_s, items.values.first['zone'].first.to_s
       end
       
       should "(23) list disk metadata with query" do
-        q = "select * from #{Rudy::RUDY_DOMAIN} where rtype = 'disk'"
+        q = "select * from #{Rudy::DOMAIN} where rtype = 'disk'"
         
-        items = @@sdb.query_with_attributes(Rudy::RUDY_DOMAIN, "['rtype' = 'disk']")
+        items = @sdb.query_with_attributes(Rudy::DOMAIN, "['rtype' = 'disk']")
         assert_equal Hash, items.class
         assert items.size > 0, "No disks"
         assert_equal @@global.zone.to_s, items.values.first['zone'].first.to_s
       end
       
-      should "(30) get disk metadata" do
-        disk_tmp = create_disk
-        disk = Rudy::MetaData::Disk.get(disk_tmp.name)
-        assert_equal Rudy::MetaData::Disk, disk.class
-        assert_equal @@global.zone.to_s, disk.zone.to_s
+      should "(30) get disk from Rudy::Disks, modify, and save" do
+        disk_tmp = Rudy::Disk.new('/rudy/disk', 1, '/dev/sdh')
+        rdisk = Rudy::Disks.new
+        disk_orig = rdisk.get(disk_tmp.name)
+        assert_equal Rudy::Disk, disk_orig.class, "Not a Rudy::Disk #{disk_orig}"
+        assert_equal @@global.zone.to_s, disk_orig.zone.to_s, "Unexpected zone #{disk_orig.zone}"
+        sleep 1
+        disk_orig.size = 2
+        assert disk_orig.save, "Did not save #{disk_orig.name}"
+        disk_new = rdisk.get(disk_orig.name)
+        assert_equal disk_orig.size, disk_new.size, "Different size #{disk_new.size}"
+        assert disk_new.destroy, "Did not destroy #{disk_new.name}"
       end
       
       
-      should "(99) destroy disk metadata" do
-        q = "select * from #{Rudy::RUDY_DOMAIN} where rtype = 'disk'"
-        items = @@sdb.select(q)
+      xshould "(90) destroy all disk metadata" do
+        # disabled b/c there are disks at this point. Previous tests delete them. 
+        q = "select * from #{Rudy::DOMAIN} where rtype = 'disk'"
+        items = @sdb.select(q)
+        p items
         assert_equal Hash, items.class
         items.keys.each do |item|
-          @@sdb.destroy(Rudy::RUDY_DOMAIN, item)
+          @sdb.destroy(Rudy::DOMAIN, item)
         end
       end
       
+      should "(99) destroy domain" do
+        assert @sdb.destroy_domain(Rudy::DOMAIN), "Domain not destroyed (#{Rudy::DOMAIN})"
+      end
+      
     end
     
     

data/test/30_sdb_metadata/20_backups_test.rb

@@ -15,7 +15,7 @@ module Rudy::Test
     
     def format_timestamp(dat)
       mon, day, hour, min, sec = [dat.mon, dat.day, dat.hour, dat.min, dat.sec].collect { |v| v.to_s.rjust(2, "0") }
-      [dat.year, mon, day, Rudy::RUDY_DELIM, hour, min, Rudy::RUDY_DELIM, sec].join
+      [dat.year, mon, day, Rudy::DELIM, hour, min, Rudy::DELIM, sec].join
     end
     
     context "#{name}_20 Backups" do
@@ -27,7 +27,7 @@ module Rudy::Test
       end
       
       should "(01) have domain" do
-        #assert @@sdb.domains.create(Rudy::RUDY_DOMAIN), "Domain not created (#{Rudy::RUDY_DOMAIN})"
+        #assert @@sdb.domains.create(Rudy::DOMAIN), "Domain not created (#{Rudy::DOMAIN})"
       end
       
       
@@ -42,7 +42,7 @@ module Rudy::Test
         back_time = format_timestamp(Time.now.utc)
         
         back_name.shift   # don't use region in backup name, but add the backup identifier and path
-        back_name = ['back', back_name, 'rudy', 'disk', back_time].join(Rudy::RUDY_DELIM)
+        back_name = ['back', back_name, 'rudy', 'disk', back_time].join(Rudy::DELIM)
         assert_equal back_name, back.name
 
         assert back.valid?, "Bcakup not valid"
@@ -51,7 +51,7 @@ module Rudy::Test
       end
       
       should "(20) list metadata" do
-        q = "select * from #{Rudy::RUDY_DOMAIN}"
+        q = "select * from #{Rudy::DOMAIN}"
 
         items = @@sdb.select(q)
         assert_equal Hash, items.class
@@ -60,7 +60,7 @@ module Rudy::Test
       end
       
       should "(22) list backup metadata with select" do
-        q = "select * from #{Rudy::RUDY_DOMAIN} where rtype = 'back'"
+        q = "select * from #{Rudy::DOMAIN} where rtype = 'back'"
         items = @@sdb.select(q)
         assert_equal Hash, items.class
         assert items.size > 0, "No backups"
@@ -68,9 +68,9 @@ module Rudy::Test
       end
       
       should "(23) list backup metadata with query" do
-        q = "select * from #{Rudy::RUDY_DOMAIN} where rtype = 'back'"
+        q = "select * from #{Rudy::DOMAIN} where rtype = 'back'"
         
-        items = @@sdb.query_with_attributes(Rudy::RUDY_DOMAIN, "['rtype' = 'back']")
+        items = @@sdb.query_with_attributes(Rudy::DOMAIN, "['rtype' = 'back']")
         assert_equal Hash, items.class
         assert items.size > 0, "No backups"
         assert_equal @@global.zone.to_s, items.values.first['zone'].first.to_s
@@ -85,11 +85,11 @@ module Rudy::Test
       end
       
       should "(40) destroy backup metadata" do
-        q = "select * from #{Rudy::RUDY_DOMAIN} where rtype = 'back'"
+        q = "select * from #{Rudy::DOMAIN} where rtype = 'back'"
         items = @@sdb.select(q)
         assert_equal Hash, items.class
         items.keys.each do |item|
-          @@sdb.destroy(Rudy::RUDY_DOMAIN, item)
+          @@sdb.destroy(Rudy::DOMAIN, item)
         end
       end
       

data/test/helper.rb

@@ -1,14 +1,16 @@
 
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
- 
+$:.unshift libdir
+%w{amazon-ec2 drydock caesars rye}.each { |dir| $: << File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+
+require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 
 require 'rudy'
 
 
-puts Rudy.banner("THIS IS RUBY #{RUBY_VERSION}")
+puts Rudy::Utils.banner("THIS IS RUBY #{RUBY_VERSION}")
 
 # +should_stop+ should the test be stopped?
 # +str+ The message to print when +should_stop+ is true