heirloom 0.9.0 → 0.10.0

data/spec/cipher/file_spec.rb

@@ -3,28 +3,42 @@ require 'spec_helper'
 describe Heirloom do
   before do
     @logger_mock = mock 'logger', :info => true
-    @logger_mock.stub :info => true
+    @logger_mock.stub :info  => true,
+                      :debug => true
     @config_mock = mock 'config'
     @config_mock.stub :logger => @logger_mock
     @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'
-    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(:iv=).with 'firstsixteenchar'
-    @aes_mock.should_receive(:key=).with Digest::SHA256.hexdigest 'mysecret'
-    ::File.should_receive(:open)
+    @file.should_receive(:which).with('gpg').and_return true
+    command = 'gpg --batch --yes -c --cipher-algo AES256 --passphrase mysecret --output /path_to_encrypted_archive /file 2>&1'
+    @file.should_receive(:`).with command
+    $?.stub :success? => true
     FileUtils.should_receive(:mv).
               with('/path_to_encrypted_archive', '/file')
     @file.encrypt_file(:file   => '/file',
                        :secret => 'mysecret').should be_true
   end
 
+  it "should return false if gpg is not in the path" do
+    @file.should_receive(:which).with('gpg').and_return false
+    @logger_mock.should_receive(:error)
+    @file.encrypt_file(:file   => '/file',
+                       :secret => 'mysecret').should be_false
+  end
+
+  it "should return false if gpg returns non zero code" do
+    @file.should_receive(:which).with('gpg').and_return true
+    @logger_mock.should_receive(:error)
+    command = 'gpg --batch --yes -c --cipher-algo AES256 --passphrase mysecret --output /path_to_encrypted_archive /file 2>&1'
+    @file.should_receive(:`).with command
+    $?.stub :success? => false
+    @file.encrypt_file(:file   => '/file',
+                       :secret => 'mysecret').should be_false
+  end
+
 end

data/spec/cli/upload_spec.rb

@@ -78,6 +78,7 @@ describe Heirloom do
                   with(:bucket_prefix   => 'bp',
                        :regions         => @regions,
                        :public_readable => false,
+                       :secret          => 'secret12',
                        :file            => '/tmp/file.tar.gz')
     @upload.upload
   end

data/spec/directory/directory_spec.rb

@@ -5,24 +5,28 @@ describe Heirloom::Directory do
   describe 'build_artifact_from_directory' do
     before do
       @config_mock = double 'config'
-      @logger_stub = stub :debug => 'true', :info => 'true', :warn => 'true'
+      @logger_stub = stub :debug => 'true', 
+                          :info  => 'true', 
+                          :warn  => 'true',
+                          :error => 'true'
       @config_mock.stub(:logger).and_return(@logger_stub)
       @directory = Heirloom::Directory.new :config  => @config_mock,
                                            :exclude => ['.', '..', 'dont_pack_me'],
                                            :path    => '/dir',
                                            :file    => '/tmp/file.tar.gz'
-      output_mock  = double 'output mock'
-      Dir.should_receive(:entries).with('/dir').
-                                   exactly(2).times.
-                                   and_return ['pack_me', '.hidden', 
-                                               'with a space', 'dont_pack_me']
-      Heirloom::Directory.any_instance.should_receive(:`).
-                          with("cd /dir && tar czf /tmp/file.tar.gz 'pack_me' '.hidden' 'with a space'").
-                          and_return output_mock
     end
 
     context 'when succesful' do
       before do 
+        @directory.should_receive(:which).with('tar').and_return true
+        output_mock = double 'output mock'
+        command = "cd /dir && tar czf /tmp/file.tar.gz 'pack_me' '.hidden' 'with a space'"
+        files = ['pack_me', '.hidden', 'with a space', 'dont_pack_me']
+        Heirloom::Directory.any_instance.should_receive(:`).
+                            with(command).
+                            and_return output_mock
+        Dir.should_receive(:entries).with('/dir').
+                                     and_return files
         $?.stub :success? => true
       end
 
@@ -53,7 +57,17 @@ describe Heirloom::Directory do
     end
 
     context 'when unable to create the tar' do
-      before { $?.stub(:success?).and_return(false) }
+      before do 
+        @directory.should_receive(:which).with('tar').and_return true
+        output_mock = double 'output mock'
+        command = "cd /dir && tar czf /tmp/file.tar.gz 'pack_me' '.hidden' 'with a space'"
+        files = ['pack_me', '.hidden', 'with a space', 'dont_pack_me']
+        Heirloom::Directory.any_instance.should_receive(:`).
+                            with(command).
+                            and_return output_mock
+        Dir.should_receive(:entries).with('/dir').and_return files
+        $?.stub(:success?).and_return(false)
+      end
 
       it "build should return false" do
         @directory.build_artifact_from_directory(:secret => nil).should be_false
@@ -65,6 +79,18 @@ describe Heirloom::Directory do
       end
     end
 
+    context 'when required executable is missing' do
+      before do
+        files = ['pack_me', '.hidden', 'with a space', 'dont_pack_me']
+        Dir.should_receive(:entries).with('/dir').and_return files
+      end
+
+      it "should return false if tar is not in path" do
+        @directory.should_receive(:which).with('tar').and_return false
+        @directory.build_artifact_from_directory(:secret => nil).should be_false
+      end
+    end
+
   end
 
 end

data/spec/uploader/s3_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Heirloom::Uploader::S3 do
+  before do
+    @logger_stub = stub 'logger stub', :info  => true,
+                                       :warn  => true,
+                                       :debug => true
+    @config_stub = stub 'config stub', :logger => @logger_stub
+    @s3 = Heirloom::Uploader::S3.new :config => @config_stub,
+                                     :logger => @logger_stub,
+                                     :region => 'us-west-1'
+  end
+
+  it "should upload the file to s3" do
+    @options = { :bucket          => 'bucket',
+                 :file            => 'file',
+                 :id              => 'id',
+                 :key_name        => 'key_name',
+                 :key_folder      => 'key_folder',
+                 :name            => 'name',
+                 :public_readable => true }
+    @s3_mock     = mock 's3 mock'
+    @bucket_mock = mock 'bucket mock'
+    @files_mock  = mock 'files mock'
+    @file_mock   = mock 'file mock'
+    @body_mock   = mock 'body mock'
+    Heirloom::AWS::S3.should_receive(:new).
+                      with(:config => @config_stub,
+                           :region => 'us-west-1').
+                      and_return @s3_mock
+    @s3_mock.should_receive(:get_bucket).
+             with('bucket').
+             and_return @bucket_mock
+    @bucket_mock.should_receive(:files).and_return(@files_mock)
+    File.should_receive(:open).with('file').and_return @body_mock
+    @files_mock.should_receive(:create).
+                with :key    => "key_folder/key_name",
+                     :body   => @body_mock,
+                     :public => true
+    @body_mock.should_receive(:close)
+    @s3.upload_file @options
+  end
+
+  it "should add endpoint attributes for the file to simpledb" do
+    simpledb_mock = mock 'simpledb mock'
+    options = { :bucket          => 'bucket',
+                :id              => 'id',
+                :key_name        => 'key_name',
+                :name            => 'name' }
+    Heirloom::AWS::SimpleDB.should_receive(:new).
+                            with(:config => @config_stub).
+                            and_return simpledb_mock
+    simpledb_mock.should_receive(:put_attributes).
+                  with("heirloom_name", "id", 
+                       { "us-west-1-s3-url" => "s3://bucket/name/key_name" } )
+    simpledb_mock.should_receive(:put_attributes).
+                  with("heirloom_name", "id", 
+                       { "us-west-1-http-url" => "http://s3-us-west-1.amazonaws.com/bucket/name/key_name" } )
+    simpledb_mock.should_receive(:put_attributes).
+                  with("heirloom_name", "id", 
+                       { "us-west-1-https-url" => "https://s3-us-west-1.amazonaws.com/bucket/name/key_name" } )
+    @s3.add_endpoint_attributes options
+  end
+end

data/spec/utils/file_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Heirloom::Utils::File do
+  before do
+    @object = Object.new
+    @object.extend Heirloom::Utils::File
+  end
+
+  it "should return the path to a present executable" do
+    @object.stub :path => '/test1:/test2'
+    ::File.should_receive(:executable?).
+           with('/test1/test1234').
+           and_return false
+    ::File.should_receive(:executable?).
+           with('/test2/test1234').
+           and_return true
+    @object.which('test1234').should == '/test2/test1234'
+  end
+
+  it "should return nil if the executable does not exist" do
+    @object.stub :path => '/test1:/test2'
+    ::File.should_receive(:executable?).
+           with('/test1/test1234').
+           and_return false
+    ::File.should_receive(:executable?).
+           with('/test2/test1234').
+           and_return false
+    @object.which('test1234').should be_nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302923492580 !ruby/object:Gem::Requirement
+  requirement: &70327489259240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70302923492580
+  version_requirements: *70327489259240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70302923545380 !ruby/object:Gem::Requirement
+  requirement: &70327489258580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302923545380
+  version_requirements: *70327489258580
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70302923542440 !ruby/object:Gem::Requirement
+  requirement: &70327489582820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302923542440
+  version_requirements: *70327489582820
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70302923623680 !ruby/object:Gem::Requirement
+  requirement: &70327489581740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302923623680
+  version_requirements: *70327489581740
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70302923692740 !ruby/object:Gem::Requirement
+  requirement: &70327489581060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70302923692740
+  version_requirements: *70327489581060
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -115,6 +115,7 @@ files:
 - lib/heirloom/cipher.rb
 - lib/heirloom/cipher/data.rb
 - lib/heirloom/cipher/file.rb
+- lib/heirloom/cipher/shared.rb
 - lib/heirloom/cli.rb
 - lib/heirloom/cli/authorize.rb
 - lib/heirloom/cli/catalog.rb
@@ -137,9 +138,12 @@ files:
 - lib/heirloom/directory/directory.rb
 - lib/heirloom/downloader.rb
 - lib/heirloom/downloader/s3.rb
+- lib/heirloom/exceptions.rb
 - lib/heirloom/logger.rb
 - lib/heirloom/uploader.rb
 - lib/heirloom/uploader/s3.rb
+- lib/heirloom/utils.rb
+- lib/heirloom/utils/file.rb
 - lib/heirloom/version.rb
 - spec/acl/s3_spec.rb
 - spec/archive/authorizer_spec.rb
@@ -186,6 +190,8 @@ files:
 - spec/downloader/s3_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb
+- spec/uploader/s3_spec.rb
+- spec/utils/file_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -200,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2336051542288959986
+      hash: -166474931629253916
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2336051542288959986
+      hash: -166474931629253916
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16
@@ -262,3 +268,5 @@ test_files:
 - spec/downloader/s3_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb
+- spec/uploader/s3_spec.rb
+- spec/utils/file_spec.rb