heirloom 0.12.5 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e53875623addc8598279fefdfec8c4a71d29a68
-  data.tar.gz: bcbc2a1ab5f612bc66a8a2b6f0f037fbb1a8bb0b
+  metadata.gz: ba2a3dde4a436f63dc663a4de637624667be848a
+  data.tar.gz: 1598f45ae046fa489d60414907f17b3d9bdaf6ab
 SHA512:
-  metadata.gz: 00dc8d2c29b1d01cf3d6796cc82de0141f21cf9efb7e9c9fcc545ad6a59b49e9f1a27d5df4468db08cc041fc7a234b26d050d031378cfc52a9ab5d6653be14c2
-  data.tar.gz: 555db1a43b07d64393361199307373706e7ebdb22a59e2fc07b44319d86233b0da141b166680884cc9b52cd6d5540fd88d04dd33b2af2ddfcd181b46543307e4
+  metadata.gz: d28c089db02df70b9eb5f992177318623ef580c04503b2f3b807e771fda36695c90b5499597d9f34eeab190596da735d9e046dbe1143c2e00b9abd9f439d5fb3
+  data.tar.gz: da2f5df3870707202895a317318b570cbade16b207a995090e3f87dd8d6104db8ba4778d78338759ca52776a0bfcb66b45c0c29f29d92e008257a97cd7da5623

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## head (04/21/2014):
+* Added error handling for invalid account when accessing heirloom
+
+## 0.12.7
+
+* Retry 503 errors from SimpleDB
+
+## 0.12.6
+
+* Use fog 1.29.0
+
 ## 0.12.5 (04/03/2014):
 
 * Updated download CLI argument validation

data/README.md

@@ -1,5 +1,15 @@
 [![Build Status](https://secure.travis-ci.org/intuit/heirloom.png)](http://travis-ci.org/intuit/heirloom)
 [![Code Climate](https://codeclimate.com/github/intuit/heirloom.png)](https://codeclimate.com/github/intuit/heirloom)
+
+**Heirloom is in maintenance mode!**
+
+**We will continue to provide support for bug fix requests, however new features will not be added.**
+
+We recommend using the [AWS CLI](http://aws.amazon.com/cli/) and [GPG](https://www.gnupg.org/)
+to distribute encrypted files in S3.
+
+--------
+
 Heirloom
 ========
 

data/heirloom.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", '~> 2.14.1'
   s.add_development_dependency "simplecov"
 
-  s.add_runtime_dependency 'fog', '= 1.21.0'
+  s.add_runtime_dependency 'fog', '= 1.29.0'
   s.add_runtime_dependency 'hashie', '= 2.0.5'
   s.add_runtime_dependency 'trollop', '= 2.0'
   s.add_runtime_dependency 'xml-simple', '~> 1.1.3'
   s.add_runtime_dependency "unf", "= 0.1.3"
   s.add_runtime_dependency "unf_ext", "= 0.0.6"
+  s.add_runtime_dependency "retries", "= 0.0.5"
 end

data/lib/heirloom/archive/authorizer.rb

@@ -19,18 +19,12 @@ module Heirloom
 
       @logger.info "Authorizing #{@accounts.join(', ')}."
 
-      key_name = reader.key_name
+      @key_name = reader.key_name
 
       regions.each do |region|
-        bucket = reader.get_bucket :region => region
+        @bucket = reader.get_bucket :region => region
 
-        s3_acl = ACL::S3.new :config => @config,
-                             :region => region
-
-        s3_acl.allow_read_access_from_accounts :key_name   => key_name,
-                                               :key_folder => @name,
-                                               :accounts   => @accounts,
-                                               :bucket     => bucket
+        return false unless grant_read_access region
       end
 
       @logger.info "Authorization complete."
@@ -39,6 +33,16 @@ module Heirloom
 
     private
 
+    def grant_read_access(region)
+      s3_acl = ACL::S3.new :config => @config,
+                           :region => region
+
+      s3_acl.allow_read_access_from_accounts :key_name   => @key_name,
+                                             :key_folder => @name,
+                                             :accounts   => @accounts,
+                                             :bucket     => @bucket
+    end
+
     def validate_format_of_accounts
       status = true
 

data/lib/heirloom/aws/s3.rb

@@ -94,6 +94,13 @@ module Heirloom
 
       def put_object_acl(bucket, key, grants)
         @s3.put_object_acl(bucket, key, grants)
+        true
+      rescue Excon::Errors::BadRequest => e
+        error = XmlSimple.xml_in e.response.body
+        error['Message'].each do |msg|
+          @logger.error msg
+        end
+        false
       end
 
       def put_bucket(bucket_name, region)

data/lib/heirloom/aws/simpledb.rb

@@ -1,4 +1,5 @@
 require 'fog'
+require 'retries'
 
 module Heirloom
   module AWS
@@ -20,8 +21,17 @@ module Heirloom
         @sdb = Fog::AWS::SimpleDB.new fog_args
       end
 
+      def retry_options
+        {:max_retries => 3,
+         :rescue => Excon::Errors::ServiceUnavailable,
+         :base_sleep_seconds => 10,
+         :max_sleep_seconds => 60}
+      end
+
       def domains
-        @sdb.list_domains.body['Domains']
+        with_retries(retry_options) do
+          @sdb.list_domains.body['Domains']
+        end
       end
 
       def domain_exists?(domain)
@@ -29,11 +39,15 @@ module Heirloom
       end
 
       def create_domain(domain)
-        @sdb.create_domain(domain) unless domain_exists?(domain)
+        with_retries(retry_options) do
+          @sdb.create_domain(domain) unless domain_exists?(domain)
+        end
       end
 
       def delete_domain(domain)
-        @sdb.delete_domain(domain)
+        with_retries(retry_options) do
+          @sdb.delete_domain(domain)
+        end
       end
 
       def domain_empty?(domain)
@@ -41,7 +55,9 @@ module Heirloom
       end
 
       def put_attributes(domain, key, attributes, options = {})
-        @sdb.put_attributes domain, key, attributes, options
+        with_retries(retry_options) do
+          @sdb.put_attributes domain, key, attributes, options
+        end
       end
 
       def select(query, opts = {})
@@ -52,7 +68,9 @@ module Heirloom
         logger.debug "Executing simpledb query '#{query}'."
 
         if opts[:offset] && opts[:offset] > 0
-          limit = @sdb.select("#{query} limit #{opts[:offset]}").body
+          limit = with_retries(retry_options) do
+            @sdb.select("#{query} limit #{opts[:offset]}").body
+          end
           if limit['NextToken']
             logger.debug "Next token found. Retrieving results."
             next_token = limit['NextToken']
@@ -64,7 +82,9 @@ module Heirloom
 
         while has_more
           logger.debug "Retrieving results from next token '#{next_token}'." if next_token
-          more = @sdb.select(query, 'NextToken' => next_token).body
+          more = with_retries(retry_options) do
+            @sdb.select(query, 'NextToken' => next_token).body
+          end
           more['Items'].each do |k, v|
             block_given? ? yield(k, v) : results[k] = v
           end
@@ -80,17 +100,23 @@ module Heirloom
       end
 
       def delete(domain, key)
-        @sdb.delete_attributes domain, key
+        with_retries(retry_options) do
+          @sdb.delete_attributes domain, key
+        end
       end
 
       def count(domain)
-        body = @sdb.select("SELECT count(*) FROM `#{domain}`").body
-        body['Items']['Domain']['Count'].first.to_i
+        with_retries(retry_options) do
+          body = @sdb.select("SELECT count(*) FROM `#{domain}`").body
+          body['Items']['Domain']['Count'].first.to_i
+        end
       end
 
       def item_count(domain, item)
-        query = "SELECT count(*) FROM `#{domain}` WHERE itemName() = '#{item}'"
-        @sdb.select(query).body['Items']['Domain']['Count'].first.to_i
+        with_retries(retry_options) do
+          query = "SELECT count(*) FROM `#{domain}` WHERE itemName() = '#{item}'"
+          @sdb.select(query).body['Items']['Domain']['Count'].first.to_i
+        end
       end
 
       def logger

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.12.5"
+  VERSION = "0.12.7"
 end

data/spec/archive/authorizer_spec.rb

@@ -39,7 +39,7 @@ describe Heirloom do
              with(:key_name   => '123.tar.gz',
                   :key_folder => 'tim',
                   :bucket     => 'the-bucket',
-                  :accounts   => accounts)
+                  :accounts   => accounts).and_return true
       @authorizer.authorize(:accounts => accounts,
                             :regions  => ['us-west-1', 'us-west-2']).
                   should be_true

data/spec/aws/s3_spec.rb

@@ -247,6 +247,16 @@ describe Heirloom do
       @s3.put_object_acl 'bucket', 'object', 'grants'
     end
 
+    it "should return true if Excon::Errors::BadRequest raised when account is invalid" do
+      body = '<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>UnresolvableGrantByEmailAddress</Code><Message>The e-mail address you provided does not match any account on record.</Message><RequestId>1FF76C053626CF97</RequestId><EmailAddress>brett@weav.net1</EmailAddress><HostId>AXpUoV59+WbDr++4ffoKlSdbFAlPjpoyJd5riKJ9bTZLoobnGRaboeeFmkkI7vg6</HostId></Error>'
+      @response_stub = stub 'response', :body => body
+
+      @fog_double.should_receive(:put_object_acl).
+                with('bucket', 'object', 'grants').
+                and_raise Excon::Errors::BadRequest.new 'msg', 'req', @response_stub
+      @s3.put_object_acl('bucket', 'object','grants').should be_false
+    end
+
     it "should call put bucket with location_constraint us-west-1" do
       options = { 'LocationConstraint' => 'us-west-1',
                   'x-amz-acl'          => 'private' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.7
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.29.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -295,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: heirloom
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: I help with deploying code into the cloud