heirloom 0.4.0 → 0.4.1rc1

data/CHANGELOG

@@ -1,3 +1,7 @@
+## TBD:
+
+* Added check to verify domain exists for all cmds except build
+
 ## v0.4.0:
 
 * Prefixing domain name with heirloom_

data/lib/heirloom/archive/downloader.rb

@@ -11,13 +11,13 @@ module Heirloom
 
     def download(args)
       region = args[:region]
+      base_prefix = args[:base_prefix]
 
       s3_downloader = Downloader::S3.new :config => @config,
                                          :logger => @logger,
                                          :region => region
 
-      bucket = reader.get_bucket :region => region
-      key = reader.get_key :region => region
+      bucket = get_bucket :region => region, :base_prefix => base_prefix
 
       @logger.info "Downloading s3://#{bucket}/#{key} from #{region}."
 
@@ -37,10 +37,12 @@ module Heirloom
 
     private
 
-    def reader
-      @reader ||= Reader.new :config => @config,
-                             :name   => @name,
-                             :id     => @id
+    def get_bucket(args)
+      "#{args[:base_prefix]}-#{args[:region]}"
+    end
+
+    def key
+      "#{@name}/#{@id}.tar.gz"
     end
 
   end

data/lib/heirloom/archive/verifier.rb

@@ -31,5 +31,16 @@ module Heirloom
       result
     end
 
+    def domain_exists?
+      domain = "heirloom_#{@name}"
+      sdb.domain_exists? domain
+    end
+
+    private
+
+    def sdb
+      @sdb ||= AWS::SimpleDB.new :config => @config
+    end
+
   end
 end

data/lib/heirloom/archive.rb

@@ -51,6 +51,10 @@ module Heirloom
       verifier.buckets_exist? args
     end
 
+    def domain_exists?
+      verifier.domain_exists?
+    end
+
     def destroy
       destroyer.destroy :regions => regions
     end

data/lib/heirloom/cli/authorize.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module Heirloom
   module CLI
     class Authorize
@@ -11,10 +9,14 @@ module Heirloom
         @logger = HeirloomLogger.new :log_level => @opts[:level]
         @config = load_config :logger => @logger,
                               :opts   => @opts
+
         exit 1 unless valid_options? :provided => @opts,
                                      :required => [:accounts, 
                                                    :name, :id],
                                      :logger   => @logger
+
+        ensure_domain_exists :name => @opts[:name], :config => @config
+
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
                                :config => @config
@@ -43,7 +45,7 @@ EOS
           opt :accounts, "AWS Account(s) email to authorize. Can be specified multiple times.", :type  => :string,
                                                                                                 :multi => true
           opt :help, "Display Help"
-          opt :id, "id of the archive to authorize.", :type => :string
+          opt :id, "ID of the archive to authorize.", :type => :string
           opt :key, "AWS Access Key", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'

data/lib/heirloom/cli/build.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module Heirloom
   module CLI
     class Build
@@ -73,7 +71,7 @@ Can be specified multiple times.", :type  => :string,
           opt :key, "AWS Access Key ID", :type => :string
           opt :git, "Read git commit information from directory and set as archive attributes."
           opt :help, "Display Help"
-          opt :id, "id for archive (when -g specified, assumed to be GIT sha).", :type => :string
+          opt :id, "ID for archive (when -g specified, assumed to be GIT sha).", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
           opt :name, "Name of archive.", :type => :string

data/lib/heirloom/cli/destroy.rb

@@ -13,6 +13,9 @@ module Heirloom
         exit 1 unless valid_options? :provided => @opts,
                                      :required => [:name, :id],
                                      :logger   => @logger
+
+        ensure_domain_exists :name => @opts[:name], :config => @config
+
         @name = @opts[:name]
         @id = @opts[:id]
         @archive = Archive.new :name   => @name,

data/lib/heirloom/cli/download.rb

@@ -11,7 +11,8 @@ module Heirloom
                               :opts   => @opts
 
         exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:name, :id, :output],
+                                     :required => [:base_prefix, :name,
+                                                   :id, :output],
                                      :logger   => @logger
 
         @archive = Archive.new :name   => @opts[:name],
@@ -20,8 +21,9 @@ module Heirloom
       end
       
       def download
-        @archive.download :output => @opts[:output],
-                          :region => @opts[:region]
+        @archive.download :output      => @opts[:output],
+                          :region      => @opts[:region],
+                          :base_prefix => @opts[:base_prefix]
       end
 
       private
@@ -39,7 +41,8 @@ heirloom download -n NAME -i ID -r REGION -o OUTPUT_FILE
 
 EOS
           opt :help, "Display Help"
-          opt :id, "id of the archive to download.", :type => :string
+          opt :base_prefix, "Base prefix of the archive to download.", :type => :string
+          opt :id, "ID of the archive to download.", :type => :string
           opt :key, "AWS Access Key ID", :type => :string
           opt :name, "Name of archive.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,

data/lib/heirloom/cli/list.rb

@@ -14,6 +14,8 @@ module Heirloom
                                      :required => [:name],
                                      :logger   => @logger
 
+        ensure_domain_exists :name => @opts[:name], :config => @config
+
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config
       end

data/lib/heirloom/cli/shared.rb

@@ -32,6 +32,20 @@ module Heirloom
         config
       end
 
+      def ensure_domain_exists(args)
+        config = args[:config]
+        name = args[:name]
+        logger = config.logger
+
+        archive = Archive.new :name   => name,
+                              :config => config
+
+        unless archive.domain_exists?
+          logger.error "Heirloom domain does not exist."
+          exit 1
+        end
+      end
+
     end
   end
 end

data/lib/heirloom/cli/show.rb

@@ -14,6 +14,8 @@ module Heirloom
                                      :required => [:name],
                                      :logger   => @logger
 
+        ensure_domain_exists :name => @opts[:name], :config => @config
+
         id = @opts[:id] ? @opts[:id] : latest_id
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config,
@@ -51,7 +53,7 @@ EOS
           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 :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

@@ -16,6 +16,8 @@ module Heirloom
                                                    :updated_value],
                                      :logger   => @logger
 
+        ensure_domain_exists :name => @opts[:name], :config => @config
+
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
                                :config => @config

data/lib/heirloom/cli.rb

@@ -1,4 +1,5 @@
 require 'trollop'
+require 'json'
 
 require 'heirloom/cli/shared'
 require 'heirloom/cli/authorize'

data/lib/heirloom/version.rb

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

data/spec/archive/downloader_spec.rb

@@ -2,92 +2,43 @@ require 'spec_helper'
 
 describe Heirloom do
 
-    before do
-      @config_mock = double 'config'
-      @logger_mock = double 'logger'
-      @config_mock.should_receive(:logger).and_return(@logger_mock)
-      @downloader = Heirloom::Downloader.new :config => @config_mock,
-                                             :name   => 'tim',
-                                             :id     => '123'
+  before do
+    @config_mock = double 'config'
+    @logger_stub = double 'logger', :info => true, :debug => true
+    @config_mock.should_receive(:logger).and_return(@logger_stub)
+    @downloader = Heirloom::Downloader.new :config => @config_mock,
+                                           :name   => 'tim',
+                                           :id     => '123'
+    @s3_downloader_mock = mock 's3 downloader'
+    Heirloom::Downloader::S3.should_receive(:new).
+                             with(:config => @config_mock,
+                                  :logger => @logger_stub,
+                                  :region => 'us-west-1').
+                             and_return @s3_downloader_mock
+    @s3_downloader_mock.should_receive(:download_file).
+                       with(:bucket => 'bucket-us-west-1',
+                            :key    => 'tim/123.tar.gz').
+                       and_return 'filename'
+    @file_mock = mock 'file'
+  end
+
+  context "with base_prefix specified" do
+    it "should download to the current path if output is not specified" do
+      File.should_receive(:open).with('./123.tar.gz', 'w').
+                                 and_return @file_mock
+
+      @downloader.download :region      => 'us-west-1',
+                           :base_prefix => 'bucket'
     end
 
-    it "should download an archive" do
-      s3_downloader_mock = mock 's3 downloader'
-      Heirloom::Downloader::S3.should_receive(:new).
-                               with(:config => @config_mock,
-                                    :logger => @logger_mock,
-                                    :region => 'us-west-1').
-                               and_return s3_downloader_mock
-      reader_mock = mock 'reader'
-      @downloader.should_receive(:reader).
-                  exactly(2).times.
-                  and_return reader_mock
-      reader_mock.should_receive(:get_bucket).
-                           with(:region => 'us-west-1').
-                           and_return 'bucket-us-west-1'
-      reader_mock.should_receive(:get_key).
-                           with(:region => 'us-west-1').
-                           and_return 'key'
-
-      @logger_mock.should_receive(:info).
-                   with "Downloading s3://bucket-us-west-1/key from us-west-1."
-
-      s3_downloader_mock.should_receive(:download_file).
-                         with(:bucket => 'bucket-us-west-1',
-                              :key    => 'key').
-                         and_return 'filename'
-
-      @logger_mock.should_receive(:info).
-                   with "Writing file to /tmp/file."
-
-      file_mock = mock 'file'
-
+    it "should download arhcive to specified output" do
       File.should_receive(:open).with('/tmp/file', 'w').
-                                 and_return file_mock
-
-      @logger_mock.should_receive(:info).with "Download complete."
-
-      @downloader.download(:output => '/tmp/file',
-                           :region => 'us-west-1')
-    end
-
-    it "should download the archive to the current path if output is unspecficief" do
-      s3_downloader_mock = mock 's3 downloader'
-      Heirloom::Downloader::S3.should_receive(:new).
-                               with(:config => @config_mock,
-                                    :logger => @logger_mock,
-                                    :region => 'us-west-1').
-                               and_return s3_downloader_mock
-      reader_mock = mock 'reader'
-      @downloader.should_receive(:reader).
-                  exactly(2).times.
-                  and_return reader_mock
-      reader_mock.should_receive(:get_bucket).
-                  with(:region => 'us-west-1').
-                  and_return 'bucket-us-west-1'
-      reader_mock.should_receive(:get_key).
-                  with(:region => 'us-west-1').
-                  and_return 'key'
-
-      @logger_mock.should_receive(:info).
-                   with "Downloading s3://bucket-us-west-1/key from us-west-1."
-
-      s3_downloader_mock.should_receive(:download_file).
-                         with(:bucket => 'bucket-us-west-1',
-                              :key    => 'key').
-                         and_return 'filename'
-
-      @logger_mock.should_receive(:info).
-                   with "Writing file to ./key."
-
-      file_mock = mock 'file'
-
-      File.should_receive(:open).with('./key', 'w').
-                                 and_return file_mock
-
-      @logger_mock.should_receive(:info).with "Download complete."
+                                 and_return @file_mock
 
-      @downloader.download(:region => 'us-west-1')
+      @downloader.download :output      => '/tmp/file',
+                           :region      => 'us-west-1',
+                           :base_prefix => 'bucket'
     end
+  end
 
 end

data/spec/cli/authorize_spec.rb

@@ -11,6 +11,7 @@ describe Heirloom do
     @logger_mock = mock 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
+    @config_mock.stub :logger => @logger_mock
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_mock
@@ -18,11 +19,16 @@ describe Heirloom do
                              with(:logger => @logger_mock,
                                   :opts   => options).
                              and_return @config_mock
+    Heirloom::Archive.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @archive_mock
     Heirloom::Archive.should_receive(:new).
                       with(:id   => '1.0.0',
                            :name => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_authorize = Heirloom::CLI::Authorize.new
   end
 

data/spec/cli/destroy_spec.rb

@@ -10,6 +10,7 @@ describe Heirloom do
     @logger_mock = mock 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
+    @config_mock.stub :logger => @logger_mock
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_mock
@@ -17,11 +18,16 @@ describe Heirloom do
                              with(:logger => @logger_mock,
                                   :opts   => options).
                              and_return @config_mock
+    Heirloom::Archive.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @archive_mock
     Heirloom::Archive.should_receive(:new).
                       with(:id   => '1.0.0',
                            :name => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_destroy = Heirloom::CLI::Destroy.new
   end
 

data/spec/cli/download_spec.rb

@@ -4,14 +4,16 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name   => 'archive_name',
-                :id     => '1.0.0',
-                :level  => 'info',
-                :output => '/tmp/test123',
-                :region => 'us-east-1' }
+    options = { :name        => 'archive_name',
+                :id          => '1.0.0',
+                :level       => 'info',
+                :output      => '/tmp/test123',
+                :region      => 'us-east-1',
+                :base_prefix => 'base' }
     @logger_mock = mock 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
+    @config_mock.stub :logger => @logger_mock
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).
                              with(:log_level => 'info').
@@ -29,8 +31,9 @@ describe Heirloom do
   end
 
   it "should download an archive" do
-    @archive_mock.should_receive(:download).with :output => '/tmp/test123',
-                                                 :region => 'us-east-1'
+    @archive_mock.should_receive(:download).with :output      => '/tmp/test123',
+                                                 :region      => 'us-east-1',
+                                                 :base_prefix => 'base'
     @cli_download.download
   end
 

data/spec/cli/list_spec.rb

@@ -10,6 +10,7 @@ describe Heirloom do
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
+    @config_mock.stub :logger => @logger_mock
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -17,10 +18,15 @@ describe Heirloom do
                         with(:logger => @logger_stub,
                              :opts   => options).
                         and_return @config_mock
+    Heirloom::Archive.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @archive_mock
     Heirloom::Archive.should_receive(:new).
                       with(:name   => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.should_receive(:domain_exists?).and_return true
     @archive_mock.should_receive(:count)
     @cli_list = Heirloom::CLI::List.new
   end

data/spec/cli/shared_spec.rb

@@ -74,6 +74,33 @@ describe Heirloom do
       @config_mock.should_receive(:secret_key=).with 'the_secret'
       @object.load_config :logger => @logger_mock, :opts => opts
     end
+
+  end
+
+  context "testing ensure domain" do
+    before do
+      @archive_mock = mock 'archive'
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger => @logger_stub
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+      Heirloom::Archive.should_receive(:new).
+                        with(:name => 'test', :config => @config_stub).
+                        and_return @archive_mock
+    end
+
+    it "should ensure the domain for a given archive exists" do
+      @archive_mock.should_receive(:domain_exists?).and_return true
+      @object.ensure_domain_exists :config => @config_stub, 
+                                   :name   => 'test'
+    end
+
+    it "should exit if the domain does not exist" do
+      @archive_mock.should_receive(:domain_exists?).and_return false
+      lambda { @object.ensure_domain_exists :config => @config_stub,
+                                            :name   => 'test'}.
+                       should raise_error SystemExit
+    end
   end
 
 end

data/spec/cli/show_spec.rb

@@ -10,6 +10,7 @@ describe Heirloom do
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
+    @config_mock.stub :logger => @logger_mock
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -17,11 +18,16 @@ describe Heirloom do
                         with(:logger => @logger_stub,
                              :opts   => options).
                         and_return @config_mock
+    Heirloom::Archive.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @archive_mock
     Heirloom::Archive.should_receive(:new).
                       with(:name   => 'archive_name',
                            :id     => '1.0.0',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_show = Heirloom::CLI::Show.new
   end
 

data/spec/cli/update_spec.rb

@@ -12,6 +12,7 @@ describe Heirloom do
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
+    @config_mock.stub :logger => @logger_mock
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -19,11 +20,16 @@ describe Heirloom do
                           with(:logger => @logger_stub,
                                :opts   => options).
                           and_return @config_mock
+    Heirloom::Archive.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @archive_mock
     Heirloom::Archive.should_receive(:new).
                       with(:name   => 'archive_name',
                            :id     => '1.0.0',
                            :config => @config_mock).
                       and_return @archive_mock
+    @archive_mock.should_receive(:domain_exists?).and_return true
     @cli_update = Heirloom::CLI::Update.new
   end
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212754890460 !ruby/object:Gem::Requirement
+  requirement: &70189313530340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212754890460
+  version_requirements: *70189313530340
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70212754889240 !ruby/object:Gem::Requirement
+  requirement: &70189313529180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212754889240
+  version_requirements: *70189313529180
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70212754888480 !ruby/object:Gem::Requirement
+  requirement: &70189313528440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212754888480
+  version_requirements: *70189313528440
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70212754887860 !ruby/object:Gem::Requirement
+  requirement: &70189313527540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212754887860
+  version_requirements: *70189313527540
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70212754886740 !ruby/object:Gem::Requirement
+  requirement: &70189313526840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212754886740
+  version_requirements: *70189313526840
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -164,16 +164,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1382939958455203904
+      hash: 3075151930949687714
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1382939958455203904
+      version: 1.3.1
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16