heirloom 0.6.1 → 0.7.0rc1

data/lib/heirloom/cli/download.rb

@@ -11,22 +11,29 @@ module Heirloom
                               :opts   => @opts
 
         ensure_valid_options :provided => @opts,
-                             :required => [:base, :name, :id, :output],
+                             :required => [:name, :id, :output],
                              :config   => @config
 
+        @catalog = Heirloom::Catalog.new :name    => @opts[:name],
+                                         :config  => @config
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
                                :config => @config
+
+        # Lookup region & base from simpledb unless specified
+        # To Do, valid validation message that simpledb exists
+        @region = @opts[:region] || @catalog.regions.first
+        @base   = @opts[:base]   || @catalog.base
       end
       
       def download
         ensure_directory :path => @opts[:output], :config => @config
         ensure_valid_secret :secret => @opts[:secret], :config => @config
         archive = @archive.download :output      => @opts[:output],
-                                    :region      => @opts[:region],
                                     :extract     => @opts[:extract],
-                                    :base_prefix => @opts[:base],
-                                    :secret      => @opts[:secret]
+                                    :secret      => @opts[:secret],
+                                    :region      => @region,
+                                    :base_prefix => @base
         exit 1 unless archive
       end
 
@@ -37,24 +44,28 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Download an archive.
+Download Heirloom.
 
 Usage:
 
-heirloom download -n NAME -i ID -r REGION -o OUTPUT_DIRECTORY
+heirloom download -n NAME -i ID -o OUTPUT_DIRECTORY
+
+To download Heirloom without looking up details in SimpleDB, specify region (-r) and base (-b) options.
 
 EOS
-          opt :base, "Base of the archive to download.", :type => :string
-          opt :extract, "Extract the archive in the given output path.", :short => "-x"
+          opt :base, "Base of the Heirloom to download.", :type => :string
+          opt :extract, "Extract the Heirloom into the given output path.", :short => "-x"
           opt :help, "Display Help"
-          opt :id, "ID of the archive to download.", :type => :string
+          opt :id, "ID of the Heirloom to download.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :name, "Name of archive.", :type => :string
-          opt :output, "Path to output downloaded archive. Must be existing directory.", :type => :string
-          opt :region, "Region to download archive.", :type    => :string,
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
+                                                                          :default => 'us-west-1'
+          opt :name, "Name of Heirloom.", :type => :string
+          opt :output, "Path to output downloaded Heirloom. Must be existing directory.", :type => :string
+          opt :region, "Region to download Heirloom.", :type    => :string,
                                                       :default => 'us-west-1'
-          opt :secret, "Secret for ecrypted archive.", :type => :string
+          opt :secret, "Secret for ecrypted Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 

data/lib/heirloom/cli/list.rb

@@ -33,7 +33,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-List available IDs of archive.
+List Heirloom IDs.
 
 Usage:
 
@@ -47,7 +47,7 @@ EOS
                                                             :default => 'info'
           opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
                                                                           :default => 'us-west-1'
-          opt :name, "Name of archive.", :type => :string
+          opt :name, "Name of Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 

data/lib/heirloom/cli/setup.rb

@@ -14,18 +14,32 @@ module Heirloom
                              :required => [:metadata_region, :region, 
                                            :name, :base],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
-        ensure_valid_regions :regions => @opts[:region],
-                             :config  => @config
 
+        @catalog = Heirloom::Catalog.new :name    => @opts[:name],
+                                         :config  => @config
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config
       end
 
       def setup
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
+        ensure_valid_regions :regions => @opts[:region],
+                             :config  => @config
         ensure_metadata_in_upload_region :config  => @config, 
                                          :regions => @opts[:region]
+
+        @catalog.create_catalog_domain
+        unless @catalog.add_to_catalog :regions => @opts[:region],
+                                       :base    => @opts[:base]
+           if @opts[:force]
+             @logger.warn "#{@opts[:name]} already exists."
+           else
+             @logger.warn "#{@opts[:name]} already exists, exiting."
+             exit 1
+           end
+        end
+
         @archive.setup :regions       => @opts[:region],
                        :bucket_prefix => @opts[:base]
       end
@@ -48,12 +62,13 @@ EOS
 region. For example: '-b test -r us-west-1 -r us-east-1' will create bucket test-us-west-1 \
 in us-west-1 and test-us-east-1 in us-east-1.", :type => :string
           opt :help, "Display Help"
+          opt :force, "Force setup even if entry already exists in catalog."
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
                                                                           :default => 'us-west-1'
-          opt :name, "Name of archive.", :type => :string
-          opt :region, "AWS Region(s) to upload archive. \
+          opt :name, "Name of Heirloom.", :type => :string
+          opt :region, "AWS Region(s) to upload Heirloom. \
 Can be specified multiple times.", :type  => :string, 
                                    :multi => true,
                                    :default => 'us-west-1'

data/lib/heirloom/cli/shared.rb

@@ -105,7 +105,6 @@ module Heirloom
         unless archive.buckets_exist? :regions       => regions,
                                       :bucket_prefix => base
           logger.error "Required buckets for '#{base}' do not exist."
-          logger.error "Run 'heirloom setup -h' for help setting up new region."
           exit 1
         end
       end
@@ -119,8 +118,7 @@ module Heirloom
                               :config => config
 
         unless archive.domain_exists?
-          logger.error "Metadata domain '#{name}' does not exist in '#{config.metadata_region}'."
-          logger.error "Run 'heirloom setup -h' for help setting up new region."
+          logger.error "'#{name}' does not exist in '#{config.metadata_region}' catalog."
           exit 1
         end
       end
@@ -136,6 +134,17 @@ module Heirloom
         end
       end
 
+      def ensure_archive_domain_empty(args)
+        config  = args[:config]
+        archive = args[:archive]
+        logger  = config.logger
+
+        unless archive.count.zero?
+          logger.error "Not empty."
+          exit 1
+        end
+      end
+
     end
   end
 end

data/lib/heirloom/cli/show.rb

@@ -41,7 +41,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Show archive.
+Show Heirloom.
 
 Usage:
 
@@ -51,12 +51,12 @@ If -i is ommited, latest ID is displayed.
 
 EOS
           opt :help, "Display Help"
-          opt :id, "ID of the archive to display.", :type => :string
+          opt :id, "ID of the Heirloom to display.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
                                                                           :default => 'us-west-1'
-          opt :name, "Name of archive.", :type => :string
+          opt :name, "Name of Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 

data/lib/heirloom/cli/tag.rb

@@ -40,7 +40,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Tag an archive with an attribute and value.
+Tag an Heirloom with an attribute and value.
 
 Usage:
 
@@ -49,12 +49,12 @@ heirloom tag -n NAME -i ID -a ATTRIBUTE -u VALUE
 EOS
           opt :attribute, "Attribute to update.", :type => :string
           opt :help, "Display Help"
-          opt :id, "ID of the archive to display.", :type => :string
+          opt :id, "ID of the Heirloom to tag.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
                                                                           :default => 'us-west-1'
-          opt :name, "Name of archive.", :type => :string
+          opt :name, "Name of Heirloom.", :type => :string
           opt :value, "Value of attribute.", :type  => :string,
                                              :short => 'u'
           opt :aws_access_key, "AWS Access Key ID", :type  => :string, 

data/lib/heirloom/cli/teardown.rb

@@ -0,0 +1,75 @@
+module Heirloom
+  module CLI
+    class Teardown
+
+      include Heirloom::CLI::Shared
+
+      def initialize
+        @opts = read_options
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @config = load_config :logger => @logger,
+                              :opts   => @opts
+
+        ensure_valid_options :provided => @opts, 
+                             :required => [:name],
+                             :config   => @config
+
+        @catalog = Heirloom::Catalog.new :name    => @opts[:name],
+                                         :config  => @config
+        @archive = Archive.new :name   => @opts[:name],
+                               :config => @config
+
+      end
+
+      def teardown
+        ensure_domain_exists :name   => @opts[:name],
+                             :config => @config
+
+        ensure_archive_domain_empty :archive => @archive,
+                                    :config  => @config
+
+        @regions = @catalog.regions
+        @base    = @catalog.base
+
+        unless @opts[:keep_buckets]
+          @archive.delete_buckets :regions       => @regions,
+                                  :bucket_prefix => @base
+        end
+
+        @archive.delete_domain
+        @catalog.delete_from_catalog
+      end
+
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Teardown S3 buckets and SimpleDB domain for a given Heirloom name.
+
+Usage:
+
+heirloom teardown -n NAME
+
+Note: All Heirlooms must be destroyed.
+
+EOS
+          opt :help, "Display Help"
+          opt :level, "Log level [debug|info|warn|error].", :type    => :string,
+                                                            :default => 'info'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
+                                                                          :default => 'us-west-1'
+          opt :name, "Name of Heirloom.", :type => :string
+          opt :keep_buckets, "Do not delete S3 buckets."
+          opt :aws_access_key, "AWS Access Key ID", :type => :string, 
+                                                    :short => :none
+          opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
+                                                        :short => :none
+        end
+      end
+
+    end
+  end
+end

data/lib/heirloom/cli/upload.rb

@@ -11,36 +11,34 @@ module Heirloom
                               :opts   => @opts
 
         ensure_valid_options :provided => @opts, 
-                             :required => [:name, :id, :region, 
-                                           :base, :directory],
+                             :required => [:name, :id, :directory],
                              :config   => @config
-
+        @catalog = Heirloom::Catalog.new :name    => @opts[:name],
+                                         :config  => @config
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
                                :config => @config
+        @regions = @catalog.regions
+        @base    = @catalog.base
       end
 
       def upload
         ensure_valid_region :region => @opts[:metadata_region],
                             :config => @config
-        ensure_valid_regions :regions => @opts[:region],
-                             :config  => @config
         ensure_domain_exists :name   => @opts[:name], 
                              :config => @config
-        ensure_buckets_exist :base    => @opts[:base],
+        ensure_buckets_exist :base    => @base,
                              :name    => @opts[:name],
-                             :regions => @opts[:region],
+                             :regions => @regions,
                              :config  => @config
         ensure_directory :path   => @opts[:directory], 
                          :config => @config
         ensure_valid_secret :secret => @opts[:secret], 
                             :config => @config
-        ensure_metadata_in_upload_region :config  => @config, 
-                                         :regions => @opts[:region]
 
-        @archive.destroy :keep_domain => true if @archive.exists?
+        @archive.destroy if @archive.exists?
                           
-        build = @archive.build :base       => @opts[:base],
+        build = @archive.build :base       => @base,
                                :directory  => @opts[:directory],
                                :exclude    => @opts[:exclude],
                                :git        => @opts[:git],
@@ -51,8 +49,8 @@ module Heirloom
           exit 1
         end
 
-        @archive.upload :bucket_prefix   => @opts[:base],
-                        :regions         => @opts[:region],
+        @archive.upload :bucket_prefix   => @base,
+                        :regions         => @regions,
                         :public_readable => @opts[:public],
                         :file            => build
       end
@@ -68,29 +66,22 @@ Upload a directory to Heirloom.
 
 Usage:
 
-heirloom upload -n NAME -i ID -b BASE -r REGION1 -r REGION2 -d DIRECTORY_TO_UPLOAD
+heirloom upload -n NAME -i ID -d DIRECTORY_TO_UPLOAD
 
 EOS
-          opt :base, "Base prefix which will be combined with region. \
-For example: -b 'test' -r 'us-west-1'  will expect bucket 'test-us-west-1' \
-to be present", :type => :string
           opt :directory, "Source directory of build.", :type  => :string
           opt :exclude, "File(s) or directorie(s) to exclude. \
 Can be specified multiple times.", :type  => :string, :multi => true
-          opt :git, "Read git commit information from directory and set as archive attributes."
+          opt :git, "Read git commit information from directory and set as Heirloom attributes."
           opt :help, "Display Help"
-          opt :id, "ID for archive (when -g specified, assumed to be GIT sha).", :type => :string
+          opt :id, "ID for Heirloom (when -g specified, assumed to be GIT sha).", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
                                                                           :default => 'us-west-1'
-          opt :name, "Name of archive.", :type => :string
-          opt :public, "Set this archive as public readable?"
-          opt :region, "Region(s) to upload archive. \
-Can be specified multiple times.", :type  => :string, 
-                                   :multi => true,
-                                   :default => 'us-west-1'
-          opt :secret, "Encrypt the archive with given secret.", :type => :string
+          opt :name, "Name of Heirloom.", :type => :string
+          opt :public, "Set this Heirloom as public readable?"
+          opt :secret, "Encrypt the Heirloom with given secret.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 

data/lib/heirloom/cli.rb

@@ -3,6 +3,7 @@ require 'trollop'
 
 require 'heirloom/cli/shared'
 require 'heirloom/cli/authorize'
+require 'heirloom/cli/catalog'
 require 'heirloom/cli/upload'
 require 'heirloom/cli/setup'
 require 'heirloom/cli/list'
@@ -10,6 +11,7 @@ require 'heirloom/cli/show'
 require 'heirloom/cli/tag'
 require 'heirloom/cli/download'
 require 'heirloom/cli/destroy'
+require 'heirloom/cli/teardown'
 
 module Heirloom
   module CLI
@@ -19,6 +21,8 @@ module Heirloom
       case cmd
       when 'authorize'
         CLI::Authorize.new.authorize
+      when 'catalog'
+        CLI::Catalog.new.list
       when 'destroy', 'delete'
         CLI::Destroy.new.destroy
       when 'download'
@@ -29,6 +33,8 @@ module Heirloom
         CLI::Setup.new.setup
       when 'show'
         CLI::Show.new.show
+      when 'teardown'
+        CLI::Teardown.new.teardown
       when 'update', 'tag'
         CLI::Tag.new.tag
       when 'build', 'upload'
@@ -37,7 +43,7 @@ module Heirloom
         puts Heirloom::VERSION
       else
         puts "Unkown command: '#{cmd}'." unless cmd == '-h'
-        puts "heirloom [authorize|destroy|download|list|setup|show|tag|upload] OPTIONS"
+        puts "heirloom [authorize|catalog|destroy|download|list|setup|show|tag|teardown|upload] OPTIONS"
         puts "Append -h for help on specific command."
       end
     end

data/lib/heirloom/directory/directory.rb

@@ -18,7 +18,7 @@ module Heirloom
 
       @local_build = Tempfile.new('archive.tar.gz').path
 
-      @logger.info "Building Heirloom '#{@local_build}' from '#{@path}'."
+      @logger.debug "Building Heirloom '#{@local_build}' from '#{@path}'."
       @logger.debug "Excluding #{@exclude.to_s}."
       @logger.debug "Adding #{files_to_pack}."
 

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.6.1"
+  VERSION = "0.7.0rc1"
 end

data/lib/heirloom.rb

@@ -1,11 +1,12 @@
-require "heirloom/config"
 require "heirloom/acl"
-require "heirloom/aws"
-require "heirloom/logger"
 require "heirloom/archive"
-require "heirloom/directory"
+require "heirloom/aws"
+require "heirloom/catalog"
 require "heirloom/cipher"
-require "heirloom/uploader"
-require "heirloom/downloader"
+require "heirloom/config"
 require "heirloom/destroyer"
+require "heirloom/directory"
+require "heirloom/downloader"
+require "heirloom/logger"
+require "heirloom/uploader"
 require "heirloom/version"

data/spec/acl/s3_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Heirloom do
   before do
     @config_mock = double 'config'
-    @logger_mock = double 'logger'
-    @config_mock.should_receive(:logger).and_return(@logger_mock)
+    @logger_stub = stub 'logger', :info => true, :debug => true
+    @config_mock.should_receive(:logger).and_return(@logger_stub)
 
     @s3 = Heirloom::ACL::S3.new :config  => @config_mock,
                                 :region  => 'us-west-1'
@@ -25,11 +25,6 @@ describe Heirloom do
     s3_mock.should_receive(:get_bucket_acl).with('bucket').
                                             and_return acls
 
-    @logger_mock.should_receive(:info).
-                 with 'Authorizing acct1@test.com to s3://bucket/key-folder/key.tar.gz.'
-    @logger_mock.should_receive(:info).
-                 with 'Authorizing acct2@test.com to s3://bucket/key-folder/key.tar.gz.'
-
     s3_mock.should_receive(:put_object_acl).
             with("bucket", "key-folder/key.tar.gz", {"Owner"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "AccessControlList"=>[{"Grantee"=>{"EmailAddress"=>"acct1@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"EmailAddress"=>"acct2@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "Permission"=>"FULL_CONTROL"}]})
 

data/spec/archive/destroyer_spec.rb

@@ -4,15 +4,14 @@ describe Heirloom do
 
     before do
       @config_mock = double 'config'
-      @logger_mock = double 'logger'
-      @config_mock.should_receive(:logger).and_return(@logger_mock)
+      @logger_stub = stub 'logger', :info => true, :debug => true
+      @config_mock.should_receive(:logger).and_return @logger_stub
       @destroyer = Heirloom::Destroyer.new :config => @config_mock,
                                            :name   => 'tim',
                                            :id     => '123'
     end
 
     before do
-      @logger_mock.stub :info => true
       @reader_mock = mock 'archive reader'
       @destroyer.stub :reader => @reader_mock
       @reader_mock.should_receive(:get_bucket).
@@ -31,23 +30,11 @@ describe Heirloom do
                              :bucket     => 'bucket-us-west-1'
       @sdb_mock = mock 'sdb'
       @destroyer.stub :sdb => @sdb_mock
-      @sdb_mock.should_receive(:delete).with 'heirloom_tim', '123'
     end
 
     it "should destroy the given archive" do
-      Kernel.should_receive(:sleep).with 3
-      @sdb_mock.should_receive(:domain_empty?).with('heirloom_tim').
-               and_return true
-      @sdb_mock.should_receive(:delete_domain).with('heirloom_tim')
-      @destroyer.destroy :regions => ['us-west-1'],
-                         :keep_domain => false
-    end
-
-    it "should destroy the given archive but keep the sbd domain" do
-      @sdb_mock.should_receive(:domain_empty?).exactly(0).times
-      @sdb_mock.should_receive(:delete_domain).exactly(0).times
-      @destroyer.destroy :regions     => ['us-west-1'],
-                         :keep_domain => true
+      @sdb_mock.should_receive(:delete).with 'heirloom_tim', '123'
+      @destroyer.destroy :regions => ['us-west-1']
     end
 
 end

data/spec/archive/lister_spec.rb

@@ -12,7 +12,7 @@ describe Heirloom do
     sdb_mock = mock 'sdb'
     @lister.should_receive(:sdb).and_return sdb_mock
     sdb_mock.should_receive(:select).
-             with("select * from heirloom_test123 where built_at > '2000-01-01T00:00:00.000Z' \
+             with("select * from `heirloom_test123` where built_at > '2000-01-01T00:00:00.000Z' \
                  order by built_at desc limit 10").
              and_return( {'1' => 'one', '2' => 'two', '3' => 'three'} )
     @lister.list.should == ['1', '2', '3']

data/spec/archive/reader_spec.rb

@@ -20,28 +20,28 @@ describe Heirloom do
 
     it "should show the item record" do
       @sdb_mock.should_receive(:select).
-               with("select * from heirloom_tim where itemName() = '123'").
+               with("select * from `heirloom_tim` where itemName() = '123'").
                and_return( { '123' => { 'value' => [ 'details' ] } } )
       @reader.show.should == { 'value' => 'details' }
     end
 
     it "should return an empty hash if item does not exist" do
       @sdb_mock.should_receive(:select).
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return({})
       @reader.show.should == {}
     end
 
     it "should return true if the record exists" do
       @sdb_mock.should_receive(:select).
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return( { '123' => { 'value' => [ 'details' ] } } )
       @reader.exists?.should == true
     end
 
     it "should return false if the record does not exist" do
       @sdb_mock.should_receive(:select).
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return({})
       @reader.exists?.should == false
     end
@@ -49,7 +49,7 @@ describe Heirloom do
     it "should return the bucket if it exists" do
       @sdb_mock.should_receive(:select).
                 exactly(3).times.
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return( { '123' => 
                               { 'us-west-1-s3-url' => 
                                 [ 's3://the-bucket/the-buck/the-key' ]  
@@ -61,7 +61,7 @@ describe Heirloom do
     it "should return nil if the key does not exist" do
       @sdb_mock.should_receive(:select).
                 exactly(1).times.
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return( { } )
       @reader.get_key(:region => 'us-west-1').should == nil
     end
@@ -69,7 +69,7 @@ describe Heirloom do
     it "should return nil if the bucket does not exist" do
       @sdb_mock.should_receive(:select).
                 exactly(1).times.
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return( { } )
       @reader.get_bucket(:region => 'us-west-1').should == nil
     end
@@ -77,7 +77,7 @@ describe Heirloom do
     it "should return the key if it exists" do
       @sdb_mock.should_receive(:select).
                 exactly(6).times.
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return( { '123' => 
                               { 'us-west-1-s3-url' => 
                                 ['s3://the-url/the-bucket/the-key'] 
@@ -89,7 +89,7 @@ describe Heirloom do
     it "should return the regions the archive has been uploaded to" do
       @sdb_mock.should_receive(:select).
                 exactly(1).times.
-                with("select * from heirloom_tim where itemName() = '123'").
+                with("select * from `heirloom_tim` where itemName() = '123'").
                 and_return( { '123' => 
                               { 'us-west-1-s3-url' => 
                                 ['s3://the-url-us-west-1/the-bucket/the-key'],