heirloom 0.5.0rc3 → 0.5.0rc4

data/spec/archive/writer_spec.rb

@@ -17,7 +17,7 @@ describe Heirloom do
       File.should_receive(:open).with('/tmp/tempfile', 'w')
       Heirloom::Writer.any_instance.should_receive(:`).
                        with('tar xzf /tmp/tempfile -C /output')
-      $?.should_receive(:success?).and_return true
+      $?.stub :success? => true
       @writer.save_archive(:archive => 'archive_data', 
                            :output  => '/output',
                            :file    => 'id.tar.gz',
@@ -28,8 +28,8 @@ describe Heirloom do
       File.should_receive(:open).with('/tmp/tempfile', 'w')
       Heirloom::Writer.any_instance.should_receive(:`).
                        with('tar xzf /tmp/tempfile -C /output')
+      $?.stub :success? => false
       @logger_mock.should_receive(:error).with "Error extracting archive."
-      $?.should_receive(:success?).and_return false
       @writer.save_archive(:archive => 'archive_data', 
                            :output  => '/output',
                            :file    => 'id.tar.gz',

data/spec/archive_spec.rb

@@ -164,8 +164,9 @@ describe Heirloom do
                                :id      => '123').
                           and_return destroyer_mock
       destroyer_mock.should_receive(:destroy).
-                     with(:regions => ['us-west-1', 'us-west-2'])
-      @archive.destroy
+                     with(:regions     => ['us-west-1', 'us-west-2'],
+                          :keep_domain => false)
+      @archive.destroy :keep_domain => false
     end
 
     it "should call the regions method for an archive" do

data/spec/aws/s3_spec.rb

@@ -51,5 +51,21 @@ describe Heirloom do
     @s3.put_object_acl 'bucket', 'object', 'grants'
   end
 
+  it "should call put bucket with location_constraint us-west-1" do
+    options = { 'LocationConstraint' => 'us-west-1',
+                'x-amz-acl'          => 'private' }
+    @fog_mock.should_receive(:put_bucket).
+              with('name', options)
+    @s3.put_bucket 'name', 'us-west-1'
+  end
+
+  it "should call put bucket with location_constraint nil when region us-west-1" do
+    options = { 'LocationConstraint' => nil,
+                'x-amz-acl'          => 'private' }
+    @fog_mock.should_receive(:put_bucket).
+              with('name', options)
+    @s3.put_bucket 'name', 'us-east-1'
+  end
+
 
 end

data/spec/cipher/data_spec.rb

@@ -18,10 +18,10 @@ describe Heirloom do
 
     it "should decrypt the given data" do
       @aes_mock.should_receive(:decrypt)
-      @aes_mock.should_receive(:key=).with 'mysecret'
+      @aes_mock.should_receive(:key=).with Digest::SHA256.hexdigest 'mysecret'
       @aes_mock.should_receive(:iv=).with 'firstsixteenchar'
       @aes_mock.should_receive(:update).with('crypteddata').and_return 'cleartext'
-      @aes_mock.should_receive(:final).and_return 'final'
+      @aes_mock.stub :final => 'final'
       @data.decrypt_data(:data => 'firstsixteencharcrypteddata',
                          :secret => 'mysecret').
             should == 'cleartextfinal'
@@ -31,7 +31,7 @@ describe Heirloom do
       @logger_mock.should_receive(:error).
                    with "Unable to decrypt archive: 'OpenSSL::Cipher::CipherError'"
       @aes_mock.should_receive(:decrypt)
-      @aes_mock.should_receive(:key=).with 'badsecret'
+      @aes_mock.should_receive(:key=).with Digest::SHA256.hexdigest 'badsecret'
       @aes_mock.should_receive(:iv=).with 'firstsixteenchar'
       @aes_mock.should_receive(:update).with('crypteddata').and_return 'crap'
       @aes_mock.should_receive(:final).and_raise OpenSSL::Cipher::CipherError

data/spec/cipher/file_spec.rb

@@ -9,6 +9,7 @@ describe Heirloom do
     @tempfile_stub = stub 'tempfile', :path => '/path_to_encrypted_archive'
     Tempfile.stub :new => @tempfile_stub
     @aes_mock = mock 'aes'
+    @aes_mock.stub :random_iv => 'firstsixteenchar'
     OpenSSL::Cipher::AES256.should_receive(:new).
                             with(:CBC).and_return @aes_mock
     @file = Heirloom::Cipher::File.new :config => @config_mock
@@ -16,12 +17,12 @@ describe Heirloom do
 
   it "should encrypt the given file" do
     @aes_mock.should_receive(:encrypt)
-    @aes_mock.should_receive(:random_iv).and_return 'firstsixteenchar'
     @aes_mock.should_receive(:iv=).with 'firstsixteenchar'
-    @aes_mock.should_receive(:key=).with 'mysecret'
+    @aes_mock.should_receive(:key=).with Digest::SHA256.hexdigest 'mysecret'
     ::File.should_receive(:open)
     @file.encrypt_file(:file   => '/file',
-                       :secret => 'mysecret').should == '/path_to_encrypted_archive'
+                       :secret => 'mysecret').
+          should == '/path_to_encrypted_archive'
   end
 
 end

data/spec/cli/authorize_spec.rb

@@ -8,7 +8,7 @@ describe Heirloom do
                 :accounts => ['test@test.com'],
                 :name     => 'archive_name',
                 :id       => '1.0.0' }
-    @logger_stub = stub
+    @logger_stub = stub 'logger', :error => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
     @config_mock.stub :logger     => @logger_stub,
@@ -35,8 +35,15 @@ describe Heirloom do
   end
 
   it "should authorize an account" do
-    @archive_mock.should_receive(:authorize).with ['test@test.com']
+    @archive_mock.should_receive(:authorize).with(['test@test.com']).
+                  and_return true
     @cli_authorize.authorize
   end
 
+  it "should exit if authorize returns false" do
+    @archive_mock.should_receive(:authorize).with(['test@test.com']).
+                  and_return false
+    lambda { @cli_authorize.authorize }.should raise_error SystemExit
+  end
+
 end

data/spec/cli/destroy_spec.rb

@@ -34,7 +34,7 @@ describe Heirloom do
   end
 
   it "should destroy an archive" do
-    @archive_mock.should_receive(:destroy)
+    @archive_mock.should_receive(:destroy).with :keep_domain => false
     @cli_destroy.destroy
   end
 

data/spec/cli/shared_spec.rb

@@ -16,8 +16,9 @@ describe Heirloom do
       @object.extend Heirloom::CLI::Shared
     end
 
-    it "should exit if the secret is given and under 32 characters" do
+    it "should exit if the secret is given and under 8 characters" do
       @logger_mock.should_receive(:error)
+      @logger_mock.stub :info => true
       lambda { @object.ensure_valid_secret(:secret => 'shorty',
                                            :config => @config_mock) }.
                        should raise_error SystemExit

data/spec/cli/{update_spec.rb → tag_spec.rb}

@@ -4,12 +4,12 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :name           => 'archive_name',
-                :id             => '1.0.0',
-                :level          => 'info',
-                :attribute      => 'att',
-                :updated_value  => 'val' }
-    @logger_stub = stub :debug => true
+    options = { :name      => 'archive_name',
+                :id        => '1.0.0',
+                :level     => 'info',
+                :attribute => 'att',
+                :value     => 'val' }
+    @logger_stub = stub :debug => true, :error => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
     @config_mock.stub :logger     => @logger_stub, 
@@ -18,10 +18,10 @@ describe Heirloom do
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
-    Heirloom::CLI::Update.any_instance.should_receive(:load_config).
-                          with(:logger => @logger_stub,
-                               :opts   => options).
-                          and_return @config_mock
+    Heirloom::CLI::Tag.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).
@@ -32,14 +32,20 @@ describe Heirloom do
                            :config => @config_mock).
                       and_return @archive_mock
     @archive_mock.should_receive(:domain_exists?).and_return true
-    @cli_update = Heirloom::CLI::Update.new
+    @cli_tag = Heirloom::CLI::Tag.new
   end
 
-  it "should update an attribute for a given id" do
+  it "should tag an archive attribute with a given id" do
+    @archive_mock.stub :exists? => true
     @archive_mock.should_receive(:update).
                   with(:attribute => 'att',
                        :value     => 'val')
-    @cli_update.update
+    @cli_tag.tag
+  end
+
+  it "should exit if the archive does not exist" do
+    @archive_mock.stub :exists? => false
+    lambda { @cli_tag.tag }.should raise_error SystemExit
   end
 
 end

data/spec/cli/{build_spec.rb → upload_spec.rb}

@@ -4,17 +4,17 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    options = { :level       => 'info',
-                :base_prefix => 'base',
-                :git         => false,
-                :exclude     => ['exclude1', 'exclude2'],
-                :region      => ['us-west-1', 'us-west-2'],
-                :directory   => '/buildme',
-                :public      => false,
-                :name        => 'archive_name',
-                :id          => '1.0.0' }
+    options = { :level     => 'info',
+                :base      => 'base',
+                :git       => false,
+                :exclude   => ['exclude1', 'exclude2'],
+                :region    => ['us-west-1', 'us-west-2'],
+                :directory => '/buildme',
+                :public    => false,
+                :name      => 'archive_name',
+                :id        => '1.0.0' }
 
-    @logger_stub = stub :error => true, :info => true
+    @logger_stub = stub 'logger', :error => true, :info => true
     @config_mock = mock 'config'
     @config_mock.stub :logger     => @logger_stub,
                       :access_key => 'key',
@@ -23,38 +23,38 @@ describe Heirloom do
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub
-    Heirloom::CLI::Build.any_instance.should_receive(:load_config).
-                         with(:logger => @logger_stub,
-                              :opts   => options).
-                         and_return @config_mock
+    Heirloom::CLI::Upload.any_instance.should_receive(:load_config).
+                          with(:logger => @logger_stub,
+                               :opts   => options).
+                          and_return @config_mock
     Heirloom::Archive.should_receive(:new).
                       with(:id   => '1.0.0',
                            :name => 'archive_name',
                            :config => @config_mock).
                       and_return @archive_mock
-    @build = Heirloom::CLI::Build.new
+    @upload = Heirloom::CLI::Upload.new
   end
 
-  it "should build an archive" do
-    @build.stub :ensure_directory => true
-    @archive_mock.should_receive(:buckets_exist?).
+  it "should upload an archive" do
+    @upload.stub :ensure_directory => true
+    @upload.stub :ensure_valid_secret => true
+    @archive_mock.should_receive(:setup).
                   with(:bucket_prefix => 'base',
-                       :regions       => ["us-west-1", "us-west-2"]).
-                  and_return true
+                       :regions       => ["us-west-1", "us-west-2"])
     @archive_mock.stub :exists? => false
     @archive_mock.should_receive(:build).
-                  with(:bucket_prefix => 'base',
-                       :directory     => '/buildme',
-                       :exclude       => ["exclude1", "exclude2"],
-                       :git           => false,
-                       :secret        => nil).
+                  with(:base      => 'base',
+                       :directory => '/buildme',
+                       :exclude   => ["exclude1", "exclude2"],
+                       :git       => false,
+                       :secret    => nil).
                   and_return '/tmp/build123.tar.gz'
     @archive_mock.should_receive(:upload).
                   with(:bucket_prefix   => 'base',
                        :regions         => ['us-west-1', 'us-west-2'],
                        :public_readable => false,
                        :file            => '/tmp/build123.tar.gz')
-    @build.build
+    @upload.upload
   end
 
 end

data/spec/directory/directory_spec.rb

@@ -22,9 +22,12 @@ describe Heirloom::Directory do
     end
 
     context 'when succesful' do
+      before do 
+        $?.stub :success? => true
+      end
+
       context 'without secret provided' do
         it "should build an archive from the path" do
-          $?.should_receive(:success?).and_return true
           @directory.build_artifact_from_directory(:secret => nil).
                      should be_true
         end
@@ -39,7 +42,6 @@ describe Heirloom::Directory do
         end
 
         it "should build and encrypt an archive from the path" do
-          $?.should_receive(:success?).and_return true
           @cipher_mock.should_receive(:encrypt_file).
                        with(:file => '/tmp/file.tar.gz', 
                             :secret => 'supersecret').

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc3
+  version: 0.5.0rc4
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151211289720 !ruby/object:Gem::Requirement
+  requirement: &70328442595660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,51 +21,40 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151211289720
+  version_requirements: *70328442595660
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70151211289060 !ruby/object:Gem::Requirement
+  requirement: &70328442595020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151211289060
+  version_requirements: *70328442595020
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70151211287820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70151211287820
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: &70151211287040 !ruby/object:Gem::Requirement
+  requirement: &70328442594520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151211287040
+  version_requirements: *70328442594520
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70151211286040 !ruby/object:Gem::Requirement
+  requirement: &70328442594040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151211286040
+  version_requirements: *70328442594040
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -94,6 +83,7 @@ files:
 - lib/heirloom/archive/downloader.rb
 - lib/heirloom/archive/lister.rb
 - lib/heirloom/archive/reader.rb
+- lib/heirloom/archive/setuper.rb
 - lib/heirloom/archive/updater.rb
 - lib/heirloom/archive/uploader.rb
 - lib/heirloom/archive/verifier.rb
@@ -106,13 +96,13 @@ files:
 - lib/heirloom/cipher/file.rb
 - lib/heirloom/cli.rb
 - lib/heirloom/cli/authorize.rb
-- lib/heirloom/cli/build.rb
 - lib/heirloom/cli/destroy.rb
 - lib/heirloom/cli/download.rb
 - lib/heirloom/cli/list.rb
 - lib/heirloom/cli/shared.rb
 - lib/heirloom/cli/show.rb
-- lib/heirloom/cli/update.rb
+- lib/heirloom/cli/tag.rb
+- lib/heirloom/cli/upload.rb
 - lib/heirloom/config.rb
 - lib/heirloom/destroyer.rb
 - lib/heirloom/destroyer/s3.rb
@@ -133,6 +123,7 @@ files:
 - spec/archive/downloader_spec.rb
 - spec/archive/lister_spec.rb
 - spec/archive/reader_spec.rb
+- spec/archive/setup_spec.rb
 - spec/archive/updater_spec.rb
 - spec/archive/uploader_spec.rb
 - spec/archive/verifier_spec.rb
@@ -143,13 +134,13 @@ files:
 - spec/cipher/data_spec.rb
 - spec/cipher/file_spec.rb
 - spec/cli/authorize_spec.rb
-- spec/cli/build_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/download_spec.rb
 - spec/cli/list_spec.rb
 - spec/cli/shared_spec.rb
 - spec/cli/show_spec.rb
-- spec/cli/update_spec.rb
+- spec/cli/tag_spec.rb
+- spec/cli/upload_spec.rb
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
 - spec/directory/directory_spec.rb
@@ -171,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4293229693492168052
+      hash: -3871179857834754510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,6 +183,7 @@ test_files:
 - spec/archive/downloader_spec.rb
 - spec/archive/lister_spec.rb
 - spec/archive/reader_spec.rb
+- spec/archive/setup_spec.rb
 - spec/archive/updater_spec.rb
 - spec/archive/uploader_spec.rb
 - spec/archive/verifier_spec.rb
@@ -202,13 +194,13 @@ test_files:
 - spec/cipher/data_spec.rb
 - spec/cipher/file_spec.rb
 - spec/cli/authorize_spec.rb
-- spec/cli/build_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/download_spec.rb
 - spec/cli/list_spec.rb
 - spec/cli/shared_spec.rb
 - spec/cli/show_spec.rb
-- spec/cli/update_spec.rb
+- spec/cli/tag_spec.rb
+- spec/cli/upload_spec.rb
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
 - spec/directory/directory_spec.rb