builder.rb in heirloom-0.4.0

- old
+ new
@@ -3,80 +3,80 @@
 
 module Heirloom
 
   class Builder
 
-    attr_accessor :config, :id, :local_build, :logger, :name, :source
+    attr_writer :local_build
 
     def initialize(args)
-      self.config = args[:config]
-      self.name = args[:name]
-      self.id = args[:id]
-      self.logger = config.logger
-      sdb.create_domain name
+      @config = args[:config]
+      @name = args[:name]
+      @domain = "heirloom_#{@name}"
+      @id = args[:id]
+      @logger = @config.logger
+      sdb.create_domain @domain
     end
 
     def build(args)
-      self.source = args[:directory] ||= '.'
+      @source = args[:directory] ||= '.'
 
-      directory = Directory.new :path      => source,
+      directory = Directory.new :path      => @source,
                                 :exclude   => args[:exclude],
-                                :config    => config
+                                :config    => @config
 
       return false unless directory.build_artifact_from_directory
 
-      self.local_build = directory.local_build
+      @local_build = directory.local_build
 
       create_artifact_record
 
       add_git_commit if args[:git]
 
-      logger.info "Build complete."
+      @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 = GitDirectory.new(:path => source)
-      commit = git.commit id
+      git = GitDirectory.new(:path => @source)
+      commit = git.commit @id
       if commit
         add_git_commit_to_artifact_record commit
       else
-        logger.warn "Could not find Git sha: #{id}."
+        @logger.warn "Could not find Git sha: #{@id}."
       end
     end
 
     def add_git_commit_to_artifact_record(commit)
-      attributes = { 'sha'             => id,
+      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}"
+      attributes.each_pair do |k, v|
+        @logger.info "Git #{k}: #{v}"
+      end
 
-      sdb.put_attributes name, id, attributes
+      sdb.put_attributes @domain, @id, attributes
     end
 
     def create_artifact_record
-      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
+      attributes = { 'built_by' => "#{user}@#{hostname}",
+                     'built_at' => Time.now.utc.iso8601,
+                     'id'       => @id }
+      @logger.info "Create artifact record #{@id}."
+      sdb.put_attributes @domain, @id, attributes
     end
 
     def sdb
-      @sdb ||= AWS::SimpleDB.new :config => config
+      @sdb ||= AWS::SimpleDB.new :config => @config
     end
 
     def user
       ENV['USER']
     end