heirloom 0.1.4 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.2.0:
+
+* Command line options updates for each sub command.
+* Command line option moved into seperate class.
+* Artifact renamed to archive across the gem.
+* Added bucket verification
+
 ## v0.1.4:
 
 * Limit list of artifact ids returned in list

data/README.md

@@ -1,7 +1,7 @@
 Heirloom
 ========
 
-I help building and deploying artifcts to cloud based storage services and tracking meta data about those artifacts for easy deployments.  
+I help building and deploying .tar.gz files to cloud based storage services and tracking meta data about those 'Heirlooms' for easy deployments.  
 
 How To Use Heirloom
 -------------------
@@ -12,7 +12,6 @@ To get started copy the sample below into .heirloom.yml and update the specified
 aws:
   access_key: UPDATE_ME
   secret_key: UPDATE_ME
-  bucket_prefix: UPDATE_ME
   regions:
     - us-west-1
     - us-west-2
@@ -22,10 +21,9 @@ aws:
     - UPDATE@ME
 ```
 
-* **access_key / secret_key**: Account where you would like the artifacts storaged.
-* **bucket prefix**: Heirloom expects a bucket with the prefix - region to be created in each zone, for example if the prefix is my-artifact, heirloom would expect my-artifact-us-west-1 to be created (as well as any addition regions listed).
-* **regions**: AWS regions where the artifcat should be uploaded
-* **authorized_aws_accounts**: Heirloom expects you to deploy to seperate accounts from where the artifact is stored.  authorized_aws_accounts specifices the **email** address of other accounts to be authorized to access private artifacts.
+* **access_key / secret_key**: Account where you would like the Heirlooms storaged.
+* **regions**: AWS regions where the Heirlooms should be uploaded
+* **authorized_aws_accounts**: Heirloom expects you to deploy to seperate accounts from where the Heirloom is stored.  authorized_aws_accounts specifices the **email** address of other accounts to be authorized to access private Heirlooms.
 
 Platforms
 ---------

data/heirloom.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Brett Weaver"]
   s.email       = ["brett@weav.net"]
   s.homepage    = ""
-  s.summary     = %q{I help with artifacts}
-  s.description = %q{I help build and manage artifacts}
+  s.summary     = %q{I help with deploying code into the cloud}
+  s.description = %q{I help build and manage building tar.gz files and deploying them into the cloud}
 
   s.rubyforge_project = "heirloom"
 

data/lib/heirloom.rb

@@ -2,7 +2,7 @@ require "heirloom/acl"
 require "heirloom/aws"
 require "heirloom/config"
 require "heirloom/logger"
-require "heirloom/artifact"
+require "heirloom/archive"
 require "heirloom/directory"
 require "heirloom/uploader"
 require "heirloom/downloader"

data/lib/heirloom/archive.rb

@@ -0,0 +1,121 @@
+require 'heirloom/archive/lister.rb'
+require 'heirloom/archive/reader.rb'
+require 'heirloom/archive/builder.rb'
+require 'heirloom/archive/updater.rb'
+require 'heirloom/archive/uploader.rb'
+require 'heirloom/archive/downloader.rb'
+require 'heirloom/archive/authorizer.rb'
+require 'heirloom/archive/destroyer.rb'
+require 'heirloom/archive/verifier.rb'
+
+module Heirloom
+
+  class Archive
+
+    def initialize(args)
+      @config = Config.new :config => args[:config],
+                           :logger => args[:logger]
+      @name = args[:name]
+      @id = args[:id]
+    end
+
+    def authorize
+      authorizer.authorize
+    end
+
+    def build(args)
+      builder.build args
+    end
+
+    def download(args)
+      downloader.download args
+    end
+
+    def update(args)
+      updater.update args
+    end
+
+    def upload(args)
+      uploader.upload args
+    end
+
+    def exists?
+      reader.exists?
+    end
+
+    def buckets_exist?(args)
+      verifier.buckets_exist? args
+    end
+
+    def destroy
+      destroyer.destroy
+    end
+
+    def show
+      reader.show
+    end
+
+    def list(limit=10)
+      lister.list(limit)
+    end
+
+    def cleanup
+      builder.cleanup
+    end
+
+    private
+
+    def lister
+      @lister ||= Lister.new :config => @config,
+                             :name   => @name
+    end
+
+    def reader
+      @reader ||= Reader.new :config => @config,
+                             :name   => @name,
+                             :id     => @id
+    end
+
+    def builder
+      @builder ||= Builder.new :config => @config,
+                               :name   => @name,
+                               :id     => @id
+    end
+
+    def updater
+      @updater ||= Updater.new :config => @config,
+                               :name   => @name,
+                               :id     => @id
+    end
+
+    def uploader
+      @uploader ||= Uploader.new :config => @config,
+                                 :name   => @name,
+                                 :id     => @id
+    end
+
+    def downloader
+      @downloader ||= Downloader.new :config => @config,
+                                     :name   => @name,
+                                     :id     => @id
+    end
+
+    def authorizer
+      @authorizer ||= Authorizer.new :config => @config,
+                                     :name   => @name,
+                                     :id     => @id
+    end
+
+    def destroyer
+      @destroyer ||= Destroyer.new :config => @config,
+                                   :name   => @name,
+                                   :id     => @id
+    end
+
+    def verifier
+      @verifier ||= Verifier.new :config => @config,
+                                 :name   => @name
+    end
+
+  end
+end

data/lib/heirloom/{artifact/artifact_authorizer.rb → archive/authorizer.rb}

@@ -1,6 +1,6 @@
 module Heirloom
 
-  class ArtifactAuthorizer
+  class Authorizer
 
     def initialize(args)
       @config = args[:config]
@@ -13,7 +13,7 @@ module Heirloom
       @logger.info "Authorizing access to artifact."
 
       @config.regions.each do |region|
-        bucket = artifact_reader.get_bucket :region => region
+        bucket = reader.get_bucket :region => region
 
         s3_acl = ACL::S3.new :config => @config,
                              :region => region
@@ -28,10 +28,10 @@ module Heirloom
 
     private
 
-    def artifact_reader
-      @artifact_reader ||= ArtifactReader.new :config => @config,
-                                              :name   => @name,
-                                              :id     => @id
+    def reader
+      @reader ||= Reader.new :config => @config,
+                             :name   => @name,
+                             :id     => @id
     end
 
   end

data/lib/heirloom/{artifact/artifact_builder.rb → archive/builder.rb}

@@ -3,7 +3,7 @@ require 'time'
 
 module Heirloom
 
-  class ArtifactBuilder
+  class Builder
 
     attr_accessor :config, :id, :local_build, :logger, :name, :source
 
@@ -47,12 +47,7 @@ module Heirloom
       add_git_commit_to_artifact_record git_commit
     end
 
-    def create_artifact_domain
-      logger.info "Verifying artifact domain #{name} exists."
-    end
-
     def create_artifact_record
-      create_artifact_domain
       attributes = { 'built_by'        => "#{user}@#{hostname}",
                      'built_at'        => Time.now.utc.iso8601,
                      'id'              => id }

data/lib/heirloom/archive/destroyer.rb

@@ -0,0 +1,50 @@
+module Heirloom
+
+  class Destroyer
+
+    attr_accessor :config, :id, :logger, :name
+
+    def initialize(args)
+      self.config = args[:config]
+      self.name = args[:name]
+      self.id = args[:id]
+      self.logger = config.logger
+    end
+
+    def destroy
+      logger.info "Destroying #{@name} - #{@id}"
+
+      config.regions.each do |region|
+        bucket = reader.get_bucket :region => region
+
+        key = "#{id}.tar.gz"
+
+        if bucket
+          logger.info "Destroying 's3://#{bucket}/#{name}/#{key}'."
+
+          s3_destroyer = Destroyer::S3.new :config => config,
+                                           :region => region
+
+          s3_destroyer.destroy_file :key_name => key,
+                                    :key_folder => name,
+                                    :bucket => bucket
+        end
+      end
+      sdb.delete name, id
+      logger.info "Destroy complete."
+    end
+
+    private
+
+    def sdb
+      @sdb ||= AWS::SimpleDB.new :config => @config
+    end
+
+    def reader
+      @reader ||= Reader.new :config => config,
+                             :name   => name,
+                             :id     => id
+    end
+
+  end
+end

data/lib/heirloom/{artifact/artifact_downloader.rb → archive/downloader.rb}

@@ -1,6 +1,6 @@
 module Heirloom
 
-  class ArtifactDownloader
+  class Downloader
 
     attr_accessor :config, :id, :name, :logger
 
@@ -18,8 +18,8 @@ module Heirloom
                                          :logger => logger,
                                          :region => region
 
-      bucket = artifact_reader.get_bucket :region => region
-      key = artifact_reader.get_key :region => region
+      bucket = reader.get_bucket :region => region
+      key = reader.get_key :region => region
 
       logger.info "Downloading s3://#{bucket}/#{key} from #{region}."
 
@@ -39,10 +39,10 @@ module Heirloom
 
     private
 
-    def artifact_reader
-      @artifact_reader ||= ArtifactReader.new :config => config,
-                                              :name   => name,
-                                              :id     => id
+    def reader
+      @reader ||= Reader.new :config => config,
+                             :name   => name,
+                             :id     => id
     end
 
   end

data/lib/heirloom/{artifact/artifact_lister.rb → archive/lister.rb}

@@ -1,6 +1,6 @@
 module Heirloom
 
-  class ArtifactLister
+  class Lister
 
     def initialize(args)
       @config = args[:config]
@@ -18,11 +18,5 @@ module Heirloom
       @sdb ||= AWS::SimpleDB.new :config => @config
     end
 
-    def artifact_reader(id)
-      @artifact_reader ||= ArtifactReader.new :config => @config,
-                                              :name   => @name,
-                                              :id     => id
-    end
-
   end
 end

data/lib/heirloom/archive/reader.rb

@@ -0,0 +1,74 @@
+module Heirloom
+
+  class Reader
+
+    attr_accessor :config, :id, :name
+
+    def initialize(args)
+      self.config = args[:config]
+      self.name = args[:name]
+      self.id = args[:id]
+      @logger = config.logger
+    end
+
+    def exists?
+      if show.any?
+        @logger.debug "Found entry for #{id} in SimpleDB."
+        true
+      else
+        @logger.debug "Entry for #{id} not found in SimpleDB."
+        false
+      end
+    end
+
+    def get_bucket(args)
+      @logger.debug "Looking for bucket in #{args[:region]} for #{id}"
+      url = get_url(args)
+      if url
+        bucket = url.gsub('s3://', '').split('/').first
+        @logger.debug "Found bucket #{bucket}."
+        bucket
+      else
+        @logger.debug "Bucket not found."
+        nil
+      end
+    end
+
+    def get_key(args)
+      url = get_url(args)
+      if url
+        bucket_path = get_bucket :region => args[:region]
+        bucket = url.gsub('s3://', '').gsub(bucket_path, '')
+        bucket.slice!(0)
+        bucket
+      else
+        nil
+      end
+    end
+
+    def show
+      items = sdb.select "select * from #{name} where itemName() = '#{id}'"
+      items[id] ? items[id] : {}
+    end
+
+    private
+
+    def get_url(args)
+      return nil unless exists?
+      @logger.debug "Looking for #{args[:region]} endpoint for #{id}"
+      url = "#{args[:region]}-s3-url"
+      if show[url]
+        @logger.debug "Found #{url} for #{id}."
+        show[url].first
+      else
+        @logger.debug "#{args[:region]} endpoint for #{id} not found."
+        nil
+      end
+    end
+
+    def sdb
+      @sdb ||= AWS::SimpleDB.new :config => @config
+    end
+
+  end
+end

data/lib/heirloom/{artifact/artifact_updater.rb → archive/updater.rb}

@@ -1,6 +1,6 @@
 module Heirloom
 
-  class ArtifactUpdater
+  class Updater
 
     def initialize(args)
       @config = args[:config]
@@ -12,10 +12,10 @@ module Heirloom
 
     def update(args)
       attribute = args[:attribute]
-      update = args[:update]
+      value = args[:value]
 
-      sdb.put_attributes @name, @id, { attribute => update }, { :replace => attribute }
-      @logger.info "Updated #{@name} (#{@id}): #{attribute} = #{update}."
+      sdb.put_attributes @name, @id, { attribute => value }, { :replace => attribute }
+      @logger.info "Updated #{@name} (#{@id}): #{attribute} = #{value}."
     end
 
     private

data/lib/heirloom/{artifact/artifact_uploader.rb → archive/uploader.rb}

@@ -1,6 +1,6 @@
 module Heirloom
 
-  class ArtifactUploader
+  class Uploader
 
     def initialize(args)
       @config = args[:config]
@@ -10,8 +10,7 @@ module Heirloom
     end
 
     def upload(args)
-      file = args[:file]
-      key_name = "#{@id}.tar.gz"
+      heirloom_file = args[:file]
       bucket_prefix = args[:bucket_prefix]
       public_readable = args[:public_readable]
 
@@ -23,12 +22,16 @@ module Heirloom
                                        :region => region
 
         s3_uploader.upload_file :bucket          => bucket,
-                                :file            => file,
+                                :file            => heirloom_file,
                                 :id              => @id,
                                 :key_folder      => @name,
-                                :key_name        => key_name,
+                                :key_name        => "#{@id}.tar.gz",
                                 :name            => @name,
                                 :public_readable => public_readable
+
+        s3_uploader.add_endpoint_attributes :bucket     => bucket,
+                                            :id         => @id,
+                                            :name       => @name
       end
       @logger.info "Upload complete."
     end