heirloom 0.1.4 → 0.2.0

data/lib/heirloom/config.rb

@@ -3,10 +3,11 @@ module Heirloom
 
     attr_accessor :access_key, :secret_key, :regions, 
                   :primary_region, :bucket_prefix, :authorized_aws_accounts,
-                  :logger
+                  :logger, :simpledb
 
     def initialize(args = {})
       @config = args[:config]
+      self.logger = args[:logger] ||= HeirloomLogger.new
       load_config_file
     end
 
@@ -14,8 +15,6 @@ module Heirloom
       config_file = "#{ENV['HOME']}/.heirloom.yml"
       c = @config ? @config : YAML::load( File.open( config_file ) )
 
-      self.logger = c['logger'] ||= HeirloomLogger.new
-
       aws = c['aws']
 
       self.access_key = aws['access_key']
@@ -23,6 +22,7 @@ module Heirloom
       self.regions = aws['regions']
       self.bucket_prefix = aws['bucket_prefix']
       self.authorized_aws_accounts = aws['authorized_aws_accounts']
+      self.simpledb = aws['simpledb'] ||= true
       self.primary_region = regions ? regions.first : 'us-west-1'
     end
 

data/lib/heirloom/destroyer/s3.rb

@@ -1,5 +1,5 @@
 module Heirloom
-  module Destroyer
+  class Destroyer
     class S3
 
       attr_accessor :config, :region

data/lib/heirloom/directory/directory.rb

@@ -24,7 +24,7 @@ module Heirloom
         self.local_build = File.join(Dir.tmpdir, random_text + ".tar.gz")
       end
 
-      logger.info "Building artifact '#{local_build}' from '#{path}'."
+      logger.info "Building Heirloom '#{local_build}' from '#{path}'."
       logger.info "Excluding #{exclude.to_s}."
       logger.info "Adding #{files_to_pack.to_s}."
 

data/lib/heirloom/downloader/s3.rb

@@ -1,5 +1,5 @@
 module Heirloom
-  module Downloader
+  class Downloader
     class S3
 
       def initialize(args)

data/lib/heirloom/logger.rb

@@ -3,6 +3,7 @@ module Heirloom
     
     def initialize(args = {})
       @logger = args[:logger] ||= Logger.new(STDOUT)
+      @log_level = args[:log_level] ||= 'info'
 
       unless args[:logger]
         @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
@@ -11,9 +12,31 @@ module Heirloom
         end
       end
 
+      case @log_level.downcase
+      when 'info'
+        @logger.level = Logger::INFO
+      when 'debug'
+        @logger.level = Logger::DEBUG
+      when 'warn'
+        @logger.level = Logger::WARN
+      when 'error'
+        @logger.level = Logger::ERROR
+      end
       @logger
     end
 
+    def debug(msg)
+      @logger.debug msg
+    end
+
+    def info(msg)
+      @logger.info msg
+    end
+
+    def error(msg)
+      @logger.error msg
+    end
+
     def info(msg)
       @logger.info msg
     end

data/lib/heirloom/uploader/s3.rb

@@ -1,5 +1,5 @@
 module Heirloom
-  module Uploader
+  class Uploader
     class S3
 
       def initialize(args)
@@ -26,22 +26,14 @@ module Heirloom
                                :public => public_readable
 
         @logger.info "File is readable by the public internet." if public_readable
-
-        add_endpoint_attributes :bucket     => bucket,
-                                :id         => id,
-                                :key_folder => key_folder,
-                                :key_name   => key_name,
-                                :name       => name
       end
 
-      private
-
       def add_endpoint_attributes(args)
         bucket = args[:bucket]
         id = args[:id]
-        key_name = args[:key_name]
-        key_folder = args[:key_folder]
         name = args[:name]
+        key_folder = name
+        key_name = "#{id}.tar.gz"
 
         s3_endpoint = "s3://#{bucket}/#{key_folder}/#{key_name}"
         http_endpoint = "http://#{endpoints[@region]}/#{bucket}/#{key_folder}/#{key_name}"
@@ -57,6 +49,8 @@ module Heirloom
         @logger.info "Adding attribute #{https_endpoint}."
       end
 
+      private
+
       def endpoints
         {
           'us-east-1' => 's3.amazonaws.com',
@@ -73,6 +67,7 @@ module Heirloom
       def sdb
         @sdb ||= AWS::SimpleDB.new :config => @config
       end
+
     end
   end
 end

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/spec/acl/s3_spec.rb

@@ -27,25 +27,17 @@ describe Heirloom do
     s3_mock.should_receive(:get_bucket_acl).with('bucket').
                                             and_return acls
 
-    grants_mock = mock 'grants'
-    @s3.should_receive(:build_bucket_grants).
-        with(:id   => '123',
-             :name => 'Brett',
-             :accounts => ['acct1@test.com', 'acct2@test.com']).
-        and_return grants_mock
-
     @logger_mock.should_receive(:info).
                  with 'Authorizing acct1@test.com to s3://bucket/key-folder/key.tar.gz.'
     @logger_mock.should_receive(:info).
                  with 'Authorizing acct2@test.com to s3://bucket/key-folder/key.tar.gz.'
 
-    s3_mock.should_receive(:put_object_acl).with('bucket', 'key-folder/key.tar.gz', grants_mock)
+    s3_mock.should_receive(:put_object_acl).
+            with("bucket", "key-folder/key.tar.gz", {"Owner"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "AccessControlList"=>[{"Grantee"=>{"EmailAddress"=>"acct1@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"EmailAddress"=>"acct2@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "Permission"=>"FULL_CONTROL"}]})
 
     @s3.allow_read_access_from_accounts :bucket     => 'bucket', 
                                         :key_name   => 'key',
                                         :key_folder => 'key-folder'
   end
 
-  it "should test build_bucket_grants private method"
-
 end

data/spec/config_spec.rb

@@ -8,21 +8,23 @@ describe Heirloom do
                   'secret_key'              => 'secret',
                   'regions'                 => ['us-west-1', 'us-west-2'],
                   'bucket_prefix'           => 'prefix',
+                  'simpledb'               => true,
                   'authorized_aws_accounts' => [ 'test1 @acct.com', 'test2@acct.com' ]
-                },
-                'logger' => 'da-logger'
+                }
               }
   end
 
   it "should create a new config object from the hash passed as config" do
-    config = Heirloom::Config.new :config => @config
+    config = Heirloom::Config.new :config => @config,
+                                  :logger => 'da-logger'
     config.access_key.should == @config['aws']['access_key']
     config.secret_key.should == @config['aws']['secret_key']
     config.regions.should == @config['aws']['regions']
     config.primary_region.should == 'us-west-1'
     config.bucket_prefix.should == @config['aws']['bucket_prefix']
     config.authorized_aws_accounts.should == @config['aws']['authorized_aws_accounts']
-    config.logger.should == @config['logger']
+    config.simpledb.should == true
+    config.logger.should == 'da-logger'
   end
 
   it "should create a new config object and read from ~/.heirloom.yml" do
@@ -34,7 +36,16 @@ describe Heirloom do
     config.regions.should == @config['aws']['regions']
     config.primary_region.should == 'us-west-1'
     config.bucket_prefix.should == @config['aws']['bucket_prefix']
+    config.simpledb.should == true
     config.authorized_aws_accounts.should == @config['aws']['authorized_aws_accounts']
   end
 
+  it "should set simpledb to true by default" do
+    @config['aws']['simpledb'] = nil
+    File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
+                               and_return(@config.to_yaml)
+    config = Heirloom::Config.new
+    config.simpledb.should == true
+  end
+
 end

data/spec/directory/directory_spec.rb

@@ -11,7 +11,7 @@ describe Heirloom do
                                            :path    => '/target/dir'
     end
 
-    it "should build an artifact from the latest commit in path" do
+    it "should build an archive from the latest commit in path" do
       @logger_mock.should_receive(:info).exactly(3).times
       file_mock = double 'file'
       File.should_receive(:open).and_return file_mock

data/spec/{artifact/artifact_authorizer_spec.rb → heirloom/authorizer_spec.rb}

@@ -6,20 +6,20 @@ describe Heirloom do
       @config_mock = double('config')
       @logger_mock = double('logger')
       @config_mock.should_receive(:logger).and_return(@logger_mock)
-      @authorizer = Heirloom::ArtifactAuthorizer.new :config => @config_mock,
-                                                     :name   => 'tim',
-                                                     :id     => '123'
+      @authorizer = Heirloom::Authorizer.new :config => @config_mock,
+                                             :name   => 'tim',
+                                             :id     => '123'
     end
 
     it "should authorize access to an acl across all regions" do
-      artifact_reader = double
+      reader = double
       s3_acl = double
       @logger_mock.should_receive(:info).exactly(2).times
       @config_mock.should_receive(:regions).
                    and_return(['us-west-1', 'us-west-2'])
-      @authorizer.should_receive(:artifact_reader).exactly(2).times.
-                  and_return(artifact_reader)
-      artifact_reader.should_receive(:get_bucket).exactly(2).times.
+      @authorizer.should_receive(:reader).exactly(2).times.
+                  and_return(reader)
+      reader.should_receive(:get_bucket).exactly(2).times.
                       and_return('the-bucket')
       Heirloom::ACL::S3.should_receive(:new).exactly(2).
                         times.and_return(s3_acl)

data/spec/{artifact/artifact_builder_spec.rb → heirloom/builder_spec.rb}

@@ -10,12 +10,12 @@ describe Heirloom do
       Heirloom::AWS::SimpleDB.should_receive(:new).with(:config => @config_mock).
                               and_return(@simpledb_mock)
       @simpledb_mock.should_receive(:create_domain).with 'tim'
-      @builder = Heirloom::ArtifactBuilder.new :config => @config_mock,
+      @builder = Heirloom::Builder.new :config => @config_mock,
                                                :name   => 'tim',
                                                :id     => '123'
     end
 
-    it "should build an artifact" do
+    it "should build an archive" do
       directory_mock = double "directory"
       Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
                                                     :exclude => ['.dir_to_exclude'],
@@ -31,7 +31,7 @@ describe Heirloom do
                      :git       => 'true').should == '/tmp/file'
     end
 
-    it "should cleanup the local artifact" do
+    it "should cleanup the local archive" do
       @builder.local_build = '/tmp/file'
       @logger_mock.should_receive(:info).with("Cleaning up local build /tmp/file.")
       File.should_receive(:delete).with('/tmp/file')

data/spec/{artifact/artifact_destroyer_spec.rb → heirloom/destroyer_spec.rb}

@@ -6,21 +6,21 @@ describe Heirloom do
       @config_mock = double 'config'
       @logger_mock = double 'logger'
       @config_mock.should_receive(:logger).and_return(@logger_mock)
-      @destroyer = Heirloom::ArtifactDestroyer.new :config => @config_mock,
+      @destroyer = Heirloom::Destroyer.new :config => @config_mock,
                                                    :name   => 'tim',
                                                    :id     => '123'
     end
 
-    it "should destroy the given artifact" do
+    it "should destroy the given archive" do
       @logger_mock.should_receive(:info).
                    with "Destroying tim - 123"
       @config_mock.should_receive(:regions).and_return ['us-west-1']
-      artifact_reader_mock = mock 'artifact reader'
-      @destroyer.should_receive(:artifact_reader).and_return artifact_reader_mock
+      reader_mock = mock 'archive reader'
+      @destroyer.should_receive(:reader).and_return reader_mock
       bucket_mock = mock 'bucket'
-      artifact_reader_mock.should_receive(:get_bucket).
-                           with(:region => 'us-west-1').
-                           and_return 'bucket-us-west-1'
+      reader_mock.should_receive(:get_bucket).
+                  with(:region => 'us-west-1').
+                  and_return 'bucket-us-west-1'
 
       @logger_mock.should_receive(:info).
                    with "Destroying 's3://bucket-us-west-1/tim/123.tar.gz'."

data/spec/{artifact/artifact_downloader_spec.rb → heirloom/downloader_spec.rb}

@@ -6,26 +6,26 @@ describe Heirloom do
       @config_mock = double 'config'
       @logger_mock = double 'logger'
       @config_mock.should_receive(:logger).and_return(@logger_mock)
-      @downloader = Heirloom::ArtifactDownloader.new :config => @config_mock,
+      @downloader = Heirloom::Downloader.new :config => @config_mock,
                                                      :name   => 'tim',
                                                      :id     => '123'
     end
 
-    it "should download an artifact" do
+    it "should download an archive" do
       s3_downloader_mock = mock 's3 downloader'
       Heirloom::Downloader::S3.should_receive(:new).
                                with(:config => @config_mock,
                                     :logger => @logger_mock,
                                     :region => 'us-west-1').
                                and_return s3_downloader_mock
-      artifact_reader_mock = mock 'artifact_reader'
-      @downloader.should_receive(:artifact_reader).
+      reader_mock = mock 'reader'
+      @downloader.should_receive(:reader).
                   exactly(2).times.
-                  and_return artifact_reader_mock
-      artifact_reader_mock.should_receive(:get_bucket).
+                  and_return reader_mock
+      reader_mock.should_receive(:get_bucket).
                            with(:region => 'us-west-1').
                            and_return 'bucket-us-west-1'
-      artifact_reader_mock.should_receive(:get_key).
+      reader_mock.should_receive(:get_key).
                            with(:region => 'us-west-1').
                            and_return 'key'
 
@@ -51,23 +51,23 @@ describe Heirloom do
                            :region => 'us-west-1')
     end
 
-    it "should download the artifact to the current path if output is unspecficief" do
+    it "should download the archive to the current path if output is unspecficief" do
       s3_downloader_mock = mock 's3 downloader'
       Heirloom::Downloader::S3.should_receive(:new).
                                with(:config => @config_mock,
                                     :logger => @logger_mock,
                                     :region => 'us-west-1').
                                and_return s3_downloader_mock
-      artifact_reader_mock = mock 'artifact_reader'
-      @downloader.should_receive(:artifact_reader).
+      reader_mock = mock 'reader'
+      @downloader.should_receive(:reader).
                   exactly(2).times.
-                  and_return artifact_reader_mock
-      artifact_reader_mock.should_receive(:get_bucket).
-                           with(:region => 'us-west-1').
-                           and_return 'bucket-us-west-1'
-      artifact_reader_mock.should_receive(:get_key).
-                           with(:region => 'us-west-1').
-                           and_return 'key'
+                  and_return reader_mock
+      reader_mock.should_receive(:get_bucket).
+                  with(:region => 'us-west-1').
+                  and_return 'bucket-us-west-1'
+      reader_mock.should_receive(:get_key).
+                  with(:region => 'us-west-1').
+                  and_return 'key'
 
       @logger_mock.should_receive(:info).
                    with "Downloading s3://bucket-us-west-1/key from us-west-1."

data/spec/{artifact/artifact_lister_spec.rb → heirloom/lister_spec.rb}

@@ -4,11 +4,11 @@ describe Heirloom do
 
   before do
     @config_mock = double 'config'
-    @lister = Heirloom::ArtifactLister.new :config => @config_mock,
-                                           :name     => 'test123'
+    @lister = Heirloom::Lister.new :config => @config_mock,
+                                   :name     => 'test123'
   end
 
-  it "should list the known artifacts" do
+  it "should list the known archive" do
     sdb_mock = mock 'sdb'
     @lister.should_receive(:sdb).and_return sdb_mock
     sdb_mock.should_receive(:select).

data/spec/heirloom/reader_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Heirloom do
+
+  before do
+    @sdb_mock = mock 'sdb'
+    @config_mock = double 'config'
+    @logger_mock = double 'logger'
+    @config_mock.should_receive(:logger).and_return @logger_mock
+    Heirloom::AWS::SimpleDB.should_receive(:new).and_return @sdb_mock
+    @reader = Heirloom::Reader.new :config => @config_mock,
+                                   :name   => 'tim',
+                                   :id     => '123'
+  end
+
+  it "should show the item record" do
+    @sdb_mock.should_receive(:select).
+             with("select * from tim where itemName() = '123'").
+             and_return( { '123' => { 'value' => 'details' } } )
+    @reader.show.should == { 'value' => 'details' }
+  end
+
+  it "should return an empty hash if item does not exist" do
+    @sdb_mock.should_receive(:select).
+              with("select * from tim where itemName() = '123'").
+              and_return({})
+    @reader.show.should == {}
+  end
+
+  it "should return true if the record exists" do
+    @sdb_mock.should_receive(:select).
+              with("select * from tim where itemName() = '123'").
+              and_return( { '123' => { 'value' => 'details' } } )
+    @logger_mock.should_receive(:debug).exactly(1).times
+    @reader.exists?.should == true
+  end
+
+  it "should return false if the recrod does not exist" do
+    @sdb_mock.should_receive(:select).
+              with("select * from tim where itemName() = '123'").
+              and_return({})
+    @logger_mock.should_receive(:debug).exactly(1).times
+    @reader.exists?.should == false
+  end
+
+  it "should return the bucket if it exists" do
+    @logger_mock.should_receive(:debug).exactly(5).times
+    @sdb_mock.should_receive(:select).
+              exactly(3).times.
+              with("select * from tim where itemName() = '123'").
+              and_return( { '123' => 
+                            { 'us-west-1-s3-url' => 
+                              ['s3://the-url/the-buck/the-key'] 
+                            }
+                          } )
+    @reader.get_bucket(:region => 'us-west-1').should == 'the-url'
+  end
+
+  it "should return nil if the bucket does not exist" do
+    @logger_mock.should_receive(:debug).exactly(3).times
+    @sdb_mock.should_receive(:select).
+              exactly(1).times.
+              with("select * from tim where itemName() = '123'").
+              and_return( { } )
+    @reader.get_bucket(:region => 'us-west-1').should == nil
+  end
+
+  it "should return the key if it exists" do
+    @logger_mock.should_receive(:debug).exactly(8).times
+    @sdb_mock.should_receive(:select).
+              exactly(6).times.
+              with("select * from tim where itemName() = '123'").
+              and_return( { '123' => 
+                            { 'us-west-1-s3-url' => 
+                              ['s3://the-url/the-bucket/the-key'] 
+                            }
+                          } )
+    @reader.get_key(:region => 'us-west-1').should == 'the-bucket/the-key'
+  end
+
+  it "should return nil if the key does not exist" do
+    @logger_mock.should_receive(:debug).exactly(1).times
+    @sdb_mock.should_receive(:select).
+              exactly(1).times.
+              with("select * from tim where itemName() = '123'").
+              and_return( { } )
+    @reader.get_key(:region => 'us-west-1').should == nil
+  end
+
+end