heirloom 0.1.3 → 0.1.4

data/CHANGELOG

@@ -0,0 +1,6 @@
+## v0.1.4:
+
+* Limit list of artifact ids returned in list
+* Sort ids by date added
+* Show latest id as default
+* Setting deafult download path to local dir

data/README.md

@@ -3,7 +3,6 @@ Heirloom
 
 I help building and deploying artifcts to cloud based storage services and tracking meta data about those artifacts for easy deployments.  
 
-
 How To Use Heirloom
 -------------------
 

data/lib/heirloom/acl/s3.rb

@@ -2,14 +2,16 @@ module Heirloom
   module ACL
     class S3
 
+      attr_accessor :accounts, :config, :logger, :region
+
       def initialize(args)
-        @config = args[:config]
-        @region = args[:region]
-        @logger = args[:logger]
-        @accounts = @config.authorized_aws_accounts
+        self.config = args[:config]
+        self.region = args[:region]
+        self.logger = config.logger
+        self.accounts = config.authorized_aws_accounts
       end
 
-      def allow_read_acccess_from_accounts(args)
+      def allow_read_access_from_accounts(args)
         bucket = args[:bucket]
         key_name = args[:key_name]
         key_folder = args[:key_folder]
@@ -23,10 +25,10 @@ module Heirloom
 
         grants = build_bucket_grants :id => id,
                                      :name => name,
-                                     :accounts => @accounts
+                                     :accounts => accounts
 
-        @accounts.each do |a|
-          @logger.info "Authorizing #{a} to s3://#{bucket}/#{key}"
+        accounts.each do |a|
+          logger.info "Authorizing #{a} to s3://#{bucket}/#{key}."
         end
         s3.put_object_acl bucket, key, grants
       end

data/lib/heirloom/artifact.rb

@@ -12,98 +12,99 @@ module Heirloom
   class Artifact
 
     def initialize(args)
-      @config = Config.new :config => args[:config]
-      @logger = HeirloomLogger.new :logger => args[:logger]
+      @config = Config.new :config => args[:config],
+                           :logger => args[:logger]
+      @name = args[:name]
+      @id = args[:id]
+    end
+
+    def authorize
+      artifact_authorizer.authorize
     end
 
     def build(args)
-      if artifact_reader.exists? args
-        @logger.info "Destroying existing artifact."
-        destroy(args)
-      end
-
-      file = artifact_builder.build args
-
-      artifact_uploader.upload :id              => args[:id],
-                               :name            => args[:name],
-                               :bucket_prefix   => args[:bucket_prefix],
-                               :public_readable => args[:public],
-                               :file            => file
-
-      artifact_authorizer.authorize :id               => args[:id],
-                                    :name             => args[:name],
-                                    :public_readable  => args[:public]
-      
-      artifact_builder.cleanup
+      artifact_builder.build args
+    end
 
-      @logger.info "Artifact build completed."
+    def download(args)
+      artifact_downloader.download args
     end
 
     def update(args)
-      artifact_updater.update(args)
-      @logger.info "Artifact update completed."
+      artifact_updater.update args
     end
 
-    def download(args)
-      artifact_downloader.download(args)
-      @logger.info "Artifact download completed."
+    def upload(args)
+      artifact_uploader.upload args
+    end
+
+    def exists?
+      artifact_reader.exists?
     end
 
-    def destroy(args)
-      artifact_destroyer.destroy(args)
-      @logger.info "Artifact destroyed."
+    def destroy
+      artifact_destroyer.destroy
     end
 
-    def show(args)
-      artifact_reader.show(args)
+    def show
+      artifact_reader.show
     end
 
-    def list(args)
-      artifact_lister.list(args)
+    def list(limit=10)
+      artifact_lister.list(limit)
     end
 
-    def names
-      artifact_lister.names
+    def cleanup
+      artifact_builder.cleanup
     end
 
     private
 
     def artifact_lister
-      @artifact_lister ||= ArtifactLister.new :config => @config
+      @artifact_lister ||= ArtifactLister.new :config => @config,
+                                              :name   => @name
     end
 
     def artifact_reader
-      @artifact_reader ||= ArtifactReader.new :config => @config
+      @artifact_reader ||= ArtifactReader.new :config => @config,
+                                              :name   => @name,
+                                              :id     => @id
     end
 
     def artifact_builder
       @artifact_builder ||= ArtifactBuilder.new :config => @config,
-                                                :logger => @logger
+                                                :name   => @name,
+                                                :id     => @id
     end
 
     def artifact_updater
       @artifact_updater ||= ArtifactUpdater.new :config => @config,
-                                                :logger => @logger
+                                                :name   => @name,
+                                                :id     => @id
     end
 
     def artifact_uploader
       @artifact_uploader ||= ArtifactUploader.new :config => @config,
-                                                  :logger => @logger
+                                                  :name   => @name,
+                                                  :id     => @id
     end
 
     def artifact_downloader
       @artifact_downloader ||= ArtifactDownloader.new :config => @config,
-                                                      :logger => @logger
+                                                      :name   => @name,
+                                                      :id     => @id
     end
 
     def artifact_authorizer
       @artifact_authorizer ||= ArtifactAuthorizer.new :config => @config,
-                                                      :logger => @logger
+                                                      :name   => @name,
+                                                      :id     => @id
     end
 
     def artifact_destroyer
       @artifact_destroyer ||= ArtifactDestroyer.new :config => @config,
-                                                    :logger => @logger
+                                                    :name   => @name,
+                                                    :id     => @id
     end
 
   end

data/lib/heirloom/artifact/artifact_authorizer.rb

@@ -4,36 +4,34 @@ module Heirloom
 
     def initialize(args)
       @config = args[:config]
-      @logger = args[:logger]
+      @name   = args[:name]
+      @id     = args[:id]
+      @logger = @config.logger
     end
 
-    def authorize(args)
-      id = args[:id]
-      name = args[:name]
-      public_readable = args[:public_readable]
-
-      unless public_readable
-        @logger.info "Authorizing access to artifact."
-
-        @config.regions.each do |region|
-          bucket = artifact_reader.get_bucket :region => region,
-                                              :name   => name,
-                                              :id     => id
-          s3_acl = ACL::S3.new :config => @config,
-                               :logger => @logger,
-                               :region => region
-
-          s3_acl.allow_read_acccess_from_accounts :key_name => id,
-                                                  :key_folder => name,
-                                                  :bucket => bucket
-        end
+    def authorize
+      @logger.info "Authorizing access to artifact."
+
+      @config.regions.each do |region|
+        bucket = artifact_reader.get_bucket :region => region
+
+        s3_acl = ACL::S3.new :config => @config,
+                             :region => region
+
+        s3_acl.allow_read_access_from_accounts :key_name => @id,
+                                               :key_folder => @name,
+                                               :bucket => bucket
       end
+
+      @logger.info "Authorization complete."
     end
 
     private
 
     def artifact_reader
-      @artifact_reader ||= ArtifactReader.new :config => @config
+      @artifact_reader ||= ArtifactReader.new :config => @config,
+                                              :name   => @name,
+                                              :id     => @id
     end
 
   end

data/lib/heirloom/artifact/artifact_builder.rb

@@ -5,73 +5,77 @@ module Heirloom
 
   class ArtifactBuilder
 
+    attr_accessor :config, :id, :local_build, :logger, :name, :source
+
     def initialize(args)
-      @config = args[:config]
-      @logger = args[:logger]
+      self.config = args[:config]
+      self.name = args[:name]
+      self.id = args[:id]
+      self.logger = config.logger
+      sdb.create_domain name
     end
 
     def build(args)
-      @name = args[:name]
-      @id = args[:id]
-      @exclude = args[:exclude]
+      self.source = args[:directory] ||= '.'
 
-      directory = args[:directory] ||= '.'
+      directory = Directory.new :path      => source,
+                                :exclude   => args[:exclude],
+                                :config    => config
 
-      @directory = Directory.new :directory => directory,
-                                 :exclude   => @exclude,
-                                 :logger    => @logger
+      directory.build_artifact_from_directory
 
-      @local_build = @directory.build_artifact_from_directory
+      self.local_build = directory.local_build
 
       create_artifact_record
 
-      if args[:git]
-        git_directory = GitDirectory.new :directory => directory,
-                                         :logger    => @logger
-        @logger.info "Adding git commit to attributes."
-        @commit = git_directory.commit @id
-        add_git_commit_to_artifact_record
-      end
+      add_git_commit if args[:git]
+
+      logger.info "Build complete."
 
-      @local_build
+      local_build
     end
 
     def cleanup
-      @logger.info "Cleaning up local build #{@local_build}."
-      File.delete @local_build
+      logger.info "Cleaning up local build #{local_build}."
+      File.delete local_build
     end
 
     private
 
+    def add_git_commit
+      git_commit = GitDirectory.new(:path => source).commit
+      add_git_commit_to_artifact_record git_commit
+    end
+
     def create_artifact_domain
-      @logger.info "Verifying artifact domain #{@name} exists."
-      sdb.create_domain @name
+      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 }
-      @logger.info "Create artifact record #{@id}"
-      sdb.put_attributes @name, @id, attributes
+                     'id'              => id }
+      logger.info "Create artifact record #{id}."
+      sdb.put_attributes name, id, attributes
     end
 
-    def add_git_commit_to_artifact_record
-      attributes = { 'sha'             => @id,
-                     'abbreviated_sha' => @commit.id_abbrev,
-                     'message'         => @commit.message,
-                     'author'          => @commit.author.name }
-      @logger.info "Git sha: #{@id}"
-      @logger.info "Git abbreviated_sha: #{@commit.id_abbrev}"
-      @logger.info "Git message: #{@commit.message}"
-      @logger.info "Git author: #{@commit.author.name}"
-
-      sdb.put_attributes @name, @id, attributes
+    def add_git_commit_to_artifact_record(commit)
+      attributes = { 'sha'             => id,
+                     'abbreviated_sha' => commit.id_abbrev,
+                     'message'         => commit.message,
+                     'author'          => commit.author.name }
+
+      logger.info "Git sha: #{id}"
+      logger.info "Git abbreviated_sha: #{commit.id_abbrev}"
+      logger.info "Git message: #{commit.message}"
+      logger.info "Git author: #{commit.author.name}"
+
+      sdb.put_attributes name, id, attributes
     end
 
     def sdb
-      @sdb ||= AWS::SimpleDB.new :config => @config
+      @sdb ||= AWS::SimpleDB.new :config => config
     end
 
     def user

data/lib/heirloom/artifact/artifact_destroyer.rb

@@ -2,27 +2,26 @@ module Heirloom
 
   class ArtifactDestroyer
 
+    attr_accessor :config, :id, :logger, :name
+
     def initialize(args)
-      @config = args[:config]
-      @logger = args[:logger]
+      self.config = args[:config]
+      self.name = args[:name]
+      self.id = args[:id]
+      self.logger = config.logger
     end
 
-    def destroy(args)
-      id = args[:id]
-      name = args[:name]
+    def destroy
+      logger.info "Destroying #{@name} - #{@id}"
 
-      @logger.info "Destroying #{args[:name]} - #{args[:id]}"
+      config.regions.each do |region|
+        bucket = artifact_reader.get_bucket :region => region
 
-      @config.regions.each do |region|
-        puts "#{region}, #{name}, #{id}"
-        bucket = artifact_reader.get_bucket :region => region,
-                                            :name   => name,
-                                            :id     => id
         key = "#{id}.tar.gz"
 
-        @logger.info "Deleting s3://#{bucket}/#{name}/#{key}"
+        logger.info "Destroying 's3://#{bucket}/#{name}/#{key}'."
 
-        s3_destroyer = Destroyer::S3.new :config => @config,
+        s3_destroyer = Destroyer::S3.new :config => config,
                                          :region => region
 
         s3_destroyer.destroy_file :key_name => key,
@@ -31,6 +30,7 @@ module Heirloom
 
       end
       sdb.delete name, id
+      logger.info "Destroy complete."
     end
 
     private
@@ -40,7 +40,9 @@ module Heirloom
     end
 
     def artifact_reader
-      @artifact_reader ||= ArtifactReader.new :config => @config
+      @artifact_reader ||= ArtifactReader.new :config => config,
+                                              :name   => name,
+                                              :id     => id
     end
 
   end

data/lib/heirloom/artifact/artifact_downloader.rb

@@ -2,65 +2,47 @@ module Heirloom
 
   class ArtifactDownloader
 
+    attr_accessor :config, :id, :name, :logger
+
     def initialize(args)
-      @config = args[:config]
-      @logger = args[:logger]
+      self.config = args[:config]
+      self.name = args[:name]
+      self.id = args[:id]
+      self.logger = config.logger
     end
 
     def download(args)
-      @id = args[:id]
-      @name = args[:name]
-      @output = args[:output]
-      @region = args[:region]
-
-      s3_downloader = Downloader::S3.new :config => @config,
-                                         :logger => @logger,
-                                         :region => @region
+      region = args[:region]
 
-      bucket = artifact_reader.get_bucket :region => @region,
-                                          :name   => @name,
-                                          :id     => @id
+      s3_downloader = Downloader::S3.new :config => config,
+                                         :logger => logger,
+                                         :region => region
 
-      key = artifact_reader.get_key :region => @region,
-                                    :name   => @name,
-                                    :id     => @id
+      bucket = artifact_reader.get_bucket :region => region
+      key = artifact_reader.get_key :region => region
 
-      @logger.info "Downloading s3://#{bucket}/#{key} from #{@region}."
+      logger.info "Downloading s3://#{bucket}/#{key} from #{region}."
 
       file = s3_downloader.download_file :bucket => bucket,
                                          :key    => key
 
-      @logger.info "Writing file to #{@output}."
+      output = args[:output] ||= "./#{key.split('/').last}"
+
+      logger.info "Writing file to #{output}."
 
-      File.open(@output, 'w') do |local_file|
+      File.open(output, 'w') do |local_file|
         local_file.write file
       end
-    end
-
-    private
 
-    def get_bucket
-      artifact = artifact_reader.show :name => @name,
-                                      :id   => @id
-
-      url = artifact["#{@region}-s3-url"].first
-
-      bucket = url.gsub('s3://', '').split('/').first
+      logger.info "Download complete."
     end
 
-    def get_key
-      artifact = artifact_reader.show :name => @name,
-                                      :id   => @id
-
-      url = artifact["#{@region}-s3-url"].first
-
-      bucket = url.gsub('s3://', '').gsub(get_bucket, '')
-      bucket.slice!(0)
-      bucket
-    end
+    private
 
     def artifact_reader
-      @artifact_reader ||= ArtifactReader.new :config => @config
+      @artifact_reader ||= ArtifactReader.new :config => config,
+                                              :name   => name,
+                                              :id     => id
     end
 
   end