heirloom 0.8.3 → 0.9.0

data/CHANGELOG

@@ -1,3 +1,13 @@
+## 0.9.0:
+
+* Updated tempfile logic to fix GC issues.
+* Removed git support.
+* Only setup existing buckets if forced.
+* Ensure valid bucket name and heirloom name on setup.
+* Return friendly error when bucket or heirloom does not exist.
+* Updating to fog 1.6.0
+* Removing grit gem
+
 ## 0.8.3:
 
 * Teardown does not try to delete buckets if they are not empty.

data/heirloom.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", '~> 2.11.0'
   s.add_development_dependency "rake"
 
-  s.add_runtime_dependency 'fog', '~> 1.5.0'
-  s.add_runtime_dependency 'grit', '~> 2.5.0' 
+  s.add_runtime_dependency 'fog', '~> 1.6.0'
   s.add_runtime_dependency 'trollop', '= 2.0'
+  s.add_runtime_dependency 'xml-simple', '~> 1.1.2'
 end

data/lib/heirloom/archive/builder.rb

@@ -10,8 +10,8 @@ module Heirloom
     def initialize(args)
       @config = args[:config]
       @name   = args[:name]
-      @domain = "heirloom_#{@name}"
       @id     = args[:id]
+      @domain = "heirloom_#{@name}"
       @logger = @config.logger
     end
 
@@ -19,49 +19,23 @@ module Heirloom
       @source        = args[:directory] ||= '.'
       @secret        = args[:secret]
       @bucket_prefix = args[:bucket_prefix]
+      @file          = args[:file]
+      @exclude       = args[:exclude]
 
       directory = Directory.new :path    => @source,
-                                :exclude => args[:exclude],
+                                :file    => @file,
+                                :exclude => @exclude,
                                 :config  => @config
 
       unless directory.build_artifact_from_directory :secret => @secret
         return false
       end
 
-      @local_build = directory.local_build
-
       create_artifact_record
-
-      add_git_commit if args[:git]
-
-      @local_build
     end
 
     private
 
-    def add_git_commit
-      git = GitDirectory.new(:path => @source)
-      commit = git.commit @id
-      if commit
-        add_git_commit_to_artifact_record commit
-      else
-        @logger.warn "Could not load Git sha '#{@id}' in '#{@source}'."
-      end
-    end
-
-    def add_git_commit_to_artifact_record(commit)
-      attributes = { 'sha'             => @id,
-                     'abbreviated_sha' => commit.id_abbrev,
-                     'message'         => commit.message.gsub("\n"," ")[0..1023],
-                     'author'          => commit.author.name }
-
-      attributes.each_pair do |k, v|
-        @logger.info "Git #{k}: #{v}"
-      end
-
-      sdb.put_attributes @domain, @id, attributes
-    end
-
     def create_artifact_record
       attributes = { 'built_by'      => "#{user}@#{hostname}",
                      'built_at'      => Time.now.utc.iso8601,

data/lib/heirloom/archive/downloader.rb

@@ -24,6 +24,8 @@ module Heirloom
 
       raw_archive = s3_downloader.download_file :bucket => bucket,
                                                 :key    => key
+      
+      return false unless raw_archive
 
       archive = cipher_data.decrypt_data :data   => raw_archive,
                                          :secret => secret

data/lib/heirloom/cipher/file.rb

@@ -1,5 +1,6 @@
 require 'openssl'
 require 'tempfile'
+require 'fileutils'
 
 module Heirloom
   module Cipher
@@ -11,10 +12,10 @@ module Heirloom
       end
 
       def encrypt_file(args)
-        file   = args[:file]
-        secret = args[:secret]
-        output = Tempfile.new('archive.tar.gz.enc')
-        iv     = @aes.random_iv
+        @file           = args[:file]
+        @encrypted_file = Tempfile.new('archive.tar.gz.enc')
+        secret          = args[:secret]
+        iv              = @aes.random_iv
 
         @aes.encrypt
         @aes.iv = iv
@@ -22,9 +23,9 @@ module Heirloom
 
         # Need to refactor to be less complex
         # Additionally tests to do fully cover logic
-        ::File.open(output,'w') do |enc|
+        ::File.open(@encrypted_file,'w') do |enc|
           enc << iv
-          ::File.open(file) do |f|
+          ::File.open(@file) do |f|
             loop do
               r = f.read(4096)
               break unless r
@@ -33,7 +34,15 @@ module Heirloom
           end
           enc << @aes.final
         end
-        output.path
+
+        replace_file
+      end
+
+      private
+
+      def replace_file
+        FileUtils.mv @encrypted_file.path, @file
+        @encrypted_file.close!
       end
 
     end

data/lib/heirloom/cli/download.rb

@@ -22,8 +22,13 @@ module Heirloom
                                       :config => @config)
 
         @archive = Archive.new :name   => @opts[:name],
-                               :id     => id,
-                               :config => @config
+                               :config => @config,
+                               :id     => id
+
+        unless @opts[:bucket_prefix]
+          ensure_archive_exists :archive => @archive,
+                                :config  => @config
+        end
 
         # Lookup region & bucket_prefix from simpledb unless specified
         # To Do, valid validation message that simpledb exists
@@ -35,8 +40,6 @@ module Heirloom
         ensure_directory :path => @opts[:output], :config => @config
         secret = read_secret :opts   => @opts,
                              :config => @config
-        ensure_valid_secret :secret => secret, 
-                            :config => @config
         archive = @archive.download :output        => @opts[:output],
                                     :extract       => @opts[:extract],
                                     :region        => @region,
@@ -74,7 +77,7 @@ EOS
           opt :name, "Name of Heirloom.", :type => :string
           opt :output, "Path to output downloaded Heirloom. Must be existing directory.", :type => :string
           opt :region, "Region to download Heirloom.", :type    => :string,
-                                                      :default => 'us-west-1'
+                                                       :default => 'us-west-1'
           opt :secret, "Secret for ecrypted Heirloom.", :type => :string
           opt :secret_file, "Read secret from file.", :type  => :string,
                                                       :short => :none

data/lib/heirloom/cli/setup.rb

@@ -25,16 +25,30 @@ module Heirloom
       def setup
         ensure_valid_region :region => @opts[:metadata_region],
                             :config => @config
+
         ensure_valid_regions :regions => @opts[:region],
                              :config  => @config
+
         ensure_metadata_in_upload_region :config  => @config, 
                                          :regions => @opts[:region]
+
+        ensure_valid_name :config => @config,
+                          :name   => @opts[:name]
+
+        ensure_valid_bucket_prefix :config        => @config,
+                                   :bucket_prefix => @opts[:bucket_prefix]
+
+        @catalog.create_catalog_domain
+
+        ensure_entry_does_not_exist_in_catalog :config  => @config,
+                                               :catalog => @catalog,
+                                               :entry   => @opts[:name],
+                                               :force   => @opts[:force]
+
         ensure_buckets_available :config        => @config,
                                  :bucket_prefix => @opts[:bucket_prefix],
                                  :regions       => @opts[:region]
 
-        @catalog.create_catalog_domain
-
         @catalog.add_to_catalog :regions       => @opts[:region],
                                 :bucket_prefix => @opts[:bucket_prefix]
 
@@ -59,6 +73,7 @@ EOS
           opt :bucket_prefix, "The bucket prefix will be combined with specified \
 regions to create the required buckets. For example: '-b test -r us-west-1 -r \
 us-east-1' will create bucket test-us-west-1 in us-west-1 and test-us-east-1 in us-east-1.", :type => :string
+          opt :force, "Overwrite existing catalog entries."
           opt :help, "Display Help"
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'

data/lib/heirloom/cli/shared.rb

@@ -124,8 +124,8 @@ module Heirloom
       end
 
       def ensure_archive_exists(args)
-        config  = args[:config]
         archive = args[:archive]
+        config  = args[:config]
         logger  = config.logger
 
         unless archive.exists?
@@ -189,6 +189,41 @@ module Heirloom
         end
       end
 
+      def ensure_entry_does_not_exist_in_catalog(args)
+        config  = args[:config]
+        catalog = args[:catalog]
+        entry   = args[:entry]
+        force   = args[:force]
+        logger  = config.logger
+        region  = config.metadata_region
+
+        if catalog.entry_exists_in_catalog?(entry) && !force
+          logger.error "Entry #{entry} exists in catalog. Use --force to overwrite."
+          exit 1
+        end
+      end
+
+      def ensure_valid_name(args)
+        config = args[:config]
+        name   = args[:name]
+        logger = config.logger
+        unless name =~ /^[0-9a-z\-\_]+$/
+          logger.error "Invalid name '#{name}'. Can only contain lower case letters, numbers, dashes and underscores."
+          exit 1
+        end
+      end
+
+      def ensure_valid_bucket_prefix(args)
+        config        = args[:config]
+        bucket_prefix = args[:bucket_prefix]
+        logger        = config.logger
+
+        unless bucket_prefix =~ /^[0-9a-z\-]+$/
+          logger.error "Invalid bucket prefix '#{bucket_prefix}'. Can only contain lower case letters, numbers and dashes."
+          exit 1
+        end
+      end
+
       def latest_id(args)
         archive = Archive.new :name   => args[:name],
                               :config => args[:config]

data/lib/heirloom/cli/upload.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Heirloom
   module CLI
     class Upload
@@ -45,13 +47,14 @@ module Heirloom
 
         @archive.destroy if @archive.exists?
                           
-        build = @archive.build :bucket_prefix => @bucket_prefix,
-                               :directory     => @opts[:directory],
-                               :exclude       => @opts[:exclude],
-                               :git           => @opts[:git],
-                               :secret        => secret
+        @file = Tempfile.new('archive.tar.gz')
+
+        unless @archive.build :bucket_prefix => @bucket_prefix,
+                              :directory     => @opts[:directory],
+                              :exclude       => @opts[:exclude],
+                              :file          => @file.path,
+                              :secret        => secret
 
-        unless build
           @logger.error "Build failed."
           exit 1
         end
@@ -59,7 +62,9 @@ module Heirloom
         @archive.upload :bucket_prefix   => @bucket_prefix,
                         :regions         => @regions,
                         :public_readable => @opts[:public],
-                        :file            => build
+                        :file            => @file.path
+
+        @file.close!
       end
 
       private
@@ -76,12 +81,11 @@ Usage:
 heirloom upload -n NAME -i ID -d DIRECTORY_TO_UPLOAD
 
 EOS
-          opt :directory, "Source directory of build.", :type  => :string
+          opt :directory, "Source directory to upload.", :type  => :string
           opt :exclude, "File(s) or directorie(s) to exclude. \
 Can be specified multiple times.", :type  => :string, :multi => true
-          opt :git, "Read git commit information from directory and set as Heirloom attributes."
           opt :help, "Display Help"
-          opt :id, "ID for Heirloom (when -g specified, assumed to be GIT sha).", :type => :string
+          opt :id, "ID for Heirloom.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   

data/lib/heirloom/directory/directory.rb

@@ -1,24 +1,19 @@
-require 'tempfile'
-
 module Heirloom
 
   class Directory
 
-    attr_reader :local_build
-
     def initialize(args)
-      @config = args[:config]
+      @config  = args[:config]
       @exclude = args[:exclude]
-      @path = args[:path]
-      @logger = @config.logger
+      @path    = args[:path]
+      @file    = args[:file]
+      @logger  = @config.logger
     end
 
     def build_artifact_from_directory(args)
       @secret = args[:secret]
 
-      @local_build = Tempfile.new('archive.tar.gz').path
-
-      @logger.debug "Building Heirloom '#{@local_build}' from '#{@path}'."
+      @logger.debug "Building Heirloom '#{@file}' from '#{@path}'."
       @logger.debug "Excluding #{@exclude.to_s}."
       @logger.debug "Adding #{files_to_pack}."
 
@@ -30,7 +25,7 @@ module Heirloom
     private
 
     def build_archive
-      command = "cd #{@path} && tar czf #{@local_build} #{files_to_pack}"
+      command = "cd #{@path} && tar czf #{@file} #{files_to_pack}"
       @logger.info "Archiving with: `#{command}`"
       output = `#{command}`
       @logger.debug "Exited with status: '#{$?.exitstatus}' ouput: '#{output}'"
@@ -40,8 +35,8 @@ module Heirloom
     def build_encrypted_archive
       return false unless build_archive
       @logger.info "Secret provided. Encrypting."
-      @local_build = cipher_file.encrypt_file :file   => @local_build,
-                                              :secret => @secret
+      cipher_file.encrypt_file :file   => @file,
+                               :secret => @secret
     end
 
     def files_to_pack

data/lib/heirloom/directory.rb

@@ -1,2 +1 @@
 require 'heirloom/directory/directory'
-require 'heirloom/directory/git_directory'

data/lib/heirloom/downloader/s3.rb

@@ -1,3 +1,5 @@
+require 'xmlsimple'
+
 module Heirloom
   class Downloader
     class S3
@@ -10,8 +12,16 @@ module Heirloom
 
       def download_file(args)
         s3.get_object args[:bucket], args[:key]
+      rescue Excon::Errors::Forbidden, Excon::Errors::NotFound => e
+        error = XmlSimple.xml_in e.response.body
+        error['Message'].each do |msg|
+          @logger.error msg
+        end
+        false
       end
 
+      private
+
       def s3
         @s3 ||= AWS::S3.new :config => @config,
                             :region => @region

data/lib/heirloom/logger.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Heirloom
   class HeirloomLogger
     

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

data/spec/archive/builder_spec.rb

@@ -17,99 +17,28 @@ describe Heirloom::Builder do
           @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"
 
           Heirloom::Directory.should_receive(:new).
                               with(:path    => 'path_to_build',
                                    :exclude => ['.dir_to_exclude'],
+                                   :file    => '/tmp/file.tar.gz',
                                    :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
 
-      context 'with a git directory' do
-
-        before do
-          Heirloom::AWS::SimpleDB.should_receive(:new).
-                                  with(:config => @config_mock).
-                                  and_return(@simpledb_mock)
-        end
-
-        it "should build an archive" do
-          commit_attributes = { 'sha'             => '123',
-                                'abbreviated_sha' => 'abc123',
-                                'message'         => 'yoyo',
-                                'author'          => 'weaver' }
-          @simpledb_mock.should_receive(:put_attributes).
-                         with('heirloom_tim', '123', commit_attributes)
-          @git_commit_stub = stub :id_abbrev => "abc123",
-                                  :message   => "yoyo",
-                                  :author    => @author_stub
-          @git_dir_mock.stub :commit => @git_commit_stub
-          @builder.build(:exclude   => ['.dir_to_exclude'],
-                         :directory => 'path_to_build',
-                         :git       => 'true').should == '/var/tmp/file.tar.gz'
-        end
-
-        it "should remove new lines from the commit message" do
-          commit_attributes = { 'sha'             => '123',
-                                'abbreviated_sha' => 'abc123',
-                                'message'         => 'yo yo  yo',
-                                'author'          => 'weaver' }
-          @simpledb_mock.should_receive(:put_attributes).
-                         with('heirloom_tim', '123', commit_attributes)
-          @git_commit_stub = stub :id_abbrev => "abc123",
-                                  :message   => "yo\nyo\n\nyo",
-                                  :author    => @author_stub
-          @git_dir_mock.stub :commit => @git_commit_stub
-          @builder.build(:exclude   => ['.dir_to_exclude'],
-                         :directory => 'path_to_build',
-                         :git       => 'true').should == '/var/tmp/file.tar.gz'
-        end
-
-        it "should truncate commit message to 1024 chars" do
-          long_commit_message = 'long commit message' * 100
-          truncated_commit_attributes = { 'sha'             => '123',
-                                          'abbreviated_sha' => 'abc123',
-                                          'message'         => long_commit_message[0..1023],
-                                          'author'          => 'weaver' }
-          @simpledb_mock.should_receive(:put_attributes).
-                         with('heirloom_tim', '123', truncated_commit_attributes)
-          @git_commit_stub = stub :id_abbrev => "abc123",
-                                  :message   => long_commit_message,
-                                  :author    => @author_stub
-          @git_dir_mock.stub :commit => @git_commit_stub
-          @builder.build(:exclude   => ['.dir_to_exclude'],
-                         :directory => 'path_to_build',
-                         :git       => 'true').should == '/var/tmp/file.tar.gz'
-        end
-
-      end
-
-      context "without git dir" do
-        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 load Git sha '123' in 'path_to_build'."
-          @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
     end
 
     it "should return false if the build fails" do
       directory_stub = stub :build_artifact_from_directory => false
       Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
                                                     :exclude => ['.dir_to_exclude'],
+                                                    :file    => '/tmp/file.tar.gz',
                                                     :config  => @config_mock).
                                                and_return directory_stub
       @builder.build(:exclude   => ['.dir_to_exclude'],
                      :directory => 'path_to_build',
-                     :git       => 'true').should be_false
+                     :file      => '/tmp/file.tar.gz').should be_false
     end
 
   end

data/spec/archive/downloader_spec.rb

@@ -16,49 +16,68 @@ describe Heirloom do
                                   :region => 'us-west-1').
                              and_return @s3_downloader_mock
     @cipher_mock = mock 'cipher'
-    Heirloom::Cipher::Data.should_receive(:new).
-                           with(:config => @config_mock).
-                           and_return @cipher_mock
   end
 
   context "no secret given" do
-    before do
-      @writer_mock = mock 'writer'
-      Heirloom::Writer.should_receive(:new).
-                       with(:config => @config_mock).
-                       and_return @writer_mock
-      @s3_downloader_mock.should_receive(:download_file).
-                          with(:bucket => 'bucket-us-west-1',
-                               :key    => 'tim/123.tar.gz').
-                          and_return 'plaintext'
-      @cipher_mock.should_receive(:decrypt_data).
-                   with(:secret => nil,
-                        :data   => 'plaintext').and_return 'plaintext'
-    end
+    context "when succesful" do
+      before do
+        @writer_mock = mock 'writer'
+        Heirloom::Writer.should_receive(:new).
+                         with(:config => @config_mock).
+                         and_return @writer_mock
+        @s3_downloader_mock.should_receive(:download_file).
+                            with(:bucket => 'bucket-us-west-1',
+                                 :key    => 'tim/123.tar.gz').
+                            and_return 'plaintext'
+        @cipher_mock.should_receive(:decrypt_data).
+                     with(:secret => nil,
+                          :data   => 'plaintext').and_return 'plaintext'
+        Heirloom::Cipher::Data.should_receive(:new).
+                               with(:config => @config_mock).
+                               and_return @cipher_mock
+      end
+
+      it "should download to the current path if output is not specified" do
+        @writer_mock.should_receive(:save_archive).
+                     with(:archive => 'plaintext',
+                          :file    => "123.tar.gz",
+                          :output  => './',
+                          :extract => false).and_return true
+        @downloader.download(:region        => 'us-west-1',
+                             :bucket_prefix => 'bucket',
+                             :extract       => false,
+                             :secret        => nil).should == './'
+      end
 
-    it "should download to the current path if output is not specified" do
-      @writer_mock.should_receive(:save_archive).
-                   with(:archive => 'plaintext',
-                        :file    => "123.tar.gz",
-                        :output  => './',
-                        :extract => false).and_return true
-      @downloader.download(:region        => 'us-west-1',
-                           :bucket_prefix => 'bucket',
-                           :extract       => false,
-                           :secret        => nil).should == './'
+      it "should download arhcive to specified output" do
+        @writer_mock.should_receive(:save_archive).
+                     with(:archive => 'plaintext',
+                          :file    => "123.tar.gz",
+                          :output  => '/tmp/dir',
+                          :extract => false).and_return true
+        @downloader.download(:output        => '/tmp/dir',
+                             :region        => 'us-west-1',
+                             :bucket_prefix => 'bucket',
+                             :extract       => false,
+                             :secret        => nil).should == '/tmp/dir'
+      end
     end
 
-    it "should download arhcive to specified output" do
-      @writer_mock.should_receive(:save_archive).
-                   with(:archive => 'plaintext',
-                        :file    => "123.tar.gz",
-                        :output  => '/tmp/dir',
-                        :extract => false).and_return true
-      @downloader.download(:output        => '/tmp/dir',
-                           :region        => 'us-west-1',
-                           :bucket_prefix => 'bucket',
-                           :extract       => false,
-                           :secret        => nil).should == '/tmp/dir'
+    context "when unsuccesful" do
+      before do
+        @s3_downloader_mock.should_receive(:download_file).
+                            with(:bucket => 'bucket-us-west-1',
+                                 :key    => 'tim/123.tar.gz').
+                            and_return false
+      end
+
+      it "should return false if the archive is not downloaded" do
+        @downloader.download(:output        => '/tmp/dir',
+                             :region        => 'us-west-1',
+                             :bucket_prefix => 'bucket',
+                             :extract       => false,
+                             :secret        => nil).should be_false
+      end
     end
   end
 
@@ -68,6 +87,9 @@ describe Heirloom do
                           with(:bucket => 'bucket-us-west-1',
                                :key    => 'tim/123.tar.gz').
                           and_return 'encrypted_data'
+      Heirloom::Cipher::Data.should_receive(:new).
+                             with(:config => @config_mock).
+                             and_return @cipher_mock
     end
 
     context "valid secret" do

data/spec/cipher/file_spec.rb

@@ -6,7 +6,8 @@ describe Heirloom do
     @logger_mock.stub :info => true
     @config_mock = mock 'config'
     @config_mock.stub :logger => @logger_mock
-    @tempfile_stub = stub 'tempfile', :path => '/path_to_encrypted_archive'
+    @tempfile_stub = stub 'tempfile', :path   => '/path_to_encrypted_archive', 
+                                      :close! => true
     Tempfile.stub :new => @tempfile_stub
     @aes_mock = mock 'aes'
     @aes_mock.stub :random_iv => 'firstsixteenchar'
@@ -20,9 +21,10 @@ describe Heirloom do
     @aes_mock.should_receive(:iv=).with 'firstsixteenchar'
     @aes_mock.should_receive(:key=).with Digest::SHA256.hexdigest 'mysecret'
     ::File.should_receive(:open)
+    FileUtils.should_receive(:mv).
+              with('/path_to_encrypted_archive', '/file')
     @file.encrypt_file(:file   => '/file',
-                       :secret => 'mysecret').
-          should == '/path_to_encrypted_archive'
+                       :secret => 'mysecret').should be_true
   end
 
 end

data/spec/cli/download_spec.rb

@@ -58,6 +58,7 @@ describe Heirloom do
     before do
       @catalog_stub = stub 'catalog', :regions       => ['us-east-1', 'us-west-1'],
                                       :bucket_prefix => 'bp'
+      @archive_mock.stub :exists? => true
       options = { :name            => 'archive_name',
                   :level           => 'info',
                   :output          => '/tmp/test123',

data/spec/cli/shared_spec.rb

@@ -353,4 +353,115 @@ describe Heirloom do
                should raise_error SystemExit
     end
   end
+
+  context "testing ensure entry does not exist in catalog unless forced" do
+    before do
+      @catalog_mock = mock 'catalog'
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should exit if the entry exists in catalog and not forced" do
+      options = { :config  => @config_stub, 
+                  :catalog => @catalog_mock,
+                  :entry   => 'entry', 
+                  :force   => false }
+      @catalog_mock.should_receive(:entry_exists_in_catalog?).
+                    with('entry').
+                    and_return true
+      lambda { @object.ensure_entry_does_not_exist_in_catalog options }.
+                       should raise_error SystemExit
+    end
+
+    it "should not exit if the entry exists in catalog and forced" do
+      options = { :config  => @config_stub, 
+                  :catalog => @catalog_mock,
+                  :entry   => 'entry', 
+                  :force   => true }
+      @catalog_mock.should_receive(:entry_exists_in_catalog?).
+                    with('entry').
+                    and_return true
+      @object.ensure_entry_does_not_exist_in_catalog options
+    end
+
+    it "should not exit if the does not exists in catalog" do
+      options = { :config  => @config_stub, 
+                  :catalog => @catalog_mock,
+                  :entry   => 'entry', 
+                  :force   => false }
+      @catalog_mock.should_receive(:entry_exists_in_catalog?).
+                    with('entry').
+                    and_return false
+      @object.ensure_entry_does_not_exist_in_catalog options
+    end
+  end
+
+  context "testing ensure valid name" do
+    before do
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should not exit if name is valid" do
+      @object.ensure_valid_name :config => @config_stub,
+                                :name   => 'test-123_test'
+    end
+
+    it "should exit if name contains a upper case" do
+      lambda { @object.ensure_valid_name :config => @config_stub,
+                                         :name   => 'TEST-123' }.
+                       should raise_error SystemExit
+    end
+
+    it "should exit if name contains a space" do
+      lambda { @object.ensure_valid_name :config => @config_stub,
+                                         :name   => 'test 123' }.
+                       should raise_error SystemExit
+    end
+
+    it "should exit if name contains invalid characters" do
+      lambda { @object.ensure_valid_name :config => @config_stub,
+                                         :name   => 'test,123' }.
+                       should raise_error SystemExit
+    end
+  end
+
+  context "testing ensure valid bucket prefix" do
+    before do
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger          => @logger_stub,
+                                    :metadata_region => 'us-west-1'
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should not exit if bucket_prefix is valid" do
+      @object.ensure_valid_bucket_prefix :config        => @config_stub,
+                                         :bucket_prefix => 'test-123'
+    end
+
+    it "should exit if bucket_prefix contains uppercase" do
+      lambda { @object.ensure_valid_bucket_prefix :config        => @config_stub,
+                                                  :bucket_prefix => 'TEST-123' }.
+                       should raise_error SystemExit
+    end
+
+    it "should exit if bucket_prefix contains a space" do
+      lambda { @object.ensure_valid_bucket_prefix :config        => @config_stub,
+                                                  :bucket_prefix => 'test 123' }.
+                       should raise_error SystemExit
+    end
+
+    it "should exit if bucket_prefix contains invalid characters" do
+      lambda { @object.ensure_valid_bucket_prefix :config        => @config_stub,
+                                                  :bucket_prefix => 'test,123' }.
+                       should raise_error SystemExit
+    end
+  end
 end

data/spec/cli/upload_spec.rb

@@ -6,7 +6,6 @@ describe Heirloom do
   before do
     @regions = ['us-west-1', 'us-west-2']
     options = { :level           => 'info',
-                :git             => false,
                 :exclude         => ['exclude1', 'exclude2'],
                 :directory       => '/buildme',
                 :public          => false,
@@ -27,6 +26,10 @@ describe Heirloom do
                        :bucket_prefix          => 'bp',
                        :catalog_domain_exists? => true
     Trollop.stub(:options).and_return options
+    tempfile_stub = stub 'tempfile', :path   => '/tmp/file.tar.gz',
+                                     :close! => true
+    Tempfile.stub :new => tempfile_stub
+    
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
     Heirloom::CLI::Upload.any_instance.should_receive(:load_config).
@@ -68,14 +71,14 @@ describe Heirloom do
                   with(:bucket_prefix => 'bp',
                        :directory     => '/buildme',
                        :exclude       => ["exclude1", "exclude2"],
-                       :git           => false,
-                       :secret        => 'secret12').
-                  and_return '/tmp/build123.tar.gz'
+                       :secret        => 'secret12',
+                       :file          => '/tmp/file.tar.gz').
+                  and_return true
     @archive_mock.should_receive(:upload).
                   with(:bucket_prefix   => 'bp',
                        :regions         => @regions,
                        :public_readable => false,
-                       :file            => '/tmp/build123.tar.gz')
+                       :file            => '/tmp/file.tar.gz')
     @upload.upload
   end
 

data/spec/directory/directory_spec.rb

@@ -9,9 +9,8 @@ describe Heirloom::Directory do
       @config_mock.stub(:logger).and_return(@logger_stub)
       @directory = Heirloom::Directory.new :config  => @config_mock,
                                            :exclude => ['.', '..', 'dont_pack_me'],
-                                           :path    => '/dir'
-      @tempfile_stub = stub 'tempfile', :path => '/tmp/file.tar.gz'
-      Tempfile.stub :new => @tempfile_stub
+                                           :path    => '/dir',
+                                           :file    => '/tmp/file.tar.gz'
       output_mock  = double 'output mock'
       Dir.should_receive(:entries).with('/dir').
                                    exactly(2).times.
@@ -46,7 +45,7 @@ describe Heirloom::Directory do
           @cipher_mock.should_receive(:encrypt_file).
                        with(:file => '/tmp/file.tar.gz', 
                             :secret => 'supersecret').
-                       and_return '/tmp/encrypted_file.tar.gz'
+                       and_return true
           @directory.build_artifact_from_directory(:secret => 'supersecret').
                      should be_true
        end

data/spec/downloader/s3_spec.rb

@@ -2,22 +2,50 @@ require 'spec_helper'
 
 describe Heirloom do
 
+  before do
+    @s3_mock = mock 's3 mock'
+    Heirloom::AWS::S3.stub :new => @s3_mock
+
+    @config_mock = double 'config'
+    @logger_mock = double 'logger'
+    @config_mock.stub :logger => @logger_mock
+    @s3 = Heirloom::Downloader::S3.new :config  => @config_mock,
+                                       :region  => 'us-west-1'
+  end
+
+  context "when succesful" do
+    it "should download the specified file from s3" do
+      @s3_mock.should_receive(:get_object).
+               with('bucket', 'key_name').
+               and_return 'data'
+      @s3.download_file(:key    => 'key_name',
+                        :bucket => 'bucket').should == 'data' 
+    end
+  end
+
+  context "when unsuccesful" do
     before do
-      @config_mock = double 'config'
-      @logger_mock = double 'logger'
-      @config_mock.should_receive(:logger).and_return(@logger_mock)
+      body = '<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>AccessDenied</Code><Message>Access Denied</Message><RequestId>7A737B6941146062</RequestId><HostId>8DlaCTOXO2aBxLnM2cZs+C8pQ2a5IDI/NQJRlPGRbPbBU2U1jH67i0zA376utqyR</HostId></Error>'
+      @response_stub = stub 'response', :body => body
+    end
 
-      @s3 = Heirloom::Downloader::S3.new :config  => @config_mock,
-                                         :region  => 'us-west-1'
+    it "should return an error if the bucket not found" do
+      @logger_mock.should_receive(:error).with('Access Denied')
+      @s3_mock.should_receive(:get_object).
+               with('bucket', 'key_name').
+               and_raise Excon::Errors::Forbidden.new 'msg', 'req', @response_stub
+      @s3.download_file(:key    => 'key_name',
+                        :bucket => 'bucket').should be_false
     end
 
-    it "should download the specified file from s3" do
-      s3_mock = mock 's3 mock'
-      @s3.should_receive(:s3).and_return(s3_mock)
-      s3_mock.should_receive(:get_object).
-              with 'bucket', 'key_name'
-      @s3.download_file :key   => 'key_name',
-                        :bucket     => 'bucket'
+    it "should return an error if the object not found / forbidden" do
+      @logger_mock.should_receive(:error).with('Access Denied')
+      @s3_mock.should_receive(:get_object).
+               with('bucket', 'key_name').
+               and_raise Excon::Errors::NotFound.new 'msg', 'req', @response_stub
+      @s3.download_file(:key    => 'key_name',
+                        :bucket => 'bucket').should be_false
     end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70288889244580 !ruby/object:Gem::Requirement
+  requirement: &70302923492580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70288889244580
+  version_requirements: *70302923492580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70288889253380 !ruby/object:Gem::Requirement
+  requirement: &70302923545380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,40 +32,40 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288889253380
+  version_requirements: *70302923545380
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70288889249440 !ruby/object:Gem::Requirement
+  requirement: &70302923542440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70288889249440
+  version_requirements: *70302923542440
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &70288889247600 !ruby/object:Gem::Requirement
+  name: trollop
+  requirement: &70302923623680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70288889247600
+  version_requirements: *70302923623680
 - !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: &70288889097340 !ruby/object:Gem::Requirement
+  name: xml-simple
+  requirement: &70302923692740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70288889097340
+  version_requirements: *70302923692740
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -135,7 +135,6 @@ files:
 - lib/heirloom/destroyer/s3.rb
 - lib/heirloom/directory.rb
 - lib/heirloom/directory/directory.rb
-- lib/heirloom/directory/git_directory.rb
 - lib/heirloom/downloader.rb
 - lib/heirloom/downloader/s3.rb
 - lib/heirloom/logger.rb
@@ -184,7 +183,6 @@ files:
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
 - spec/directory/directory_spec.rb
-- spec/directory/git_directory_spec.rb
 - spec/downloader/s3_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb
@@ -202,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3211129644745839536
+      hash: -2336051542288959986
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3211129644745839536
+      hash: -2336051542288959986
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16
@@ -261,7 +259,6 @@ test_files:
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
 - spec/directory/directory_spec.rb
-- spec/directory/git_directory_spec.rb
 - spec/downloader/s3_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb

data/lib/heirloom/directory/git_directory.rb

@@ -1,33 +0,0 @@
-require 'grit'
-
-include Grit
-
-module Heirloom
-
-  class GitDirectory
-
-    def initialize(args)
-      @path = args[:path]
-    end
-
-    def commit(sha = nil)
-      return false unless repo
-
-      if sha
-        commit = repo.commits(sha)
-        commit ? commit.first : false
-      else
-        repo.commits.first
-      end
-    end
-
-    private
-
-    def repo
-      Repo.new @path
-    rescue Grit::InvalidGitRepositoryError
-      false
-    end
-
-  end
-end

data/spec/directory/git_directory_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe Heirloom do
-
-  describe 'commit' do
-    before do
-      @repo_mock     = double 'repo mock'
-      @git_directory = Heirloom::GitDirectory.new :path => '/target/dir'
-    end
-    
-    context "when dir is git repo" do
-      before do
-        Repo.should_receive(:new).with('/target/dir').exactly(2).times.
-             and_return(@repo_mock)
-      end
-
-      it "should return the first commit from the given repo" do
-        @repo_mock.stub(:commits).and_return(['git_sha', 'other_sha'])
-        @git_directory.commit.should == 'git_sha'
-      end
-
-      it "should read commit from the given path" do
-        @repo_mock.should_receive(:commits).
-                   with('sha_i_want').
-                   and_return(['sha_i_want', 'other_sha'])
-        @git_directory.commit('sha_i_want').should == 'sha_i_want'
-      end
-
-      it "should return false if the commit given does not exist" do
-        @repo_mock.should_receive(:commits).
-                   with('sha_that_dont_exist').
-                   and_return(nil)
-        @git_directory.commit('sha_that_dont_exist').should be_false
-      end
-    end
-
-    context "when dir is not git repo" do
-      it "should return false if the directory is not a git repo" do
-        Repo.should_receive(:new).with('/target/dir').
-             and_raise Grit::InvalidGitRepositoryError
-        @git_directory.commit.should be_false
-      end
-    end
-
-  end
-
-end