heirloom 0.5.0rc2 → 0.5.0rc3

data/spec/archive/writer_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Heirloom do
+
+  before do
+    @logger_mock = mock 'logger'
+    @logger_mock.stub :info => true, :debug => true
+    @config_mock = mock 'config'
+    @config_mock.stub :logger => @logger_mock
+    @tempfile_stub = stub 'tempfile', :path => '/tmp/tempfile'
+    Tempfile.stub :new => @tempfile_stub
+    @writer = Heirloom::Writer.new :config => @config_mock
+  end
+
+  context "extract is set to true" do
+    it "should extract the given archive object into the output directory" 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
+      @writer.save_archive(:archive => 'archive_data', 
+                           :output  => '/output',
+                           :file    => 'id.tar.gz',
+                           :extract => true).should be_true
+    end
+
+    it "should return false if the extract fails" do
+      File.should_receive(:open).with('/tmp/tempfile', 'w')
+      Heirloom::Writer.any_instance.should_receive(:`).
+                       with('tar xzf /tmp/tempfile -C /output')
+      @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',
+                           :extract => true).should be_false
+    end
+  end
+
+  context "extract is set to false" do
+    it "should save the given archive object into the output directory" do
+      File.should_receive(:open).with('/output/id.tar.gz', 'w').
+           and_return true
+      @writer.save_archive :archive => 'archive_data', 
+                           :output  => '/output',
+                           :file    => 'id.tar.gz',
+                           :extract => false
+    end
+  end
+
+end

data/spec/archive_spec.rb

@@ -125,17 +125,6 @@ describe Heirloom do
       @archive.list
     end
 
-    it "should call cleanup method" do
-      mock = double('Mock')
-      Heirloom::Builder.should_receive(:new).
-                        with(:config => @config_mock,
-                             :name   => 'chef',
-                             :id     => '123').
-                        and_return mock
-      mock.should_receive(:cleanup)
-      @archive.cleanup
-    end
-
     it "should return true if the required buckets exist" do
       mock = double('Mock')
       Heirloom::Verifier.should_receive(:new).

data/spec/aws/simpledb_spec.rb

@@ -43,8 +43,8 @@ describe Heirloom do
 
   it "should update the attributes for an entry" do
     @fog_mock.should_receive(:put_attributes).
-              with('domain', 'key', 'attributes', { "option" => "123" })
-    @sdb.put_attributes('domain', 'key', 'attributes', { "option" => "123" })
+              with('domain', 'key', {'key' => 'value'}, { "option" => "123" })
+    @sdb.put_attributes('domain', 'key', {'key' => 'value'}, { "option" => "123" })
   end
 
   it "should delete the given entry from sdb" do

data/spec/cipher/data_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Heirloom do
+  before do
+    @logger_mock = mock 'logger', :info => true
+    @logger_mock.stub :info => true
+    @config_mock = mock 'config'
+    @config_mock.stub :logger => @logger_mock
+    @data = Heirloom::Cipher::Data.new :config => @config_mock
+  end
+
+  context "with secret given" do
+    before do
+      @aes_mock = mock 'aes'
+      OpenSSL::Cipher::AES256.should_receive(:new).
+                              with(:CBC).and_return @aes_mock
+    end
+
+    it "should decrypt the given data" do
+      @aes_mock.should_receive(:decrypt)
+      @aes_mock.should_receive(:key=).with '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'
+      @data.decrypt_data(:data => 'firstsixteencharcrypteddata',
+                         :secret => 'mysecret').
+            should == 'cleartextfinal'
+    end
+
+    it "should rescue bad key error and return false" 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(:iv=).with 'firstsixteenchar'
+      @aes_mock.should_receive(:update).with('crypteddata').and_return 'crap'
+      @aes_mock.should_receive(:final).and_raise OpenSSL::Cipher::CipherError
+      @data.decrypt_data(:data => 'firstsixteencharcrypteddata',
+                         :secret => 'badsecret').
+            should be_false
+    end
+
+  end
+
+  context "no secret given" do
+    before do
+      @data = Heirloom::Cipher::Data.new :config => @config_mock
+    end
+
+    it "should return the data if no secret given" do
+      @data.decrypt_data(:data   => 'plaintext',
+                         :secret => nil).should == 'plaintext'
+    end
+  end
+
+end

data/spec/cipher/file_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Heirloom do
+  before do
+    @logger_mock = mock 'logger', :info => true
+    @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 :new => @tempfile_stub
+    @aes_mock = mock 'aes'
+    OpenSSL::Cipher::AES256.should_receive(:new).
+                            with(:CBC).and_return @aes_mock
+    @file = Heirloom::Cipher::File.new :config => @config_mock
+  end
+
+  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'
+    ::File.should_receive(:open)
+    @file.encrypt_file(:file   => '/file',
+                       :secret => 'mysecret').should == '/path_to_encrypted_archive'
+  end
+
+end

data/spec/cli/build_spec.rb

@@ -36,6 +36,7 @@ describe Heirloom do
   end
 
   it "should build an archive" do
+    @build.stub :ensure_directory => true
     @archive_mock.should_receive(:buckets_exist?).
                   with(:bucket_prefix => 'base',
                        :regions       => ["us-west-1", "us-west-2"]).
@@ -45,15 +46,14 @@ describe Heirloom do
                   with(:bucket_prefix => 'base',
                        :directory     => '/buildme',
                        :exclude       => ["exclude1", "exclude2"],
-                       :git           => false).
+                       :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')
-    @archive_mock.should_receive(:cleanup)
-
     @build.build
   end
 

data/spec/cli/download_spec.rb

@@ -34,10 +34,12 @@ describe Heirloom do
   end
 
   it "should download an archive" do
-    @archive_mock.should_receive(:download).with :output      => '/tmp/test123',
+    @archive_mock.should_receive(:download).with(:output      => '/tmp/test123',
                                                  :region      => 'us-east-1',
                                                  :base_prefix => 'base',
-                                                 :extract     => false
+                                                 :extract     => false,
+                                                 :secret      => nil).
+                  and_return '/tmp/test123'
     @cli_download.should_receive(:ensure_directory).
                   with(:config => @config_mock, 
                        :path => '/tmp/test123').

data/spec/cli/shared_spec.rb

@@ -16,6 +16,13 @@ describe Heirloom do
       @object.extend Heirloom::CLI::Shared
     end
 
+    it "should exit if the secret is given and under 32 characters" do
+      @logger_mock.should_receive(:error)
+      lambda { @object.ensure_valid_secret(:secret => 'shorty',
+                                           :config => @config_mock) }.
+                       should raise_error SystemExit
+    end
+
     it "should return false if a required array is emtpy" do
       @logger_mock.should_receive(:error)
       lambda { @object.ensure_valid_options(:provided => { 
@@ -75,15 +82,15 @@ describe Heirloom do
     end
 
     it "should set the access key if specified" do
-      opts = { :key       => 'the_key',
-               :key_given => true }
+      opts = { :aws_access_key       => 'the_key',
+               :aws_access_key_given => true }
       @config_mock.should_receive(:access_key=).with 'the_key'
       @object.load_config :logger => @logger_mock, :opts => opts
     end
 
     it "should set the secret key if specified" do
-      opts = { :secret       => 'the_secret',
-               :secret_given => true }
+      opts = { :aws_secret_key       => 'the_secret',
+               :aws_secret_key_given => true }
       @config_mock.should_receive(:secret_key=).with 'the_secret'
       @object.load_config :logger => @logger_mock, :opts => opts
     end
@@ -92,7 +99,7 @@ describe Heirloom do
 
   context "test ensure directory" do
     before do
-      @logger_stub = mock 'logger', :error => true
+      @logger_stub = stub 'logger', :error => true
       @config_mock = mock 'config'
       @config_mock.stub :logger => @logger_stub
       @object = Object.new

data/spec/config_spec.rb

@@ -21,7 +21,7 @@ describe Heirloom do
   end
 
   it "should create a new config object and read from ~/.heirloom.yml" do
-    File.should_receive(:exists?).and_return true
+    File.stub :exists? => true
     File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
                                and_return(@config.to_yaml)
     config = Heirloom::Config.new
@@ -38,7 +38,7 @@ describe Heirloom do
   end
 
   it "should load a blank config if the file does not exist and no config passed" do
-    File.should_receive(:exists?).and_return false
+    File.stub :exists? => false
     config = Heirloom::Config.new
     config.access_key.should be_nil
     config.secret_key.should be_nil

data/spec/directory/directory_spec.rb

@@ -9,28 +9,57 @@ describe Heirloom::Directory do
       @config_mock.stub(:logger).and_return(@logger_stub)
       @directory = Heirloom::Directory.new :config  => @config_mock,
                                            :exclude => ['.', '..', 'dont_pack_me'],
-                                           :path    => '/target/dir'
-      @directory.stub :random_archive => '/tmp/dir/file.tar.gz'
+                                           :path    => '/dir'
+      @tempfile_stub = stub 'tempfile', :path => '/tmp/file.tar.gz'
+      Tempfile.stub :new => @tempfile_stub
       output_mock  = double 'output mock'
-      Dir.stub :tmpdir => '/tmp/dir'
-      Dir.should_receive(:entries).with('/target/dir').
+      Dir.should_receive(:entries).with('/dir').
                                    exactly(2).times.
                                    and_return(['pack_me', '.hidden', 'dont_pack_me'])
       Heirloom::Directory.any_instance.should_receive(:`).
-                          with("tar czf /tmp/dir/file.tar.gz pack_me .hidden").
+                          with("cd /dir && tar czf /tmp/file.tar.gz pack_me .hidden").
                           and_return output_mock
     end
 
-    it "should build an archive from the latest commit in path" do
-      $?.should_receive(:success?).and_return true
-      @directory.build_artifact_from_directory.should be_true
+    context 'when succesful' do
+      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
+      end
+
+      context 'without secret provided' do
+        before do
+          @cipher_mock = mock 'cipher'
+          Heirloom::Cipher::File.should_receive(:new).
+                                 with(:config => @config_mock).
+                                 and_return @cipher_mock
+        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').
+                       and_return '/tmp/encrypted_file.tar.gz'
+          @directory.build_artifact_from_directory(:secret => 'supersecret').
+                     should be_true
+       end
+      end
     end
 
     context 'when unable to create the tar' do
       before { $?.stub(:success?).and_return(false) }
 
-      it "should build return false" do
-        @directory.build_artifact_from_directory.should be_false
+      it "build should return false" do
+        @directory.build_artifact_from_directory(:secret => nil).should be_false
+      end
+
+      it "encrypted build should return false" do
+        @directory.build_artifact_from_directory(:secret => 'supersecret').
+                   should be_false
       end
     end
 

data/spec/directory/git_directory_spec.rb

@@ -6,26 +6,40 @@ describe Heirloom do
     before do
       @repo_mock     = double 'repo mock'
       @git_directory = Heirloom::GitDirectory.new :path => '/target/dir'
-      Repo.should_receive(:new).with('/target/dir').and_return(@repo_mock)
     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 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 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'
+      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
 
-    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
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc2
+  version: 0.5.0rc3
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70122355909400 !ruby/object:Gem::Requirement
+  requirement: &70151211289720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122355909400
+  version_requirements: *70151211289720
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70122355908680 !ruby/object:Gem::Requirement
+  requirement: &70151211289060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122355908680
+  version_requirements: *70151211289060
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70122355908000 !ruby/object:Gem::Requirement
+  requirement: &70151211287820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122355908000
+  version_requirements: *70151211287820
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70122355907160 !ruby/object:Gem::Requirement
+  requirement: &70151211287040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122355907160
+  version_requirements: *70151211287040
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70122355906660 !ruby/object:Gem::Requirement
+  requirement: &70151211286040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122355906660
+  version_requirements: *70151211286040
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -92,15 +92,18 @@ files:
 - lib/heirloom/archive/builder.rb
 - lib/heirloom/archive/destroyer.rb
 - lib/heirloom/archive/downloader.rb
-- lib/heirloom/archive/extracter.rb
 - lib/heirloom/archive/lister.rb
 - lib/heirloom/archive/reader.rb
 - lib/heirloom/archive/updater.rb
 - lib/heirloom/archive/uploader.rb
 - lib/heirloom/archive/verifier.rb
+- lib/heirloom/archive/writer.rb
 - lib/heirloom/aws.rb
 - lib/heirloom/aws/s3.rb
 - lib/heirloom/aws/simpledb.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/build.rb
@@ -119,8 +122,6 @@ files:
 - lib/heirloom/downloader.rb
 - lib/heirloom/downloader/s3.rb
 - lib/heirloom/logger.rb
-- lib/heirloom/misc.rb
-- lib/heirloom/misc/tmp.rb
 - lib/heirloom/uploader.rb
 - lib/heirloom/uploader/s3.rb
 - lib/heirloom/version.rb
@@ -130,15 +131,17 @@ files:
 - spec/archive/builder_spec.rb
 - spec/archive/destroyer_spec.rb
 - spec/archive/downloader_spec.rb
-- spec/archive/extracter_spec.rb
 - spec/archive/lister_spec.rb
 - spec/archive/reader_spec.rb
 - spec/archive/updater_spec.rb
 - spec/archive/uploader_spec.rb
 - spec/archive/verifier_spec.rb
+- spec/archive/writer_spec.rb
 - spec/archive_spec.rb
 - spec/aws/s3_spec.rb
 - spec/aws/simpledb_spec.rb
+- 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
@@ -153,7 +156,6 @@ files:
 - spec/directory/git_directory_spec.rb
 - spec/downloader/s3_spec.rb
 - spec/logger_spec.rb
-- spec/misc/tmp_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -169,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3832291684396607232
+      hash: -4293229693492168052
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,15 +190,17 @@ test_files:
 - spec/archive/builder_spec.rb
 - spec/archive/destroyer_spec.rb
 - spec/archive/downloader_spec.rb
-- spec/archive/extracter_spec.rb
 - spec/archive/lister_spec.rb
 - spec/archive/reader_spec.rb
 - spec/archive/updater_spec.rb
 - spec/archive/uploader_spec.rb
 - spec/archive/verifier_spec.rb
+- spec/archive/writer_spec.rb
 - spec/archive_spec.rb
 - spec/aws/s3_spec.rb
 - spec/aws/simpledb_spec.rb
+- 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
@@ -211,5 +215,4 @@ test_files:
 - spec/directory/git_directory_spec.rb
 - spec/downloader/s3_spec.rb
 - spec/logger_spec.rb
-- spec/misc/tmp_spec.rb
 - spec/spec_helper.rb