vagrant-proxyconf 0.6.0 → 1.0.0.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmMyYjRlNzJlMzdlY2VhNDYzOTJhNGEwMGM4MmM2YWVkN2ViMTdlZA==
+    NTE3NjFmYmRjMjI3OTUyZDY5OGRkZTc3MzZkY2RlNjY3ZmMyMjlhZA==
   data.tar.gz: !binary |-
-    N2NmMDMyYWVmZWVkNDdlNTdlYmYzNzgyYmE2OGNiNjI3ZGYyY2EwOQ==
+    MWEzOTY2NGNlMTE0Nzc4YTBhY2U3ZWZhMDQ4NDlkNzcyZWYwNGQ5Mg==
 SHA512:
   metadata.gz: !binary |-
-    NjhmOGI0YjczMzZiNzQ4NmEwMGU0YTg0N2ZmZjFkM2NkMjM4NzIyMDNjOTA3
-    N2RjM2U4MDg4MjUzY2NiMzdhMDMwMDE4MjkwMmY4N2U5NmE0OWE2OGZiMGQ2
-    YzU3YzQ0MmU2OTZiOGJlMGNmZDJhYjMxMzE2MTM3OGMyM2Q1MGY=
+    M2RmMTc1NWFmNWU5NzEyZTU5NGQyMjUyOGI1YzQ0NTIyNzhmZWJkNGYwNTNh
+    YmFmYzk3NjRjMzE0MjczN2Y2MmU4OWEyODljY2E3M2JkMmU1MjQ4ZGMzNGFm
+    NzI4OGM0ZjQ0ZDg3YzVhNGYxZDIwNzQwZWQyNGEyOGFjZWNmYjc=
   data.tar.gz: !binary |-
-    ZTE5YTFlNGMwNDI4NWJmM2E4OGYwNzM1NWJhMmY3NGFlMzViY2U5YzZlNzRj
-    NTEzNzljY2Y3NzIwYWM0ZmU0OGFjNDVlZjdiZjcyNzliYTU4YTUxNjk4YzRl
-    ZjJmZjVmNzdmYWYxZTQwYzNmZDNjN2EzZmJkNGMyNmIyYThjODY=
+    ZjhjOTVmZjI5Yzg5MWMyNDQ2MmZjMWM5ZjE4NDgxYzEzNjM4ZGY4YWMwNGQy
+    OTIzOTU4ZDI5MjBjYjAxNTcyZGI1MDNlNjAwNmJlYzY0M2VjMGZiNTM5MDVk
+    OTQyNTg5NmQxZjJlNTIzOWQ5N2Y1NGViMzA1ZjVhNmFiZWE3ZmE=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.0.rc1 / 2013-10-30
+
+- Add support for configuring Yum directly (not only via global env vars) ([GH-4][])
+- Remove the target path before uploading files to VM to avoid permission problems ([GH-32][])
+
 # 0.6.0 / 2013-10-15
 
 - Add support for the [vagrant-vbguest](https://github.com/dotless-de/vagrant-vbguest) plugin ([GH-30][])
@@ -60,6 +65,7 @@
 
 
 [GH-2]:  https://github.com/tmatilai/vagrant-proxyconf/issues/2  "Issue 2"
+[GH-4]:  https://github.com/tmatilai/vagrant-proxyconf/issues/4  "Issue 4"
 [GH-5]:  https://github.com/tmatilai/vagrant-proxyconf/issues/5  "Issue 5"
 [GH-6]:  https://github.com/tmatilai/vagrant-proxyconf/issues/6  "Issue 6"
 [GH-7]:  https://github.com/tmatilai/vagrant-proxyconf/issues/7  "Issue 7"
@@ -82,3 +88,4 @@
 [GH-28]: https://github.com/tmatilai/vagrant-proxyconf/issues/28 "Issue 28"
 [GH-29]: https://github.com/tmatilai/vagrant-proxyconf/issues/29 "Issue 29"
 [GH-30]: https://github.com/tmatilai/vagrant-proxyconf/issues/30 "Issue 30"
+[GH-32]: https://github.com/tmatilai/vagrant-proxyconf/issues/32 "Issue 32"

data/Gemfile

@@ -7,7 +7,7 @@ gem 'rake'
 gem 'rspec', '~> 2.11'
 gem 'simplecov', '~> 0.7', :require => false
 gem 'tailor', '~> 1.2'
-gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v1.3.4'
+gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v1.3.5'
 
 group :development do
   gem 'guard-rspec'

data/Guardfile

@@ -1,5 +1,6 @@
 guard 'rspec'  do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
+  watch(%r{^(resources/.+)\.})       { |m| "spec/unit/vagrant-proxyconf/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')       { "spec" }
 end

data/README.md

@@ -14,11 +14,12 @@
 
 A [Vagrant](http://www.vagrantup.com/) plugin that configures the virtual machine to use specified proxies. This is useful for example in case you are behind a corporate proxy server, or you have a caching proxy (for example [polipo](https://github.com/tmatilai/polipo-box)).
 
-At this state we support:
+The plugin can set:
 
-* Generic `http_proxy` etc. environment variables that many programs support
-* APT proxy/cacher
-* Setting default proxy configuration for all Chef provisioners
+* generic `http_proxy` etc. environment variables that many programs support
+* default proxy configuration for all Chef provisioners
+* proxy configuration for Apt
+* proxy configuration for Yum
 
 ## Quick start
 
@@ -86,7 +87,7 @@ end
 #### Possible values
 
 * If all keys are unset or `nil`, no configuration is written.
-* A proxy should be specified in the form of _protocol://[user:pass@]host[:port]_.
+* A proxy should be specified in the form of _http://[user:pass@]host:port_.
 * Empty string (`""`) or `false` in any setting also force the configuration files to be written, but without configuration for that key. Can be used to clear the old configuration and/or override a global setting.
 
 #### Environment variables
@@ -106,7 +107,7 @@ VAGRANT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
 
 ### Global `*_proxy` environment variables
 
-Many programs (wget, curl, yum, etc.) can be configured to use proxies with `<protocol>_proxy` or `<PROTOCOL>_PROXY` environment variables. This configuration will be written to _/etc/profile.d/proxy.sh_ on the guest.
+Many programs (wget, curl, yum, etc.) can be configured to use proxies with `http_proxy` or `HTTP_PROXY` etc. environment variables. This configuration will be written to _/etc/profile.d/proxy.sh_ on the guest.
 
 Also sudo will be configured to preserve the variables. This requires that sudo in the VM is configured to support "sudoers.d", i.e. _/etc/sudoers_ contains line `#includedir /etc/sudoers.d`.
 
@@ -131,7 +132,7 @@ end
 #### Possible values
 
 * If all keys are unset or `nil`, no configuration is written.
-* A proxy can be specified in the form of _protocol://[user:pass@]host[:port]_.
+* A proxy can be specified in the form of _http://[user:pass@]host:port_.
 * The values are used as specified, so you can use for example variables that will be evaluated by the shell on the VM.
 * Empty string (`""`) or `false` in any setting also force the configuration file to be written, but without configuration for that key. Can be used to clear the old configuration and/or override a global setting.
 
@@ -158,7 +159,7 @@ Configures Apt to use the specified proxy settings. The configuration will be wr
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.apt_proxy.http  = "192.168.33.1:3142"
+  config.apt_proxy.http  = "http://192.168.33.1:3142"
   config.apt_proxy.https = "DIRECT"
   # ... other stuff
 end
@@ -172,9 +173,9 @@ end
 
 #### Possible values
 
-* If all keys are unset or `nil`, no configuration is written.
-* A proxy can be specified in the form of _[http://][user:pass@]host[:port]_. So all but the _host_ part are optional. The default port is 3142 and protocol is the same as the key.
-* Empty string (`""`) or `false` in any protocol also force the configuration file to be written, but without configuration for that protocol. Can be used to clear the old configuration and/or override a global setting.
+* If all keys are unset or `nil`, no configuration is written or modified.
+* A proxy can be specified in the form of _[http://][user:pass@]host[:port]_. So all but the _host_ part are optional. The default port is 3142 and scheme is the same as the key.
+* Empty string (`""`) or `false` in any key also force the configuration file to be written, but without configuration for that scheme. Can be used to clear the old configuration and/or override a global setting.
 * `"DIRECT"` can be used to specify that no proxy should be used. This is mostly useful for disabling proxy for HTTPS URIs when HTTP proxy is set (as Apt defaults to the latter).
 * Please refer to [apt.conf(5)](http://manpages.debian.net/man/5/apt.conf) manual for more information.
 
@@ -196,6 +197,41 @@ VAGRANT_APT_HTTP_PROXY="proxy.example.com:8080" vagrant up
 
 [apt-cacher-box](https://github.com/tmatilai/apt-cacher-box) gives an example for setting up apt-cacher proxy server in a Vagrant VM.
 
+### Yum
+
+Configures Yum to use the specified proxy settings. The configuration will be inserted to _/etc/yum.conf_ on the guest.
+
+#### Example Vagrantfile
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.yum_proxy.http  = "http://192.168.33.1:3142"
+  # ... other stuff
+end
+```
+
+#### Configuration keys
+
+* `config.yum_proxy.http` - The proxy for yum
+
+#### Possible values
+
+* If the keys is unset or `nil`, the current configuration is not modified.
+* A proxy can be specified in the form of _http://[user:pass@]host:port_.
+* Empty string (`""`) or `false` disables the proxy from the configuration.
+
+#### Environment variables
+
+* `VAGRANT_YUM_HTTP_PROXY`
+
+This also overrides the Vagrantfile configuration. To disable or remove the proxy use an empty value.
+
+For example to spin up a VM, run:
+
+```sh
+VAGRANT_YUM_HTTP_PROXY="http://proxy.example.com:8123" vagrant up
+```
+
 ## Related plugins and projects
 
 * [apt-cacher-box](https://github.com/tmatilai/apt-cacher-box)<br/>

data/lib/vagrant-proxyconf/action.rb

@@ -1,6 +1,7 @@
 require_relative 'action/configure_apt_proxy'
 require_relative 'action/configure_chef_proxy'
 require_relative 'action/configure_env_proxy'
+require_relative 'action/configure_yum_proxy'
 require_relative 'action/only_once'
 
 module VagrantPlugins
@@ -24,6 +25,7 @@ module VagrantPlugins
           builder.use ConfigureAptProxy
           builder.use ConfigureChefProxy
           builder.use ConfigureEnvProxy
+          builder.use ConfigureYumProxy
         end
       end
     end

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

@@ -78,6 +78,7 @@ module VagrantPlugins
 
           logger.debug "Configuration (#{path}):\n#{config}"
           machine.communicate.tap do |comm|
+            comm.sudo("rm #{tmp}", error_check: false)
             comm.upload(local_tmp.path, tmp)
             comm.sudo("chmod #{opts[:mode] || '0644'} #{tmp}")
             comm.sudo("chown #{opts[:owner] || 'root:root'} #{tmp}")

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

@@ -1,4 +1,5 @@
 require_relative '../logger'
+require_relative '../userinfo_uri'
 
 module VagrantPlugins
   module ProxyConf
@@ -51,23 +52,25 @@ module VagrantPlugins
           chef_provisioners(machine).each { |prov| configure_chef(prov.config, config) }
         end
 
-        # Configures proxies for the Chef provisioner if they are not set
+        # Configures proxies for a Chef provisioner if they are not set
         #
         # @param chef [VagrantPlugins::Chef::Config::Base] the Chef provisioner configuration
         # @param config [Config::Proxy] the default configuration
         def configure_chef(chef, config)
-          if !chef.http_proxy && config.http
-            chef.http_proxy      = config.http
-            chef.http_proxy_user = config.http_user
-            chef.http_proxy_pass = config.http_pass
-          end
-          if !chef.https_proxy && config.https
-            chef.https_proxy      = config.https
-            chef.https_proxy_user = config.https_user
-            chef.https_proxy_pass = config.https_pass
-          end
-          if !chef.no_proxy && config.no_proxy
-            chef.no_proxy = config.no_proxy
+          configure_chef_proxy(chef, 'http', config.http)
+          configure_chef_proxy(chef, 'https', config.https)
+          chef.no_proxy ||= config.no_proxy if config.no_proxy
+        end
+
+        # @param chef [VagrantPlugins::Chef::Config::Base] the Chef provisioner configuration
+        # @param scheme [String] the http protocol (http or https)
+        # @param uri [String] the URI with optional userinfo
+        def configure_chef_proxy(chef, scheme, uri)
+          if uri && !chef.public_send("#{scheme}_proxy")
+            u = UserinfoURI.new(uri)
+            chef.public_send("#{scheme}_proxy_user=", u.user)
+            chef.public_send("#{scheme}_proxy_pass=", u.pass)
+            chef.public_send("#{scheme}_proxy=", u.uri)
           end
         end
       end

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

@@ -0,0 +1,44 @@
+require_relative 'base'
+require_relative '../resource'
+require_relative '../userinfo_uri'
+
+module VagrantPlugins
+  module ProxyConf
+    class Action
+      # Action for configuring Yum on the guest
+      class ConfigureYumProxy < Base
+        def config_name
+          'yum_proxy'
+        end
+
+        private
+
+        def configure_machine(machine, config)
+          tmp = "/tmp/vagrant-proxyconf"
+          path = config_path(machine)
+
+          machine.communicate.tap do |comm|
+            comm.sudo("rm #{tmp}", error_check: false)
+            comm.upload(ProxyConf.resource("yum_config.awk"), tmp)
+            comm.sudo("touch #{path}")
+            comm.sudo("gawk -f #{tmp} #{proxy_params(config)} #{path} > #{path}.new")
+            comm.sudo("chmod 0644 #{path}.new")
+            comm.sudo("chown root:root #{path}.new")
+            comm.sudo("mv #{path}.new #{path}")
+            comm.sudo("rm #{tmp}")
+          end
+        end
+
+        def proxy_params(config)
+          u = UserinfoURI.new(config.http)
+          "-v proxy=#{escape(u.uri)} -v user=#{escape(u.user)} -v pass=#{escape(u.pass)}"
+        end
+
+        # @param value [String, nil] the string to escape for shell usage
+        def escape(value)
+          value.to_s.shellescape
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/cap/redhat/yum_proxy_conf.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Redhat
+        # Capability for Yum proxy configuration
+        module YumProxyConf
+          # @return [String] the path to the configuration file
+          def self.yum_proxy_conf(machine)
+            '/etc/yum.conf'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/config/proxy.rb

@@ -1,4 +1,3 @@
-require 'uri'
 require 'vagrant'
 require_relative 'key_mixin'
 
@@ -23,36 +22,6 @@ module VagrantPlugins
 
         # @return [String] a comma separated list of hosts or domains which do not use proxies
         key :no_proxy, env_var: 'VAGRANT_NO_PROXY'
-
-        # @return [String] username for the HTTP proxy
-        def http_user
-          user(http)
-        end
-
-        # @return [String] password for the HTTP proxy
-        def http_pass
-          pass(http)
-        end
-
-        # @return [String] username for the HTTPS proxy
-        def https_user
-          user(https)
-        end
-
-        # @return [String] password for the HTTPS proxy
-        def https_pass
-          pass(https)
-        end
-
-        private
-
-        def user(uri)
-          URI.parse(uri).user if uri
-        end
-
-        def pass(uri)
-          URI.parse(uri).password if uri
-        end
       end
     end
   end

data/lib/vagrant-proxyconf/config/yum_proxy.rb

@@ -0,0 +1,19 @@
+require 'vagrant'
+require_relative 'key_mixin'
+
+module VagrantPlugins
+  module ProxyConf
+    module Config
+      # Proxy configuration for Yum
+      #
+      # @!parse class YumProxy < Vagrant::Plugin::V2::Config; end
+      class YumProxy < Vagrant.plugin('2', :config)
+        include KeyMixin
+        # @!parse extend KeyMixin::ClassMethods
+
+        # @return [String] the HTTP proxy
+        key :http, env_var: 'VAGRANT_YUM_HTTP_PROXY'
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/plugin.rb

@@ -67,6 +67,11 @@ module VagrantPlugins
         Config::Proxy
       end
 
+      config 'yum_proxy' do
+        require_relative 'config/yum_proxy'
+        Config::YumProxy
+      end
+
       guest_capability 'debian', 'apt_proxy_conf' do
         require_relative 'cap/debian/apt_proxy_conf'
         Cap::Debian::AptProxyConf
@@ -77,6 +82,11 @@ module VagrantPlugins
         Cap::Linux::EnvProxyConf
       end
 
+      guest_capability 'redhat', 'yum_proxy_conf' do
+        require_relative 'cap/redhat/yum_proxy_conf'
+        Cap::Redhat::YumProxyConf
+      end
+
       action_hook 'proxyconf_configure' do |hook|
         require_relative 'action'
 

data/lib/vagrant-proxyconf/resource.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  # Base module for Vagrant Proxyconf plugin
+  module ProxyConf
+    # @param name [String] the resource file name
+    # @return [String] the absolute path to the resource file
+    def self.resource(name)
+      File.join(resource_root, name)
+    end
+
+    private
+
+    # @return [String] the absolute åath to the resource directory
+    def self.resource_root
+      File.expand_path('../../../resources', __FILE__)
+    end
+  end
+end

data/lib/vagrant-proxyconf/userinfo_uri.rb

@@ -0,0 +1,39 @@
+require 'uri'
+
+module VagrantPlugins
+  module ProxyConf
+    # Helper class that strips userinfo from the URI to separate attributes
+    class UserinfoURI
+      # @return [String] the URI without userinfo
+      attr_reader :uri
+
+      alias_method :to_s, :uri
+
+      # @return [String] the username
+      attr_reader :user
+
+      # @return [String] the password
+      attr_reader :pass
+
+      # @param uri [String] the URI including optional userinfo
+      def initialize(uri)
+        if uri
+          u = URI.parse(uri)
+          @uri  = strip_userinfo(u)
+          @user = u.user
+          @pass = u.password
+        end
+      end
+
+      private
+
+      # @param uri [URI::Generic] the URI with optional userinfo
+      # @return [String] the URI without userinfo
+      def strip_userinfo(uri)
+        u = uri.dup
+        u.userinfo = ''
+        u.to_s
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '0.6.0'
+    VERSION = '1.0.0.rc1'
   end
 end

data/locales/en.yml

@@ -24,6 +24,14 @@ en:
       configuring: |-
         Configuring proxy environment variables...
 
+    yum_proxy:
+      not_enabled: |-
+        yum_proxy not enabled or configured
+      not_supported: |-
+        Skipping Yum proxy config as the machine does not support it
+      configuring: |-
+        Configuring proxy for Yum...
+
     errors:
       vagrant_version: |-
         vagrant-proxyconf plugin requires Vagrant %{min_version} or newer

data/resources/yum_config.awk

@@ -0,0 +1,65 @@
+#!/usr/bin/env gawk
+#
+# Adds or modifies proxy configuration for Yum
+#
+# Usage:
+#   yum_config.awk -v proxy=http://proxy:1234 -v user=foo -v pass=bar /etc/yum.comf
+#
+# License: MIT
+# Copyright (c) 2013 Teemu Matilainen <teemu.matilainen@iki.fi>
+#
+
+BEGIN {
+  FS = OFS = "="
+
+  # [main] section:
+  #   0: not seen yet
+  #   1: inside of it
+  #   2: already on another section
+  main = 0
+
+  conf["proxy"] = (proxy ? proxy : "_none_")
+  conf["proxy_username"] = (proxy ? user : "")
+  conf["proxy_password"] = (proxy ? pass : "")
+}
+
+# Section headers
+/^\[.*\]$/ {
+  if ($0 == "[main]") {
+    # entering [main] section
+    main = 1
+  } else if (main == 1) {
+    # [main] section ended
+    print_proxy_conf()
+    main = 2
+  }
+}
+
+# Old configuration
+$1 ~ /^proxy(_username|_password)?$/ {
+  if (main == 1) {
+    $2 = conf[$1]
+    seen[$1] = 1
+  }
+}
+
+# Print every line by default
+{ print $0 }
+
+# Print missing configuration if needed
+END {
+  if (main == 0) print "[main]"
+  if (main < 2) print_proxy_conf()
+}
+
+# Prints proxy* configuration not seen yet
+function print_proxy_conf() {
+  print_key("proxy")
+  print_key("proxy_username")
+  print_key("proxy_password")
+}
+
+# Prints a proxy*=<value> line
+function print_key(key) {
+  if (!seen[key]) print key, conf[key]
+}

data/spec/unit/fixtures/yum_only_disabled_proxy.conf

@@ -0,0 +1,4 @@
+[main]
+proxy=_none_
+proxy_username=
+proxy_password=

data/spec/unit/fixtures/yum_only_main.conf

@@ -0,0 +1,25 @@
+[main]
+cachedir=/var/cache/yum/$basearch/$releasever
+keepcache=0
+debuglevel=2
+logfile=/var/log/yum.log
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+installonly_limit=5
+bugtracker_url=http://bugs.centos.org/set_project.php?project_id=16&ref=http://bugs.centos.org/bug_report_page.php?category=yum
+distroverpkg=centos-release
+
+#  This is the default, if you make this bigger yum won't see if the metadata
+# is newer on the remote and so you'll "gain" the bandwidth of not having to
+# download the new metadata and "pay" for it by yum not having correct
+# information.
+#  It is esp. important, to have correct metadata, for distributions like
+# Fedora which don't keep old packages around. If you don't like this checking
+# interupting your command line usage, it's much better to have something
+# manually check the metadata once an hour (yum-updatesd will do this).
+# metadata_expire=90m
+
+# PUT YOUR REPOS HERE OR IN separate files named file.repo
+# in /etc/yum.repos.d

data/spec/unit/fixtures/yum_only_main_with_disabled_proxy.conf

@@ -0,0 +1,28 @@
+[main]
+cachedir=/var/cache/yum/$basearch/$releasever
+keepcache=0
+debuglevel=2
+logfile=/var/log/yum.log
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+installonly_limit=5
+bugtracker_url=http://bugs.centos.org/set_project.php?project_id=16&ref=http://bugs.centos.org/bug_report_page.php?category=yum
+distroverpkg=centos-release
+
+#  This is the default, if you make this bigger yum won't see if the metadata
+# is newer on the remote and so you'll "gain" the bandwidth of not having to
+# download the new metadata and "pay" for it by yum not having correct
+# information.
+#  It is esp. important, to have correct metadata, for distributions like
+# Fedora which don't keep old packages around. If you don't like this checking
+# interupting your command line usage, it's much better to have something
+# manually check the metadata once an hour (yum-updatesd will do this).
+# metadata_expire=90m
+
+# PUT YOUR REPOS HERE OR IN separate files named file.repo
+# in /etc/yum.repos.d
+proxy=_none_
+proxy_username=
+proxy_password=

data/spec/unit/fixtures/yum_only_main_with_proxy.conf

@@ -0,0 +1,28 @@
+[main]
+cachedir=/var/cache/yum/$basearch/$releasever
+keepcache=0
+debuglevel=2
+logfile=/var/log/yum.log
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+installonly_limit=5
+bugtracker_url=http://bugs.centos.org/set_project.php?project_id=16&ref=http://bugs.centos.org/bug_report_page.php?category=yum
+distroverpkg=centos-release
+
+#  This is the default, if you make this bigger yum won't see if the metadata
+# is newer on the remote and so you'll "gain" the bandwidth of not having to
+# download the new metadata and "pay" for it by yum not having correct
+# information.
+#  It is esp. important, to have correct metadata, for distributions like
+# Fedora which don't keep old packages around. If you don't like this checking
+# interupting your command line usage, it's much better to have something
+# manually check the metadata once an hour (yum-updatesd will do this).
+# metadata_expire=90m
+
+# PUT YOUR REPOS HERE OR IN separate files named file.repo
+# in /etc/yum.repos.d
+proxy=http://proxy.example.com:3128/
+proxy_username=foo
+proxy_password=bar

data/spec/unit/fixtures/yum_only_proxy.conf

@@ -0,0 +1,4 @@
+[main]
+proxy=http://proxy:1234
+proxy_username=
+proxy_password=

data/spec/unit/fixtures/yum_only_proxy_and_userinfo.conf

@@ -0,0 +1,4 @@
+[main]
+proxy=http://proxy.example.com:3128/
+proxy_username=foo
+proxy_password=bar

data/spec/unit/fixtures/yum_with_repository.conf

@@ -0,0 +1,7 @@
+[main]
+debuglevel=2
+plugins=1
+[myrepo]
+name=My Repository
+baseurl=http://myrepo/somewhere
+proxy=http://repoproxy:8080

data/spec/unit/fixtures/yum_with_repository_and_disabled_proxy.conf

@@ -0,0 +1,10 @@
+[main]
+debuglevel=2
+plugins=1
+proxy=_none_
+proxy_username=
+proxy_password=
+[myrepo]
+name=My Repository
+baseurl=http://myrepo/somewhere
+proxy=http://repoproxy:8080

data/spec/unit/fixtures/yum_with_repository_and_new_proxy.conf

@@ -0,0 +1,10 @@
+[main]
+debuglevel=2
+plugins=1
+proxy=http://newproxy:9876
+proxy_username=baz
+proxy_password=
+[myrepo]
+name=My Repository
+baseurl=http://myrepo/somewhere
+proxy=http://repoproxy:8080

data/spec/unit/fixtures/yum_with_repository_and_proxy.conf

@@ -0,0 +1,10 @@
+[main]
+debuglevel=2
+plugins=1
+proxy=http://proxy.example.com:3128/
+proxy_username=foo
+proxy_password=bar
+[myrepo]
+name=My Repository
+baseurl=http://myrepo/somewhere
+proxy=http://repoproxy:8080

data/spec/unit/fixtures/yum_with_repository_and_proxy_without_userinfo.conf

@@ -0,0 +1,8 @@
+[main]
+debuglevel=2
+plugins=1
+proxy=http://oldproxy.example.com:3128
+[myrepo]
+name=My Repository
+baseurl=http://myrepo/somewhere
+proxy=http://repoproxy:8080

data/spec/unit/support/fixture.rb

@@ -0,0 +1,9 @@
+# @return [String] the path to the fixture file
+def fixture_path(filename)
+  File.expand_path("../../fixtures/#{filename}", __FILE__)
+end
+
+# @return [String] the content of a fixture file
+def fixture(filename)
+  IO.read(fixture_path(filename))
+end

data/spec/unit/vagrant-proxyconf/action/configure_chef_proxy_spec.rb

@@ -27,9 +27,8 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
 
     context "with specified default configurations" do
       before :each do
-        config.http      = 'http://foo:1234'
-        config.http_user = 'bar'
-        config.https     = false
+        config.http  = 'http://bar:baz@foo:1234'
+        config.https = false
 
         configure_chef
       end
@@ -37,7 +36,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
       it "configures chef" do
         expect(chef.http_proxy).to  eq 'http://foo:1234'
         expect(chef.http_proxy_user).to eq 'bar'
-        expect(chef.http_proxy_pass).to be_nil
+        expect(chef.http_proxy_pass).to eq 'baz'
         expect(chef.https_proxy).to be_nil
         expect(chef.https_proxy_user).to be_nil
         expect(chef.https_proxy_pass).to be_nil
@@ -46,13 +45,11 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
 
     context "with specified chef configurations" do
       before :each do
-        chef.http_proxy  = 'http://proxy:8080/'
-        chef.no_proxy    = 'localhost'
+        chef.http_proxy = 'http://proxy:8080/'
+        chef.no_proxy   = 'localhost'
 
-        config.http      = 'http://default:7070/'
-        config.http_user = 'foo'
-        config.http_pass = false
-        config.https     = 'http://sslproxy:3128/'
+        config.http     = 'http://foo:@default:7070/'
+        config.https    = 'http://sslproxy:3128/'
 
         configure_chef
       end
@@ -65,7 +62,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
       end
 
       it "configures unset proxies" do
-        expect(chef.https_proxy).to  eq 'http://sslproxy:3128/'
+        expect(chef.https_proxy).to eq 'http://sslproxy:3128/'
       end
     end
   end

data/spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/configure_yum_proxy'
+
+describe VagrantPlugins::ProxyConf::Action::ConfigureYumProxy do
+
+  describe '#config_name' do
+    subject { described_class.new(double, double).config_name }
+    it      { should eq 'yum_proxy' }
+  end
+
+  describe '#proxy_params' do
+    subject { described_class.new(nil, nil).send(:proxy_params, config) }
+    let(:config) { OpenStruct.new(http: http) }
+
+    context "with `false`" do
+      let(:http) { false }
+      it { should eq %q{-v proxy='' -v user='' -v pass=''} }
+    end
+
+    context "without userinfo" do
+      let(:http) { 'http://proxy:1234/' }
+      it { should eq %q{-v proxy=http://proxy:1234/ -v user='' -v pass=''} }
+    end
+
+    context "with userinfo" do
+      let(:http) { 'http://foo:bar@myproxy:9876' }
+      it { should eq %q{-v proxy=http://myproxy:9876 -v user=foo -v pass=bar} }
+    end
+
+    context "with special characters" do
+      let(:http) { %q{http://x*y:a(b@proxy.com:8080} }
+      it { should eq %q{-v proxy=http://proxy.com:8080 -v user=x\\*y -v pass=a\\(b} }
+    end
+  end
+end

data/spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/redhat/yum_proxy_conf'
+
+describe VagrantPlugins::ProxyConf::Cap::Redhat::YumProxyConf do
+
+  describe '.yum_proxy_conf' do
+    let(:subject) { described_class.yum_proxy_conf(double) }
+    it { should eq '/etc/yum.conf' }
+  end
+
+end

data/spec/unit/vagrant-proxyconf/config/proxy_spec.rb

@@ -2,66 +2,4 @@ require 'spec_helper'
 require 'vagrant-proxyconf/config/proxy'
 
 describe VagrantPlugins::ProxyConf::Config::Proxy do
-  before :each do
-    # Ensure tests are not affected by environment variables
-    %w[HTTP_PROXY HTTPS_PROXY FTP_PROXY NO_PROXY].each do |var|
-      ENV.delete("VAGRANT_#{var}")
-    end
-  end
-
-  subject do
-    described_class.new.tap do |config|
-      config.http  = http_proxy
-      config.https = https_proxy
-    end
-  end
-  let(:http_proxy)  { nil }
-  let(:https_proxy) { nil }
-
-  context "defaults" do
-    its(:http_user)  { should be_nil }
-    its(:http_pass)  { should be_nil }
-    its(:https_user) { should be_nil }
-    its(:https_pass) { should be_nil }
-  end
-
-  context "without userinfo" do
-    let(:http_proxy)  { 'http://proxy.example.com:8123/' }
-    let(:https_proxy) { '' }
-
-    its(:http_user)  { should be_nil }
-    its(:http_pass)  { should be_nil }
-    its(:https_user) { should be_nil }
-    its(:https_pass) { should be_nil }
-  end
-
-  context "with username" do
-    let(:http_proxy)  { 'http://foo@proxy.example.com:8123/' }
-    let(:https_proxy) { 'http://bar@localhost' }
-
-    its(:http_user)  { should eq 'foo' }
-    its(:http_pass)  { should be_nil }
-    its(:https_user) { should eq 'bar' }
-    its(:https_pass) { should be_nil }
-  end
-
-  context "with userinfo" do
-    let(:http_proxy)  { 'http://foo:bar@proxy.example.com:8123/' }
-    let(:https_proxy) { 'http://:baz@localhost' }
-
-    its(:http_user)  { should eq 'foo' }
-    its(:http_pass)  { should eq 'bar' }
-    its(:https_user) { should eq '' }
-    its(:https_pass) { should eq 'baz' }
-  end
-
-  context "with false" do
-    let(:http_proxy)  { false }
-    let(:https_proxy) { false }
-
-    its(:http_user)  { should be_nil }
-    its(:http_pass)  { should be_nil }
-    its(:https_user) { should be_nil }
-    its(:https_pass) { should be_nil }
-  end
 end

data/spec/unit/vagrant-proxyconf/config/yum_proxy_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/config/yum_proxy'
+
+describe VagrantPlugins::ProxyConf::Config::YumProxy do
+end

data/spec/unit/vagrant-proxyconf/resource_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/resource'
+
+describe VagrantPlugins::ProxyConf do
+  describe ".resource" do
+    let(:root_dir) { File.expand_path('../../../..', __FILE__) }
+
+    it "returns path to the specified file" do
+      expect(described_class.resource('foo.txt').to_s).to eq File.join(root_dir, 'resources', 'foo.txt')
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/resources/yum_config_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+require 'unit/support/fixture'
+require 'vagrant-proxyconf/resource'
+
+describe 'resources/yum_config.awk' do
+  def configure(config = {})
+    cmd = "gawk -f #{VagrantPlugins::ProxyConf.resource('yum_config.awk')}"
+    cmd << %w[proxy user pass].map { |var| " -v #{var}=#{config[var.to_sym].to_s.shellescape}" }.join
+    cmd << " #{fixture_path(old_conf)}"
+    `#{cmd}`
+  end
+
+  context "with empty old conf" do
+    let(:old_conf) { 'empty' }
+
+    it "adds the specified proxy" do
+      expect(configure(proxy: 'http://proxy:1234')).to eq fixture('yum_only_proxy.conf')
+    end
+
+    it "adds proxy and userinfo" do
+      conf = { proxy: 'http://proxy.example.com:3128/', user: 'foo', pass: 'bar' }
+      expect(configure(conf)).to eq fixture('yum_only_proxy_and_userinfo.conf')
+    end
+
+    it "adds disabled proxy if proxy not specified" do
+      expect(configure(user: 'foo')).to eq fixture('yum_only_disabled_proxy.conf')
+    end
+
+  end
+
+  context "with only main section" do
+    let(:old_conf) { 'yum_only_main.conf' }
+
+    it "adds the specified proxy" do
+      conf = { proxy: 'http://proxy.example.com:3128/', user: 'foo', pass: 'bar' }
+      expect(configure(conf)).to eq fixture('yum_only_main_with_proxy.conf')
+    end
+
+    it "adds disabled proxy if proxy not specified" do
+      expect(configure(pass: 'bar')).to eq fixture('yum_only_main_with_disabled_proxy.conf')
+    end
+  end
+
+  context "with main and repository sections" do
+    context "without old proxy conf" do
+      let(:old_conf) { 'yum_with_repository.conf' }
+
+      it "adds the specified proxy" do
+        conf = { proxy: 'http://proxy.example.com:3128/', user: 'foo', pass: 'bar' }
+        expect(configure(conf)).to eq fixture('yum_with_repository_and_proxy.conf')
+      end
+
+      it "adds disabled proxy if proxy not specified" do
+        expect(configure).to eq fixture('yum_with_repository_and_disabled_proxy.conf')
+      end
+    end
+
+    context "with old proxy conf" do
+      let(:old_conf) { 'yum_with_repository_and_proxy.conf' }
+
+      it "replaces existing proxy" do
+        conf = { proxy: 'http://newproxy:9876', user: 'baz' }
+        expect(configure(conf)).to eq fixture('yum_with_repository_and_new_proxy.conf')
+      end
+
+      it "disables existing proxy" do
+        conf = { proxy: '', user: 'baz' }
+        expect(configure(conf)).to eq fixture('yum_with_repository_and_disabled_proxy.conf')
+      end
+    end
+
+    context "without userinfo" do
+      let(:old_conf) { 'yum_with_repository_and_proxy_without_userinfo.conf' }
+
+      it "replaces existing proxy and adds userinfo" do
+        conf = { proxy: 'http://proxy.example.com:3128/', user: 'foo', pass: 'bar' }
+        expect(configure(conf)).to eq fixture('yum_with_repository_and_proxy.conf')
+      end
+
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/userinfo_uri_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/userinfo_uri'
+
+describe VagrantPlugins::ProxyConf::UserinfoURI do
+
+  subject { described_class.new(uri) }
+
+  context "with nil" do
+    let(:uri)  { nil }
+    its(:to_s) { should be_nil }
+    its(:uri)  { should be_nil }
+    its(:user) { should be_nil }
+    its(:pass) { should be_nil }
+  end
+
+  context "with false" do
+    let(:uri)  { false }
+    its(:to_s) { should be_nil }
+    its(:uri)  { should be_nil }
+    its(:user) { should be_nil }
+    its(:pass) { should be_nil }
+  end
+
+  context "with empty" do
+    let(:uri)  { '' }
+    its(:to_s) { should eq '' }
+    its(:uri)  { should eq '' }
+    its(:user) { should be_nil }
+    its(:pass) { should be_nil }
+  end
+
+  context "without userinfo" do
+    let(:uri)  { 'http://proxy.example.com:8123/' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    its(:user) { should be_nil }
+    its(:pass) { should be_nil }
+  end
+
+  context "with username" do
+    let(:uri)  { 'http://foo@proxy.example.com:8123/' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    its(:user) { should eq 'foo' }
+    its(:pass) { should be_nil }
+  end
+
+  context "with password" do
+    let(:uri)  { 'http://:bar@proxy.example.com:8123/' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    its(:user) { should eq '' }
+    its(:pass) { should eq 'bar' }
+  end
+
+  context "with userinfo" do
+    let(:uri)  { 'http://foo:bar@proxy.example.com:8123/' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    its(:user) { should eq 'foo' }
+    its(:pass) { should eq 'bar' }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -35,34 +35,59 @@ files:
 - lib/vagrant-proxyconf/action/configure_apt_proxy.rb
 - lib/vagrant-proxyconf/action/configure_chef_proxy.rb
 - lib/vagrant-proxyconf/action/configure_env_proxy.rb
+- lib/vagrant-proxyconf/action/configure_yum_proxy.rb
 - lib/vagrant-proxyconf/action/only_once.rb
 - lib/vagrant-proxyconf/cap/debian/apt_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/linux/env_proxy_conf.rb
+- lib/vagrant-proxyconf/cap/redhat/yum_proxy_conf.rb
 - lib/vagrant-proxyconf/config/apt_proxy.rb
 - lib/vagrant-proxyconf/config/env_proxy.rb
 - lib/vagrant-proxyconf/config/key.rb
 - lib/vagrant-proxyconf/config/key_mixin.rb
 - lib/vagrant-proxyconf/config/proxy.rb
+- lib/vagrant-proxyconf/config/yum_proxy.rb
 - lib/vagrant-proxyconf/logger.rb
 - lib/vagrant-proxyconf/plugin.rb
+- lib/vagrant-proxyconf/resource.rb
+- lib/vagrant-proxyconf/userinfo_uri.rb
 - lib/vagrant-proxyconf/version.rb
 - locales/en.yml
+- resources/yum_config.awk
 - spec/spec_helper.rb
+- spec/unit/fixtures/empty
+- spec/unit/fixtures/yum_only_disabled_proxy.conf
+- spec/unit/fixtures/yum_only_main.conf
+- spec/unit/fixtures/yum_only_main_with_disabled_proxy.conf
+- spec/unit/fixtures/yum_only_main_with_proxy.conf
+- spec/unit/fixtures/yum_only_proxy.conf
+- spec/unit/fixtures/yum_only_proxy_and_userinfo.conf
+- spec/unit/fixtures/yum_with_repository.conf
+- spec/unit/fixtures/yum_with_repository_and_disabled_proxy.conf
+- spec/unit/fixtures/yum_with_repository_and_new_proxy.conf
+- spec/unit/fixtures/yum_with_repository_and_proxy.conf
+- spec/unit/fixtures/yum_with_repository_and_proxy_without_userinfo.conf
+- spec/unit/support/fixture.rb
 - spec/unit/support/shared/apt_proxy_config.rb
 - spec/unit/vagrant-proxyconf/action/configure_apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_chef_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_env_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/only_once_spec.rb
 - spec/unit/vagrant-proxyconf/action_spec.rb
 - spec/unit/vagrant-proxyconf/cap/debian/apt_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/env_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/config/apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/key_mixin_spec.rb
 - spec/unit/vagrant-proxyconf/config/key_spec.rb
 - spec/unit/vagrant-proxyconf/config/proxy_spec.rb
+- spec/unit/vagrant-proxyconf/config/yum_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/logger_spec.rb
 - spec/unit/vagrant-proxyconf/plugin_spec.rb
+- spec/unit/vagrant-proxyconf/resource_spec.rb
+- spec/unit/vagrant-proxyconf/resources/yum_config_spec.rb
+- spec/unit/vagrant-proxyconf/userinfo_uri_spec.rb
 - vagrant-proxyconf.gemspec
 homepage: http://tmatilai.github.io/vagrant-proxyconf/
 licenses:
@@ -79,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.4
@@ -90,19 +115,38 @@ specification_version: 4
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers
 test_files:
 - spec/spec_helper.rb
+- spec/unit/fixtures/empty
+- spec/unit/fixtures/yum_only_disabled_proxy.conf
+- spec/unit/fixtures/yum_only_main.conf
+- spec/unit/fixtures/yum_only_main_with_disabled_proxy.conf
+- spec/unit/fixtures/yum_only_main_with_proxy.conf
+- spec/unit/fixtures/yum_only_proxy.conf
+- spec/unit/fixtures/yum_only_proxy_and_userinfo.conf
+- spec/unit/fixtures/yum_with_repository.conf
+- spec/unit/fixtures/yum_with_repository_and_disabled_proxy.conf
+- spec/unit/fixtures/yum_with_repository_and_new_proxy.conf
+- spec/unit/fixtures/yum_with_repository_and_proxy.conf
+- spec/unit/fixtures/yum_with_repository_and_proxy_without_userinfo.conf
+- spec/unit/support/fixture.rb
 - spec/unit/support/shared/apt_proxy_config.rb
 - spec/unit/vagrant-proxyconf/action/configure_apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_chef_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_env_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/only_once_spec.rb
 - spec/unit/vagrant-proxyconf/action_spec.rb
 - spec/unit/vagrant-proxyconf/cap/debian/apt_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/env_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/config/apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/key_mixin_spec.rb
 - spec/unit/vagrant-proxyconf/config/key_spec.rb
 - spec/unit/vagrant-proxyconf/config/proxy_spec.rb
+- spec/unit/vagrant-proxyconf/config/yum_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/logger_spec.rb
 - spec/unit/vagrant-proxyconf/plugin_spec.rb
+- spec/unit/vagrant-proxyconf/resource_spec.rb
+- spec/unit/vagrant-proxyconf/resources/yum_config_spec.rb
+- spec/unit/vagrant-proxyconf/userinfo_uri_spec.rb
 has_rdoc: