heirloom 0.6.1 → 0.7.0rc1

data/spec/cli/teardown_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'heirloom/cli'
+
+describe Heirloom do
+
+  before do
+    options = { :level           => 'info',
+                :name            => 'archive_name',
+                :metadata_region => 'us-west-1' }
+
+    @logger_stub = stub 'logger', :error => true, :info => true
+    @config_mock = mock 'config'
+    @config_mock.stub :logger          => @logger_stub,
+                      :access_key      => 'key',
+                      :secret_key      => 'secret',
+                      :metadata_region => 'us-west-1'
+    @archive_mock = mock 'archive'
+    @catalog_mock = mock 'catalog'
+    @catalog_mock.stub :regions => ['us-west-1', 'us-west-2']
+    @catalog_mock.stub :base => 'base'
+    Trollop.stub(:options).and_return options
+    Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
+                             and_return @logger_stub
+    Heirloom::CLI::Teardown.any_instance.should_receive(:load_config).
+                            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::Catalog.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @catalog_mock
+    @teardown = Heirloom::CLI::Teardown.new
+  end
+
+  it "should delete s3 buckets, catalog and simpledb domain" do
+    @teardown.should_receive(:ensure_domain_exists).
+              with(:name   => 'archive_name',
+                   :config => @config_mock)
+    @teardown.should_receive(:ensure_archive_domain_empty).
+              with(:archive => @archive_mock,
+                   :config  => @config_mock)
+    @archive_mock.should_receive(:delete_buckets)
+    @archive_mock.should_receive(:delete_domain)
+    @catalog_mock.should_receive(:delete_from_catalog)
+    @teardown.teardown 
+  end
+
+end

data/spec/cli/upload_spec.rb

@@ -6,10 +6,8 @@ describe Heirloom do
   before do
     @regions = ['us-west-1', 'us-west-2']
     options = { :level           => 'info',
-                :base            => 'base',
                 :git             => false,
                 :exclude         => ['exclude1', 'exclude2'],
-                :region          => @regions,
                 :directory       => '/buildme',
                 :public          => false,
                 :secret          => 'secret12',
@@ -24,6 +22,8 @@ describe Heirloom do
                       :secret_key      => 'secret',
                       :metadata_region => 'us-west-1'
     @archive_mock = mock 'archive'
+    @catalog_stub = stub 'catalog', :regions => @regions,
+                                    :base    => 'base'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
@@ -36,6 +36,10 @@ describe Heirloom do
                            :name => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
+    Heirloom::Catalog.should_receive(:new).
+                      with(:name => 'archive_name',
+                           :config => @config_mock).
+                      and_return @catalog_stub
     @upload = Heirloom::CLI::Upload.new
   end
 
@@ -54,9 +58,6 @@ describe Heirloom do
     @upload.should_receive(:ensure_valid_secret).
             with(:secret => 'secret12',
                  :config => @config_mock)
-    @upload.should_receive(:ensure_metadata_in_upload_region).
-            with(:config  => @config_mock,
-                 :regions => @regions)
     @archive_mock.stub :exists? => false
     @archive_mock.should_receive(:build).
                   with(:base      => 'base',

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.7.0rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191146015360 !ruby/object:Gem::Requirement
+  requirement: &70259043841160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191146015360
+  version_requirements: *70259043841160
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70191146014760 !ruby/object:Gem::Requirement
+  requirement: &70259043839120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70191146014760
+  version_requirements: *70259043839120
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70191146014100 !ruby/object:Gem::Requirement
+  requirement: &70259043838180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70191146014100
+  version_requirements: *70259043838180
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70191146013520 !ruby/object:Gem::Requirement
+  requirement: &70259043837620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191146013520
+  version_requirements: *70259043837620
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -84,6 +84,7 @@ files:
 - lib/heirloom/archive/lister.rb
 - lib/heirloom/archive/reader.rb
 - lib/heirloom/archive/setuper.rb
+- lib/heirloom/archive/teardowner.rb
 - lib/heirloom/archive/updater.rb
 - lib/heirloom/archive/uploader.rb
 - lib/heirloom/archive/verifier.rb
@@ -91,11 +92,19 @@ files:
 - lib/heirloom/aws.rb
 - lib/heirloom/aws/s3.rb
 - lib/heirloom/aws/simpledb.rb
+- lib/heirloom/catalog.rb
+- lib/heirloom/catalog/add.rb
+- lib/heirloom/catalog/delete.rb
+- lib/heirloom/catalog/list.rb
+- lib/heirloom/catalog/setup.rb
+- lib/heirloom/catalog/show.rb
+- lib/heirloom/catalog/verify.rb
 - lib/heirloom/cipher.rb
 - lib/heirloom/cipher/data.rb
 - lib/heirloom/cipher/file.rb
 - lib/heirloom/cli.rb
 - lib/heirloom/cli/authorize.rb
+- lib/heirloom/cli/catalog.rb
 - lib/heirloom/cli/destroy.rb
 - lib/heirloom/cli/download.rb
 - lib/heirloom/cli/list.rb
@@ -103,6 +112,7 @@ files:
 - lib/heirloom/cli/shared.rb
 - lib/heirloom/cli/show.rb
 - lib/heirloom/cli/tag.rb
+- lib/heirloom/cli/teardown.rb
 - lib/heirloom/cli/upload.rb
 - lib/heirloom/config.rb
 - lib/heirloom/destroyer.rb
@@ -125,6 +135,7 @@ files:
 - spec/archive/lister_spec.rb
 - spec/archive/reader_spec.rb
 - spec/archive/setup_spec.rb
+- spec/archive/teardowner_spec.rb
 - spec/archive/updater_spec.rb
 - spec/archive/uploader_spec.rb
 - spec/archive/verifier_spec.rb
@@ -132,9 +143,17 @@ files:
 - spec/archive_spec.rb
 - spec/aws/s3_spec.rb
 - spec/aws/simpledb_spec.rb
+- spec/catalog/add_spec.rb
+- spec/catalog/delete_spec.rb
+- spec/catalog/list_spec.rb
+- spec/catalog/setup_spec.rb
+- spec/catalog/show_spec.rb
+- spec/catalog/verify_spec.rb
+- spec/catalog_spec.rb
 - spec/cipher/data_spec.rb
 - spec/cipher/file_spec.rb
 - spec/cli/authorize_spec.rb
+- spec/cli/catalog_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/download_spec.rb
 - spec/cli/list_spec.rb
@@ -142,6 +161,7 @@ files:
 - spec/cli/shared_spec.rb
 - spec/cli/show_spec.rb
 - spec/cli/tag_spec.rb
+- spec/cli/teardown_spec.rb
 - spec/cli/upload_spec.rb
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
@@ -164,16 +184,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 376571268782401083
+      hash: -980215948232096115
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 376571268782401083
+      version: 1.3.1
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16
@@ -189,6 +206,7 @@ test_files:
 - spec/archive/lister_spec.rb
 - spec/archive/reader_spec.rb
 - spec/archive/setup_spec.rb
+- spec/archive/teardowner_spec.rb
 - spec/archive/updater_spec.rb
 - spec/archive/uploader_spec.rb
 - spec/archive/verifier_spec.rb
@@ -196,9 +214,17 @@ test_files:
 - spec/archive_spec.rb
 - spec/aws/s3_spec.rb
 - spec/aws/simpledb_spec.rb
+- spec/catalog/add_spec.rb
+- spec/catalog/delete_spec.rb
+- spec/catalog/list_spec.rb
+- spec/catalog/setup_spec.rb
+- spec/catalog/show_spec.rb
+- spec/catalog/verify_spec.rb
+- spec/catalog_spec.rb
 - spec/cipher/data_spec.rb
 - spec/cipher/file_spec.rb
 - spec/cli/authorize_spec.rb
+- spec/cli/catalog_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/download_spec.rb
 - spec/cli/list_spec.rb
@@ -206,6 +232,7 @@ test_files:
 - spec/cli/shared_spec.rb
 - spec/cli/show_spec.rb
 - spec/cli/tag_spec.rb
+- spec/cli/teardown_spec.rb
 - spec/cli/upload_spec.rb
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb