heirloom 0.11.0.beta.2 → 0.11.0

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## HEAD:
 
+## 0.11.0 (04/26/2013):
+
 * Add support for multiple environments
 * Environment named 'default' is now the default
 * Added functionality to the show command to include permissions of objects
@@ -9,6 +11,7 @@
 * Catalog output renamed Bucket Prefix to bucket_prefix
 * Catalog output renamed Region to region
 * Add `rotate` command to allow for encryption key rotation
+* Add support for IAM instance roles
 
 ## 0.10.1 (02/28/2013):
 

data/lib/heirloom/aws/s3.rb

@@ -9,10 +9,16 @@ module Heirloom
         @region = args[:region]
         @logger = @config.logger
 
-        @s3 = Fog::Storage.new :provider              => 'AWS',
-                               :aws_access_key_id     => @config.access_key,
-                               :aws_secret_access_key => @config.secret_key,
-                               :region                => @region
+        fog_args = { :region   => @region, :provider => 'AWS' }
+
+        if @config.use_iam_profile
+          fog_args[:use_iam_profile] = true
+        else
+          fog_args[:aws_access_key_id]     = @config.access_key
+          fog_args[:aws_secret_access_key] = @config.secret_key
+        end
+
+        @s3 = Fog::Storage.new fog_args
       end
 
       def delete_object(bucket_name, object_name, options = {})

data/lib/heirloom/aws/simpledb.rb

@@ -6,9 +6,17 @@ module Heirloom
 
       def initialize(args)
         @config = args[:config]
-        @sdb = Fog::AWS::SimpleDB.new :aws_access_key_id     => @config.access_key,
-                                      :aws_secret_access_key => @config.secret_key,
-                                      :region                => @config.metadata_region
+        
+        fog_args = { :region => @config.metadata_region }
+
+        if @config.use_iam_profile
+          fog_args[:use_iam_profile] = true
+        else
+          fog_args[:aws_access_key_id]     = @config.access_key
+          fog_args[:aws_secret_access_key] = @config.secret_key
+        end
+
+        @sdb = Fog::AWS::SimpleDB.new fog_args
       end
 
       def domains

data/lib/heirloom/cli/authorize.rb

@@ -60,6 +60,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :use_iam_profile, "Use IAM EC2 Profile", :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 :use_iam_profile, "Use IAM EC2 Profile", :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 :use_iam_profile, "Use IAM EC2 Profile", :short => :none
           opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         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 :use_iam_profile, "Use IAM EC2 Profile", :short => :none
           opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         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 :use_iam_profile, "Use IAM EC2 Profile", :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 :use_iam_profile, "Use IAM EC2 Profile", :short => :none
           opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end

data/lib/heirloom/cli/shared.rb

@@ -9,6 +9,7 @@ module Heirloom
         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.use_iam_profile = opts[:use_iam_profile] if opts[:use_iam_profile]
         config
       end
 
@@ -28,8 +29,10 @@ module Heirloom
         config   = args[:config]
         logger   = config.logger
 
-        required << :aws_access_key unless config.access_key
-        required << :aws_secret_key unless config.secret_key
+        unless config.use_iam_profile
+          required << :aws_access_key unless config.access_key
+          required << :aws_secret_key unless config.secret_key
+        end
 
         missing_opts = required.sort.map do |opt|
           case provided[opt]

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 :use_iam_profile, "Use IAM EC2 Profile", :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 :use_iam_profile, "Use IAM EC2 Profile", :short => :none
           opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         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 :use_iam_profile, "Use IAM EC2 Profile", :short => :none
           opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
         end
       end

data/lib/heirloom/cli/upload.rb

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

data/lib/heirloom/config.rb

@@ -1,7 +1,7 @@
 module Heirloom
   class Config
 
-    attr_accessor :access_key, :secret_key, :metadata_region, :logger, :environment
+    attr_accessor :access_key, :secret_key, :metadata_region, :logger, :environment, :use_iam_profile
 
     def initialize(args={})
       @opts        = args[:opts] ||= Hash.new
@@ -18,6 +18,8 @@ module Heirloom
                                      @config['secret_key']
       @metadata_region = @opts.fetch :metadata_region, 
                                      @config['metadata_region']
+      @use_iam_profile = @opts.fetch :use_iam_profile,
+                                     false
     end
 
     private

data/lib/heirloom/version.rb

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

data/spec/aws/s3_spec.rb

@@ -1,244 +1,267 @@
 require 'spec_helper'
 
 describe Heirloom do
-  before do
-    @directories_mock = mock 'directories'
-    @bucket_mock = mock 'bucket'
-    @logger_stub = stub 'logger', :debug => true, 
-                                  :info  => true,
-                                  :warn  => true
-    @config_mock = mock 'config'
-    @config_mock.stub :access_key => 'the-key',
-                      :secret_key => 'the-secret',
-                      :logger     => @logger_stub
-    @fog_mock = mock 'fog'
-    @fog_mock.stub :directories => @directories_mock
-    Fog::Storage.should_receive(:new).and_return @fog_mock
-    @s3 = Heirloom::AWS::S3.new :config => @config_mock,
-                                :region => 'us-west-1'
-  end
+  context "using IAM roles" do
 
-  context "bucket_exists?" do
-    it "should return true if the bucket exists" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').and_return @bucket_mock
-      @s3.bucket_exists?('bucket').should be_true
-    end
+    it "should use the access and secret keys by default" do
 
-    it "should return false if the bucket does not exist" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').and_return nil
-      @s3.bucket_exists?('bucket').should be_false
-    end
+      config = mock_config :aws_access_key_id => 'key',
+                           :aws_secret_access_key => 'secret'
 
-    it "should return false if bucket owned by another account" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').
-                        and_raise Excon::Errors::Forbidden.new('msg')
-      @s3.bucket_exists?('bucket').should be_false
-    end
-  end
+      Fog::Storage.should_receive(:new).
+                   with :provider => 'AWS',
+                        :aws_access_key_id => 'key',
+                        :aws_secret_access_key => 'secret',
+                        :region => 'us-west-1'
+      s3 = Heirloom::AWS::S3.new :config => config, :region => 'us-west-1'
 
-  context "bucket_exists_in_another_region?" do
-    it "should return true if the bucket exists in another region" do
-      @bucket_mock.stub :location => 'us-east-1'
-      @directories_mock.should_receive(:get).
-                        with('bucket').at_least(:once).
-                        and_return @bucket_mock
-      @s3.bucket_exists_in_another_region?('bucket').should be_true
     end
 
-    it "should return false if the bucket exists in the curren region" do
-      @bucket_mock.stub :location => 'us-west-1'
-      @directories_mock.should_receive(:get).
-                        with('bucket').at_least(:once).
-                        and_return @bucket_mock
-      @s3.bucket_exists_in_another_region?('bucket').should be_false
-    end
+    it "should use the iam role if asked to" do
+
+      config = mock_config :use_iam_profile => true
+      
+      Fog::Storage.should_receive(:new).
+                   with :provider => 'AWS',
+                        :use_iam_profile => true,
+                        :region => 'us-west-1'
+      s3 = Heirloom::AWS::S3.new :config => config, :region => 'us-west-1'
 
-    it "should return false if bucket owned by another account" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').
-                        and_raise Excon::Errors::Forbidden.new('msg')
-      @s3.bucket_exists_in_another_region?('bucket').should be_false
     end
   end
 
-  context "bucket_owned_by_another_account?" do
-    it "should return false if bucket owned by this account" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').
-                        and_return @bucket_mock
-      @s3.bucket_owned_by_another_account?('bucket').should be_false
-    end
+  context "s3 / bucket operations" do
 
-    it "should return false if bucket does not exist" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').
-                        and_return nil
-      @s3.bucket_owned_by_another_account?('bucket').should be_false
+    before do
+      @directories_mock = mock 'directories'
+      @bucket_mock = mock 'bucket'
+      @fog_mock = mock 'fog'
+      @fog_mock.stub :directories => @directories_mock
+      Fog::Storage.stub :new => @fog_mock
+      @s3 = Heirloom::AWS::S3.new :config => mock_config, :region => 'us-west-1'
     end
 
-    it "should return true if bucket is not owned by another account" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').
-                        and_raise Excon::Errors::Forbidden.new('msg')
-      @s3.bucket_owned_by_another_account?('bucket').should be_true
+    context "bucket_exists?" do
+      it "should return true if the bucket exists" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').and_return @bucket_mock
+        @s3.bucket_exists?('bucket').should be_true
+      end
+
+      it "should return false if the bucket does not exist" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').and_return nil
+        @s3.bucket_exists?('bucket').should be_false
+      end
+
+      it "should return false if bucket owned by another account" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').
+                          and_raise Excon::Errors::Forbidden.new('msg')
+        @s3.bucket_exists?('bucket').should be_false
+      end
     end
-  end
-
-  it "should delete an object from s3" do
-    @fog_mock.should_receive(:delete_object).
-              with('bucket', 'object', { :option => 'test' })
-    @s3.delete_object('bucket', 'object', { :option => 'test' })
-  end
-
-  it "should get a bucket from s3" do
-    @directories_mock.should_receive(:get).with 'bucket'
-    @s3.get_bucket 'bucket'
-  end
-
-  context "testing bucket availability" do
 
-    it "should return false if the bucket is forbidden" do
-      @directories_mock.should_receive(:get).
-                  with('bucket').
-                  and_raise Excon::Errors::Forbidden.new('msg')
-      @s3.bucket_name_available?('bucket').should be_false
+    context "bucket_exists_in_another_region?" do
+      it "should return true if the bucket exists in another region" do
+        @bucket_mock.stub :location => 'us-east-1'
+        @directories_mock.should_receive(:get).
+                          with('bucket').at_least(:once).
+                          and_return @bucket_mock
+        @s3.bucket_exists_in_another_region?('bucket').should be_true
+      end
+
+      it "should return false if the bucket exists in the curren region" do
+        @bucket_mock.stub :location => 'us-west-1'
+        @directories_mock.should_receive(:get).
+                          with('bucket').at_least(:once).
+                          and_return @bucket_mock
+        @s3.bucket_exists_in_another_region?('bucket').should be_false
+      end
+
+      it "should return false if bucket owned by another account" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').
+                          and_raise Excon::Errors::Forbidden.new('msg')
+        @s3.bucket_exists_in_another_region?('bucket').should be_false
+      end
     end
 
-    it "should return false if bucket in different region" do
-      @directories_mock.should_receive(:get).
-                  with('bucket').at_least(:once).
-                  and_return @bucket_mock
-      @bucket_mock.stub :location => 'us-east-1'
-      @s3.bucket_name_available?('bucket').should be_false
+    context "bucket_owned_by_another_account?" do
+      it "should return false if bucket owned by this account" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').
+                          and_return @bucket_mock
+        @s3.bucket_owned_by_another_account?('bucket').should be_false
+      end
+
+      it "should return false if bucket does not exist" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').
+                          and_return nil
+        @s3.bucket_owned_by_another_account?('bucket').should be_false
+      end
+
+      it "should return true if bucket is not owned by another account" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').
+                          and_raise Excon::Errors::Forbidden.new('msg')
+        @s3.bucket_owned_by_another_account?('bucket').should be_true
+      end
     end
 
-    it "should return true if the bucket is in this account / region" do
-      @directories_mock.should_receive(:get).
-                with('bucket').at_least(:once).
-                and_return @bucket_mock
-      @bucket_mock.stub :location => 'us-west-1'
-      @s3.bucket_name_available?('bucket').should be_true
+    it "should delete an object from s3" do
+      @fog_mock.should_receive(:delete_object).
+                with('bucket', 'object', { :option => 'test' })
+      @s3.delete_object('bucket', 'object', { :option => 'test' })
     end
 
-    it "should return true if the bucket is not found" do
-      @directories_mock.should_receive(:get).
-                        with('bucket').at_least(:once).
-                        and_return nil
-      @s3.bucket_name_available?('bucket').should be_true
+    it "should get a bucket from s3" do
+      @directories_mock.should_receive(:get).with 'bucket'
+      @s3.get_bucket 'bucket'
     end
 
-  end
+    context "testing bucket availability" do
+
+      it "should return false if the bucket is forbidden" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').
+                          and_raise Excon::Errors::Forbidden.new('msg')
+        @s3.bucket_name_available?('bucket').should be_false
+      end
+
+      it "should return false if bucket in different region" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').at_least(:once).
+                          and_return @bucket_mock
+        @bucket_mock.stub :location => 'us-east-1'
+        @s3.bucket_name_available?('bucket').should be_false
+      end
+
+      it "should return true if the bucket is in this account / region" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').at_least(:once).
+                          and_return @bucket_mock
+        @bucket_mock.stub :location => 'us-west-1'
+        @s3.bucket_name_available?('bucket').should be_true
+      end
+
+      it "should return true if the bucket is not found" do
+        @directories_mock.should_receive(:get).
+                          with('bucket').at_least(:once).
+                          and_return nil
+        @s3.bucket_name_available?('bucket').should be_true
+      end
 
-  it "should return object versions for a given bucket" do
-    body_mock = mock 'body'
-    @fog_mock.should_receive(:get_bucket_object_versions).
-              with('bucket').
-              and_return body_mock
-    body_mock.stub :body => 'body_hash'
-    @s3.get_bucket_object_versions('bucket').should == 'body_hash'
-  end
+    end
 
-  context "testing bucket deletion" do
-    it "should return true if the bucket has 0 objects" do
+    it "should return object versions for a given bucket" do
       body_mock = mock 'body'
       @fog_mock.should_receive(:get_bucket_object_versions).
                 with('bucket').
                 and_return body_mock
-      body_mock.stub :body => { "Versions" => [ ] }
-      @s3.bucket_empty?('bucket').should be_true
+      body_mock.stub :body => 'body_hash'
+      @s3.get_bucket_object_versions('bucket').should == 'body_hash'
     end
 
-    it "should return false if the bucket has any objects" do
-      body_mock = mock 'body'
-      @fog_mock.should_receive(:get_bucket_object_versions).
-                with('bucket').
-                and_return body_mock
-      body_mock.stub :body => { "Versions" => [ 'obj1', 'obj2' ] }
-      @s3.bucket_empty?('bucket').should be_false
+    context "testing bucket deletion" do
+      it "should return true if the bucket has 0 objects" do
+        body_mock = mock 'body'
+        @fog_mock.should_receive(:get_bucket_object_versions).
+                  with('bucket').
+                  and_return body_mock
+        body_mock.stub :body => { "Versions" => [ ] }
+        @s3.bucket_empty?('bucket').should be_true
+      end
+
+      it "should return false if the bucket has any objects" do
+        body_mock = mock 'body'
+        @fog_mock.should_receive(:get_bucket_object_versions).
+                  with('bucket').
+                  and_return body_mock
+        body_mock.stub :body => { "Versions" => [ 'obj1', 'obj2' ] }
+        @s3.bucket_empty?('bucket').should be_false
+      end
+
+      it "should delete a bucket from s3 if empty" do
+        body_mock = mock 'body'
+        @fog_mock.should_receive(:get_bucket_object_versions).
+                  with('bucket').
+                  and_return body_mock
+        body_mock.stub :body => { "Versions" => [ ] }
+        @fog_mock.should_receive(:delete_bucket).
+          with('bucket').and_return true
+        @s3.delete_bucket('bucket').should be_true
+      end
+
+      it "should return false and not attempt to delete a non empty s3 bucket" do
+        body_mock = mock 'body'
+        @fog_mock.should_receive(:get_bucket_object_versions).
+                  with('bucket').
+                  and_return body_mock
+        body_mock.stub :body => { "Versions" => [ 'obj1', 'obj2' ] }
+        @fog_mock.should_receive(:delete_bucket).never
+        @s3.delete_bucket('bucket').should be_false
+      end
+
+      it "should return true if Excon::Errors::NotFound raised when deleting bucket" do
+        @fog_mock.should_receive(:get_bucket_object_versions).
+                  with('bucket').
+                  and_raise Excon::Errors::NotFound.new 'Bucket does not exist.'
+        @fog_mock.should_receive(:delete_bucket).never
+        @s3.delete_bucket('bucket').should be_true
+      end
     end
 
-    it "should delete a bucket from s3 if empty" do
+    it "should get an object from s3" do
       body_mock = mock 'body'
-      @fog_mock.should_receive(:get_bucket_object_versions).
-                with('bucket').
+      @fog_mock.should_receive(:get_object).
+                with('bucket', 'object').
                 and_return body_mock
-      body_mock.stub :body => { "Versions" => [ ] }
-      @fog_mock.should_receive(:delete_bucket).
-                with('bucket').and_return true
-      @s3.delete_bucket('bucket').should be_true
+      body_mock.stub :body => 'body_hash'
+      @s3.get_object('bucket', 'object').should == 'body_hash'
     end
 
-    it "should return false and not attempt to delete a non empty s3 bucket" do
+    it "should get a buckets acl from s3" do
       body_mock = mock 'body'
-      @fog_mock.should_receive(:get_bucket_object_versions).
-                with('bucket').
+      @fog_mock.should_receive(:get_object).
+                with('bucket', 'object').
                 and_return body_mock
-      body_mock.stub :body => { "Versions" => [ 'obj1', 'obj2' ] }
-      @fog_mock.should_receive(:delete_bucket).never
-      @s3.delete_bucket('bucket').should be_false
+      body_mock.should_receive(:body)
+      @s3.get_object('bucket', 'object')
     end
 
-    it "should return true if Excon::Errors::NotFound raised when deleting bucket" do
-      @fog_mock.should_receive(:get_bucket_object_versions).
-                with('bucket').
-                and_raise Excon::Errors::NotFound.new 'Bucket does not exist.'
-      @fog_mock.should_receive(:delete_bucket).never
-      @s3.delete_bucket('bucket').should be_true
+    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
-  end
 
-  it "should get an object from s3" do
-    body_mock = mock 'body'
-    @fog_mock.should_receive(:get_object).
-              with('bucket', 'object').
-              and_return body_mock
-    body_mock.stub :body => 'body_hash'
-    @s3.get_object('bucket', 'object').should == 'body_hash'
-  end
-
-  it "should get a buckets acl from s3" do
-    body_mock = mock 'body'
-    @fog_mock.should_receive(:get_object).
-              with('bucket', 'object').
-              and_return body_mock
-    body_mock.should_receive(:body)
-    @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'
+      @s3.put_object_acl 'bucket', 'object', 'grants'
+    end
 
-  it "should set object acls" do
-    @fog_mock.should_receive(:put_object_acl).
-              with 'bucket', 'object', 'grants'
-    @s3.put_object_acl 'bucket', 'object', 'grants'
-  end
+    it "should call put bucket with location_constraint us-west-1" do
+      options = { 'LocationConstraint' => 'us-west-1',
+                  'x-amz-acl'          => 'private' }
+      @fog_mock.should_receive(:put_bucket).
+                with('name', options)
+      @s3.put_bucket 'name', 'us-west-1'
+    end
 
-  it "should call put bucket with location_constraint us-west-1" do
-    options = { 'LocationConstraint' => 'us-west-1',
-                'x-amz-acl'          => 'private' }
-    @fog_mock.should_receive(:put_bucket).
-              with('name', options)
-    @s3.put_bucket 'name', 'us-west-1'
-  end
+    it "should call put bucket with location_constraint nil when region us-west-1" do
+      options = { 'LocationConstraint' => nil,
+                  'x-amz-acl'          => 'private' }
+      @fog_mock.should_receive(:put_bucket).
+                with('name', options)
+      @s3.put_bucket 'name', 'us-east-1'
+    end
 
-  it "should call put bucket with location_constraint nil when region us-west-1" do
-    options = { 'LocationConstraint' => nil,
-                'x-amz-acl'          => 'private' }
-    @fog_mock.should_receive(:put_bucket).
-              with('name', options)
-    @s3.put_bucket 'name', 'us-east-1'
   end
-
-
 end

data/spec/aws/simpledb_spec.rb

@@ -1,97 +1,121 @@
 require 'spec_helper'
 
 describe Heirloom do
-  before 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(:metadata_region).and_return 'us-west-1'
-    @fog_mock = mock 'fog'
-    Fog::AWS::SimpleDB.should_receive(:new).
-                       with(:aws_access_key_id     => 'the-key',
-                            :aws_secret_access_key => 'the-secret',
-                            :region                => 'us-west-1').
-                       and_return @fog_mock
-    @sdb = Heirloom::AWS::SimpleDB.new :config => @config_mock
-  end
 
-  it "should list the domains in simples db" do
-    body_mock = mock 'body'
-    @fog_mock.should_receive(:list_domains).
-              and_return body_mock
-    body_mock.should_receive(:body).
-              and_return 'Domains' => ['domain1']
-    @sdb.domains.should == ['domain1']
-  end
+  context "credential management" do
 
-  it "should create a new domain when it does not exist" do
-    @sdb.should_receive(:domains).and_return([])
-    @fog_mock.should_receive(:create_domain).with('new_domain')
-    @sdb.create_domain('new_domain')
-  end
+    it "should use the access and secret keys by default" do
 
-  it "should destroy the specified domain" do
-    @fog_mock.should_receive(:delete_domain).with('new_domain')
-    @sdb.delete_domain('new_domain')
-  end
+      config = mock_config :aws_access_key_id => 'key',
+                           :aws_secret_access_key => 'secret'
 
-  it "should not create a new domain when already exists" do
-    @sdb.should_receive(:domains).and_return(['new_domain'])
-    @fog_mock.should_receive(:create_domain).exactly(0).times
-    @sdb.create_domain('new_domain')
-  end
+      Fog::AWS::SimpleDB.should_receive(:new).
+                         with :aws_access_key_id => 'key',
+                              :aws_secret_access_key => 'secret',
+                              :region => 'us-west-1'
 
-  it "should update the attributes for an entry" do
-    @fog_mock.should_receive(:put_attributes).
-              with('domain', 'key', {'key' => 'value'}, { "option" => "123" })
-    @sdb.put_attributes('domain', 'key', {'key' => 'value'}, { "option" => "123" })
-  end
+      s3 = Heirloom::AWS::SimpleDB.new :config => config
+
+    end
+
+    it "should use the iam role if asked to" do
+
+      config = mock_config :use_iam_profile => true
+      
+      Fog::AWS::SimpleDB.should_receive(:new).
+                         with :use_iam_profile => true,
+                              :region => 'us-west-1'
+      s3 = Heirloom::AWS::SimpleDB.new :config => config
+
+    end
 
-  it "should delete the given entry from sdb" do
-    @fog_mock.should_receive(:delete_attributes).with('domain', 'key')
-    @sdb.delete('domain', 'key')
   end
 
-  context "testing counts" do
+  context "sdb operations" do
+
     before do
-      @body_stub = stub 'body'
+      @fog_mock = mock 'fog'
+      Fog::AWS::SimpleDB.stub :new => @fog_mock
+      @sdb = Heirloom::AWS::SimpleDB.new :config => mock_config
     end
 
-    it "should count the number of entries in the domain" do
-      data = { 'Items' => { 'Domain' => { 'Count' => ['1'] } } }
-      @fog_mock.should_receive(:select).
-                with('SELECT count(*) FROM `heirloom_domain`').
-                and_return @body_stub
-      @body_stub.stub :body => data
-      @sdb.count('heirloom_domain').should == 1
+    it "should list the domains in simples db" do
+      body_mock = mock 'body'
+      @fog_mock.should_receive(:list_domains).
+                and_return body_mock
+      body_mock.should_receive(:body).
+                and_return 'Domains' => ['domain1']
+      @sdb.domains.should == ['domain1']
     end
 
-    it "should return true if no entries for the domain" do
-      data = { 'Items' => { 'Domain' => { 'Count' => ['0'] } } }
-      @fog_mock.should_receive(:select).
-                with('SELECT count(*) FROM `heirloom_domain`').
-                and_return @body_stub
-      @body_stub.stub :body => data
-      @sdb.domain_empty?('heirloom_domain').should be_true
+    it "should create a new domain when it does not exist" do
+      @sdb.should_receive(:domains).and_return([])
+      @fog_mock.should_receive(:create_domain).with('new_domain')
+      @sdb.create_domain('new_domain')
     end
 
-    it "should return false if entries exist for the domain" do
-      data = { 'Items' => { 'Domain' => { 'Count' => ['50'] } } }
-      @fog_mock.should_receive(:select).
-                with('SELECT count(*) FROM `heirloom_domain`').
-                and_return @body_stub
-      @body_stub.stub :body => data
-      @sdb.domain_empty?('heirloom_domain').should be_false
+    it "should destroy the specified domain" do
+      @fog_mock.should_receive(:delete_domain).with('new_domain')
+      @sdb.delete_domain('new_domain')
     end
 
-    it "should return the count for a specific itemName within a domain" do
-      data = { 'Items' => { 'Domain' => { 'Count' => ['1'] } } }
-      @fog_mock.should_receive(:select).
-                with("SELECT count(*) FROM `heirloom` WHERE itemName() = 'archive'").
-                and_return @body_stub
-      @body_stub.stub :body => data
-      @sdb.item_count('heirloom', 'archive').should == 1
+    it "should not create a new domain when already exists" do
+      @sdb.should_receive(:domains).and_return(['new_domain'])
+      @fog_mock.should_receive(:create_domain).exactly(0).times
+      @sdb.create_domain('new_domain')
+    end
+
+    it "should update the attributes for an entry" do
+      @fog_mock.should_receive(:put_attributes).
+        with('domain', 'key', {'key' => 'value'}, { "option" => "123" })
+      @sdb.put_attributes('domain', 'key', {'key' => 'value'}, { "option" => "123" })
+    end
+
+    it "should delete the given entry from sdb" do
+      @fog_mock.should_receive(:delete_attributes).with('domain', 'key')
+      @sdb.delete('domain', 'key')
     end
-  end
 
+    context "testing counts" do
+      before do
+        @body_stub = stub 'body'
+      end
+
+      it "should count the number of entries in the domain" do
+        data = { 'Items' => { 'Domain' => { 'Count' => ['1'] } } }
+        @fog_mock.should_receive(:select).
+                  with('SELECT count(*) FROM `heirloom_domain`').
+                  and_return @body_stub
+        @body_stub.stub :body => data
+        @sdb.count('heirloom_domain').should == 1
+      end
+
+      it "should return true if no entries for the domain" do
+        data = { 'Items' => { 'Domain' => { 'Count' => ['0'] } } }
+        @fog_mock.should_receive(:select).
+                  with('SELECT count(*) FROM `heirloom_domain`').
+                  and_return @body_stub
+        @body_stub.stub :body => data
+        @sdb.domain_empty?('heirloom_domain').should be_true
+      end
+
+      it "should return false if entries exist for the domain" do
+        data = { 'Items' => { 'Domain' => { 'Count' => ['50'] } } }
+        @fog_mock.should_receive(:select).
+                  with('SELECT count(*) FROM `heirloom_domain`').
+                  and_return @body_stub
+        @body_stub.stub :body => data
+        @sdb.domain_empty?('heirloom_domain').should be_false
+      end
+
+      it "should return the count for a specific itemName within a domain" do
+        data = { 'Items' => { 'Domain' => { 'Count' => ['1'] } } }
+        @fog_mock.should_receive(:select).
+                  with("SELECT count(*) FROM `heirloom` WHERE itemName() = 'archive'").
+                  and_return @body_stub
+        @body_stub.stub :body => data
+        @sdb.item_count('heirloom', 'archive').should == 1
+      end
+    end
+  end
 end

data/spec/cli/authorize_spec.rb

@@ -10,12 +10,8 @@ describe Heirloom do
                 :id              => '1.0.0',
                 :metadata_region => 'us-west-1' }
     @logger_stub = stub 'logger', :error => true
-    @config_mock = mock 'config'
+    @config_mock = mock_config :logger => @logger_stub
     @archive_mock = mock 'archive'
-    @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

data/spec/cli/catalog_spec.rb

@@ -10,13 +10,9 @@ describe Heirloom do
                 { 'regions'       => ['us-west-1'],
                   'bucket_prefix' => ['bp'] } }
     @logger_stub = stub :debug => true
-    @config_mock = mock 'config'
+    @config_mock = mock_config :logger => @logger_stub
     @catalog_mock = mock 'catalog'
     @catalog_mock.stub :catalog_domain_exists? => true
-    @config_mock.stub :logger          => @logger_mock, 
-                      :access_key      => 'key',
-                      :secret_key      => 'secret',
-                      :metadata_region => 'us-west-1'
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
     Heirloom::CLI::Catalog.any_instance.should_receive(:load_config).

data/spec/cli/destroy_spec.rb

@@ -9,12 +9,8 @@ describe Heirloom do
                 :level           => 'info',
                 :metadata_region => 'us-west-1' }
     @logger_stub = stub 'logger'
-    @config_mock = mock 'config'
+    @config_mock = mock_config :logger => @logger_stub
     @archive_mock = mock 'archive'
-    @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

data/spec/cli/download_spec.rb

@@ -5,12 +5,8 @@ describe Heirloom do
 
   before do
     @logger_stub = stub 'logger'
-    @config_mock = mock 'config'
+    @config_mock = mock_config :logger => @logger_stub
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger     => @logger_stub,
-                      :access_key => 'key',
-                      :secret_key => 'secret',
-                      :metadata_region => 'us-west-1'
     Heirloom::HeirloomLogger.should_receive(:new).
                              with(:log_level => 'info').
                              and_return @logger_stub

data/spec/cli/list_spec.rb

@@ -9,12 +9,8 @@ describe Heirloom do
                  :metadata_region => 'us-west-1',
                  :count           => 100 }
     @logger_stub = stub :debug => true
-    @config_mock = mock 'config'
+    @config_mock = mock_config :logger => @logger_stub
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger          => @logger_mock, 
-                      :access_key      => 'key',
-                      :secret_key      => 'secret',
-                      :metadata_region => 'us-west-1'
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
     Heirloom::CLI::List.any_instance.should_receive(:load_config).

data/spec/cli/setup_spec.rb

@@ -12,11 +12,7 @@ describe Heirloom do
                 :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'
+    @config_mock = mock_config :logger => @logger_stub
     @archive_mock = mock 'archive'
     @catalog_mock = mock 'catalog'
     @checker_mock = mock 'checker'

data/spec/cli/shared_spec.rb

@@ -7,12 +7,8 @@ describe Heirloom do
   context "testing ensure_valid_options" do
 
     before do
-      @config_mock = mock 'config'
       @logger_mock = mock 'logger'
-      @config_mock.stub :logger          => @logger_mock,
-                        :access_key      => 'key',
-                        :secret_key      => 'secret',
-                        :metadata_region => 'us-west-1'
+      @config_mock = mock_config(:logger => @logger_mock)
       @object = Object.new
       @object.extend Heirloom::CLI::Shared
     end

data/spec/cli/show_spec.rb

@@ -10,12 +10,8 @@ describe Heirloom do
                  :level           => 'info',
                  :metadata_region => 'us-west-1' }
     @logger_stub = stub :debug => true
-    @config_mock = mock 'config'
+    @config_mock = mock_config(:logger => @logger_stub)
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger          => @logger_stub, 
-                      :access_key      => 'key',
-                      :secret_key      => 'secret',
-                      :metadata_region => 'us-west-1'
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
     Heirloom::CLI::Show.any_instance.should_receive(:load_config).

data/spec/cli/tag_spec.rb

@@ -11,12 +11,9 @@ describe Heirloom do
                 :value           => 'val',
                 :metadata_region => 'us-west-1' }
     @logger_stub = stub :debug => true, :error => true
-    @config_mock = mock 'config'
+    @config_mock = mock_config(:logger => @logger_stub)
     @archive_mock = mock 'archive'
-    @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

data/spec/cli/teardown_spec.rb

@@ -9,11 +9,7 @@ describe Heirloom do
                 :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'
+    @config_mock = mock_config(:logger => @logger_stub)
     @archive_mock = mock 'archive'
     @catalog_mock = mock 'catalog'
     @catalog_mock.stub :regions => ['us-west-1', 'us-west-2']

data/spec/cli/upload_spec.rb

@@ -15,11 +15,7 @@ describe Heirloom do
                 :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'
+    @config_mock = mock_config(:logger => @logger_stub)
     @archive_mock = mock 'archive'
     @catalog_mock = mock 'catalog'
     @catalog_mock.stub :regions                => @regions,

data/spec/spec_helper.rb

@@ -3,6 +3,24 @@ require 'bundler/setup'
 
 require 'heirloom'
 
+module SpecHelpers
+
+  def mock_config(args={})
+    args[:logger]          ||= stub :debug => true, :info => true, :warn => true, :error => true
+    args[:access_key]      ||= 'key'
+    args[:secret_key]      ||= 'secret'
+    args[:metadata_region] ||= 'us-west-1'
+    args[:use_iam_profile] ||= false
+
+    config_mock = mock 'config'
+    config_mock.stub args
+
+    config_mock
+  end
+
+end
+
 RSpec.configure do |config|
-  #spec config
+  config.include SpecHelpers
 end
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.11.0.beta.2
-  prerelease: 7
+  version: 0.11.0
+  prerelease: 
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -235,13 +235,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -211146683438990673
+      hash: -4406439853802667005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4406439853802667005
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.24