relishable 0.29 → 0.30

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cd081e731c8554ce64f2ecc1bd23dc09c6d3939b
+  data.tar.gz: f2bec42c99a51404d73d839b86534c3273116462
+SHA512:
+  metadata.gz: 87b1c341657829673f2d1102982881ac582f39c108eb182d0e7ddc0d8b41d7e6c5fb7491cebefaa1fb78f90196a1d43bb039e8c2c3df69d00908f9eb0e05a763
+  data.tar.gz: 9af60883aa254a485739bfe716e3c28e93075b392cf94bf8b620f47daf01258734e615ba4ce2974c7df3596360f8272a0287b1a0079ceb8db540e8496297637d

data/Gemfile.lock

@@ -1,40 +1,78 @@
 PATH
   remote: .
   specs:
-    relishable (0.26)
-      fog
-      legacy-fernet
+    relishable (0.30)
+      fog (~> 1.23.0)
+      legacy-fernet (~> 1.6.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
     builder (3.2.2)
-    excon (0.25.3)
-    fog (1.15.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.5)
+    excon (0.40.0)
+    fog (1.23.0)
+      fog-brightbox
+      fog-core (~> 1.23)
+      fog-json
+      fog-softlayer
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.5.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto
+    fog-core (1.24.0)
       builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
+      excon (~> 0.38)
+      formatador (~> 0.2)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    formatador (0.2.4)
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
+    fog-softlayer (0.3.19)
+      fog-core
+      fog-json
+    formatador (0.2.5)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     legacy-fernet (1.6.3)
       multi_json
-    mime-types (1.24)
-    mini_portile (0.5.1)
-    multi_json (1.7.9)
-    net-scp (1.1.2)
+    mime-types (2.4.2)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    ruby-hmac (0.4.0)
+    net-ssh (2.9.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.2)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.1)
+    safe_yaml (0.9.5)
+    webmock (1.19.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake (> 0)
   relishable!
+  rspec (~> 3.1.0)
+  webmock (~> 1.19.0)

data/lib/relish.rb

@@ -7,80 +7,119 @@ require "relish/release"
 class Relish
 
   def initialize(*args)
-    @db = DynamoHelper.new(*args)
+    @db    = DynamoHelper.new(*args)
+    @tries = 3
   end
 
   def copy(id, version, data)
-    Release.new.tap do |release|
-      release.item = {}
-      release.id = id
-      release.version = version
-      data.each do |k, v|
-        release.send("#{k}=", v.to_s) unless v.nil?
+    rescue_dynamodb_error do
+      Release.new.tap do |release|
+        release.item = {}
+        release.id = id
+        release.version = version
+        data.each do |k, v|
+          release.send("#{k}=", v.to_s) unless v.nil?
+        end
+        @db.put(release.item)
       end
-      @db.put(release.item)
     end
   end
 
   def create(id, data)
-    item = @db.query_current_version(id)
-    Release.new.tap do |release|
-      if item.nil?
-        release.item = {}
-        release.id = id
-        release.version = "1"
-      else
-        release.item = item
-        release.version = (release.version.to_i + 1).to_s
-      end
-      data.each do |k, v|
-        release.send("#{k}=", v.to_s) unless v.nil?
+    rescue_dynamodb_error do
+      item = @db.query_current_version(id)
+      Release.new.tap do |release|
+        if item.nil?
+          release.item = {}
+          release.id = id
+          release.version = "1"
+        else
+          release.item = item
+          release.version = (release.version.to_i + 1).to_s
+        end
+        data.each do |k, v|
+          release.send("#{k}=", v.to_s) unless v.nil?
+        end
+        @db.put_current_version(release.item)
       end
-      @db.put_current_version(release.item)
     end
   end
 
   def current(id, *attrs)
-    item = @db.query_current_version(id, *attrs)
-    unless item.nil?
-      Release.new.tap do |release|
-        release.item = item
+    rescue_dynamodb_error do
+      item = @db.query_current_version(id, *attrs)
+      unless item.nil?
+        Release.new.tap do |release|
+          release.item = item
+        end
       end
     end
   end
 
   def read(id, version, *attrs)
-    item = @db.get_version(id, version, *attrs)
-    unless item.nil?
-      Release.new.tap do |release|
-        release.item = item
+    rescue_dynamodb_error do
+      item = @db.get_version(id, version, *attrs)
+      unless item.nil?
+        Release.new.tap do |release|
+          release.item = item
+        end
       end
     end
   end
 
   def dump(id, consistent=nil, limit=nil)
-    items = @db.query(id, consistent, limit)
-    items.map do |item|
-      Release.new.tap do |release|
-        release.item = item
+    rescue_dynamodb_error do
+      items = @db.query(id, consistent, limit)
+      items.map do |item|
+        Release.new.tap do |release|
+          release.item = item
+        end
       end
     end
   end
-
+    
   def update(id, version, data)
-    item = @db.get_version(id, version)
-    unless item.nil?
-      Release.new.tap do |release|
-        release.item = item
-        data.each do |k, v|
-          release.send("#{k}=", v.to_s) unless v.nil?
+    rescue_dynamodb_error do
+      item = @db.get_version(id, version)
+      unless item.nil?
+        Release.new.tap do |release|
+          release.item = item
+          data.each do |k, v|
+            release.send("#{k}=", v.to_s) unless v.nil?
+          end
+          @db.put_version(id, version, release.item)
         end
-        @db.put_version(id, version, release.item)
       end
     end
   end
 
   def delete(id, version)
-    @db.delete_version(id, version)
+    rescue_dynamodb_error do
+      @db.delete_version(id, version)
+    end
+  end
+
+  def set_error_handler(&blk)
+    @error_handler = blk
+  end
+
+  def rescue_dynamodb_error
+    tries = @tries
+    begin
+      yield
+    rescue => e
+      retries = ((tries -= 1) > 0)
+
+      unless @error_handler.nil?
+        @error_handler.call(e, retries)
+      end
+
+      if retries
+        retry
+      else
+        raise
+      end
+
+    end
   end
 end

data/lib/relish/version.rb

@@ -0,0 +1,5 @@
+class Relish
+  VERSION = "0.30"
+end
+
+  

metadata

@@ -1,86 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.29'
-  prerelease: 
+  version: '0.30'
 platform: ruby
 authors:
 - Mark Fine
 - Blake Gentry
+- Pedro Belo
+- Joshua Tobin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: legacy-fernet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.0
 description: Release manager.
-email: mark.fine@gmail.com
+email:
+- pedro@heroku.com
+- mark.fine@gmail.com
+- tobin@heroku.com
+- opensource@heroku.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
+- lib/relish.rb
 - lib/relish/cloudfront_helper.rb
 - lib/relish/dynamo_helper.rb
 - lib/relish/encryption_helper.rb
 - lib/relish/release.rb
 - lib/relish/s3_helper.rb
-- lib/relish.rb
-- Gemfile
-- Gemfile.lock
+- lib/relish/version.rb
 homepage: http://github.com/heroku/relish
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: releases
 test_files: []
-has_rdoc: