vagrant-s3auth 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06edc23d119892ccc9f71721ea458fc20485102
-  data.tar.gz: 2f402e2d249ab5db39a2e134030abd29b2d268ff
+  metadata.gz: b66094513a9359fdfaa1bad57c2d96db83972c02
+  data.tar.gz: af829decb08f5da02d44124aa89c88aa39a07d92
 SHA512:
-  metadata.gz: d8e0d925b25da57e804918b179b956e15e09c83317f2aa1cdbc2ae3d9809128430b7c1f87ca3d951d446c34ca696dc1db9dc0ac94420e0225b388bea0d4924da
-  data.tar.gz: 9fdf565b0630c9efcb9a4aa1f220d4b01f2a6639a65b6d7c03687570d545ba6109cee4e2488552add9a56d631c347d5ef63f555607061d05f9dffd466a74d16f
+  metadata.gz: 603e26c2c9ac9f963291aa62fc7c7be32f45ebf4adef3be663b6de60d291756e3d4eea903d37727c8a9608efeb8402e63b2c6e2e3fbc490a1fb10ad7c7174c03
+  data.tar.gz: ea62ef852d128b07ef947eec3eea033a43d811c92dcddb6a87a40d351a2618e16de9a1ec50622600a4ccbc95f19b75f01330f9439e2b3a078202e8e665c807ba

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.3
+
+**10 March 2015**
+
+Fixes:
+
+* fix namespace collisions with [vagrant-aws][vagrant-aws] [#11]
+
+Thanks, [@andres-rojas][andres-rojas]!
+
+
 ## 1.0.2
 
 **25 December 2014**
@@ -60,3 +71,8 @@ Enhancements:
 [#1]: https://github.com/WhoopInc/vagrant-s3auth/issues/1
 [#7]: https://github.com/WhoopInc/vagrant-s3auth/issues/7
 [#9]: https://github.com/WhoopInc/vagrant-s3auth/issues/9
+[#11]: https://github.com/WhoopInc/vagrant-s3auth/pull/11
+
+[andres-rojas]: https://github.com/andres-rojas
+
+[vagrant-aws]: https://github.com/mitchellh/vagrant-aws

data/Gemfile

@@ -8,4 +8,5 @@ end
 
 group :plugins do
   gemspec
+  gem 'vagrant-aws', git: 'git://github.com/mitchellh/vagrant-aws.git', ref: 'master'
 end

data/Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant-aws.git
+  revision: d77a8b94e24fe3e7864a74634d99b5b1afbf2660
+  ref: master
+  specs:
+    vagrant-aws (0.6.0)
+      fog (~> 1.22)
+
 GIT
   remote: git://github.com/mitchellh/vagrant.git
   revision: 686e940a8474a8733be40b32e5d9107d557c627b
@@ -23,12 +31,13 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-s3auth (1.0.2)
+    vagrant-s3auth (1.0.3)
       aws-sdk (~> 1.59.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.0)
     akami (1.2.2)
       gyoku (>= 0.4.0)
       nokogiri
@@ -46,7 +55,91 @@ GEM
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     erubis (2.7.0)
+    excon (0.44.4)
     ffi (1.9.6)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.28.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.27, >= 1.27.3)
+      fog-ecloud
+      fog-json
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.29.0)
+      builder
+      excon (~> 0.38)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-ecloud (0.0.2)
+      fog-core
+      fog-xml
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
+    fog-profitbricks (0.0.1)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.3)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.0)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.1)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.1)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.0)
+      fog-core
+      fog-json
+    fog-terremark (0.0.4)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.0.1)
+      fission
+      fog-core
+    fog-voxel (0.0.2)
+      fog-core
+      fog-xml
+    fog-xml (0.1.1)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
     gssapi (1.0.3)
       ffi (>= 1.0.1)
     gyoku (1.2.2)
@@ -60,6 +153,8 @@ GEM
     httpi (0.9.7)
       rack
     i18n (0.6.11)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     json (1.8.1)
     listen (2.7.12)
       celluloid (>= 0.15.2)
@@ -138,4 +233,5 @@ DEPENDENCIES
   rake (~> 10.3.2)
   rubocop (~> 0.28.0)
   vagrant!
+  vagrant-aws!
   vagrant-s3auth!

data/README.md

@@ -82,9 +82,11 @@ IAM accounts will need at least the following policy:
 }
 ```
 
-`s3:ListBucket` permission is not strictly necessary. vagrant-s3auth will never
+**IMPORTANT:** You must split up bucket and object permissions into separate policy statements as written above! See [Writing IAM Policies: How to grant access to an Amazon S3 Bucket][aws-s3-iam].
+
+Also note that `s3:ListBucket` permission is not strictly necessary. vagrant-s3auth will never
 make a ListBucket request, but without ListBucket permission, a misspelled box
-name results in a 403 Forbidden error instead of a 404 Not Found error.
+name results in a 403 Forbidden error instead of a 404 Not Found error. ([Why?][aws-403-404])
 
 See [AWS S3 Guide: User Policy Examples][aws-user-policy] for more.
 
@@ -214,7 +216,8 @@ unless Vagrant.has_plugin?('vagrant-s3auth')
 end
 ```
 
-
+[aws-403-404]: https://forums.aws.amazon.com/thread.jspa?threadID=56531#jive-message-210346
+[aws-s3-iam]: http://blogs.aws.amazon.com/security/post/Tx3VRSWZ6B3SHAV/Writing-IAM-Policies-How-to-grant-access-to-an-Amazon-S3-bucket
 [aws-signed]: http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html#ConstructingTheAuthenticationHeader
 [aws-user-policy]: http://docs.aws.amazon.com/AmazonS3/latest/dev/example-policies-s3.html
 [bucket-vhost]: http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostingExamples

data/lib/vagrant-s3auth/extension/downloader.rb

@@ -35,9 +35,9 @@ module Vagrant
             bucket: s3_object && s3_object.bucket.name)
         end
         raise
-      rescue AWS::Errors::MissingCredentialsError
+      rescue ::AWS::Errors::MissingCredentialsError
         raise VagrantPlugins::S3Auth::Errors::MissingCredentialsError
-      rescue AWS::Errors::Base => e
+      rescue ::AWS::Errors::Base => e
         raise VagrantPlugins::S3Auth::Errors::S3APIError, error: e
       end
 

data/lib/vagrant-s3auth/util.rb

@@ -27,7 +27,7 @@ module VagrantPlugins
         end
 
         if bucket && key
-          AWS::S3.new(region: get_bucket_region(bucket))
+          ::AWS::S3.new(region: get_bucket_region(bucket))
             .buckets[bucket].objects[key]
         elsif follow_redirect
           response = Net::HTTP.get_response(url) rescue nil
@@ -45,8 +45,8 @@ module VagrantPlugins
       end
 
       def self.get_bucket_region(bucket)
-        LOCATION_TO_REGION[AWS::S3.new.buckets[bucket].location_constraint]
-      rescue AWS::S3::Errors::AccessDenied
+        LOCATION_TO_REGION[::AWS::S3.new.buckets[bucket].location_constraint]
+      rescue ::AWS::S3::Errors::AccessDenied
         raise Errors::BucketLocationAccessDeniedError,
           bucket: bucket,
           access_key: ENV['AWS_ACCESS_KEY_ID']

data/lib/vagrant-s3auth/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module S3Auth
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-s3auth
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nikhil Benesch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.59.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.59.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.28.0
 description: 
@@ -87,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -123,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Private, versioned Vagrant boxes hosted on Amazon S3.