heirloom 0.1.4 → 0.2.0

data/lib/heirloom/archive/verifier.rb

@@ -0,0 +1,34 @@
+module Heirloom
+
+  class Verifier
+
+    def initialize(args)
+      @config = args[:config]
+      @name = args[:name]
+      @logger = @config.logger
+    end
+
+    def buckets_exist?(args)
+      bucket_prefix = args[:bucket_prefix]
+      result = true
+
+      @config.regions.each do |region|
+        bucket = "#{bucket_prefix}-#{region}"
+        
+        s3 ||= AWS::S3.new :config => @config,
+                           :region => region
+
+        if s3.get_bucket bucket
+          @logger.debug "#{bucket} exists in #{region}"
+        else
+          @logger.debug "#{bucket} in #{region} does not exist"
+          result = false
+        end
+
+      end
+
+      result
+    end
+
+  end
+end

data/lib/heirloom/aws/simpledb.rb

@@ -15,8 +15,12 @@ module Heirloom
         @sdb.list_domains.body['Domains']
       end
 
+      def domain_exists?(domain)
+        domains.include? domain
+      end
+
       def create_domain(domain)
-        @sdb.create_domain(domain) unless domains.include? domain
+        @sdb.create_domain(domain) unless domain_exists?(domain)
       end
 
       def put_attributes(domain, key, attributes, options = {})

data/lib/heirloom/cli.rb

@@ -10,79 +10,25 @@ 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 list -n NAME
-heirloom show -n NAME -i ID
-heirloom build -n NAME -i ID -b BUCKET_PREFIX [-d DIRECTORY] [-p] [-g]
-heirloom download -n NAME -i ID -r REGION -o OUTPUT_FILE
-heirloom update -n NAME -i ID -a ATTRIBUTE -u UPDATE
-heirloom destroy -n NAME -i ID
-
-EOS
-        opt :help, "Display Help"
-        opt :attribute, "Attribute to update.", :type => :string
-        opt :bucket_prefix, "Bucket prefix which will be combined with region.", :type => :string
-        opt :directory, "Source directory of build.", :type    => :string, 
-                                                      :default => '.'
-        opt :exclude, "Comma spereate list of files or directories to exclude.", :type => :string,
-                                                                                 :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?"
-        opt :region, "Region to download artifact.", :type    => :string,
-                                                     :default => 'us-west-1'
-        opt :update, "Update value of attribute.", :type => :string
-      end
-
       cmd = ARGV.shift
 
       case cmd
       when 'list'
-        cli_list = CLI::List.new :name => @opts[:name]
-        cli_list.list @opts[:limit]
+        CLI::List.new.list
       when 'show'
-        cli_show = CLI::Show.new :name   => @opts[:name],
-                                 :id     => @opts[:id]
-        cli_show.show
+        CLI::Show.new.show
       when 'build'
-        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
+        CLI::Build.new.build
       when 'update'
-        cli_update = CLI::Update.new :name      => @opts[:name],
-                                     :id        => @opts[:id],
-                                     :attribute => @opts[:attribute],
-                                     :update    => @opts[:update]
-        cli_update.update
+        CLI::Update.new.update
       when 'download'
-        cli_download = CLI::Download.new :name   => @opts[:name],
-                                         :id     => @opts[:id],
-                                         :output => @opts[:output],
-                                         :region => @opts[:region]
-        cli_download.download
+        CLI::Download.new.download
       when 'destroy', 'delete'
-        cli_destroy = CLI::Destroy.new :name   => @opts[:name],
-                                       :id     => @opts[:id]
-        cli_destroy.destroy
+        CLI::Destroy.new.destroy
       else
         puts "Unkown command: '#{cmd}'."
+        puts "heirloom [list|show|build|update|download|destroy] OPTIONS"
+        puts "Append -h for help on specific command."
       end
     end
   end

data/lib/heirloom/cli/build.rb

@@ -1,38 +1,66 @@
+require 'json'
+
 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
+      def initialize
+        @opts = read_options
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @archive = Archive.new :name   => @opts[:name],
+                               :id     => @opts[:id],
+                               :logger => @logger
       end
-      
+
       def build
-        @artifact.destroy if @artifact.exists?
+        unless @archive.buckets_exist? :bucket_prefix => @opts[:bucket_prefix]
+          @logger.error "Buckets do no exist in required regions."
+          exit 1
+        end
+
+        @archive.destroy if @archive.exists?
                           
-        file = @artifact.build :accounts       => @accounts,
-                               :bucket_prefix  => @bucket_prefix,
-                               :directory      => @directory,
-                               :exclude        => @exclude,
-                               :public         => @public,
-                               :git            => @git
+        archive_file = @archive.build :bucket_prefix  => @opts[:bucket_prefix],
+                                      :directory      => @opts[:directory],
+                                      :exclude        => @opts[:exclude].split(','),
+                                      :public         => @opts[:public],
+                                      :git            => @opts[:git]
+
+        @archive.upload :bucket_prefix => @opts[:bucket_prefix],
+                        :file          => archive_file
+
+        @archive.authorize unless @public
+
+        @archive.cleanup
+      end
+
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Build and upload a new archive.
 
-        @artifact.upload :bucket_prefix    => @bucket_prefix,
-                         :file             => file
+Usage:
 
-        @artifact.authorize unless @public
+heirloom build -n NAME -i ID -b BUCKET_PREFIX [-d DIRECTORY] [-p] [-g] [-e DIRECTORIES_TO_EXCLUDE]
 
-        @artifact.cleanup
+EOS
+          opt :bucket_prefix, "Bucket prefix which will be combined with region.", :type => :string
+          opt :directory, "Source directory of build.", :type    => :string, 
+                                                        :default => '.'
+          opt :exclude, "Comma spereate list of files or directories to exclude.", :type => :string,
+                                                                                   :default => '.git'
+          opt :git, "Read git commit information from directory."
+          opt :help, "Display Help"
+          opt :id, "ID of the archive to display.", :type => :string
+          opt :level, "Log level.", :type    => :string,
+                                    :default => 'info'
+          opt :name, "Name of archive.", :type => :string
+          opt :public, "Set this archive as public readable?"
+        end
       end
 
     end

data/lib/heirloom/cli/destroy.rb

@@ -2,19 +2,41 @@ 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
+      def initialize
+        @opts = read_options
+        @name = @opts[:name]
+        @id = @opts[:id]
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @archive = Archive.new :name   => @name,
+                               :id     => @id,
+                               :logger => @logger
       end
       
       def destroy
-        @artifact.destroy
+        @archive.destroy
       end
 
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Destroy an archive.
+
+Usage:
+
+heirloom destroy -n NAME -i ID [-l LOG_LEVEL]
+
+EOS
+          opt :help, "Display Help"
+          opt :id, "ID of the archive to display.", :type => :string
+          opt :level, "Log level.", :type    => :string,
+                                    :default => 'info'
+          opt :name, "Name of archive.", :type => :string
+        end
+      end
     end
   end
 end

data/lib/heirloom/cli/download.rb

@@ -2,22 +2,43 @@ 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
+      def initialize
+        @opts = read_options
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @archive = Archive.new :name   => @opts[:name],
+                               :id     => @opts[:id],
+                               :logger => @logger
       end
       
       def download
-        @artifact.download :output => @output,
-                           :region => @region
+        @archive.download :output => @opts[:output],
+                          :region => @opts[:region]
       end
 
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Download an archive.
+
+Usage:
+
+heirloom download -n NAME -i ID -r REGION -o OUTPUT_FILE
+
+EOS
+          opt :help, "Display Help"
+          opt :id, "ID of the archive to display.", :type => :string
+          opt :level, "Log level.", :type    => :string,
+                                    :default => 'info'
+          opt :name, "Name of archive.", :type => :string
+          opt :output, "Location to download archive.", :type => :string
+          opt :region, "Region to download archive.", :type    => :string,
+                                                       :default => 'us-west-1'
+        end
+      end
     end
   end
 end

data/lib/heirloom/cli/list.rb

@@ -2,14 +2,38 @@ module Heirloom
   module CLI
     class List
 
-      def initialize(args)
-        @artifact = Artifact.new :name   => args[:name],
-                                 :logger => args[:logger]
+      def initialize
+        @opts = read_options
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @archive = Archive.new :name   => @opts[:name],
+                               :logger => @logger
       end
       
-      def list(limit)
-        @logger = Logger
-        puts @artifact.list(limit)
+      def list(count = @opts[:count])
+        puts @archive.list(count)
+      end
+
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+List versions of archive.
+
+Usage:
+
+heirloom list -n NAME
+
+EOS
+          opt :help, "Display Help"
+          opt :level, "Log level.", :type    => :string,
+                                    :default => 'info'
+          opt :name, "Name of archive.", :type => :string
+          opt :count, "Number of versions to return.", :type    => :integer,
+                                                       :default => 10
+        end
       end
 
     end

data/lib/heirloom/cli/show.rb

@@ -2,24 +2,46 @@ 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]
+      def initialize
+        @opts = read_options
+        id = @opts[:id] ? @opts[:id] : latest_id
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @archive = Archive.new :name   => @opts[:name],
+                               :id     => id,
+                               :logger => @logger
       end
       
       def show
-        @logger = Logger
-        puts @artifact.show.to_yaml
+        puts @archive.show.to_yaml
       end
 
       private
 
-      def latest_id(args)
-        @artifact = Artifact.new :name   => args[:name],
-                                 :logger => args[:logger]
-        @artifact.list(1).first
+      def latest_id
+        @archive = Archive.new :name => @opts[:name]
+        @archive.list(1).first
+      end
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Show details about a version of an archive.
+
+Usage:
+
+heirloom show -n NAME -i ID
+
+If -i is ommited, latest version is displayed.
+
+EOS
+          opt :help, "Display Help"
+          opt :level, "Log level.", :type    => :string,
+                                    :default => 'info'
+          opt :name, "Name of archive.", :type => :string
+          opt :id, "ID of the archive to display.", :type => :string
+        end
       end
 
     end

data/lib/heirloom/cli/update.rb

@@ -2,22 +2,42 @@ 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
+      def initialize
+        @opts = read_options
+        @logger = HeirloomLogger.new :log_level => @opts[:level]
+        @archive = Archive.new :name   => @opts[:name],
+                               :id     => @opts[:id],
+                               :logger => @logger
       end
       
       def update
-        @artifact.update :attribute => @attribute,
-                         :update    => @update
+        @archive.update :attribute => @opts[:attribute],
+                        :value     => @opts[:value]
       end
 
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+Update an archive's attribute.
+
+Usage:
+
+heirloom update -n NAME -i ID -a ATTRIBUTE_TO_UPDATE -v NEW_VALUE
+
+EOS
+          opt :attribute, "Attribute to update.", :type => :string
+          opt :help, "Display Help"
+          opt :id, "ID of the archive to display.", :type => :string
+          opt :level, "Log level.", :type    => :string,
+                                    :default => 'info'
+          opt :name, "Name of archive.", :type => :string
+          opt :value, "New value of attribute.", :type => :string
+        end
+      end
     end
   end
 end