rivet 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e571e21a6e6dbd83b0c828bc157c26b4e35e146f
-  data.tar.gz: 2a3015fe9287588854936fb5fe0e813bbb17c2b5
+  metadata.gz: 72ec75ab5d5a2c2fae55a1cbac82e306ef1e424b
+  data.tar.gz: 6dfb2bb918e9a3fb5ea651abc3a88f455d0b1589
 SHA512:
-  metadata.gz: 04cc4af56e35f6e5b93534a6a74f9d91049604f8d00cc8f25389a7b1e47640fb836da44b89f4e7de6c95dda5cae8afc5cf82f3ae402ad59bba670c3d0a41967c
-  data.tar.gz: 6914b5dd48f3e8068919876766cd3f8e391bb6de01bcdbceb9285703ee906278be6bbcb1d49712af521345a7dc9ff51fc9dd97fff540524a26ec4b0c156f0aef
+  metadata.gz: f49329736b4ad73648a2be03ef0265766dfa69fbbc12558b5d0fd9a76f46f37d89bd0c522e596d037801cf1abf4b9a7e620d156fe91634c94a2b851feb68b3b3
+  data.tar.gz: 5593c85d3aeb3d3f303adfbdc2bb12d0a0024ae4aa14225c4aa6d6cef961522971fd2b774a1012a83040d90bd2237c2fad7e2ce14efb967b4428c1ba944601aa

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Rivet CHANGELOG
 ===
 
+3.0.5 -
+---
+  * Adds the aws-sdk back to the gem dependencies as it is necessary.
+
 3.0.4 -
 ---
   * Fixes bug because of missing require for the new aws-sdk-v1 gem.

data/Gemfile

@@ -8,5 +8,6 @@ group(:development, :test) do
   gem 'rspec',  '~> 2.14.1'
 end
 
-gem 'aws-sdk',  '>= 1.11.1'
+gem 'aws-sdk-v1', '~> 1'
+gem 'aws-sdk',  '~> 2'
 gem 'diff-lcs', '>= 1.2.5'

data/Gemfile.lock

@@ -4,19 +4,31 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    aws-sdk (1.59.0)
-      aws-sdk-v1 (= 1.59.0)
-    aws-sdk-v1 (1.59.0)
+    aws-sdk (2.0.22)
+      aws-sdk-resources (= 2.0.22)
+    aws-sdk-core (2.0.22)
+      builder (~> 3.0)
+      jmespath (~> 1.0)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+    aws-sdk-resources (2.0.22)
+      aws-sdk-core (= 2.0.22)
+    aws-sdk-v1 (1.61.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
+    builder (3.2.2)
     diff-lcs (1.2.5)
     ffi2-generators (0.1.1)
-    json (1.8.1)
-    json (1.8.1-java)
-    mini_portile (0.6.1)
-    nokogiri (1.6.4.1)
+    jmespath (1.0.2)
+      multi_json (~> 1.0)
+    json (1.8.2)
+    json (1.8.2-java)
+    mini_portile (0.6.2)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    nokogiri (1.6.4.1-java)
+    nokogiri (1.6.6.2-java)
     parser (2.2.0.pre.8)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
@@ -246,7 +258,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk (>= 1.11.1)
+  aws-sdk (~> 2)
+  aws-sdk-v1 (~> 1)
   diff-lcs (>= 1.2.5)
   rake (>= 10.1.0)
   rspec (~> 2.14.1)

data/lib/rivet/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Rivet
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/rivet.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk-v1', '~> 1'
-  spec.add_dependency 'diff-lcs', '>= 1.2.5'
-  spec.add_development_dependency 'pry', '~> 0.9.12'
-  spec.add_development_dependency 'rake', '>= 10.1.0'
-  spec.add_development_dependency 'rspec', '~> 2.14.1'
+  spec.add_dependency 'aws-sdk',    '~> 2'
+  spec.add_dependency 'diff-lcs',   '>= 1.2.5'
+  spec.add_development_dependency   'pry', '~> 0.9.12'
+  spec.add_development_dependency   'rake', '>= 10.1.0'
+  spec.add_development_dependency   'rspec', '~> 2.14.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivet
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Brian Bianco
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement