vagrant-s3auth 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eafb392e95d39afdc9210feb19836e4b128bffba
-  data.tar.gz: 385dbe4e3449263bfa5ce7071cf9ec615b52b14d
+  metadata.gz: 497d147d5fb4636bd0653dcc502062c8ee3ccbc1
+  data.tar.gz: e1c85dcd893e04a9a74e65c3c6b709620d31cfde
 SHA512:
-  metadata.gz: 3ac40f12b14adaa86f877e27099a1afec61f468b371de35be52ee8a2ea8c18d4fbe519a34d8a698ee3d2a267b33bbf4a9b1bb0449d171ce19ed37f7fa05adbbc
-  data.tar.gz: aa707d08bc2c4afef554e451bec8e6fad54215e198bbd3c3259d4fbb019ff6cbf7c4885d163755e3ae07c320825b960abbf1995b92e21e075293f982b45b9011
+  metadata.gz: 7f6a8b6450e73759490ff0ae77f365283f47fc591f2b3a45e9bde151495aed5e63ef780ec33a794f6e8d92d543f32f1e2327ad50f2f8f43a9dec370997c00e55
+  data.tar.gz: df4ba738e97b5eceec09d7e02654b4bf3b2c17e74ada47db61f6507bb9a22d84f2cd241e62deb1dfab548f821cc838709cf6e8f0ad95f1ec671a171333f2c020

data/.rubocop.yml

@@ -5,7 +5,7 @@ Metrics/AbcSize:
   Max: 30
 
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 12
 
 Metrics/LineLength:
   Max: 100
@@ -15,7 +15,7 @@ Metrics/MethodLength:
   Max: 20
 
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 15
 
 Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation

data/CHANGELOG.md

@@ -1,6 +1,19 @@
+## 1.0.1
+
+**21 December 2014**
+
+Enhancements:
+
+* support bucket-in-host style S3 URLs to simplify usage instructions
+
+Fixes:
+
+* internal cleanup
+* improved detection of incompatible Vagrant versions
+
 ## 1.0.0
 
-**Unreleased**
+**16 December 2014**
 
 Enhancements:
 

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-s3auth (1.0.0)
+    vagrant-s3auth (1.0.1)
       aws-sdk (~> 1.59.1)
 
 GEM

data/README.md

@@ -1,7 +1,7 @@
 # vagrant-s3auth
 
 <a href="https://travis-ci.org/WhoopInc/vagrant-s3auth">
-  <img src="https://travis-ci.org/WhoopInc/vagrant-s3auth.svg?branch=1.0-cleanup"
+  <img src="https://travis-ci.org/WhoopInc/vagrant-s3auth.svg?branch=master"
     align="right">
 </a>
 
@@ -62,11 +62,16 @@ ENV['AWS_SECRET_ACCESS_KEY'] = creds[1].chomp
 
 #### S3 URLs
 
-Note that your URL must use the path style of specifying the bucket:
+You can use any valid HTTP(S) URL for your object:
 
-```
+```bash
+# path style
 http://s3.amazonaws.com/bucket/resource
 https://s3.amazonaws.com/bucket/resource
+
+# host style
+http://bucket.s3.amazonaws.com/resource
+https://bucket.s3.amazonaws.com/resource
 ```
 
 Or the S3 protocol shorthand
@@ -77,13 +82,6 @@ s3://bucket/resource
 
 which expands to the path-style HTTPS URL.
 
-Virtual host-style S3 URLs, where the bucket is specified in the hostname, are
-**not detected**!
-
-```
-https://bucket.s3-region.amazonaws.com/resource # ignored
-```
-
 ##### Non-standard regions
 
 If your bucket is not hosted in the US Standard region, you'll need to specify
@@ -91,6 +89,7 @@ the correct region endpoint as part of the URL:
 
 ```
 https://s3-us-west-2.amazonaws.com/bucket/resource
+https://bucket.s3-us-west-2.amazonaws.com/resource
 ```
 
 Or just use the S3 protocol shorthand, which will automatically determine the

data/lib/vagrant-s3auth/{extensions → extension}/downloader.rb

@@ -3,18 +3,19 @@ require 'uri'
 require 'vagrant/util/downloader'
 require 'vagrant-s3auth/util'
 
+S3Auth = VagrantPlugins::S3Auth
+
 module Vagrant
   module Util
     class Downloader
       def execute_curl_with_s3(options, subprocess_options, &data_proc)
-        begin
-          url = URI.parse(@source)
-        rescue URI::InvalidURIError
-          @logger.info("s3auth: Ignoring unparsable URL: #{url}")
-        end
+        # The URL sent to curl is always the last argument. We have to rely
+        # on this implementation detail because we need to hook into both
+        # HEAD and GET requests.
+        url = options.last
 
-        if url && (s3_object = VagrantPlugins::S3Auth::Util.s3_object_for(url))
-          @logger.info("s3auth: Discovered S3 URL: #{url}")
+        if s3_object = S3Auth::Util.s3_object_for(url)
+          @logger.info("s3auth: Discovered S3 URL: #{@source}")
           @logger.debug("s3auth: Bucket: #{s3_object.bucket.name.inspect}")
           @logger.debug("s3auth: Key: #{s3_object.key.inspect}")
 
@@ -22,8 +23,7 @@ module Vagrant
 
           @logger.info("s3auth: Generating signed URL for #{method.upcase}")
 
-          options.pop
-          options << VagrantPlugins::S3Auth::Util.s3_url_for(method, s3_object).to_s
+          url.replace(S3Auth::Util.s3_url_for(method, s3_object).to_s)
         end
 
         execute_curl_without_s3(options, subprocess_options, &data_proc)

data/lib/vagrant-s3auth/plugin.rb

@@ -4,16 +4,14 @@ rescue LoadError
   raise 'The Vagrant S3Auth plugin must be run within Vagrant.'
 end
 
-if Vagrant::VERSION < '1.5.0'
-  raise 'The Vagrant AWS plugin is only compatible with Vagrant 1.5+'
-end
-
 require_relative 'errors'
-require_relative 'extensions'
+require_relative 'extension/downloader'
 
 module VagrantPlugins
   module S3Auth
-    class Plugin < Vagrant.plugin(2)
+    class Plugin < Vagrant.plugin('2')
+      Vagrant.require_version('>= 1.5.1')
+
       name 's3auth'
 
       description <<-DESC

data/lib/vagrant-s3auth/util.rb

@@ -6,7 +6,7 @@ require 'uri'
 module VagrantPlugins
   module S3Auth
     module Util
-      S3_HOST_MATCHER = /^s3([[:alnum:]\-\.]+)?\.amazonaws\.com$/
+      S3_HOST_MATCHER = /^((?<bucket>[[:alnum:]\-\.]+).)?s3([[:alnum:]\-\.]+)?\.amazonaws\.com$/
 
       LOCATION_TO_REGION = Hash.new { |_, key| key }.merge(
         nil => 'us-east-1',
@@ -20,9 +20,9 @@ module VagrantPlugins
           bucket = url.host
           key = url.path[1..-1]
           raise Errors::MalformedShorthandURLError, url: url unless bucket && key
-        elsif url.host =~ S3_HOST_MATCHER
+        elsif match = S3_HOST_MATCHER.match(url.host)
           components = url.path.split('/').delete_if(&:empty?)
-          bucket = components.shift
+          bucket = match['bucket'] || components.shift
           key = components.join('/')
         end
 

data/lib/vagrant-s3auth/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module S3Auth
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/test/run.bats

@@ -31,48 +31,72 @@ teardown() {
   bundle exec vagrant box add "$ATLAS_USERNAME/$VAGRANT_S3AUTH_ATLAS_BOX_NAME"
 }
 
-@test "simple box with full standard url" {
+@test "simple box with full path standard url" {
   bundle exec vagrant box add \
     --name "$VAGRANT_S3AUTH_BOX_BASE" \
     "https://s3.amazonaws.com/us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
 }
 
+@test "simple box with full host standard url" {
+  bundle exec vagrant box add \
+    --name "$VAGRANT_S3AUTH_BOX_BASE" \
+    "https://us-east-1.$VAGRANT_S3AUTH_BUCKET.s3.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE.box"
+}
+
 @test "simple box with shorthand standard url" {
   bundle exec vagrant box add \
     --name "$VAGRANT_S3AUTH_BOX_BASE" \
     "s3://us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
 }
 
-@test "simple box with full nonstandard url" {
+@test "simple box with full path nonstandard url" {
   bundle exec vagrant box add \
     --name "$VAGRANT_S3AUTH_BOX_BASE" \
     "https://s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
 }
 
+@test "simple box with full host nonstandard url" {
+  bundle exec vagrant box add \
+    --name "$VAGRANT_S3AUTH_BOX_BASE" \
+    "https://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET.s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE.box"
+}
+
 @test "simple box with shorthand nonstandard url" {
   bundle exec vagrant box add \
     --name "$VAGRANT_S3AUTH_BOX_BASE" \
     "s3://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
 }
 
-@test "metadata box with full standard url" {
+@test "metadata box with full path standard url" {
   bundle exec vagrant box add \
     --name "vagrant-s3auth/$VAGRANT_S3AUTH_BOX_BASE" \
     "https://s3.amazonaws.com/us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
 }
 
+@test "metadata box with full host standard url" {
+  bundle exec vagrant box add \
+    --name "vagrant-s3auth/$VAGRANT_S3AUTH_BOX_BASE" \
+    "https://us-east-1.$VAGRANT_S3AUTH_BUCKET.s3.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE"
+}
+
 @test "metadata box with shorthand standard url" {
   bundle exec vagrant box add \
     --name "vagrant-s3auth/$VAGRANT_S3AUTH_BOX_BASE" \
     "s3://us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
 }
 
-@test "metadata box with full nonstandard url" {
+@test "metadata box with full path nonstandard url" {
   bundle exec vagrant box add \
     --name "vagrant-s3auth/$VAGRANT_S3AUTH_BOX_BASE" \
     "https://s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
 }
 
+@test "metadata box with full host nonstandard url" {
+  bundle exec vagrant box add \
+    --name "vagrant-s3auth/$VAGRANT_S3AUTH_BOX_BASE" \
+    "https://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET.s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE"
+}
+
 @test "metadata box with shorthand nonstandard url" {
   bundle exec vagrant box add \
     --name "vagrant-s3auth/$VAGRANT_S3AUTH_BOX_BASE" \
@@ -88,6 +112,5 @@ teardown() {
 @test "garbage full url" {
   run bundle exec vagrant box add --name "$VAGRANT_S3AUTH_BOX_BASE" https://smoogedydoop
   [[ "$status" -eq 1 ]]
-  echo "$output"
   [[ "$output" == *"error occurred while downloading the remote file"* ]]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-s3auth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nikhil Benesch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -101,8 +101,7 @@ files:
 - TESTING.md
 - lib/vagrant-s3auth.rb
 - lib/vagrant-s3auth/errors.rb
-- lib/vagrant-s3auth/extensions.rb
-- lib/vagrant-s3auth/extensions/downloader.rb
+- lib/vagrant-s3auth/extension/downloader.rb
 - lib/vagrant-s3auth/plugin.rb
 - lib/vagrant-s3auth/util.rb
 - lib/vagrant-s3auth/version.rb

data/lib/vagrant-s3auth/extensions.rb

@@ -1 +0,0 @@
-require_relative 'extensions/downloader'