vagrant-proxyconf 0.5.2 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI4MTE4NzRhOTYzYWY1MDVkZThkM2Y5MTNjZmQ0ODY2ZTM0YmZjMg==
+    MGJkNWQ0YjdiMjA4ZDQ0YmQ3MzM3ZDFjODM3MmEwODk2YmI2M2ZhMg==
   data.tar.gz: !binary |-
-    Mzg5Y2U5MWU3MmM2ZDQyOTQ3NGE1ODVmZGFhNmRlNTZkMGQxZWUxNg==
+    MGE0Y2VkOWUzOWNjZDg0NDQxYTU0MmZmMDdhY2Y2ZTZkZmRiMzY3OQ==
 SHA512:
   metadata.gz: !binary |-
-    Mzk2YzM2ZjlhYTkwMmE2NTg4ZGI5YTIzMjU4OTE3YTM3YjFkOWU3MWUyOTRi
-    NWY1YjIxZjY2ZmNiOTQwMzAxNjRiNjVhOTM2ODkxYWMyMjM1YWY0YWFhNTVm
-    OWEwNDgyMmZkOTg5OTE3N2NlMWI0Mzc2YmQ2NGJiN2ZkMmY4N2M=
+    YzA5OWYxNTZmYWZmYzdiNzM0Y2YwMDVmZDMyYzM3YTc3YWY0MTUyMmZkNDYx
+    ZTc3YTJlNjc1YTE1Njk2ZTk1ZmEzNGU1Mjc3ZTA1MDAxNGQyZGVkNDNkZDU1
+    Mjc5YzQ4NzY2ZjAwZmQxMjYzZjVkYTgxZGUwNWU0YmMyMzE3N2U=
   data.tar.gz: !binary |-
-    NDE4YTdlNjNlOTY1NDQ5ZTMxYzIzOTFiMDM2NWNkYTdlMjAyOWNlMzI1MDM1
-    MGFiNDIwOTRiMTk2YjFlZWUzNDM4ODQ3OWI5MDU2ZGNlODYzZWJjMzc4NTA3
-    MmFiMmVmNWM2YjA0MWYxNzFiNDczMzkxYjJiODM2ZDFlNWUyYWU=
+    YjRkN2YyYzI3ZDM0NDg5NTQ3ZDBkMTZkOTQzYWU2MDY3NTA4YjQzODYzMWEz
+    YTA2ZjEzZGZiNDk3MmJhNDA0OWE3MDAxNzc5YTc5YTVkN2VlYWIyM2U5ZjEx
+    OTAwN2IwYjMyN2U1YTM1YjQ2OTI0YjQyNmU3ZTU2ZjE4MjViNzM=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.5.3 / 2013-09-30
+
+- Compatibility with vagrant-aws v0.4.0 ([GH-28][])
+    * Next vagrant-aws release [will remove](https://github.com/mitchellh/vagrant-aws/commit/dd17f23) its custom TimedProvision action class
+- Ensure that generated configuration files are not deleted before uploading ([GH-29][])
+
 # 0.5.2 / 2013-09-27
 
 - Fix sudo configuration on old Ubuntu 10.04 "lucid" guests ([GH-26][])
@@ -69,3 +75,5 @@
 [GH-25]: https://github.com/tmatilai/vagrant-proxyconf/issues/25 "Issue 25"
 [GH-26]: https://github.com/tmatilai/vagrant-proxyconf/issues/26 "Issue 26"
 [GH-27]: https://github.com/tmatilai/vagrant-proxyconf/issues/27 "Issue 27"
+[GH-28]: https://github.com/tmatilai/vagrant-proxyconf/issues/28 "Issue 28"
+[GH-29]: https://github.com/tmatilai/vagrant-proxyconf/issues/29 "Issue 29"

data/lib/vagrant-proxyconf/action/base.rb

@@ -72,10 +72,11 @@ module VagrantPlugins
         def write_config(machine, config, opts = {})
           tmp = "/tmp/vagrant-proxyconf"
           path = opts[:path] || config_path(machine)
+          local_tmp = tempfile(config)
 
           logger.debug "Configuration (#{path}):\n#{config}"
           machine.communicate.tap do |comm|
-            comm.upload(tempfile(config).path, tmp)
+            comm.upload(local_tmp.path, tmp)
             comm.sudo("chmod #{opts[:mode] || '0644'} #{tmp}")
             comm.sudo("chown #{opts[:owner] || 'root:root'} #{tmp}")
             comm.sudo("mkdir -p #{File.dirname(path)}")

data/lib/vagrant-proxyconf/plugin.rb

@@ -27,24 +27,6 @@ module VagrantPlugins
         I18n.reload!
       end
 
-      def self.register_hooks(hook, provision_action)
-        require_relative 'action/configure_apt_proxy'
-        require_relative 'action/configure_chef_proxy'
-        require_relative 'action/configure_env_proxy'
-
-        hook.after provision_action, Action::ConfigureAptProxy
-        hook.after provision_action, Action::ConfigureChefProxy
-        hook.after provision_action, Action::ConfigureEnvProxy
-      end
-
-      def self.aws_plugin_installed?
-        VagrantPlugins.const_defined?('AWS')
-      end
-
-      def self.omnibus_plugin_installed?
-        VagrantPlugins.const_defined?('Omnibus')
-      end
-
       setup_i18n
       check_vagrant_version!
 
@@ -76,16 +58,30 @@ module VagrantPlugins
       end
 
       action_hook 'proxyconf_configure' do |hook|
-        if omnibus_plugin_installed?
+        if defined? VagrantPlugins::Omnibus::Action::InstallChef
           # configure the proxies before vagrant-omnibus
           register_hooks(hook, VagrantPlugins::Omnibus::Action::InstallChef)
         else
           register_hooks(hook, Vagrant::Action::Builtin::Provision)
 
-          # vagrant-aws uses a non-standard provision action
-          register_hooks(hook, VagrantPlugins::AWS::Action::TimedProvision) if aws_plugin_installed?
+          # vagrant-aws < 0.4.0 uses a non-standard provision action
+          if defined? VagrantPlugins::AWS::Action::TimedProvision
+            register_hooks(hook, VagrantPlugins::AWS::Action::TimedProvision)
+          end
         end
       end
+
+      private
+
+      def self.register_hooks(hook, provision_action)
+        require_relative 'action/configure_apt_proxy'
+        require_relative 'action/configure_chef_proxy'
+        require_relative 'action/configure_env_proxy'
+
+        hook.after provision_action, Action::ConfigureAptProxy
+        hook.after provision_action, Action::ConfigureChefProxy
+        hook.after provision_action, Action::ConfigureEnvProxy
+      end
     end
   end
 end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email: