heirloom 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+## v0.3.1:
+
+* Switched from Minitar to shell
+* Removed Minitar gem
+* Fixed git commit flag
+* Updated specs
+* Updated gems
+
 ## v0.3.0:
 
 * Move account authorization out of config to cli

data/heirloom.gemspec

@@ -24,6 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'fog'
   s.add_runtime_dependency 'grit'
   s.add_runtime_dependency 'logger'
-  s.add_runtime_dependency 'minitar'
   s.add_runtime_dependency 'trollop'
 end

data/lib/heirloom/archive/builder.rb

@@ -22,7 +22,7 @@ module Heirloom
                                 :exclude   => args[:exclude],
                                 :config    => config
 
-      directory.build_artifact_from_directory
+      return false unless directory.build_artifact_from_directory
 
       self.local_build = directory.local_build
 
@@ -43,8 +43,13 @@ module Heirloom
     private
 
     def add_git_commit
-      git_commit = GitDirectory.new(:path => source).commit
-      add_git_commit_to_artifact_record git_commit
+      git = GitDirectory.new(:path => source)
+      commit = git.commit id
+      if commit
+        add_git_commit_to_artifact_record commit
+      else
+        logger.warn "Could not find Git sha: #{id}."
+      end
     end
 
     def add_git_commit_to_artifact_record(commit)

data/lib/heirloom/cli/build.rb

@@ -26,17 +26,21 @@ module Heirloom
 
         @archive.destroy if @archive.exists?
                           
-        archive_file = @archive.build :bucket_prefix   => @opts[:bucket_prefix],
-                                      :directory       => @opts[:directory],
-                                      :exclude         => @opts[:exclude].split(','),
-                                      :git             => @opts[:git]
+        build = @archive.build :bucket_prefix   => @opts[:bucket_prefix],
+                               :directory       => @opts[:directory],
+                               :exclude         => @opts[:exclude].split(','),
+                               :git             => @opts[:git]
 
-        @archive.upload :bucket_prefix   => @opts[:bucket_prefix],
-                        :regions         => @opts[:regions],
-                        :public_readable => @opts[:public],
-                        :file            => archive_file
-
-        @archive.cleanup
+        if build
+          @archive.upload :bucket_prefix   => @opts[:bucket_prefix],
+                          :regions         => @opts[:regions],
+                          :public_readable => @opts[:public],
+                          :file            => build
+          @archive.cleanup
+        else
+          @logger.error "Build failed."
+          exit 1
+        end
       end
 
       private

data/lib/heirloom/directory/directory.rb

@@ -1,9 +1,5 @@
-require 'zlib'
-require 'archive/tar/minitar'
 require 'tmpdir'
 
-include Archive::Tar
-
 module Heirloom
 
   class Directory
@@ -18,7 +14,7 @@ module Heirloom
     end
 
     def build_artifact_from_directory
-      random_text = (0...8).map{65.+(rand(25)).chr}.join
+      random_text = (0...8).map{65.+(Kernel.rand(25)).chr}.join
 
       unless local_build
         self.local_build = File.join(Dir.tmpdir, random_text + ".tar.gz")
@@ -28,12 +24,18 @@ module Heirloom
       logger.info "Excluding #{exclude.to_s}."
       logger.info "Adding #{files_to_pack.to_s}."
 
-      tgz = Zlib::GzipWriter.new File.open(local_build, 'wb')
-
-      Minitar.pack(files_to_pack, tgz)
+      build_archive local_build, files_to_pack
     end
 
     private
+
+    def build_archive(local_build, files_to_pack)
+      command = "tar czf #{local_build} #{files_to_pack.join(' ')}"
+      logger.info "Archiving with: `#{command}`"
+      output = `#{command}`
+      logger.debug "Exited with status: '#{$?.exitstatus}' ouput: '#{output}'"
+      $?.success?
+    end
       
     def files_to_pack
       Dir.entries(path) - ['.', '..'] - exclude

data/lib/heirloom/directory/git_directory.rb

@@ -6,15 +6,18 @@ module Heirloom
 
   class GitDirectory
 
-    attr_accessor :path
-
     def initialize(args)
-      self.path = args[:path]
+      @path = args[:path]
     end
 
     def commit(sha = nil)
-      repo = Repo.new path
-      sha ? repo.commits(sha).first : repo.commits.first
+      repo = Repo.new @path
+      if sha 
+        commit = repo.commits(sha)
+        commit ? commit.first : false
+      else
+        repo.commits.first
+      end
     end
 
   end

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/archive/builder_spec.rb

@@ -4,36 +4,81 @@ describe Heirloom do
 
     before do
       @config_mock = double 'config'
-      @logger_mock = double 'logger'
+      @logger_stub = stub :debug => 'true', :info => 'true', :warn => 'true'
       @simpledb_mock = double 'simple db'
-      @config_mock.should_receive(:logger).and_return(@logger_mock)
+      @config_mock.should_receive(:logger).and_return(@logger_stub)
       Heirloom::AWS::SimpleDB.should_receive(:new).with(:config => @config_mock).
                               and_return(@simpledb_mock)
       @simpledb_mock.should_receive(:create_domain).with 'tim'
       @builder = Heirloom::Builder.new :config => @config_mock,
-                                               :name   => 'tim',
-                                               :id     => '123'
+                                       :name   => 'tim',
+                                       :id     => '123'
     end
 
     it "should build an archive" do
-      directory_mock = double "directory"
+      directory_stub = stub :build_artifact_from_directory => '/tmp/build_dir',
+                            :local_build                   => '/var/tmp/file.tar.gz'
+      git_dir_mock = double "git directory mock"
+      author_stub = stub :name => 'weaver'
+      git_commit_stub = stub :id_abbrev => 'abc123',
+                             :message   => 'yoyo',
+                             :author    => author_stub
       Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
                                                     :exclude => ['.dir_to_exclude'],
                                                     :config  => @config_mock).
-                                               and_return(directory_mock)
-      directory_mock.should_receive :build_artifact_from_directory
-      directory_mock.should_receive(:local_build).and_return('/tmp/file')
+                                               and_return directory_stub
       @builder.should_receive(:create_artifact_record)
-      @builder.should_receive(:add_git_commit)
-      @logger_mock.should_receive(:info).with("Build complete.")
+      Heirloom::GitDirectory.should_receive(:new).
+                             with(:path => 'path_to_build').
+                             and_return git_dir_mock
+      git_dir_mock.should_receive(:commit).
+                   with('123').and_return git_commit_stub
+      commit_attributes = { 'sha'             => '123',
+                            'abbreviated_sha' => 'abc123',
+                            'message'         => 'yoyo',
+                            'author'          => 'weaver' }
+      @simpledb_mock.should_receive(:put_attributes).
+                     with('tim', '123', commit_attributes)
+
+      @builder.build(:exclude   => ['.dir_to_exclude'],
+                     :directory => 'path_to_build',
+                     :git       => 'true').should == '/var/tmp/file.tar.gz'
+    end
+
+    it "should build an archive and log a warning if the git sha is not found" do
+      directory_stub = stub :build_artifact_from_directory => '/tmp/build_dir',
+                            :local_build                   => '/var/tmp/file.tar.gz'
+      git_dir_mock = double "git directory mock"
+      Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
+                                                    :exclude => ['.dir_to_exclude'],
+                                                    :config  => @config_mock).
+                                               and_return directory_stub
+      @builder.should_receive(:create_artifact_record)
+      Heirloom::GitDirectory.should_receive(:new).
+                             with(:path => 'path_to_build').
+                             and_return git_dir_mock
+      @logger_stub.should_receive(:warn).with "Could not find Git sha: 123."
+      git_dir_mock.should_receive(:commit).
+                   with('123').and_return false
+      @builder.build(:exclude   => ['.dir_to_exclude'],
+                     :directory => 'path_to_build',
+                     :git       => 'true').should == '/var/tmp/file.tar.gz'
+    end
+
+
+    it "should return false if the build fails" do
+      directory_stub = stub :build_artifact_from_directory => false
+      Heirloom::Directory.should_receive(:new).with(:path    => 'path_to_build',
+                                                    :exclude => ['.dir_to_exclude'],
+                                                    :config  => @config_mock).
+                                               and_return directory_stub
       @builder.build(:exclude   => ['.dir_to_exclude'],
                      :directory => 'path_to_build',
-                     :git       => 'true').should == '/tmp/file'
+                     :git       => 'true').should be_false
     end
 
     it "should cleanup the local archive" do
       @builder.local_build = '/tmp/file'
-      @logger_mock.should_receive(:info).with("Cleaning up local build /tmp/file.")
       File.should_receive(:delete).with('/tmp/file')
       @builder.cleanup
     end

data/spec/directory/directory_spec.rb

@@ -4,23 +4,41 @@ describe Heirloom do
 
     before do
       @config_mock = double 'config'
-      @logger_mock = double 'logger'
-      @config_mock.should_receive(:logger).and_return(@logger_mock)
+      @logger_stub = stub :debug => 'true', :info => 'true', :warn => 'true'
+      @config_mock.should_receive(:logger).and_return(@logger_stub)
       @directory = Heirloom::Directory.new :config  => @config_mock,
-                                           :exclude => ['.', '..', 'pack_me'],
+                                           :exclude => ['.', '..', 'dont_pack_me'],
                                            :path    => '/target/dir'
     end
 
     it "should build an archive from the latest commit in path" do
-      @logger_mock.should_receive(:info).exactly(3).times
       file_mock = double 'file'
-      File.should_receive(:open).and_return file_mock
-      gzip_mock = double 'gzip mock'
-      Zlib::GzipWriter.should_receive(:new).and_return gzip_mock
-      @directory.should_receive(:files_to_pack).
-                 exactly(2).times.and_return(['pack_me'])
-      Minitar.should_receive(:pack).with(['pack_me'], gzip_mock)
-      @directory.build_artifact_from_directory
+      output_mock = double 'output mock'
+      Dir.stub :tmpdir => '/tmp/dir'
+      Kernel.stub :rand => 0
+      Dir.should_receive(:entries).with('/target/dir').
+                                   exactly(2).times.
+                                   and_return(['pack_me', '.hidden', 'dont_pack_me'])
+      Heirloom::Directory.any_instance.should_receive(:`).
+                          with("tar czf /tmp/dir/AAAAAAAA.tar.gz pack_me .hidden").
+                          and_return output_mock
+      $?.should_receive(:success?).and_return true
+      @directory.build_artifact_from_directory.should be_true
+    end
+
+    it "should return false if the shell is not succesful" do
+      file_mock = double 'file'
+      output_mock = double 'output mock'
+      Dir.stub :tmpdir => '/tmp/dir'
+      Kernel.stub :rand => 0
+      Dir.should_receive(:entries).with('/target/dir').
+                                   exactly(2).times.
+                                   and_return(['pack_me', '.hidden', 'dont_pack_me'])
+      Heirloom::Directory.any_instance.should_receive(:`).
+                          with("tar czf /tmp/dir/AAAAAAAA.tar.gz pack_me .hidden").
+                          and_return output_mock
+      $?.should_receive(:success?).and_return false
+      @directory.build_artifact_from_directory.should be_false
     end
 
 end

data/spec/directory/git_directory_spec.rb

@@ -2,27 +2,31 @@ require 'spec_helper'
 
 describe Heirloom do
 
-    before do
-      @git_directory = Heirloom::GitDirectory.new :path => '/target/dir'
-    end
+  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)
+    @commits_mock = double 'commits mock'
+  end
 
-    it "should read commit from the given path" do
-      repo_mock = double 'repo mock'
-      Repo.should_receive(:new).with('/target/dir').and_return(repo_mock)
-      commits_mock = double 'commits mock'
-      repo_mock.should_receive(:commits).and_return(commits_mock)
-      commits_mock.should_receive(:first).and_return('git_sha')
-      @git_directory.commit.should == 'git_sha'
-    end
+  it "should read commit from the given path" do
+    @repo_mock.should_receive(:commits).and_return(@commits_mock)
+    @commits_mock.should_receive(:first).and_return('git_sha')
+    @git_directory.commit.should == 'git_sha'
+  end
 
-    it "should read commit from the given path" do
-      repo_mock = double 'repo mock'
-      Repo.should_receive(:new).with('/target/dir').and_return(repo_mock)
-      commits_mock = double 'commits mock'
-      repo_mock.should_receive(:commits).with('sha_i_want').
-                and_return(commits_mock)
-      commits_mock.should_receive(:first).and_return('git_sha')
-      @git_directory.commit 'sha_i_want'
-    end
+  it "should read commit from the given path" do
+    @repo_mock.should_receive(:commits).with('sha_i_want').
+               and_return(@commits_mock)
+    @commits_mock.should_receive(:first).and_return('git_sha')
+    @git_directory.commit('sha_i_want').should == 'git_sha'
+  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(@commits_mock)
+    @commits_mock.should_receive(:first).and_return nil
+    @git_directory.commit('sha_that_dont_exist').should be_false
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70366950210620 !ruby/object:Gem::Requirement
+  requirement: &70227657292060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366950210620
+  version_requirements: *70227657292060
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70366950210120 !ruby/object:Gem::Requirement
+  requirement: &70227657291640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366950210120
+  version_requirements: *70227657291640
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70366950209660 !ruby/object:Gem::Requirement
+  requirement: &70227657290960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366950209660
+  version_requirements: *70227657290960
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70366950209200 !ruby/object:Gem::Requirement
+  requirement: &70227657290280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366950209200
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: &70366950208780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70366950208780
+  version_requirements: *70227657290280
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70366950208340 !ruby/object:Gem::Requirement
+  requirement: &70227657289580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366950208340
+  version_requirements: *70227657289580
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -168,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2580747408097791260
+      hash: -4029449288318118169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2580747408097791260
+      hash: -4029449288318118169
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16