heirloom 0.1.3 → 0.1.4

data/lib/heirloom/artifact/artifact_lister.rb

@@ -4,15 +4,12 @@ module Heirloom
 
     def initialize(args)
       @config = args[:config]
+      @name = args[:name]
     end
 
-    def list(args)
-      domain = args[:name]
-      sdb.select("select * from #{domain}").keys.reverse
-    end
-
-    def names
-      sdb.domains
+    def list(limit=10)
+      sdb.select("select * from #{@name} where built_at > '2000-01-01T00:00:00.000Z'\
+                  order by built_at desc limit #{limit}").keys
     end
 
     private
@@ -21,5 +18,11 @@ 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/artifact/artifact_reader.rb

@@ -2,41 +2,38 @@ module Heirloom
 
   class ArtifactReader
 
+    attr_accessor :config, :id, :name
+
     def initialize(args)
-      @config = args[:config]
+      self.config = args[:config]
+      self.name = args[:name]
+      self.id = args[:id]
     end
 
-    def show(args)
-      domain = args[:name]
-      id = args[:id]
-      items = sdb.select "select * from #{domain} where itemName() = '#{id}'"
-      items[id]
+    def show
+      items = sdb.select "select * from #{name} where itemName() = '#{id}'"
+      items[@id]
     end
 
-    def exists?(args)
-      show(args) != nil
+    def exists?
+      show != nil
     end
 
     def get_bucket(args)
-      artifact = show :name => args[:name],
-                      :id   => args[:id]
-
-      url = artifact["#{args[:region]}-s3-url"].first
-
-      bucket = url.gsub('s3://', '').split('/').first
+      get_url(args).gsub('s3://', '').split('/').first
     end
 
     def get_key(args)
-      artifact = show :name => args[:name],
-                      :id   => args[:id]
-
-      url = artifact["#{args[:region]}-s3-url"].first
-
-      bucket = url.gsub('s3://', '').gsub(get_bucket(args), '')
+      bucket_path = get_bucket :region => args[:region]
+      bucket = get_url(args).gsub('s3://', '').gsub(bucket_path, '')
       bucket.slice!(0)
       bucket
     end
 
+    def get_url(args)
+      show["#{args[:region]}-s3-url"].first
+    end
+
     private
 
     def sdb

data/lib/heirloom/artifact/artifact_updater.rb

@@ -4,17 +4,18 @@ module Heirloom
 
     def initialize(args)
       @config = args[:config]
-      @logger = args[:logger]
+      @name = args[:name]
+      @id = args[:id]
+
+      @logger = @config.logger
     end
 
     def update(args)
       attribute = args[:attribute]
-      id = args[:id]
-      name = args[:name]
       update = args[:update]
 
-      sdb.put_attributes name, id, { attribute => update }, { :replace => attribute }
-      @logger.info "Updated #{name} (#{id}): #{attribute} = #{update}"
+      sdb.put_attributes @name, @id, { attribute => update }, { :replace => attribute }
+      @logger.info "Updated #{@name} (#{@id}): #{attribute} = #{update}."
     end
 
     private

data/lib/heirloom/artifact/artifact_uploader.rb

@@ -4,15 +4,14 @@ module Heirloom
 
     def initialize(args)
       @config = args[:config]
-      @logger = args[:logger]
+      @name = args[:name]
+      @id = args[:id]
+      @logger = @config.logger
     end
 
     def upload(args)
-      id = args[:id]
       file = args[:file]
-      key_folder = args[:name]
-      key_name = "#{id}.tar.gz"
-      name = args[:name]
+      key_name = "#{@id}.tar.gz"
       bucket_prefix = args[:bucket_prefix]
       public_readable = args[:public_readable]
 
@@ -25,12 +24,13 @@ module Heirloom
 
         s3_uploader.upload_file :bucket          => bucket,
                                 :file            => file,
-                                :id              => id,
-                                :key_folder      => key_folder,
+                                :id              => @id,
+                                :key_folder      => @name,
                                 :key_name        => key_name,
-                                :name            => name,
+                                :name            => @name,
                                 :public_readable => public_readable
       end
+      @logger.info "Upload complete."
     end
 
   end

data/lib/heirloom/aws/s3.rb

@@ -15,7 +15,7 @@ module Heirloom
       end
 
       def delete_object(bucket_name, object_name, options = {})
-        @s3.delete_object(bucket_name, object_name, options = {})
+        @s3.delete_object(bucket_name, object_name, options)
       end
 
       def get_bucket(bucket)

data/lib/heirloom/cli.rb

@@ -1,16 +1,23 @@
 require 'trollop'
 
+require 'heirloom/cli/build'
+require 'heirloom/cli/list'
+require 'heirloom/cli/show'
+require 'heirloom/cli/update'
+require 'heirloom/cli/download'
+require 'heirloom/cli/destroy'
+
 module Heirloom
   module CLI
     def self.start
       @opts = Trollop::options do
+        version Heirloom::VERSION
         banner <<-EOS
 
 I build and manage artifacts
 
 Usage:
 
-heirloom names
 heirloom list -n NAME
 heirloom show -n NAME -i ID
 heirloom build -n NAME -i ID -b BUCKET_PREFIX [-d DIRECTORY] [-p] [-g]
@@ -28,6 +35,8 @@ EOS
                                                                                  :default => '.git'
         opt :git, "Read git commit information from directory."
         opt :id, "Id of artifact.", :type => :string
+        opt :limit, "Limit the results returned by list.", :type    => :integer,
+                                                           :default => 10
         opt :name, "Name of artifact.", :type => :string
         opt :output, "Output download to file.", :type => :string
         opt :public, "Set this artifact as public readable?"
@@ -37,43 +46,41 @@ EOS
       end
 
       cmd = ARGV.shift
-      a = Artifact.new :config => nil
 
       case cmd
-      when 'names'
-        puts a.names
       when 'list'
-        unless @opts[:name]
-          puts "Please specify an artifact name."
-          puts a.names
-          exit 1
-        end
-        puts a.list :name => @opts[:name]
+        cli_list = CLI::List.new :name => @opts[:name]
+        cli_list.list @opts[:limit]
       when 'show'
-        puts a.show(:name => @opts[:name],
-                    :id   => @opts[:id]).to_yaml
+        cli_show = CLI::Show.new :name   => @opts[:name],
+                                 :id     => @opts[:id]
+        cli_show.show
       when 'build'
-        a.build :name           => @opts[:name],
-                :id             => @opts[:id],
-                :accounts       => @opts[:accounts],
-                :bucket_prefix  => @opts[:bucket_prefix],
-                :directory      => @opts[:directory],
-                :exclude        => @opts[:exclude].split(','),
-                :public         => @opts[:public],
-                :git            => @opts[:git]
+        cli_build = CLI::Build.new :name          => @opts[:name],
+                                   :id            => @opts[:id],
+                                   :accounts      => @opts[:accounts],
+                                   :bucket_prefix => @opts[:bucket_prefix],
+                                   :directory     => @opts[:directory],
+                                   :exclude       => @opts[:exclude],
+                                   :public        => @opts[:public],
+                                   :git           => @opts[:git]
+        cli_build.build
       when 'update'
-        a.update :name      => @opts[:name],
-                 :id        => @opts[:id],
-                 :attribute => @opts[:attribute],
-                 :update    => @opts[:update]
+        cli_update = CLI::Update.new :name      => @opts[:name],
+                                     :id        => @opts[:id],
+                                     :attribute => @opts[:attribute],
+                                     :update    => @opts[:update]
+        cli_update.update
       when 'download'
-        a.download :name   => @opts[:name],
-                   :id     => @opts[:id],
-                   :output => @opts[:output],
-                   :region => @opts[:region]
+        cli_download = CLI::Download.new :name   => @opts[:name],
+                                         :id     => @opts[:id],
+                                         :output => @opts[:output],
+                                         :region => @opts[:region]
+        cli_download.download
       when 'destroy', 'delete'
-        a.destroy :name => @opts[:name],
-                  :id   => @opts[:id]
+        cli_destroy = CLI::Destroy.new :name   => @opts[:name],
+                                       :id     => @opts[:id]
+        cli_destroy.destroy
       else
         puts "Unkown command: '#{cmd}'."
       end

data/lib/heirloom/cli/build.rb

@@ -0,0 +1,40 @@
+module Heirloom
+  module CLI
+    class Build
+
+      def initialize(args)
+        @name = args[:name]
+        @id = args[:id]
+        @accounts = args[:accounts]
+        @bucket_prefix = args[:bucket_prefix]
+        @directory = args[:directory]
+        @exclude = args[:exclude].split(',')
+        @public = args[:public]
+        @git = args[:git]
+        @logger = args[:logger]
+        @artifact = Artifact.new :name   => @name,
+                                 :id     => @id,
+                                 :logger => @logger
+      end
+      
+      def build
+        @artifact.destroy if @artifact.exists?
+                          
+        file = @artifact.build :accounts       => @accounts,
+                               :bucket_prefix  => @bucket_prefix,
+                               :directory      => @directory,
+                               :exclude        => @exclude,
+                               :public         => @public,
+                               :git            => @git
+
+        @artifact.upload :bucket_prefix    => @bucket_prefix,
+                         :file             => file
+
+        @artifact.authorize unless @public
+
+        @artifact.cleanup
+      end
+
+    end
+  end
+end

data/lib/heirloom/cli/destroy.rb

@@ -0,0 +1,20 @@
+module Heirloom
+  module CLI
+    class Destroy
+
+      def initialize(args)
+        @name = args[:name]
+        @id = args[:id]
+        @logger = args[:logger]
+        @artifact = Artifact.new :name   => @name,
+                                 :id     => @id,
+                                 :logger => @logger
+      end
+      
+      def destroy
+        @artifact.destroy
+      end
+
+    end
+  end
+end

data/lib/heirloom/cli/download.rb

@@ -0,0 +1,23 @@
+module Heirloom
+  module CLI
+    class Download
+
+      def initialize(args)
+        @name = args[:name]
+        @id = args[:id]
+        @output = args[:output]
+        @region = args[:region]
+        @logger = args[:logger]
+        @artifact = Artifact.new :name      => @name,
+                                 :id        => @id,
+                                 :logger    => @logger
+      end
+      
+      def download
+        @artifact.download :output => @output,
+                           :region => @region
+      end
+
+    end
+  end
+end

data/lib/heirloom/cli/list.rb

@@ -0,0 +1,17 @@
+module Heirloom
+  module CLI
+    class List
+
+      def initialize(args)
+        @artifact = Artifact.new :name   => args[:name],
+                                 :logger => args[:logger]
+      end
+      
+      def list(limit)
+        @logger = Logger
+        puts @artifact.list(limit)
+      end
+
+    end
+  end
+end

data/lib/heirloom/cli/show.rb

@@ -0,0 +1,27 @@
+module Heirloom
+  module CLI
+    class Show
+
+      def initialize(args)
+        id = args[:id] ? args[:id] : latest_id(args)
+        @artifact = Artifact.new :name   => args[:name],
+                                 :id     => id,
+                                 :logger => args[:logger]
+      end
+      
+      def show
+        @logger = Logger
+        puts @artifact.show.to_yaml
+      end
+
+      private
+
+      def latest_id(args)
+        @artifact = Artifact.new :name   => args[:name],
+                                 :logger => args[:logger]
+        @artifact.list(1).first
+      end
+
+    end
+  end
+end

data/lib/heirloom/cli/update.rb

@@ -0,0 +1,23 @@
+module Heirloom
+  module CLI
+    class Update
+
+      def initialize(args)
+        @name = args[:name]
+        @id = args[:id]
+        @logger = args[:logger]
+        @attribute = args[:attribute]
+        @update = args[:update]
+        @artifact = Artifact.new :name      => @name,
+                                 :id        => @id,
+                                 :logger    => @logger
+      end
+      
+      def update
+        @artifact.update :attribute => @attribute,
+                         :update    => @update
+      end
+
+    end
+  end
+end

data/lib/heirloom/config.rb

@@ -2,7 +2,8 @@ module Heirloom
   class Config
 
     attr_accessor :access_key, :secret_key, :regions, 
-                  :primary_region, :bucket_prefix, :authorized_aws_accounts
+                  :primary_region, :bucket_prefix, :authorized_aws_accounts,
+                  :logger
 
     def initialize(args = {})
       @config = args[:config]
@@ -13,12 +14,16 @@ module Heirloom
       config_file = "#{ENV['HOME']}/.heirloom.yml"
       c = @config ? @config : YAML::load( File.open( config_file ) )
 
-      self.access_key = c['aws']['access_key']
-      self.secret_key = c['aws']['secret_key']
-      self.regions = c['aws']['regions']
+      self.logger = c['logger'] ||= HeirloomLogger.new
+
+      aws = c['aws']
+
+      self.access_key = aws['access_key']
+      self.secret_key = aws['secret_key']
+      self.regions = aws['regions']
+      self.bucket_prefix = aws['bucket_prefix']
+      self.authorized_aws_accounts = aws['authorized_aws_accounts']
       self.primary_region = regions ? regions.first : 'us-west-1'
-      self.bucket_prefix = c['aws']['bucket_prefix']
-      self.authorized_aws_accounts = c['aws']['authorized_aws_accounts']
     end
 
   end