heirloom 0.5.0rc4 → 0.6.0rc1

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.6.0:
+
+* Allowing engineer to specify region for metadata
+* Ensuring metadata is in an upload region
+* Split setup into seperate subcommand
+* Perform additional validation on CLI options
+
 ## v0.5.0:
 
 * Verify domain exists for all cmds except build & download

data/README.md

@@ -24,11 +24,22 @@ aws:
 
 * **access_key / secret_key**: AWS account credentials where you would like the archives stored.
 
+Proxy Support
+-------------
+
+Heirloom uses the http_proxy & https_proxy variables.
+
+```
+export http_proxy=http://1.2.3.4:80
+export http_proxys=http://1.2.3.4:80
+```
+
 Platforms
 ---------
 
 Currently I support AWS S3 for object storage and AWS SimpleDB for metadata management.  One day I'd like to expand to other providers.
 
+
 Documentation
 -------------
 

data/lib/heirloom/archive/setuper.rb

@@ -14,6 +14,7 @@ module Heirloom
       @bucket_prefix = args[:bucket_prefix]
       create_buckets
       create_domain
+      @logger.info "Setup complete."
     end
 
     private
@@ -33,7 +34,12 @@ module Heirloom
     end
 
     def create_domain
-      sdb.create_domain @domain unless verifier.domain_exists?
+      region = @config.metadata_region
+
+      unless verifier.domain_exists?
+        @logger.info "Creating domain #{@name} in #{region}."
+        sdb.create_domain @domain 
+      end
     end
 
     def verifier

data/lib/heirloom/archive/updater.rb

@@ -16,7 +16,7 @@ module Heirloom
       value = args[:value]
 
       sdb.put_attributes @domain, @id, { attribute => value }, { :replace => attribute }
-      @logger.info "Updated #{@name} (#{@id}): #{attribute} = #{value}."
+      @logger.info "Tagged #{@name} (#{@id}): #{attribute} = #{value}."
     end
 
     private

data/lib/heirloom/archive/verifier.rb

@@ -33,17 +33,24 @@ module Heirloom
                          :region => region
 
       if s3.get_bucket bucket
-        @logger.debug "Bucket #{bucket} exists in #{region}"
+        @logger.debug "Bucket '#{bucket}' exists in '#{region}'."
         true
       else
-        @logger.debug "Bucket #{bucket} in #{region} does not exist"
+        @logger.info "Bucket '#{bucket}' does not exist in '#{region}'."
         false
       end
     end
 
     def domain_exists?
       domain = "heirloom_#{@name}"
-      sdb.domain_exists? domain
+      region = @config.metadata_region
+      if sdb.domain_exists? domain
+        @logger.debug "Domain '#{@name}' exists in '#{region}'."
+        true
+      else
+        @logger.info "Domain '#{@name}' does not exist in '#{region}'."
+        false
+      end
     end
 
     private

data/lib/heirloom/aws/simpledb.rb

@@ -8,7 +8,7 @@ module Heirloom
         @config = args[:config]
         @sdb = Fog::AWS::SimpleDB.new :aws_access_key_id     => @config.access_key,
                                       :aws_secret_access_key => @config.secret_key,
-                                      :region                => @config.primary_region
+                                      :region                => @config.metadata_region
       end
 
       def domains

data/lib/heirloom/cli/authorize.rb

@@ -13,12 +13,15 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:accounts, :name, :id],
                              :config   => @config
-
-        ensure_domain_exists :name => @opts[:name], :config => @config
-
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
+        ensure_domain_exists :name => @opts[:name], 
+                             :config => @config
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
                                :config => @config
+        ensure_archive_exists :archive => @archive,
+                              :config => @config
       end
 
       def authorize
@@ -49,6 +52,8 @@ EOS
           opt :id, "ID of the archive to authorize.", :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 :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/destroy.rb

@@ -13,7 +13,8 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name, :id],
                              :config   => @config
-
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @name = @opts[:name]
@@ -21,6 +22,8 @@ module Heirloom
         @archive = Archive.new :name   => @name,
                                :id     => @id,
                                :config => @config
+        ensure_archive_exists :archive => @archive,
+                              :config => @config
       end
       
       def destroy
@@ -45,6 +48,8 @@ EOS
           opt :id, "ID of the archive 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 :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/download.rb

@@ -11,7 +11,7 @@ module Heirloom
                               :opts   => @opts
 
         ensure_valid_options :provided => @opts,
-                             :required => [:base_prefix, :name, :id, :output],
+                             :required => [:base, :name, :id, :output],
                              :config   => @config
 
         @archive = Archive.new :name   => @opts[:name],
@@ -25,7 +25,7 @@ module Heirloom
         archive = @archive.download :output      => @opts[:output],
                                     :region      => @opts[:region],
                                     :extract     => @opts[:extract],
-                                    :base_prefix => @opts[:base_prefix],
+                                    :base_prefix => @opts[:base],
                                     :secret      => @opts[:secret]
         exit 1 unless archive
       end
@@ -44,14 +44,14 @@ Usage:
 heirloom download -n NAME -i ID -r REGION -o OUTPUT_DIRECTORY
 
 EOS
-          opt :base_prefix, "Base prefix of the archive to download.", :type => :string
+          opt :base, "Base of the archive to download.", :type => :string
+          opt :extract, "Extract the archive in the given output path.", :short => "-x"
           opt :help, "Display Help"
           opt :id, "ID of the archive to download.", :type => :string
-          opt :name, "Name of archive.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :output, "Path to download archive. Must be existing directory.", :type => :string
-          opt :extract, "Extract the archive in the given output path.", :short => "-x"
+          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,
                                                       :default => 'us-west-1'
           opt :secret, "Secret for ecrypted archive.", :type => :string

data/lib/heirloom/cli/list.rb

@@ -13,7 +13,8 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name],
                              :config   => @config
-
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @archive = Archive.new :name   => @opts[:name],
@@ -44,6 +45,8 @@ 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 archive.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/setup.rb

@@ -0,0 +1,69 @@
+module Heirloom
+  module CLI
+    class Setup
+
+      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 => [:metadata_region, :region, 
+                                           :name, :base],
+                             :config   => @config
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
+        ensure_valid_regions :regions => @opts[:region],
+                             :config  => @config
+
+        @archive = Archive.new :name   => @opts[:name],
+                               :config => @config
+      end
+
+      def setup
+        ensure_metadata_in_upload_region :config  => @config, 
+                                         :regions => @opts[:region]
+        @archive.setup :regions       => @opts[:region],
+                       :bucket_prefix => @opts[:base]
+      end
+
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Setup S3 and SimpleDB in the given regions.
+
+Usage:
+
+heirloom setup -b BASE -n NAME -m REGION1 -r REGION1 -r REGION2
+
+EOS
+          opt :base, "Base prefix which will be combined with given regions \
+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 :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. \
+Can be specified multiple times.", :type  => :string, 
+                                   :multi => true,
+                                   :default => 'us-west-1'
+          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/shared.rb

@@ -6,8 +6,9 @@ module Heirloom
         opts = args[:opts]
         logger = args[:logger]
         config = Config.new :logger => logger
-        config.access_key = opts[:aws_access_key] if opts[:aws_access_key_given]
-        config.secret_key = opts[:aws_secret_key] if opts[:aws_secret_key_given]
+        config.access_key = opts[:aws_access_key] if opts[:aws_access_key]
+        config.secret_key = opts[:aws_secret_key] if opts[:aws_secret_key]
+        config.metadata_region = opts[:metadata_region] if opts[:metadata_region]
         config
       end
 
@@ -45,6 +46,41 @@ module Heirloom
         exit 1 unless missing_opts.empty?
       end
 
+      def ensure_valid_regions(args)
+        regions = args[:regions]
+        config = args[:config]
+        regions.each do |region|
+          ensure_valid_region :region => region, 
+                              :config => config
+        end
+      end
+
+      def ensure_valid_region(args)
+        config = args[:config]
+        region = args[:region]
+        logger = config.logger
+        valid_regions = ['us-east-1', 'us-west-1', 'us-west-2']
+
+        unless valid_regions.include? region
+          logger.error "'#{region}' is not a valid region."
+          logger.error "Valid regions: #{valid_regions.join(', ')}"
+          exit 1
+        end
+      end
+
+      def ensure_metadata_in_upload_region(args)
+        config  = args[:config]
+        regions = args[:regions]
+        logger  = config.logger
+
+        unless regions.include? config.metadata_region
+          logger.error "Upload Regions: '#{regions.join(', ')}'."
+          logger.error "Metadata Region: '#{config.metadata_region}'."
+          logger.error "Upload regions must include metadata region."
+          exit 1
+        end
+      end
+
       def ensure_directory(args)
         config = args[:config]
         path = args[:path]
@@ -56,16 +92,46 @@ module Heirloom
         end
       end
 
+      def ensure_buckets_exist(args)
+        config  = args[:config]
+        base    = args[:base]
+        name    = args[:name]
+        regions = args[:regions]
+        logger  = config.logger
+
+        archive = Archive.new :name   => name,
+                              :config => config
+
+        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
+
       def ensure_domain_exists(args)
         config = args[:config]
-        name = args[:name]
+        name   = args[:name]
         logger = config.logger
 
         archive = Archive.new :name   => name,
                               :config => config
 
         unless archive.domain_exists?
-          logger.error "Heirloom domain does not exist."
+          logger.error "Metadata domain '#{name}' does not exist in '#{config.metadata_region}'."
+          logger.error "Run 'heirloom setup -h' for help setting up new region."
+          exit 1
+        end
+      end
+
+      def ensure_archive_exists(args)
+        config  = args[:config]
+        archive = args[:archive]
+        logger  = config.logger
+
+        unless archive.exists?
+          logger.error "Archive does not exist."
           exit 1
         end
       end

data/lib/heirloom/cli/show.rb

@@ -13,13 +13,15 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name],
                              :config   => @config
-
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
         ensure_domain_exists :name => @opts[:name], :config => @config
-
         id = @opts[:id] ? @opts[:id] : latest_id
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config,
                                :id     => id
+        ensure_archive_exists :archive => @archive,
+                              :config => @config
       end
       
       def show
@@ -49,10 +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 :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 :id, "ID of the archive to display.", :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

@@ -13,12 +13,15 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name, :id, :attribute, :value],
                              :config   => @config
-
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
                                :config => @config
+        ensure_archive_exists :archive => @archive,
+                              :config => @config
       end
       
       def tag
@@ -49,6 +52,8 @@ EOS
           opt :id, "ID of the archive 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 :value, "Value of attribute.", :type  => :string,
                                              :short => 'u'

data/lib/heirloom/cli/upload.rb

@@ -21,11 +21,22 @@ module Heirloom
       end
 
       def upload
-        ensure_directory :path => @opts[:directory], :config => @config
-        ensure_valid_secret :secret => @opts[:secret], :config => @config
-
-        @archive.setup :regions       => @opts[:region],
-                       :bucket_prefix => @opts[:base]
+        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],
+                             :name    => @opts[:name],
+                             :regions => @opts[:region],
+                             :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?
                           
@@ -71,10 +82,14 @@ Can be specified multiple times.", :type  => :string, :multi => true
           opt :id, "ID for archive (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
+Can be specified multiple times.", :type  => :string, 
+                                   :multi => true,
+                                   :default => 'us-west-1'
           opt :secret, "Encrypt the archive with given secret.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli.rb

@@ -4,6 +4,7 @@ require 'trollop'
 require 'heirloom/cli/shared'
 require 'heirloom/cli/authorize'
 require 'heirloom/cli/upload'
+require 'heirloom/cli/setup'
 require 'heirloom/cli/list'
 require 'heirloom/cli/show'
 require 'heirloom/cli/tag'
@@ -24,6 +25,8 @@ module Heirloom
         CLI::Download.new.download
       when 'list'
         CLI::List.new.list
+      when 'setup'
+        CLI::Setup.new.setup
       when 'show'
         CLI::Show.new.show
       when 'update', 'tag'
@@ -34,7 +37,7 @@ module Heirloom
         puts Heirloom::VERSION
       else
         puts "Unkown command: '#{cmd}'." unless cmd == '-h'
-        puts "heirloom [list|show|upload|authorize|tag|download|destroy] OPTIONS"
+        puts "heirloom [authorize|destroy|download|list|setup|show|tag|upload] OPTIONS"
         puts "Append -h for help on specific command."
       end
     end

data/lib/heirloom/config.rb

@@ -1,7 +1,7 @@
 module Heirloom
   class Config
 
-    attr_accessor :access_key, :secret_key, :primary_region, :logger
+    attr_accessor :access_key, :secret_key, :metadata_region, :logger
 
     def initialize(args = {})
       @config = args.fetch :config, load_config_file
@@ -13,7 +13,7 @@ module Heirloom
       aws = @config['aws']
       self.access_key = aws['access_key']
       self.secret_key = aws['secret_key']
-      self.primary_region = aws['primary_region'] ||= 'us-west-1'
+      self.metadata_region = aws['metadata_region']
     end
 
     def load_config_file

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.5.0rc4"
+  VERSION = "0.6.0rc1"
 end

data/script/ci_setup

@@ -11,4 +11,4 @@ rvm use "1.9.3-p125@heirloom" --create
 bundle
 
 # Run spec tests
-rspec spec
+rake spec

data/spec/archive/setup_spec.rb

@@ -5,7 +5,7 @@ describe Heirloom do
   before do
     @logger_stub = stub 'logger', :debug => true, :info => true
     @config_mock = mock 'config'
-    @config_mock.stub :logger => @logger_stub
+    @config_mock.stub :logger => @logger_stub, :metadata_region => 'us-west-1'
     @verifier_mock = mock 'verifier'
     Heirloom::Verifier.should_receive(:new).
                        with(:config => @config_mock,

data/spec/archive/verifier_spec.rb

@@ -4,7 +4,7 @@ describe Heirloom do
 
   before do
     @config_mock = double 'config'
-    @logger_stub = stub 'logger', :debug => true
+    @logger_stub = stub 'logger', :debug => true, :info => true
     @s3_mock = double 's3_mock'
     @config_mock.stub :logger => @logger_stub
     @verifier = Heirloom::Verifier.new :config => @config_mock,

data/spec/aws/simpledb_spec.rb

@@ -5,7 +5,7 @@ describe Heirloom do
     @config_mock = mock 'config'
     @config_mock.should_receive(:access_key).and_return 'the-key'
     @config_mock.should_receive(:secret_key).and_return 'the-secret'
-    @config_mock.should_receive(:primary_region).and_return 'us-west-1'
+    @config_mock.should_receive(:metadata_region).and_return 'us-west-1'
     @fog_mock = mock 'fog'
     Fog::AWS::SimpleDB.should_receive(:new).
                        with(:aws_access_key_id     => 'the-key',

data/spec/cli/authorize_spec.rb

@@ -4,16 +4,18 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :level    => 'info',
-                :accounts => ['test@test.com'],
-                :name     => 'archive_name',
-                :id       => '1.0.0' }
+    options = { :level           => 'info',
+                :accounts        => ['test@test.com'],
+                :name            => 'archive_name',
+                :id              => '1.0.0',
+                :metadata_region => 'us-west-1' }
     @logger_stub = stub 'logger', :error => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger     => @logger_stub,
-                      :access_key => 'key',
-                      :secret_key => 'secret'
+    @config_mock.stub :logger          => @logger_stub,
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -30,6 +32,7 @@ describe Heirloom do
                            :name => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.stub :exists? => true
     @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_authorize = Heirloom::CLI::Authorize.new
   end

data/spec/cli/destroy_spec.rb

@@ -4,15 +4,17 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name  => 'archive_name',
-                :id    => '1.0.0',
-                :level => 'info' }
+    options = { :name            => 'archive_name',
+                :id              => '1.0.0',
+                :level           => 'info',
+                :metadata_region => 'us-west-1' }
     @logger_stub = stub 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger     => @logger_stub,
-                      :access_key => 'key',
-                      :secret_key => 'secret'
+    @config_mock.stub :logger          => @logger_stub,
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -29,6 +31,7 @@ describe Heirloom do
                            :name => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.stub :exists? => true
     @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_destroy = Heirloom::CLI::Destroy.new
   end

data/spec/cli/download_spec.rb

@@ -4,19 +4,21 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name        => 'archive_name',
-                :id          => '1.0.0',
-                :level       => 'info',
-                :output      => '/tmp/test123',
-                :region      => 'us-east-1',
-                :extract     => false,
-                :base_prefix => 'base' }
+    options = { :name            => 'archive_name',
+                :id              => '1.0.0',
+                :level           => 'info',
+                :output          => '/tmp/test123',
+                :region          => 'us-east-1',
+                :extract         => false,
+                :metadata_region => 'us-west-1',
+                :base            => 'base' }
     @logger_stub = stub 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
     @config_mock.stub :logger     => @logger_stub,
                       :access_key => 'key',
-                      :secret_key => 'secret'
+                      :secret_key => 'secret',
+                      :metadata_region => 'us-west-1'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).
                              with(:log_level => 'info').

data/spec/cli/list_spec.rb

@@ -4,15 +4,17 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name  => 'archive_name',
-                :level => 'info',
-                :count => 100 }
+    options = { :name            => 'archive_name',
+                :level           => 'info',
+                :metadata_region => 'us-west-1',
+                :count           => 100 }
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger     => @logger_mock, 
-                      :access_key => 'key',
-                      :secret_key => 'secret'
+    @config_mock.stub :logger          => @logger_mock, 
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub

data/spec/cli/setup_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'heirloom/cli'
+
+describe Heirloom do
+
+  before do
+    @regions = ['us-west-1', 'us-west-2']
+    options = { :level           => 'info',
+                :base            => 'base',
+                :region          => @regions,
+                :name            => 'archive_name',
+                :metadata_region => 'us-west-1' }
+
+    @logger_stub = stub 'logger', :error => true, :info => true
+    @config_mock = mock 'config'
+    @config_mock.stub :logger          => @logger_stub,
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
+    @archive_mock = mock 'archive'
+    Trollop.stub(:options).and_return options
+    Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
+                             and_return @logger_stub
+    Heirloom::CLI::Setup.any_instance.should_receive(:load_config).
+                         with(:logger => @logger_stub,
+                               :opts   => options).
+                          and_return @config_mock
+    Heirloom::Archive.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @archive_mock
+    @setup = Heirloom::CLI::Setup.new
+  end
+
+  it "should setup s3 buckets and simpledb domain" do
+    @setup.should_receive(:ensure_metadata_in_upload_region).
+            with(:config  => @config_mock,
+                 :regions => @regions)
+    @archive_mock.should_receive(:setup).
+                  with(:regions       => @regions,
+                       :bucket_prefix => 'base')
+    @setup.setup 
+  end
+
+end

data/spec/cli/shared_spec.rb

@@ -9,9 +9,10 @@ describe Heirloom do
     before do
       @config_mock = mock 'config'
       @logger_mock = mock 'logger' 
-      @config_mock.stub :logger     => @logger_mock, 
-                        :access_key => 'key',
-                        :secret_key => 'secret'
+      @config_mock.stub :logger          => @logger_mock, 
+                        :access_key      => 'key',
+                        :secret_key      => 'secret',
+                        :metadata_region => 'us-west-1'
       @object = Object.new
       @object.extend Heirloom::CLI::Shared
     end
@@ -82,16 +83,20 @@ describe Heirloom do
                           :opts => {}).should == @config_mock
     end
 
+    it "should set the metadata region if specified" do
+      opts = { :metadata_region => 'us-west-1' }
+      @config_mock.should_receive(:metadata_region=).with 'us-west-1'
+      @object.load_config :logger => @logger_mock, :opts => opts
+    end
+
     it "should set the access key if specified" do
-      opts = { :aws_access_key       => 'the_key',
-               :aws_access_key_given => true }
+      opts = { :aws_access_key => 'the_key' }
       @config_mock.should_receive(:access_key=).with 'the_key'
       @object.load_config :logger => @logger_mock, :opts => opts
     end
 
     it "should set the secret key if specified" do
-      opts = { :aws_secret_key       => 'the_secret',
-               :aws_secret_key_given => true }
+      opts = { :aws_secret_key => 'the_secret' }
       @config_mock.should_receive(:secret_key=).with 'the_secret'
       @object.load_config :logger => @logger_mock, :opts => opts
     end
@@ -127,7 +132,8 @@ describe Heirloom do
     before do
       @archive_mock = mock 'archive'
       @logger_stub = stub 'logger', :error => true
-      @config_stub = stub 'config', :logger => @logger_stub
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
       @object = Object.new
       @object.extend Heirloom::CLI::Shared
       Heirloom::Archive.should_receive(:new).
@@ -136,17 +142,86 @@ describe Heirloom do
     end
 
     it "should ensure the domain for a given archive exists" do
-      @archive_mock.should_receive(:domain_exists?).and_return true
+      @archive_mock.stub :domain_exists? => true
       @object.ensure_domain_exists :config => @config_stub, 
                                    :name   => 'test'
     end
 
     it "should exit if the domain does not exist" do
-      @archive_mock.should_receive(:domain_exists?).and_return false
+      @archive_mock.stub :domain_exists? => false
       lambda { @object.ensure_domain_exists :config => @config_stub,
                                             :name   => 'test'}.
                        should raise_error SystemExit
     end
   end
 
+  context "testing ensure metadata domain" do
+    before do
+      @archive_mock = mock 'archive'
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should ensure the metadata domain is included in the upload domains" do
+      options = { :config => @config_stub, :regions => ['us-west-1', 'us-east-1'] }
+      @object.ensure_metadata_in_upload_region options
+    end
+
+    it "should exit if the metadata region is not in an upload region" do
+      options = { :config => @config_stub, :regions => ['us-west-2', 'us-east-1'] }
+      lambda { @object.ensure_metadata_in_upload_region options }.
+                       should raise_error SystemExit
+    end
+  end
+
+  context "testing ensure valid regions" do
+    before do
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should ensure the metadata domain is included in the upload domains" do
+      options = { :config => @config_stub, :regions => ['us-west-2', 'us-east-1'] }
+      @object.ensure_valid_regions options
+    end
+
+    it "should exit if the region is not valid" do
+      options = { :config => @config_stub, :regions => ['us-west-2', 'us-bad-1'] }
+      lambda { @object.ensure_valid_regions options }.
+                       should raise_error SystemExit
+    end
+
+  end
+
+  context "testing ensure archive exists" do
+    before do
+      @archive_mock = mock 'archive'
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should ensure the archive exists" do
+      @archive_mock.should_receive(:exists?).and_return true
+      options = { :config => @config_stub, :archive => @archive_mock }
+      @object.ensure_archive_exists options
+    end
+
+    it "should exit if the archive does not exist" do
+      @archive_mock.should_receive(:exists?).and_return false
+      options = { :config => @config_stub, :archive => @archive_mock }
+      lambda { @object.ensure_archive_exists options }.
+                       should raise_error SystemExit
+    end
+  end
+
+
 end

data/spec/cli/show_spec.rb

@@ -4,15 +4,17 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name  => 'archive_name',
-                :id    => '1.0.0',
-                :level => 'info' }
+    options = { :name            => 'archive_name',
+                :id              => '1.0.0',
+                :level           => 'info',
+                :metadata_region => 'us-west-1' }
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger     => @logger_stub, 
-                      :access_key => 'key',
-                      :secret_key => 'secret'
+    @config_mock.stub :logger          => @logger_stub, 
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -29,7 +31,8 @@ describe Heirloom do
                            :id     => '1.0.0',
                            :config => @config_mock).
                       and_return @archive_mock
-    @archive_mock.should_receive(:domain_exists?).and_return true
+    @archive_mock.stub :exists? => true
+    @archive_mock.stub :domain_exists? => true
     @cli_show = Heirloom::CLI::Show.new
   end
 

data/spec/cli/tag_spec.rb

@@ -4,17 +4,19 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name      => 'archive_name',
-                :id        => '1.0.0',
-                :level     => 'info',
-                :attribute => 'att',
-                :value     => 'val' }
+    options = { :name            => 'archive_name',
+                :id              => '1.0.0',
+                :level           => 'info',
+                :attribute       => 'att',
+                :value           => 'val',
+                :metadata_region => 'us-west-1' }
     @logger_stub = stub :debug => true, :error => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger     => @logger_stub, 
-                      :access_key => 'key',
-                      :secret_key => 'secret'
+    @config_mock.stub :logger          => @logger_stub, 
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -31,6 +33,7 @@ describe Heirloom do
                            :id     => '1.0.0',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.stub :exists? => true
     @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_tag = Heirloom::CLI::Tag.new
   end

data/spec/cli/upload_spec.rb

@@ -4,21 +4,25 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :level     => 'info',
-                :base      => 'base',
-                :git       => false,
-                :exclude   => ['exclude1', 'exclude2'],
-                :region    => ['us-west-1', 'us-west-2'],
-                :directory => '/buildme',
-                :public    => false,
-                :name      => 'archive_name',
-                :id        => '1.0.0' }
+    @regions = ['us-west-1', 'us-west-2']
+    options = { :level           => 'info',
+                :base            => 'base',
+                :git             => false,
+                :exclude         => ['exclude1', 'exclude2'],
+                :region          => @regions,
+                :directory       => '/buildme',
+                :public          => false,
+                :secret          => 'secret12',
+                :name            => 'archive_name',
+                :id              => '1.0.0', 
+                :metadata_region => 'us-west-1' }
 
     @logger_stub = stub 'logger', :error => true, :info => true
     @config_mock = mock 'config'
-    @config_mock.stub :logger     => @logger_stub,
-                      :access_key => 'key',
-                      :secret_key => 'secret'
+    @config_mock.stub :logger          => @logger_stub,
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
     @archive_mock = mock 'archive'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
@@ -36,22 +40,34 @@ describe Heirloom do
   end
 
   it "should upload an archive" do
-    @upload.stub :ensure_directory => true
-    @upload.stub :ensure_valid_secret => true
-    @archive_mock.should_receive(:setup).
-                  with(:bucket_prefix => 'base',
-                       :regions       => ["us-west-1", "us-west-2"])
+    @upload.should_receive(:ensure_domain_exists).
+            with(:name   => 'archive_name',
+                 :config => @config_mock)
+    @upload.should_receive(:ensure_buckets_exist).
+            with(:base    => 'base',
+                 :name    => 'archive_name',
+                 :regions => @regions,
+                 :config  => @config_mock)
+    @upload.should_receive(:ensure_directory).
+            with(:path   => '/buildme',
+                 :config => @config_mock)
+    @upload.should_receive(:ensure_valid_secret).
+            with(:secret => 'secret12',
+                 :config => @config_mock)
+    @upload.should_receive(:ensure_metadata_in_upload_region).
+            with(:config  => @config_mock,
+                 :regions => @regions)
     @archive_mock.stub :exists? => false
     @archive_mock.should_receive(:build).
                   with(:base      => 'base',
                        :directory => '/buildme',
                        :exclude   => ["exclude1", "exclude2"],
                        :git       => false,
-                       :secret    => nil).
+                       :secret    => 'secret12').
                   and_return '/tmp/build123.tar.gz'
     @archive_mock.should_receive(:upload).
                   with(:bucket_prefix   => 'base',
-                       :regions         => ['us-west-1', 'us-west-2'],
+                       :regions         => @regions,
                        :public_readable => false,
                        :file            => '/tmp/build123.tar.gz')
     @upload.upload

data/spec/config_spec.rb

@@ -4,9 +4,9 @@ describe Heirloom do
 
   before do
     @config = { 'aws' => 
-                { 'access_key'     => 'key',
-                  'secret_key'     => 'secret',
-                  'primary_region' => 'us-west-2'
+                { 'access_key '     => 'key',
+                  'secret_key '     => 'secret',
+                  'metadata_region' => 'us-west-2'
                 }
               }
   end
@@ -16,7 +16,7 @@ describe Heirloom do
                                   :logger => 'da-logger'
     config.access_key.should == @config['aws']['access_key']
     config.secret_key.should == @config['aws']['secret_key']
-    config.primary_region.should == @config['aws']['primary_region']
+    config.metadata_region.should == @config['aws']['metadata_region']
     config.logger.should == 'da-logger'
   end
 
@@ -27,14 +27,14 @@ describe Heirloom do
     config = Heirloom::Config.new
     config.access_key.should == @config['aws']['access_key']
     config.secret_key.should == @config['aws']['secret_key']
-    config.primary_region.should == @config['aws']['primary_region']
+    config.metadata_region.should == @config['aws']['metadata_region']
   end
 
-  it "should set the primary region to us-west-1 if not present in config" do
+  it "should return nil if metadata_region not present in config" do
     @config['aws'] = {}
     config = Heirloom::Config.new :config => @config,
                                   :logger => 'da-logger'
-    config.primary_region.should == 'us-west-1'
+    config.metadata_region.should == nil
   end
 
   it "should load a blank config if the file does not exist and no config passed" do
@@ -42,7 +42,7 @@ describe Heirloom do
     config = Heirloom::Config.new
     config.access_key.should be_nil
     config.secret_key.should be_nil
-    config.primary_region.should == 'us-west-1'
+    config.metadata_region.should be_nil
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc4
+  version: 0.6.0rc1
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328442595660 !ruby/object:Gem::Requirement
+  requirement: &70322913192860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328442595660
+  version_requirements: *70322913192860
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70328442595020 !ruby/object:Gem::Requirement
+  requirement: &70322913202760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70328442595020
+  version_requirements: *70322913202760
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70328442594520 !ruby/object:Gem::Requirement
+  requirement: &70322913214480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70328442594520
+  version_requirements: *70322913214480
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70328442594040 !ruby/object:Gem::Requirement
+  requirement: &70322913212440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328442594040
+  version_requirements: *70322913212440
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -99,6 +99,7 @@ files:
 - lib/heirloom/cli/destroy.rb
 - lib/heirloom/cli/download.rb
 - lib/heirloom/cli/list.rb
+- lib/heirloom/cli/setup.rb
 - lib/heirloom/cli/shared.rb
 - lib/heirloom/cli/show.rb
 - lib/heirloom/cli/tag.rb
@@ -137,6 +138,7 @@ files:
 - spec/cli/destroy_spec.rb
 - spec/cli/download_spec.rb
 - spec/cli/list_spec.rb
+- spec/cli/setup_spec.rb
 - spec/cli/shared_spec.rb
 - spec/cli/show_spec.rb
 - spec/cli/tag_spec.rb
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3871179857834754510
+      hash: -4439372529062381791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,6 +199,7 @@ test_files:
 - spec/cli/destroy_spec.rb
 - spec/cli/download_spec.rb
 - spec/cli/list_spec.rb
+- spec/cli/setup_spec.rb
 - spec/cli/shared_spec.rb
 - spec/cli/show_spec.rb
 - spec/cli/tag_spec.rb