heirloom 0.8.0 → 0.8.1

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p125@heirloom --create
+rvm use ruby-1.9.3-p194@heirloom --create

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: "rake spec"

data/CHANGELOG

@@ -1,3 +1,7 @@
+## v0.8.1:
+
+* Moving verification on entry exists into catalog class
+
 ## v0.8.0:
 
 * Change base to bucket prefix through out code base

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/intuit/heirloom.png)](http://travis-ci.org/intuit/heirloom)
+
 Heirloom
 ========
 
@@ -8,7 +10,7 @@ Heirloom creates archives from directories. Their archives are versioned and hos
 Installation
 ------------
 
-First things first, install heirloom:
+Install the gem
 
 ```
 gem install heirloom
@@ -22,8 +24,6 @@ aws:
   secret_key: UPDATE_ME
 ```
 
-* **access_key / secret_key**: AWS account credentials where you would like the archives stored.
-
 Proxy Support
 -------------
 

data/heirloom.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", '~> 2.11.0'
+  s.add_development_dependency "rake"
 
   s.add_runtime_dependency 'fog', '~> 1.5.0'
   s.add_runtime_dependency 'grit', '~> 2.5.0' 

data/lib/heirloom/catalog/add.rb

@@ -12,12 +12,14 @@ module Heirloom
         regions       = args[:regions]
         bucket_prefix = args[:bucket_prefix]
 
-        @logger.info "Adding #{@name} to catalog."
+        unless verify.entry_exists_in_catalog? @name
+          @logger.info "Adding #{@name} to catalog."
 
-        sdb.put_attributes 'heirloom', 
-                           "heirloom_#{@name}", 
-                           { "regions" => regions, 
-                             "bucket_prefix" => bucket_prefix }
+          sdb.put_attributes 'heirloom', 
+                             "heirloom_#{@name}", 
+                             "regions"       => regions, 
+                             "bucket_prefix" => bucket_prefix
+        end
 
       end
 
@@ -27,6 +29,10 @@ module Heirloom
         @sdb ||= AWS::SimpleDB.new :config => @config
       end
 
+      def verify
+        @verify ||= Catalog::Verify.new :config => @config
+      end
+
     end
   end
 end

data/lib/heirloom/cli/setup.rb

@@ -32,10 +32,6 @@ module Heirloom
 
         @catalog.create_catalog_domain
 
-        ensure_entry_does_not_exist_in_catalog :config  => @config,
-                                               :catalog => @catalog,
-                                               :entry   => @opts[:name]
-
         @catalog.add_to_catalog :regions       => @opts[:region],
                                 :bucket_prefix => @opts[:bucket_prefix]
 

data/lib/heirloom/cli/shared.rb

@@ -118,7 +118,7 @@ module Heirloom
                               :config => config
 
         unless archive.domain_exists?
-          logger.error "'#{name}' does not exist in '#{config.metadata_region}' catalog."
+          logger.error "'#{name}' metadata domain does not exist in '#{config.metadata_region}'."
           exit 1
         end
       end
@@ -170,19 +170,6 @@ module Heirloom
         end
       end
 
-      def ensure_entry_does_not_exist_in_catalog(args)
-        config  = args[:config]
-        catalog = args[:catalog]
-        entry   = args[:entry]
-        logger  = config.logger
-        region  = config.metadata_region
-
-        if catalog.entry_exists_in_catalog? entry
-          logger.error "Entry for #{entry} exists in #{region} catalog."
-          exit 1
-        end
-      end
-
       def latest_id(args)
         archive = Archive.new :name   => args[:name],
                               :config => args[:config]

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/catalog/add_spec.rb

@@ -7,13 +7,18 @@ describe Heirloom::Catalog::Add do
     @bucket_prefix = 'bucket_prefix'
     @logger_stub   = stub 'logger', :info => true
     @config_stub   = stub 'config', :logger => @logger_stub
+    @verify_stub   = stub 'verify'
 
     @add = Heirloom::Catalog::Add.new :config => @config_stub,
                                       :name   => 'new_archive'
+    Heirloom::Catalog::Verify.should_receive(:new).
+                              with(:config => @config_stub).
+                              and_return @verify_stub
   end
 
   it "should call sdb to add the entry to the catalog" do
     @sdb_mock = mock 'sdb'
+    @verify_stub.stub :entry_exists_in_catalog? => false
     Heirloom::AWS::SimpleDB.should_receive(:new).
                             with(:config => @config_stub).
                             and_return @sdb_mock
@@ -25,4 +30,11 @@ describe Heirloom::Catalog::Add do
                         :bucket_prefix => @bucket_prefix
   end
 
+  it "should not add the entry to the catalog if it's already there" do
+    @verify_stub.stub :entry_exists_in_catalog? => true
+    Heirloom::AWS::SimpleDB.should_receive(:new).never
+    @add.add_to_catalog :regions       => @regions,
+                        :bucket_prefix => @bucket_prefix
+  end
+
 end

data/spec/cli/shared_spec.rb

@@ -258,13 +258,6 @@ describe Heirloom do
                        should raise_error SystemExit
     end
 
-    it "should exit if the entry exists in catalog" do
-      @catalog_mock.should_receive(:entry_exists_in_catalog?).
-                    with('entry').
-                    and_return true
-      lambda { @object.ensure_entry_does_not_exist_in_catalog @options }.
-                       should raise_error SystemExit
-    end
   end
 
   context "testing latest id" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70260713581820 !ruby/object:Gem::Requirement
+  requirement: &70142193190000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: *70142193190000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70142193189180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260713581820
+  version_requirements: *70142193189180
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70260713581300 !ruby/object:Gem::Requirement
+  requirement: &70142193188060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70260713581300
+  version_requirements: *70142193188060
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70260713580800 !ruby/object:Gem::Requirement
+  requirement: &70142193187120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70260713580800
+  version_requirements: *70142193187120
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70260713580320 !ruby/object:Gem::Requirement
+  requirement: &70142193185780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +65,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70260713580320
+  version_requirements: *70142193185780
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -66,6 +77,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -129,7 +141,6 @@ files:
 - lib/heirloom/uploader.rb
 - lib/heirloom/uploader/s3.rb
 - lib/heirloom/version.rb
-- script/ci_setup
 - spec/acl/s3_spec.rb
 - spec/archive/authorizer_spec.rb
 - spec/archive/builder_spec.rb
@@ -189,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -176871004567933972
+      hash: -107270664148118049
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -176871004567933972
+      hash: -107270664148118049
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16

data/script/ci_setup

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# Source RVM profile and set ruby / gemset
-. /etc/profile
-
-# Exit with error if any command returns non zero
-set -e
-
-# Bundle gems
-rvm use "1.9.3-p125@heirloom" --create
-bundle
-
-# Run spec tests
-rake spec