vagrant-ebcommon 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6469c25ac5b137124b0c9594966b5714b14f4e
-  data.tar.gz: a9d9140d6113310d885ccd9bc4eadbd18df82b8c
+  metadata.gz: 8ea352a431f45e190c9272fd34568584e4ba2b08
+  data.tar.gz: 6a01faa03b7b5efbcbaf24b187c9e672c44fabfa
 SHA512:
-  metadata.gz: 93ef1d36f30a706546836393edc717a3059bf945f42822aac4242974a0dd0c894d1c0eaca3b349a1df77e529b6901968aa808d52bb4fd3626dac30d3939da29a
-  data.tar.gz: 1c07561e75e7de6ef2db79018bddb3ffd741bd3c0c69d022930977c9668ff37e489e6c4cc4a75237013b2028dab96d49ab4489393b81cfe5dfd10b108439b2d1
+  metadata.gz: fc467c96c01dd841294c21a9d3bf8d2c9dae0dd8126cdc9c80fc4b3820c1d084a50d84d8c39359eba0abefcc27c289abb001b37757ef7f0281037f9163733337
+  data.tar.gz: e7e6826879b09515959e7bccc8a93067f0d7fb0e2b9a920edce6a38594203c7d30cf1b00ca4999b7f5138b71234f34b33fbf10e1ff623703112b9c54b24b47e1

data/Vagrantfile

@@ -7,9 +7,9 @@ Vagrant.configure('2') do |config|
   config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
 
   config.ebcommon.vpn_urls = [
-    'https://docs.evbhome.com',
-    'https://reviews.evbhome.com',
+    'http://packages',
   ]
+  config.ebcommon.vpn_timeout = 3
   config.ebcommon.git_hook_root_dir = '/Volumes/eb_home/work'
   config.ebcommon.git_hook_repos = [
     'vagrant-ebcommon',

data/lib/vagrant-ebcommon/actions/setup_provision.rb

@@ -63,13 +63,13 @@ module VagrantPlugins
         # internally and everything will fail miserably if you're not on our
         # network.
         def ensure_vpn
-          if not ENV['FORCE_PROVISION'] and @ebcommon.vpn_urls
+          if !ENV['FORCE_PROVISION'] && @ebcommon.vpn_urls
             vpn_valid = false
             @ebcommon.vpn_urls.each { |url|
-              vpn_valid = ping url
+              vpn_valid = test_url_timeout url, @ebcommon.vpn_timeout
               break if vpn_valid
             }
-            if not vpn_valid
+            if !vpn_valid
               raise Ebcommon::Errors::VPNRequired.new
             end
             @env[:ui].success 'VPN connection verified, continuing provision.'
@@ -93,7 +93,7 @@ module VagrantPlugins
               end
             end
           end
-          if not contents.empty?
+          if !contents.empty?
             creds = JSON.parse contents
           end
           return creds
@@ -139,7 +139,7 @@ module VagrantPlugins
             email = @env[:ui].ask 'Enter your eventbrite email: '
             write_git_commiter_details(full_name, email)
           end
-          if not full_name.empty? or not email.empty?
+          if !full_name.empty? || !email.empty?
             @env[:ui].success "Will setup global github details in vagrant."\
               " Full Name: #{full_name}, Email: #{email}"
           end
@@ -168,10 +168,11 @@ module VagrantPlugins
 
         private
 
-          def ping(url)
+          # Test that a URL is responding something given a timeout in seconds.
+          def test_url_timeout(url, timeout)
             uri = URI(url)
             begin
-              timeout(1) do
+              timeout(timeout) do
                 s = TCPSocket.new(uri.host, uri.port)
                 s.close
               end

data/lib/vagrant-ebcommon/config.rb

@@ -2,17 +2,20 @@ module VagrantPlugins
   module Ebcommon
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :vpn_urls
+      attr_accessor :vpn_timeout
       attr_accessor :git_hook_repos
       attr_accessor :git_hook_root_dir
 
       def initialize
         @vpn_urls = UNSET_VALUE
+        @vpn_timeout = UNSET_VALUE
         @git_hook_repos = UNSET_VALUE
         @git_hook_root_dir = UNSET_VALUE
       end
 
       def finalize!
         @vpn_urls = nil if @vpn_urls == UNSET_VALUE
+        @vpn_timeout = 5 if @vpn_timeout == UNSET_VALUE
         @git_hook_repos = nil if @git_hook_repos == UNSET_VALUE
         @git_hook_root_dir = nil if @git_hook_root_dir == UNSET_VALUE
       end
@@ -20,23 +23,24 @@ module VagrantPlugins
       def validate(machine)
         errors = []
         if @vpn_urls
-          if not @vpn_urls.kind_of?(Array)
+          if !@vpn_urls.is_a?(Array)
             errors << '`vpn_urls` must be a list of urls to test vpn connection'
           else
             @vpn_urls.each { |url|
               uri = URI(url)
-              if not (uri.host and uri.port)
+              if !(uri.host && uri.port)
                 errors << "`vpn_urls` must be a list of urls: '#{url}' is not valid."
               end
             }
           end
         end
-        if @git_hook_repos
-          if not @git_hook_repos.kind_of?(Array)
-            errors << '`git_hook_repos` must be a list of paths to copy hooks to'
-          end
+        if @vpn_timeout && !@vpn_timeout.is_a?(Integer)
+          errors << '`vpn_timeout` must be an integer which represents the timeout in seconds to wait'
+        end
+        if @git_hook_repos && !@git_hook_repos.is_a?(Array)
+          errors << '`git_hook_repos` must be a list of paths to copy hooks to'
         end
-        if @git_hook_repos and not @git_hook_root_dir
+        if @git_hook_repos && !@git_hook_root_dir
           errors << '`git_hook_root_dir` must be set to the directory containing directories in `git_hook_repos`'
         end
         return { 'ebcommon' => errors }

data/lib/vagrant-ebcommon/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ebcommon
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ebcommon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Michael Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler