heirloom 0.10.1 → 0.11.0.beta.1

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.idea/

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## HEAD:
 
+* Add support for multiple environments
+* Environment named 'default' is now the default
+* Added functionality to the show command to include permissions of objects
+* Updating to fog 1.10.0
+* Add support for authorizing accounts using the canonical ID
+* Updated catalog output to include s3 urls
+* Catalog output renamed Bucket Prefix to bucket_prefix
+* Catalog output renamed Region to region
+
 ## 0.10.1 (02/28/2013):
 
 * Minor refactoring of lib/heirloom/cipher/shared.rb

data/README.md

@@ -25,10 +25,19 @@ gem install heirloom --no-ri --no-rdoc
 To get started, copy the sample below to ~/.heirloom.yml and update the specified fields.
 
 ```
+# default environment
 aws:
   access_key: UPDATE_ME
   secret_key: UPDATE_ME
   metadata_region: us-west-1
+  
+# multiple environments can be defined and 
+# selected via cli with -e or --environment
+
+# prod:
+#   access_key: UPDATE_ME
+#   secret_key: UPDATE_ME
+#   metadata_region: us-west-1
 ```
 
 Documentation

data/heirloom.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", '~> 2.11.0'
   s.add_development_dependency "rake"
 
-  s.add_runtime_dependency 'fog', '~> 1.6.0'
+  s.add_runtime_dependency 'fog', '~> 1.10.0'
   s.add_runtime_dependency 'trollop', '= 2.0'
   s.add_runtime_dependency 'xml-simple', '~> 1.1.2'
 end

data/lib/heirloom/acl/s3.rb

@@ -1,6 +1,7 @@
 module Heirloom
   module ACL
     class S3
+      include Heirloom::Utils::Email
 
       attr_accessor :accounts, :config, :logger, :region
 
@@ -41,15 +42,10 @@ module Heirloom
 
         a = Array.new
 
-        # Add each account email as read access
         accounts.each do |g|
-          a << {
-                 'Grantee' => { 'EmailAddress' => g } ,
-                 'Permission' => 'READ'
-               }
+            a << { 'Grantee' => grantee(g), 'Permission' => 'READ' }
         end
 
-        # Grand owner full access
         a << { 'Grantee' => { 'DisplayName' => name, 'ID' => id },
                'Permission' => 'FULL_CONTROL'
              }
@@ -68,6 +64,10 @@ module Heirloom
                             :region => @region
       end
 
+      def grantee(account)
+          valid_email?(account) ? { 'EmailAddress' => account } : { 'ID' => account }
+      end
+
     end
   end
 end

data/lib/heirloom/archive/authorizer.rb

@@ -1,6 +1,8 @@
 module Heirloom
 
   class Authorizer
+    
+    include Heirloom::Utils::Email
 
     def initialize(args)
       @config = args[:config]
@@ -38,17 +40,22 @@ module Heirloom
     private
 
     def validate_format_of_accounts
+      status = true
+
       @accounts.each do |account|
-        unless validate_email account
-          @logger.error "#{account} is not a valid email address."
-          return false
+        if valid_account?(account)
+          @logger.info "Using #{account} for authorization"
+        else 
+          @logger.error "#{account} is not a valid account type"
+          status = false
         end
       end
+
+      status
     end
 
-    def validate_email email
-      email_pattern = (email =~ /^.*@.*\..*$/)
-      email_pattern.nil? ? false : true
+    def valid_account?(account)
+      valid_email?(account) || account.length == 64
     end
 
     def reader

data/lib/heirloom/archive/reader.rb

@@ -59,13 +59,35 @@ module Heirloom
     def show
       query = sdb.select "select * from `#{@domain}` where itemName() = '#{@id}'"
       items = query[@id] ? query[@id] : {}
-      Hash.new.tap do |hash|
+      data = Hash.new.tap do |hash|
         items.each_pair.map do |key,value|
           hash[key] = value.first
         end
       end
     end
 
+    def object_acls
+      data = {}
+      regions.each do |region|
+        object_name = "#{@name}/#{key_name}"
+
+        bucket = get_bucket :region => region
+
+        s3_acl = AWS::S3.new :config => @config,
+                             :region => region
+
+        object_acl = s3_acl.get_object_acl :bucket      => bucket,
+                                           :object_name => object_name
+
+        object_acl.delete "Owner"
+        output = object_acl["AccessControlList"].map do |x|
+          "#{x["Grantee"]["DisplayName"]}:#{x["Permission"]}".downcase
+        end
+        data.merge!"#{region}-permissions" => output.join(', ')
+      end
+      data
+    end
+
     def key_name
       encrypted? ? "#{@id}.tar.gz.gpg" : "#{@id}.tar.gz"
     end

data/lib/heirloom/archive.rb

@@ -76,7 +76,7 @@ module Heirloom
     end
 
     def show
-      reader.show
+      reader.show.merge reader.object_acls
     end
 
     def list(limit=10)

data/lib/heirloom/aws/s3.rb

@@ -78,8 +78,8 @@ module Heirloom
         @s3.get_object(bucket_name, object_name).body
       end
 
-      def get_bucket_acl(bucket)
-        @s3.get_bucket_acl(bucket).body
+      def get_object_acl(args)
+        @s3.get_object_acl(args[:bucket], args[:object_name]).body
       end
 
       def get_bucket_object_versions(bucket)

data/lib/heirloom/cli/authorize.rb

@@ -43,10 +43,11 @@ Usage:
 
 heirloom authorize -n NAME -i ID -a AWS_ACCOUNT1 -a AWS_ACCOUNT2
 
-Note: This will replace all current authorizations with those specified and make the Heirloom private.
+Note: This will replace all current authorizations with those specified and make the Heirloom private.  Use the 'show' command to retrieve the existing authorizations assigned to an object.
+
 
 EOS
-          opt :accounts, "AWS Account(s) email to authorize. Can be specified multiple times.", :type  => :string,
+          opt :accounts, "AWS Account(s) email or canonical_ID to authorize. Can be specified multiple times.", :type  => :string,
                                                                                                 :multi => true
           opt :help, "Display Help"
           opt :id, "ID of the Heirloom to authorize.", :type => :string
@@ -59,6 +60,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/cli/catalog.rb

@@ -59,6 +59,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/cli/destroy.rb

@@ -55,6 +55,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/download.rb

@@ -86,6 +86,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/formatter/catalog.rb

@@ -30,9 +30,15 @@ module Heirloom
 
         def details
           data = @catalog.each_pair.map do |k,v|
+            urls = v["regions"].map do |region|
+              bucket_prefix = v["bucket_prefix"].first
+              "  #{region}-s3-url : s3://#{bucket_prefix}-#{region}/#{k}"
+            end
+
             d = k + "\n"
-            d << "  Regions       : " + @catalog[k]["regions"].join(", ") + "\n"
-            d << "  Bucket Prefix : " + @catalog[k]["bucket_prefix"].first
+            d << "  regions          : " + @catalog[k]["regions"].join(", ") + "\n"
+            d << "  bucket_prefix    : " + @catalog[k]["bucket_prefix"].first + "\n"
+            d << urls.join("\n")
           end
           data.join "\n"
         end

data/lib/heirloom/cli/formatter/show.rb

@@ -39,6 +39,7 @@ module Heirloom
         def is_internal_attribute?(attribute)
           return true if is_reserved? attribute
           return true if is_endpoint? attribute
+          return true if are_permissions? attribute
           false
         end
 
@@ -49,6 +50,10 @@ module Heirloom
         def is_endpoint?(attribute)
           attribute.match('^.*-.*-\d*-s3|http|https-url$')
         end
+
+        def are_permissions?(attribute)
+          attribute.match('^.*permissions')
+        end
       end
     end
   end

data/lib/heirloom/cli/list.rb

@@ -58,6 +58,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/cli/setup.rb

@@ -88,6 +88,7 @@ Can be specified multiple times.", :type  => :string,
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/cli/shared.rb

@@ -5,7 +5,7 @@ module Heirloom
       def load_config(args)
         opts = args[:opts]
         logger = args[:logger]
-        config = Config.new :logger => logger
+        config = Config.new :logger => logger, :environment => opts[:environment]
         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]

data/lib/heirloom/cli/show.rb

@@ -69,6 +69,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/cli/tag.rb

@@ -61,6 +61,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type  => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/teardown.rb

@@ -72,6 +72,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/cli/upload.rb

@@ -84,7 +84,7 @@ heirloom upload -n NAME -i ID -d DIRECTORY_TO_UPLOAD
 EOS
           opt :directory, "Source directory to upload.", :type  => :string
           opt :exclude, "File(s) or directorie(s) to exclude. \
-Can be specified multiple times.", :type  => :string, :multi => true
+Can be specified multiple times.", :type  => :string, :multi => true, :short => "-x"
           opt :help, "Display Help"
           opt :id, "ID for Heirloom.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
@@ -100,6 +100,7 @@ Can be specified multiple times.", :type  => :string, :multi => true
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type  => :string,
                                                         :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end
 

data/lib/heirloom/config.rb

@@ -1,22 +1,23 @@
 module Heirloom
   class Config
 
-    attr_accessor :access_key, :secret_key, :metadata_region, :logger
+    attr_accessor :access_key, :secret_key, :metadata_region, :logger, :environment
 
     def initialize(args={})
-      @opts       = args[:opts] ||= Hash.new
-      @config     = load_config_file
-      self.logger = args[:logger] ||= HeirloomLogger.new
+      @opts        = args[:opts] ||= Hash.new
+      @logger      = args[:logger] ||= HeirloomLogger.new
+      @environment = args[:environment] ||= 'default'
+      @config      = load_config_file
       load_config
     end
 
     def load_config
-      self.access_key      = @opts.fetch :aws_access_key, 
-                                         @config['access_key']
-      self.secret_key      = @opts.fetch :aws_secret_key, 
-                                         @config['secret_key']
-      self.metadata_region = @opts.fetch :metadata_region, 
-                                         @config['metadata_region']
+      @access_key      = @opts.fetch :aws_access_key, 
+                                     @config['access_key']
+      @secret_key      = @opts.fetch :aws_secret_key, 
+                                     @config['secret_key']
+      @metadata_region = @opts.fetch :metadata_region, 
+                                     @config['metadata_region']
     end
 
     private
@@ -26,7 +27,12 @@ module Heirloom
 
       if File.exists? config_file
         data = YAML::load File.open(config_file)
-        data['aws']
+        if data.has_key? @environment
+          data[@environment]
+        else
+          @logger.error "Environment '#{@environment}' not found in config file."
+          exit 1
+        end
       else
         { }
       end

data/lib/heirloom/utils/email.rb

@@ -0,0 +1,11 @@
+module Heirloom
+  module Utils
+    module Email
+
+      def valid_email?(email)
+         email =~ /^.*@.*\..*$/
+      end
+
+    end
+  end
+end

data/lib/heirloom/utils.rb

@@ -1 +1,2 @@
 require 'heirloom/utils/file'
+require 'heirloom/utils/email'

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.10.1"
+  VERSION = "0.11.0.beta.1"
 end

data/spec/archive/authorizer_spec.rb

@@ -12,14 +12,14 @@ describe Heirloom do
                                              :id     => '123.tar.gz'
     end
 
-    it "should authorize access to an archive in all regions" do
+    it "should authorize access to an archive in all regions for email or longid" do
       s3_acl_mock = mock 's3 acl'
       reader_mock = mock 'reader mock'
       reader_mock.stub :key_name => '123.tar.gz'
       reader_mock.should_receive(:get_bucket).exactly(2).times.
                       and_return('the-bucket')
 
-      accounts = [ "test@a.com", "a@test.com", "test@test.co", "test@test.co.uk" ]
+      accounts = [ "test@a.com", "a@test.com", "test@test.co", "test@test.co.uk","08b21b085ca99e70859487d685191f40d951daa0fbcb5bec51bf5ea6023e445d" ]
 
       Heirloom::Reader.should_receive(:new).
                        with(:config => @config_mock,
@@ -45,12 +45,32 @@ describe Heirloom do
                   should be_true
     end
 
-    it "should exit when an account is not an email" do
+    it "should exit when an account is a shortid" do
       @logger_mock.should_receive(:error)
-      @authorizer.authorize(:accounts => ['good@good.com', 'bad@blah'],
+      @authorizer.authorize(:accounts => [ '123456789_1234', 'good@good.com'],
                             :regions  => ['us-west-1', 'us-west-2']).
                   should be_false
     end
 
+    it "should exit when a bad email is given" do
+      @logger_mock.should_receive(:error)
+      @authorizer.authorize(:accounts => ['bad@bad', 'good@good.com'],
+                            :regions  => ['us-west-1', 'us-west-2']).
+                  should be_false
+    end
 
+    it "should exit when an id which is not long(64) or short(16)" do
+      @logger_mock.should_receive(:error)
+      @authorizer.authorize(:accounts => ['123456789_123456789_1', 'good@good.com'],
+                            :regions  => ['us-west-1', 'us-west-2']).
+                  should be_false
+    end
+
+    it "should exit even when the first value is valid" do
+      @logger_mock.should_receive(:error)
+      @authorizer.authorize(:accounts => ['good@good.com', '123456789_123456789_1'],
+                            :regions  => ['us-west-1', 'us-west-2']).
+                  should be_false
+    end
+    
 end

data/spec/archive/reader_spec.rb

@@ -4,10 +4,9 @@ describe Heirloom do
 
   before do
     @sdb_mock = mock 'sdb'
-    @config_mock = double 'config'
+    @config_mock = mock 'config'
     @logger_stub = stub :debug => true
-    @config_mock.should_receive(:logger).and_return @logger_stub
-    Heirloom::AWS::SimpleDB.should_receive(:new).and_return @sdb_mock
+    @config_mock.stub :logger => @logger_stub
     @reader = Heirloom::Reader.new :config => @config_mock,
                                    :name   => 'tim',
                                    :id     => '123'
@@ -15,6 +14,7 @@ describe Heirloom do
 
   context "domain does exist" do
     before do
+      Heirloom::AWS::SimpleDB.stub :new => @sdb_mock
       @sdb_mock.stub :domain_exists? => true
     end
 
@@ -48,11 +48,11 @@ describe Heirloom do
 
     it "should return the bucket if it exists" do
       @sdb_mock.should_receive(:select).
-                exactly(3).times.
+                at_least(:once).
                 with("select * from `heirloom_tim` where itemName() = '123'").
-                and_return( { '123' => 
-                              { 'us-west-1-s3-url' => 
-                                [ 's3://the-bucket/the-name/123.tar.gz' ]  
+                and_return( { '123' =>
+                              { 'us-west-1-s3-url' =>
+                                [ 's3://the-bucket/the-name/123.tar.gz' ]
                               }
                             } )
       @reader.get_bucket(:region => 'us-west-1').should == 'the-bucket'
@@ -60,7 +60,6 @@ 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'").
                 and_return( { } )
       @reader.get_key(:region => 'us-west-1').should == nil
@@ -68,7 +67,6 @@ 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'").
                 and_return( { } )
       @reader.get_bucket(:region => 'us-west-1').should == nil
@@ -76,11 +74,11 @@ describe Heirloom do
 
     it "should return the key if it exists" do
       @sdb_mock.should_receive(:select).
-                exactly(6).times.
+                at_least(:once).
                 with("select * from `heirloom_tim` where itemName() = '123'").
-                and_return( { '123' => 
-                              { 'us-west-1-s3-url' => 
-                                ['s3://the-url/the-bucket/123.tar.gz'] 
+                and_return( { '123' =>
+                              { 'us-west-1-s3-url' =>
+                                ['s3://the-url/the-bucket/123.tar.gz']
                               }
                             } )
       @reader.get_key(:region => 'us-west-1').should == 'the-bucket/123.tar.gz'
@@ -102,15 +100,14 @@ 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'").
-                and_return( { '123' => 
-                              { 'us-west-1-s3-url' => 
+                and_return( { '123' =>
+                              { 'us-west-1-s3-url' =>
                                 ['s3://the-url-us-west-1/the-bucket/123.tar.gz'],
-                                'build_by' => 
-                                ['user'], 
-                                'us-east-1-s3-url' => 
-                                ['s3://the-url-us-east-1/the-bucket/123.tar.gz'] 
+                                'build_by' =>
+                                ['user'],
+                                'us-east-1-s3-url' =>
+                                ['s3://the-url-us-east-1/the-bucket/123.tar.gz']
                               }
                             } )
       @reader.regions.should == ['us-west-1', 'us-east-1']
@@ -120,6 +117,7 @@ describe Heirloom do
 
   context "domain does not exist" do
     before do
+      Heirloom::AWS::SimpleDB.stub :new => @sdb_mock
       @sdb_mock.stub :domain_exists? => false
     end
 
@@ -128,4 +126,33 @@ describe Heirloom do
     end
   end
 
+  context "object_acl verify" do
+    it "should get object_acls" do
+      regions = ['us-west-1', 'us-west-2']
+      @config_mock.stub :access_key => 'the-key',
+                        :secret_key => 'the-secret'
+      @reader.stub :regions    => regions,
+                   :key_name   => 'mockvalue',
+                   :get_bucket => 'mockvalue'
+      data = { "Owner" => { "ID" => "123", "DisplayName" => "lc" },
+               "AccessControlList" => [
+                { "Grantee" => { "ID" => "321", "DisplayName" => "rickybobby" },
+                                 "Permission" => "READ" },
+                { "Grantee" => { "ID" => "123", "DisplayName" => "lc" },
+                                 "Permission" => "FULL_CONTROL" }]
+             }
+      s3_stub = stub 's3', :get_object_acl => data
+
+      regions.each do |region|
+        Heirloom::AWS::S3.should_receive(:new).
+                          with(:config => @config_mock,
+                               :region => region).
+                          and_return s3_stub
+      end
+
+      @reader.object_acls.should == { 'us-west-1-permissions' => 'rickybobby:read, lc:full_control',
+                                      'us-west-2-permissions' => 'rickybobby:read, lc:full_control' }
+    end
+  end
+
 end

data/spec/archive_spec.rb

@@ -104,15 +104,27 @@ describe Heirloom do
       @archive.exists?.should be_false
     end
 
-    it "should call show method" do
-      mock = double('Mock')
+    it "should call show method"  do
+      reader_mock = mock 'reader' 
+      show_data = { 'id'               => '0.0.7',
+                    'encrypted'        => 'true',
+                    'bucket_prefix'    => 'rickybobby',
+                    'us-west-2-s3-url' => 's3://rickybobby-us-west-2/demo2/0.0.7.tar.gz.gpg'
+                  }
+      object_acls_data = { 'us-west-2-perms' => 'rickybobby:read, lc:full_control',
+                           'us-west-1-perms' => 'rickybobby:read, lc:full_control'
+                         }
+      merge_data = show_data.merge object_acls_data
+ 
       Heirloom::Reader.should_receive(:new).
-                       with(:config => @config_mock,
-                            :name   => 'chef',
-                            :id     => '123').
-                       and_return mock
-      mock.should_receive(:show)
-      @archive.show
+                        with(:config => @config_mock,
+                             :name   => 'chef',
+                             :id     => '123').
+                        and_return reader_mock
+ 
+      reader_mock.stub(:show).and_return(show_data)
+      reader_mock.stub(:object_acls).and_return(object_acls_data)
+      @archive.show.should == merge_data
     end
 
     it "should call list method" do

data/spec/aws/s3_spec.rb

@@ -208,6 +208,16 @@ describe Heirloom do
     @s3.get_object('bucket', 'object')
   end
 
+  it "should get an objects acl from s3" do
+    body_mock = mock 'body'
+    @fog_mock.should_receive(:get_object_acl).
+              with('bucket', 'object').and_return(body_mock)
+    body_mock.stub :body => 'data'
+    @s3.get_object_acl({ :bucket => 'bucket', :object_name => 'object'}).
+        should == 'data'
+  end
+
+
   it "should set object acls" do
     @fog_mock.should_receive(:put_object_acl).
               with 'bucket', 'object', 'grants'

data/spec/cli/formatter/catalog_spec.rb

@@ -24,7 +24,11 @@ describe Heirloom do
 
   context "filtered" do
     it "should return the name with details" do
-      format = "test1\n  Regions       : us-west-1, us-east-1\n  Bucket Prefix : bp1"
+      format = "test1\n" +
+               "  regions          : us-west-1, us-east-1\n" +
+               "  bucket_prefix    : bp1\n" +
+               "  us-west-1-s3-url : s3://bp1-us-west-1/test1\n" +
+               "  us-east-1-s3-url : s3://bp1-us-east-1/test1"
       @formatter.format(:catalog => @catalog,
                         :name    => 'test1').should == format
     end

data/spec/cli/formatter/show_spec.rb

@@ -4,14 +4,16 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    @attributes = { 'id'                  => '123',
-                    'another_data'        => 'more_data',
-                    'built_at'            => 'today',
-                    'built_by'            => 'me',
-                    'bucket_prefix'       => 'bp',
-                    'us-west-1-s3-url'    => 's3',
-                    'us-west-1-http-url'  => 'http',
-                    'us-west-1-https-url' => 'https' }
+    @attributes = { 'id'                        => '123',
+                    'another_data'              => 'more_data',
+                    'built_at'                  => 'today',
+                    'built_by'                  => 'me',
+                    'bucket_prefix'             => 'bp',
+                    'us-west-1-s3-url'          => 's3',
+                    'us-west-1-http-url'        => 'http',
+                    'us-west-1-https-url'       => 'https',
+                    'us-west-1-permissions'     => 'rickybobby:full-control',
+                    'us-west-2-permissions'     => 'rickybobby:full-control' }
   end
 
   it "should remove reserved / endpoint attribs" do

data/spec/cli/shared_spec.rb

@@ -74,7 +74,7 @@ describe Heirloom do
       @logger_mock = mock 'logger'
       @object = Object.new
       @object.extend Heirloom::CLI::Shared
-      Heirloom::Config.should_receive(:new).with(:logger => @logger_mock).
+      Heirloom::Config.should_receive(:new).with(:logger => @logger_mock, :environment => nil).
                        and_return @config_mock
     end
 

data/spec/config_spec.rb

@@ -3,10 +3,15 @@ require 'spec_helper'
 describe Heirloom do
 
   before do
-    @config_file = { 'aws' => 
+    @config_file = { 'default' => 
                      { 'access_key'      => 'key',
                        'secret_key'      => 'secret',
                        'metadata_region' => 'us-west-2'
+                     },
+                     'dev' =>
+                     { 'access_key'      => 'devkey',
+                       'secret_key'      => 'devsecret',
+                       'metadata_region' => 'devmd'
                      }
                    }
     @opts = { :aws_access_key  => 'optkey',
@@ -31,9 +36,9 @@ describe Heirloom do
     File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
                                and_return(@config_file.to_yaml)
     config = Heirloom::Config.new
-    config.access_key.should == @config_file['aws']['access_key']
-    config.secret_key.should == @config_file['aws']['secret_key']
-    config.metadata_region.should == @config_file['aws']['metadata_region']
+    config.access_key.should == @config_file['default']['access_key']
+    config.secret_key.should == @config_file['default']['secret_key']
+    config.metadata_region.should == @config_file['default']['metadata_region']
   end
   
   it "should override config settings in file from opts" do
@@ -54,4 +59,40 @@ describe Heirloom do
     config.metadata_region.should be_nil
   end
 
+  it "should load a different environment if requested" do
+    File.stub :exists? => true
+    File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
+                               and_return(@config_file.to_yaml)
+    config = Heirloom::Config.new :environment => 'dev'
+    config.access_key.should == @config_file['dev']['access_key']
+    config.secret_key.should == @config_file['dev']['secret_key']
+    config.metadata_region.should == @config_file['dev']['metadata_region']
+  end
+
+  it "should still allow overrides with different environments" do
+    File.stub :exists? => true
+    File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
+                               and_return(@config_file.to_yaml)
+    opts = {
+      :aws_access_key => 'specialdevkey'
+    }
+
+    config = Heirloom::Config.new :opts => opts, :environment => 'dev'
+    config.access_key.should == 'specialdevkey'
+    config.metadata_region.should == @config_file['dev']['metadata_region']
+  end
+
+  it "should complain if a non-existing environment is requested" do
+    File.stub :exists? => true
+    File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
+                               and_return(@config_file.to_yaml)
+
+    logger_mock = mock 'logger'
+    logger_mock.should_receive(:error)
+
+    lambda {
+      config = Heirloom::Config.new :environment => 'missing', :logger => logger_mock
+    }.should raise_error SystemExit
+  end
+
 end

data/spec/utils/email_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Heirloom::Utils::Email do
+  before do
+    @object = Object.new
+    @object.extend Heirloom::Utils::Email
+  end
+
+  it "should return that the account is a valid email " do
+    account = 'good@good.com'
+    @object.valid_email?(account).should be_true
+  end
+
+  it "should return that the account is a valid email " do
+    account = 'bad@bad'
+    @object.valid_email?(account).should be_false
+  end
+
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.10.1
-  prerelease: 
+  version: 0.11.0.beta.1
+  prerelease: 7
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,7 @@ files:
 - lib/heirloom/uploader.rb
 - lib/heirloom/uploader/s3.rb
 - lib/heirloom/utils.rb
+- lib/heirloom/utils/email.rb
 - lib/heirloom/utils/file.rb
 - lib/heirloom/version.rb
 - spec/acl/s3_spec.rb
@@ -216,6 +217,7 @@ files:
 - spec/logger_spec.rb
 - spec/spec_helper.rb
 - spec/uploader/s3_spec.rb
+- spec/utils/email_spec.rb
 - spec/utils/file_spec.rb
 homepage: ''
 licenses: []
@@ -229,12 +231,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -822415306799597358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.24
@@ -288,4 +293,5 @@ test_files:
 - spec/logger_spec.rb
 - spec/spec_helper.rb
 - spec/uploader/s3_spec.rb
+- spec/utils/email_spec.rb
 - spec/utils/file_spec.rb