heirloom 0.3.1 → 0.4.0

data/lib/heirloom/cli/list.rb

@@ -2,17 +2,24 @@ module Heirloom
   module CLI
     class List
 
+      include Heirloom::CLI::Shared
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
-        exit 1 unless CLI::Shared.valid_options? :provided => @opts,
-                                                 :required => [:name],
-                                                 :logger   => @logger
+        @config = load_config :logger => @logger,
+                              :opts   => @opts
+
+        exit 1 unless valid_options? :provided => @opts,
+                                     :required => [:name],
+                                     :logger   => @logger
+
         @archive = Archive.new :name   => @opts[:name],
-                               :logger => @logger
+                               :config => @config
       end
       
       def list(count = @opts[:count])
+        @logger.debug "#{@archive.count} archives found."
         jj @archive.list(count)
       end
 
@@ -30,12 +37,14 @@ Usage:
 heirloom list -n NAME
 
 EOS
+          opt :count, "Number of versions to return.", :type    => :integer,
+                                                       :default => 10
           opt :help, "Display Help"
+          opt :key, "AWS Access Key ID", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :name, "Name of archive.", :type => :string
-          opt :count, "Number of versions to return.", :type    => :integer,
-                                                       :default => 10
+          opt :secret, "AWS Secret Access Key", :type => :string
         end
       end
 

data/lib/heirloom/cli/shared.rb

@@ -2,7 +2,7 @@ module Heirloom
   module CLI
     module Shared
 
-      def self.valid_options?(args)
+      def valid_options?(args)
         provided = args[:provided]
         required = args[:required]
         logger = args[:logger]
@@ -23,6 +23,15 @@ module Heirloom
         missing_opts.empty?
       end
 
+      def load_config(args)
+        opts = args[:opts]
+        logger = args[:logger]
+        config = Config.new :logger => logger
+        config.access_key = opts[:key] if opts[:key_given]
+        config.secret_key = opts[:secret] if opts[:secret_given]
+        config
+      end
+
     end
   end
 end

data/lib/heirloom/cli/show.rb

@@ -2,15 +2,21 @@ module Heirloom
   module CLI
     class Show
 
+      include Heirloom::CLI::Shared
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
-        exit 1 unless CLI::Shared.valid_options? :provided => @opts,
-                                                 :required => [:name],
-                                                 :logger   => @logger
+        @config = load_config :logger => @logger,
+                              :opts   => @opts
+
+        exit 1 unless valid_options? :provided => @opts,
+                                     :required => [:name],
+                                     :logger   => @logger
+
         id = @opts[:id] ? @opts[:id] : latest_id
         @archive = Archive.new :name   => @opts[:name],
-                               :logger => @logger,
+                               :config => @config,
                                :id     => id
       end
       
@@ -21,7 +27,8 @@ module Heirloom
       private
 
       def latest_id
-        @archive = Archive.new :name => @opts[:name]
+        @archive = Archive.new :name   => @opts[:name],
+                               :config => @config
         @archive.list(1).first
       end
 
@@ -40,10 +47,12 @@ If -i is ommited, latest version is displayed.
 
 EOS
           opt :help, "Display Help"
+          opt :key, "AWS Access Key ID", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :name, "Name of archive.", :type => :string
           opt :id, "id of the archive to display.", :type => :string
+          opt :secret, "AWS Secret Access Key", :type => :string
         end
       end
 

data/lib/heirloom/cli/update.rb

@@ -2,17 +2,23 @@ module Heirloom
   module CLI
     class Update
 
+      include Heirloom::CLI::Shared
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
-        exit 1 unless CLI::Shared.valid_options? :provided => @opts,
-                                                 :required => [:name, :id, 
-                                                               :attribute, 
-                                                               :updated_value],
-                                                 :logger   => @logger
+        @config = load_config :logger => @logger,
+                              :opts   => @opts
+
+        exit 1 unless valid_options? :provided => @opts,
+                                     :required => [:name, :id, 
+                                                   :attribute, 
+                                                   :updated_value],
+                                     :logger   => @logger
+
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
-                               :logger => @logger
+                               :config => @config
       end
       
       def update
@@ -37,9 +43,11 @@ EOS
           opt :attribute, "Attribute to update.", :type => :string
           opt :help, "Display Help"
           opt :id, "ID of the archive to display.", :type => :string
+          opt :key, "AWS Access Key ID", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :name, "Name of archive.", :type => :string
+          opt :secret, "AWS Secret Access Key", :type => :string
           opt :updated_value, "Updated value of attribute.", :type => :string
         end
       end

data/lib/heirloom/cli.rb

@@ -1,5 +1,6 @@
 require 'trollop'
 
+require 'heirloom/cli/shared'
 require 'heirloom/cli/authorize'
 require 'heirloom/cli/build'
 require 'heirloom/cli/list'
@@ -8,8 +9,6 @@ require 'heirloom/cli/update'
 require 'heirloom/cli/download'
 require 'heirloom/cli/destroy'
 
-require 'heirloom/cli/shared'
-
 module Heirloom
   module CLI
     def self.start

data/lib/heirloom/directory/directory.rb

@@ -4,41 +4,39 @@ module Heirloom
 
   class Directory
 
-    attr_accessor :config, :exclude, :local_build, :path, :logger
+    attr_reader :local_build
 
     def initialize(args)
-      self.config = args[:config]
-      self.exclude = args[:exclude]
-      self.path = args[:path]
-      self.logger = config.logger
+      @config = args[:config]
+      @exclude = args[:exclude]
+      @path = args[:path]
+      @logger = @config.logger
     end
 
     def build_artifact_from_directory
       random_text = (0...8).map{65.+(Kernel.rand(25)).chr}.join
 
-      unless local_build
-        self.local_build = File.join(Dir.tmpdir, random_text + ".tar.gz")
-      end
+      @local_build = File.join(Dir.tmpdir, random_text + ".tar.gz")
 
-      logger.info "Building Heirloom '#{local_build}' from '#{path}'."
-      logger.info "Excluding #{exclude.to_s}."
-      logger.info "Adding #{files_to_pack.to_s}."
+      @logger.info "Building Heirloom '#{@local_build}' from '#{@path}'."
+      @logger.info "Excluding #{@exclude.to_s}."
+      @logger.info "Adding #{files_to_pack.to_s}."
 
-      build_archive local_build, files_to_pack
+      build_archive
     end
 
     private
 
-    def build_archive(local_build, files_to_pack)
-      command = "tar czf #{local_build} #{files_to_pack.join(' ')}"
-      logger.info "Archiving with: `#{command}`"
+    def build_archive
+      command = "tar czf #{@local_build} #{files_to_pack.join(' ')}"
+      @logger.info "Archiving with: `#{command}`"
       output = `#{command}`
-      logger.debug "Exited with status: '#{$?.exitstatus}' ouput: '#{output}'"
+      @logger.debug "Exited with status: '#{$?.exitstatus}' ouput: '#{output}'"
       $?.success?
     end
-      
+
     def files_to_pack
-      Dir.entries(path) - ['.', '..'] - exclude
+      Dir.entries(@path) - ['.', '..'] - @exclude
     end
 
   end

data/lib/heirloom/directory/git_directory.rb

@@ -12,7 +12,7 @@ module Heirloom
 
     def commit(sha = nil)
       repo = Repo.new @path
-      if sha 
+      if sha
         commit = repo.commits(sha)
         commit ? commit.first : false
       else

data/lib/heirloom/uploader/s3.rb

@@ -32,6 +32,7 @@ module Heirloom
         bucket = args[:bucket]
         id = args[:id]
         name = args[:name]
+        domain = "heirloom_#{name}"
         key_folder = name
         key_name = "#{id}.tar.gz"
 
@@ -39,13 +40,13 @@ module Heirloom
         http_endpoint = "http://#{endpoints[@region]}/#{bucket}/#{key_folder}/#{key_name}"
         https_endpoint = "https://#{endpoints[@region]}/#{bucket}/#{key_folder}/#{key_name}"
 
-        sdb.put_attributes name, id, { "#{@region}-s3-url" => s3_endpoint }
+        sdb.put_attributes domain, id, { "#{@region}-s3-url" => s3_endpoint }
         @logger.info "Adding attribute #{s3_endpoint}."
 
-        sdb.put_attributes name, id, { "#{@region}-http-url" => http_endpoint }
+        sdb.put_attributes domain, id, { "#{@region}-http-url" => http_endpoint }
         @logger.info "Adding attribute #{http_endpoint}."
 
-        sdb.put_attributes name, id, { "#{@region}-https-url" => https_endpoint }
+        sdb.put_attributes domain, id, { "#{@region}-https-url" => https_endpoint }
         @logger.info "Adding attribute #{https_endpoint}."
       end
 

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/archive/builder_spec.rb

@@ -1,70 +1,68 @@
 require 'spec_helper'
 
-describe Heirloom do
+describe Heirloom::Builder do
+  before do
+    @config_mock   = double 'config'
+    @logger_stub   = stub :debug => 'true', :info => 'true', :warn => 'true'
+    @config_mock.stub(:logger).and_return(@logger_stub)
+    @simpledb_mock = double 'simple db'
+    Heirloom::AWS::SimpleDB.should_receive(:new).with(:config => @config_mock).
+                            and_return(@simpledb_mock)
+    @simpledb_mock.should_receive(:create_domain).with 'heirloom_tim'
+    @builder       = Heirloom::Builder.new :config => @config_mock,
+                                           :name   => 'tim',
+                                           :id     => '123'
+  end
 
+  describe 'build' do
     before do
-      @config_mock = double 'config'
-      @logger_stub = stub :debug => 'true', :info => 'true', :warn => 'true'
-      @simpledb_mock = double 'simple db'
-      @config_mock.should_receive(:logger).and_return(@logger_stub)
-      Heirloom::AWS::SimpleDB.should_receive(:new).with(:config => @config_mock).
-                              and_return(@simpledb_mock)
-      @simpledb_mock.should_receive(:create_domain).with 'tim'
-      @builder = Heirloom::Builder.new :config => @config_mock,
-                                       :name   => 'tim',
-                                       :id     => '123'
+      @author_stub    = stub :name => 'weaver'
+      @directory_stub = stub :build_artifact_from_directory => '/tmp/build_dir',
+                             :local_build                   => '/var/tmp/file.tar.gz'
+      @git_dir_mock   = double "git directory mock"
     end
 
-    it "should build an archive" do
-      directory_stub = stub :build_artifact_from_directory => '/tmp/build_dir',
-                            :local_build                   => '/var/tmp/file.tar.gz'
-      git_dir_mock = double "git directory mock"
-      author_stub = stub :name => 'weaver'
-      git_commit_stub = stub :id_abbrev => 'abc123',
-                             :message   => 'yoyo',
-                             :author    => author_stub
-      Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
-                                                    :exclude => ['.dir_to_exclude'],
-                                                    :config  => @config_mock).
-                                               and_return directory_stub
-      @builder.should_receive(:create_artifact_record)
-      Heirloom::GitDirectory.should_receive(:new).
-                             with(:path => 'path_to_build').
-                             and_return git_dir_mock
-      git_dir_mock.should_receive(:commit).
-                   with('123').and_return git_commit_stub
-      commit_attributes = { 'sha'             => '123',
-                            'abbreviated_sha' => 'abc123',
-                            'message'         => 'yoyo',
-                            'author'          => 'weaver' }
-      @simpledb_mock.should_receive(:put_attributes).
-                     with('tim', '123', commit_attributes)
+    context 'when successful' do
+      before do
+        Heirloom::Directory.should_receive(:new).
+                            with(:path    => 'path_to_build',
+                                 :exclude => ['.dir_to_exclude'],
+                                 :config  => @config_mock).
+                            and_return @directory_stub
+        Heirloom::GitDirectory.should_receive(:new).
+                               with(:path => 'path_to_build').
+                               and_return @git_dir_mock
+        @builder.should_receive(:create_artifact_record)
+      end
 
-      @builder.build(:exclude   => ['.dir_to_exclude'],
-                     :directory => 'path_to_build',
-                     :git       => 'true').should == '/var/tmp/file.tar.gz'
-    end
+      it "should build an archive" do
+        git_commit_stub = stub :id_abbrev => 'abc123',
+                               :message   => 'yoyo',
+                               :author    => @author_stub
+        @git_dir_mock.should_receive(:commit).
+                      with('123').and_return git_commit_stub
+        commit_attributes = { 'sha'             => '123',
+                              'abbreviated_sha' => 'abc123',
+                              'message'         => 'yoyo',
+                              'author'          => 'weaver' }
+        @simpledb_mock.should_receive(:put_attributes).
+                       with('heirloom_tim', '123', commit_attributes)
 
-    it "should build an archive and log a warning if the git sha is not found" do
-      directory_stub = stub :build_artifact_from_directory => '/tmp/build_dir',
-                            :local_build                   => '/var/tmp/file.tar.gz'
-      git_dir_mock = double "git directory mock"
-      Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
-                                                    :exclude => ['.dir_to_exclude'],
-                                                    :config  => @config_mock).
-                                               and_return directory_stub
-      @builder.should_receive(:create_artifact_record)
-      Heirloom::GitDirectory.should_receive(:new).
-                             with(:path => 'path_to_build').
-                             and_return git_dir_mock
-      @logger_stub.should_receive(:warn).with "Could not find Git sha: 123."
-      git_dir_mock.should_receive(:commit).
-                   with('123').and_return false
-      @builder.build(:exclude   => ['.dir_to_exclude'],
-                     :directory => 'path_to_build',
-                     :git       => 'true').should == '/var/tmp/file.tar.gz'
-    end
+        @builder.build(:exclude   => ['.dir_to_exclude'],
+                       :directory => 'path_to_build',
+                       :git       => 'true').should == '/var/tmp/file.tar.gz'
+      end
+
+      it "should build an archive and log a warning if the git sha is not found" do
+        @logger_stub.should_receive(:warn).with "Could not find Git sha: 123."
+        @git_dir_mock.should_receive(:commit).
+                      with('123').and_return false
+        @builder.build(:exclude   => ['.dir_to_exclude'],
+                       :directory => 'path_to_build',
+                       :git       => 'true').should == '/var/tmp/file.tar.gz'
+      end
 
+    end
 
     it "should return false if the build fails" do
       directory_stub = stub :build_artifact_from_directory => false
@@ -77,10 +75,14 @@ describe Heirloom do
                      :git       => 'true').should be_false
     end
 
+  end
+
+  describe 'cleanup' do
     it "should cleanup the local archive" do
       @builder.local_build = '/tmp/file'
       File.should_receive(:delete).with('/tmp/file')
       @builder.cleanup
     end
+  end
 
 end

data/spec/archive/destroyer_spec.rb

@@ -7,13 +7,12 @@ describe Heirloom do
       @logger_mock = double 'logger'
       @config_mock.should_receive(:logger).and_return(@logger_mock)
       @destroyer = Heirloom::Destroyer.new :config => @config_mock,
-                                                   :name   => 'tim',
-                                                   :id     => '123'
+                                           :name   => 'tim',
+                                           :id     => '123'
     end
 
     it "should destroy the given archive" do
-      @logger_mock.should_receive(:info).
-                   with "Destroying tim - 123"
+      @logger_mock.stub :info => true
       reader_mock = mock 'archive reader'
       @destroyer.should_receive(:reader).and_return reader_mock
       bucket_mock = mock 'bucket'
@@ -21,8 +20,6 @@ describe Heirloom do
                   with(:region => 'us-west-1').
                   and_return 'bucket-us-west-1'
 
-      @logger_mock.should_receive(:info).
-                   with "Destroying 's3://bucket-us-west-1/tim/123.tar.gz'."
 
       s3_destroyer_mock = mock 's3 destroyer'
       Heirloom::Destroyer::S3.should_receive(:new).
@@ -34,10 +31,12 @@ describe Heirloom do
                              :key_folder => 'tim',
                              :bucket     => 'bucket-us-west-1'
       sdb_mock = mock 'sdb'
-      @destroyer.should_receive(:sdb).and_return sdb_mock
-      sdb_mock.should_receive(:delete).with 'tim', '123'
-      @logger_mock.should_receive(:info).
-                   with "Destroy complete."
+      @destroyer.stub :sdb => sdb_mock
+      sdb_mock.should_receive(:delete).with 'heirloom_tim', '123'
+      Kernel.should_receive(:sleep).with 3
+      sdb_mock.should_receive(:domain_empty?).with('heirloom_tim').
+               and_return true
+      sdb_mock.should_receive(:delete_domain).with('heirloom_tim')
       @destroyer.destroy :regions => ['us-west-1']
     end
 

data/spec/archive/downloader_spec.rb

@@ -7,8 +7,8 @@ describe Heirloom do
       @logger_mock = double 'logger'
       @config_mock.should_receive(:logger).and_return(@logger_mock)
       @downloader = Heirloom::Downloader.new :config => @config_mock,
-                                                     :name   => 'tim',
-                                                     :id     => '123'
+                                             :name   => 'tim',
+                                             :id     => '123'
     end
 
     it "should download an archive" do

data/spec/archive/lister_spec.rb

@@ -12,7 +12,7 @@ describe Heirloom do
     sdb_mock = mock 'sdb'
     @lister.should_receive(:sdb).and_return sdb_mock
     sdb_mock.should_receive(:select).
-             with("select * from test123 where built_at > '2000-01-01T00:00:00.000Z' \
+             with("select * from heirloom_test123 where built_at > '2000-01-01T00:00:00.000Z' \
                  order by built_at desc limit 10").
              and_return( {'1' => 'one', '2' => 'two', '3' => 'three'} )
     @lister.list.should == ['1', '2', '3']