vagrant-proxyconf 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc0113cc7339765e4d71dc0a34b5c4ea9bbf29b
-  data.tar.gz: 820756398111a78c3e13eaf1412c5e2dc394657c
+  metadata.gz: bd98fb4e2a50743cbb753d23a2f3f40c52ccc901
+  data.tar.gz: 23899ffddd8e8465c4e9a3cfab028218d73bca76
 SHA512:
-  metadata.gz: cfe68c260b981d6e806c9fd0b49ce502cadac5938697903f634c14b4d85d7d0682e09abd587344e4848ab756dae78475fe72e7e289ab11243f655652ecc1f1c3
-  data.tar.gz: f0add4636c11c68fc4b264fd0454113be6091baa0f5581d32cd3b84eb7b4830b217bef0c8e3d03078ae174b40af55550bbf443546af1b866aef222ac8d5a80cf
+  metadata.gz: 9d11fc8b7115f87bf3c593dda1c4c76a9ec2ef228d4993cc40cda00aaea1a4a349b7ddeb320cc67a7978e9cf84443e759ac4954f7ac0f89a536fe4a548880ebb
+  data.tar.gz: 0143d9c0dc746e84d7f4d9fbc781bce9ccfd827a159e1e54f65bfc9382e641df7a52a70bed9224a8479863a12b4bdf4a6a876e2cac2d212d55e1d443c5d59037

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.2.0 / 2014-03-02
+
+Deprecations:
+
+  - Deprecate `config.env_proxy` and `VAGRANT_ENV_*_PROXY`, as `config.proxy.*` and `VAGRANT_*_PROXY` should be enough. The env_proxy config options will be removed in v2.0.0.
+  - `config.apt_proxy.*` and `VAGRANT_APT_*_PROXY` URIs should explicitly set the scheme and port. In v2.0.0 the scheme will be required, and default port will be scheme's default (currently 3142).
+
+Features:
+
+  - Support for configuring git and svn ([GH-40][], [GH-49][])
+  - Support for configuring npm ([GH-50][], [GH-51][])
+
 # 1.1.0 / 2014-02-06
 
 Features:
@@ -118,6 +130,10 @@ Bug fixes:
 [GH-35]: https://github.com/tmatilai/vagrant-proxyconf/issues/35 "Issue 35"
 [GH-36]: https://github.com/tmatilai/vagrant-proxyconf/issues/36 "Issue 36"
 [GH-39]: https://github.com/tmatilai/vagrant-proxyconf/issues/39 "Issue 39"
+[GH-40]: https://github.com/tmatilai/vagrant-proxyconf/issues/40 "Issue 40"
 [GH-42]: https://github.com/tmatilai/vagrant-proxyconf/issues/42 "Issue 42"
 [GH-44]: https://github.com/tmatilai/vagrant-proxyconf/issues/44 "Issue 44"
 [GH-45]: https://github.com/tmatilai/vagrant-proxyconf/issues/45 "Issue 45"
+[GH-49]: https://github.com/tmatilai/vagrant-proxyconf/issues/49 "Issue 49"
+[GH-50]: https://github.com/tmatilai/vagrant-proxyconf/issues/50 "Issue 50"
+[GH-51]: https://github.com/tmatilai/vagrant-proxyconf/issues/51 "Issue 51"

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'vagrant',
-  github: 'mitchellh/vagrant',
+  git: 'https://github.com/mitchellh/vagrant.git',
   ref: ENV.fetch('VAGRANT_VERSION', 'v1.4.3')
 
 gem 'cane', '~> 2.6'

data/README.md

@@ -21,6 +21,7 @@ The plugin can set:
 * generic `http_proxy` etc. environment variables that many programs support
 * default proxy configuration for all Chef provisioners
 * proxy configuration for Apt
+* proxy configuration for npm
 * proxy configuration for Yum
 * proxy configuration for PEAR
 
@@ -47,7 +48,7 @@ end
 
 ## Compatibility
 
-This plugin requires Vagrant 1.2 or newer ([downloads](http://downloads.vagrantup.com/)).
+This plugin requires Vagrant 1.2 or newer ([downloads](http://www.vagrantup.com/downloads)).
 
 The plugin is supposed to be compatible with all Vagrant providers and other plugins. Please file an [issue](https://github.com/tmatilai/vagrant-proxyconf/issues) if this is not the case. The following providers are confirmed to work:
 [AWS](https://github.com/mitchellh/vagrant-aws),
@@ -73,6 +74,10 @@ It is a good practise to wrap plugin specific configuration with `Vagrant.has_pl
 
 It's a common case that you want all possible connections to pass through the same proxy. This will set the default values for all other proxy configuration keys. It also sets default proxy configuration for all Chef Solo and Chef Client provisioners.
 
+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`.
+
 #### Example Vagrantfile
 
 ```ruby
@@ -131,52 +136,6 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### Global `*_proxy` environment variables
-
-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`.
-
-#### Example Vagrantfile
-
-```ruby
-Vagrant.configure("2") do |config|
-  config.env_proxy.http     = "http://192.168.33.200:8888/"
-  config.env_proxy.https    = "http://192.168.33.200:8888/"
-  config.env_proxy.no_proxy = "localhost,127.0.0.1,.example.com"
-  # ... other stuff
-end
-```
-
-#### Configuration keys
-
-* `config.env_proxy.http` - The proxy for HTTP URIs
-* `config.env_proxy.https` - The proxy for HTTPS URIs
-* `config.env_proxy.ftp` - The proxy for FTP URIs
-* `config.env_proxy.no_proxy` - A comma separated list of hosts or domains which do not use proxies.
-
-#### 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_.
-* 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.
-
-#### Environment variables
-
-* `VAGRANT_ENV_HTTP_PROXY`
-* `VAGRANT_ENV_HTTPS_PROXY`
-* `VAGRANT_ENV_FTP_PROXY`
-* `VAGRANT_ENV_NO_PROXY`
-
-These also override the Vagrantfile configuration. To disable or remove the proxy use an empty value.
-
-For example to spin up a VM, run:
-
-```sh
-VAGRANT_ENV_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
-```
-
 ### Apt
 
 Configures Apt to use the specified proxy settings. The configuration will be written to _/etc/apt/apt.conf.d/01proxy_ on the guest.
@@ -216,7 +175,7 @@ These also override the Vagrantfile configuration. To disable or remove the prox
 For example to spin up a VM, run:
 
 ```sh
-VAGRANT_APT_HTTP_PROXY="proxy.example.com:8080" vagrant up
+VAGRANT_APT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
 ```
 
 #### Running apt-cacher-ng on a Vagrant box

data/lib/vagrant-proxyconf/action.rb

@@ -2,7 +2,10 @@ require 'vagrant/action/builtin/call'
 require_relative 'action/configure_apt_proxy'
 require_relative 'action/configure_chef_proxy'
 require_relative 'action/configure_env_proxy'
+require_relative 'action/configure_git_proxy'
+require_relative 'action/configure_npm_proxy'
 require_relative 'action/configure_pear_proxy'
+require_relative 'action/configure_svn_proxy'
 require_relative 'action/configure_yum_proxy'
 require_relative 'action/is_enabled'
 require_relative 'action/only_once'
@@ -29,7 +32,10 @@ module VagrantPlugins
           b.use Builtin::Call, IsEnabled do |env, b2|
             next if !env[:result]
 
+            b2.use ConfigureGitProxy
+            b2.use ConfigureNpmProxy
             b2.use ConfigurePearProxy
+            b2.use ConfigureSvnProxy
           end
         end
       end
@@ -46,7 +52,10 @@ module VagrantPlugins
             b2.use ConfigureAptProxy
             b2.use ConfigureChefProxy
             b2.use ConfigureEnvProxy
+            b2.use ConfigureGitProxy
+            b2.use ConfigureNpmProxy
             b2.use ConfigurePearProxy
+            b2.use ConfigureSvnProxy
             b2.use ConfigureYumProxy
           end
         end

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

@@ -0,0 +1,34 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module ProxyConf
+    class Action
+      # Action for configuring Git on the guest
+      class ConfigureGitProxy < Base
+        def config_name
+          'git_proxy'
+        end
+
+        private
+
+        # @return [Vagrant::Plugin::V2::Config] the configuration
+        def config
+          return @config if @config
+
+          # Use only `config.git_proxy`, don't merge with the default config
+          @config = @machine.config.git_proxy
+          finalize_config(@config)
+        end
+
+        def configure_machine
+          if config.http
+            command = "git config --system http.proxy #{config.http}"
+          else
+            command = "git config --system --unset-all http.proxy"
+          end
+          @machine.communicate.sudo(command)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module ProxyConf
+    class Action
+      # Action for configuring npm on the guest
+      class ConfigureNpmProxy < Base
+        def config_name
+          'npm_proxy'
+        end
+
+        private
+
+        # @return [Vagrant::Plugin::V2::Config] the configuration
+        def config
+          # Use global proxy config
+          @config ||= finalize_config(@machine.config.proxy)
+        end
+
+        def configure_machine
+          set_or_delete_proxy('proxy', config.http)
+          set_or_delete_proxy('https-proxy', config.https)
+        end
+
+        def set_or_delete_proxy(key, value)
+          if value
+            command = "npm config set #{key} #{escape(config.http)}"
+          else
+            command = "npm config delete #{key}"
+          end
+          @machine.communicate.sudo(command)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require_relative 'base'
+require_relative '../userinfo_uri'
+
+module VagrantPlugins
+  module ProxyConf
+    class Action
+      # Action for configuring Svn on the guest
+      class ConfigureSvnProxy < Base
+        def config_name
+          'svn_proxy'
+        end
+
+        private
+
+        # @return [Vagrant::Plugin::V2::Config] the configuration
+        def config
+          return @config if @config
+
+          # Use only `config.svn_proxy`, don't merge with the default config
+          @config = @machine.config.svn_proxy
+          finalize_config(@config)
+        end
+
+        def configure_machine
+          write_config(svn_config, path: '/etc/subversion/servers')
+        end
+
+        def svn_config
+          u = UserinfoURI.new(config.http)
+
+          <<-CONFIG.gsub(/^. */, '')
+          [global]
+          http-proxy-host=#{u.host}
+          http-proxy-port=#{u.port}
+          http-proxy-username=#{u.user}
+          http-proxy-password=#{u.pass}
+          http-proxy-exceptions=#{config.no_proxy}
+          CONFIG
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/cap/linux/git_proxy_conf.rb

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Linux
+        # Capability for Git command
+        module GitProxyConf
+          def self.git_proxy_conf(machine)
+            machine.communicate.test('which git')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/cap/linux/npm_proxy_conf.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Linux
+        # Capability for npm proxy configuration
+        module NpmProxyConf
+          # @return [Boolean] if npm is installed
+          def self.npm_proxy_conf(machine)
+            machine.communicate.test('which npm')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/cap/linux/svn_proxy_conf.rb

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Linux
+        # Capability for Svn command
+        module SvnProxyConf
+          def self.svn_proxy_conf(machine)
+            machine.communicate.test('which svn')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/capability.rb

@@ -17,11 +17,26 @@ module VagrantPlugins
         Cap::Linux::EnvProxyConf
       end
 
+      guest_capability 'linux', 'git_proxy_conf' do
+        require_relative 'cap/linux/git_proxy_conf'
+        Cap::Linux::GitProxyConf
+      end
+
+      guest_capability 'linux', 'npm_proxy_conf' do
+        require_relative 'cap/linux/npm_proxy_conf'
+        Cap::Linux::NpmProxyConf
+      end
+
       guest_capability 'linux', 'pear_proxy_conf' do
         require_relative 'cap/linux/pear_proxy_conf'
         Cap::Linux::PearProxyConf
       end
 
+      guest_capability 'linux', 'svn_proxy_conf' do
+        require_relative 'cap/linux/svn_proxy_conf'
+        Cap::Linux::SvnProxyConf
+      end
+
       guest_capability 'redhat', 'yum_proxy_conf' do
         require_relative 'cap/redhat/yum_proxy_conf'
         Cap::Redhat::YumProxyConf

data/lib/vagrant-proxyconf/config.rb

@@ -13,11 +13,21 @@ module VagrantPlugins
         Config::EnvProxy
       end
 
+      config 'git_proxy' do
+        require_relative 'config/git_proxy'
+        Config::GitProxy
+      end
+
       config 'proxy' do
         require_relative 'config/proxy'
         Config::Proxy
       end
 
+      config 'svn_proxy' do
+        require_relative 'config/svn_proxy'
+        Config::SvnProxy
+      end
+
       config 'yum_proxy' do
         require_relative 'config/yum_proxy'
         Config::YumProxy

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

@@ -64,12 +64,35 @@ module VagrantPlugins
             'DIRECT' if value.upcase == 'DIRECT'
           end
 
+          # Hash of deprecation warning sentinels
+          @@warned = {}
+
           def prefix
-            "#{scheme}://" if value !~ %r{^.*://}
+            if value !~ %r{^.*://}
+              if !@@warned[:scheme]
+                @@warned[:scheme] = true
+
+                puts 'DEPRECATION: Specifying the scheme (http://) for `apt_proxy` URIs'
+                puts 'will be mandatory in v2.0.0.'
+                puts
+              end
+
+              "#{scheme}://"
+            end
           end
 
           def suffix
-            ':3142' if value !~ %r{:\d+$} && value !~ %r{/}
+            if value !~ %r{:\d+$} && value !~ %r{/}
+              if !@@warned[:port]
+                @@warned[:port] = true
+
+                puts 'DEPRECATION: Please specify the port (3142) for `apt_proxy` URIs,'
+                puts 'as the default will change in v2.0.0.'
+                puts
+              end
+
+              ':3142'
+            end
           end
         end
       end

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

@@ -23,6 +23,16 @@ module VagrantPlugins
         # @return [String] a comma separated list of hosts or domains which do not use proxies
         key :no_proxy, env_var: 'VAGRANT_ENV_NO_PROXY'
 
+        def validate(machine)
+          if enabled?
+            puts 'DEPRECATION: `config.env_proxy.*` and `VAGRANT_ENV_*_PROXY`'
+            puts 'configuration is deprecated and will be removed in v2.0.0.'
+            puts 'Please use `config.proxy.*` and `VAGRANT_*_PROXY` instead.'
+            puts
+          end
+          super
+        end
+
         private
 
         # (see KeyMixin#config_for)

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

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

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

@@ -0,0 +1,23 @@
+require 'vagrant'
+require_relative 'key_mixin'
+
+module VagrantPlugins
+  module ProxyConf
+    module Config
+      # Proxy configuration for Subversion
+      #
+      # @!parse class SvnProxy < Vagrant::Plugin::V2::Config; end
+      class SvnProxy < Vagrant.plugin('2', :config)
+        include KeyMixin
+        # @!parse extend KeyMixin::ClassMethods
+
+        # @return [String] the HTTP proxy
+        key :http, env_var: 'VAGRANT_SVN_HTTP_PROXY'
+
+        # @return [String] a comma separated list of hosts or domains which do
+        # not use proxies
+        key :no_proxy, env_var: 'VAGRANT_SVN_NO_PROXY'
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/userinfo_uri.rb

@@ -1,39 +1,42 @@
+require 'forwardable'
 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
+      extend Forwardable
 
-      # @return [String] the username
-      attr_reader :user
+      # @!attribute [r] host
+      #   @return [String] the host
+      # @!attribute [r] port
+      #   @return [String] the port
+      # @!attribute [r] user
+      #   @return [String] the username
+      def_delegators :@uri, :host, :port, :user
 
-      # @return [String] the password
-      attr_reader :pass
+      # @!attribute [r] pass
+      #   @return [String] the password
+      def_delegator :@uri, :password, :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
+        @set = !!uri
+        @uri = URI.parse(uri || '')
       end
 
-      private
-
-      # @param uri [URI::Generic] the URI with optional userinfo
       # @return [String] the URI without userinfo
-      def strip_userinfo(uri)
-        return '' if uri.to_s.empty?
-
-        "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      def uri
+        if !@set
+          nil
+        elsif @uri.to_s.empty?
+          ""
+        else
+          "#{@uri.scheme}://#{host}:#{port}"
+        end
       end
+
+      alias_method :to_s, :uri
     end
   end
 end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/locales/en.yml

@@ -24,6 +24,22 @@ en:
       configuring: |-
         Configuring proxy environment variables...
 
+    git_proxy:
+      not_enabled: |-
+        git_proxy not enabled or configured
+      not_supported: |-
+        Skipping Git proxy config as `git` is not found
+      configuring: |-
+        Configuring proxy for Git...
+
+    npm_proxy:
+      not_enabled: |-
+        npm_proxy not enabled or configured
+      not_supported: |-
+        Skipping npm proxy config as `npm` is not found
+      configuring: |-
+        Configuring proxy for npm...
+
     pear_proxy:
       not_enabled: |-
         pear_proxy not enabled or configured
@@ -32,6 +48,14 @@ en:
       configuring: |-
         Configuring proxy for PEAR...
 
+    svn_proxy:
+      not_enabled: |-
+        svn_proxy not enabled or configured
+      not_supported: |-
+        Skipping Subversion proxy config as the machine does not support it
+      configuring: |-
+        Configuring proxy for Subversion...
+
     yum_proxy:
       not_enabled: |-
         yum_proxy not enabled or configured

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

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/configure_git_proxy'
+
+describe VagrantPlugins::ProxyConf::Action::ConfigureGitProxy do
+
+  describe '#config_name' do
+    subject { described_class.new(double, double).config_name }
+    it      { should eq 'git_proxy' }
+  end
+
+end

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

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/configure_npm_proxy'
+
+describe VagrantPlugins::ProxyConf::Action::ConfigureNpmProxy do
+
+  describe '#config_name' do
+    subject { described_class.new(double, double).config_name }
+    it      { should eq 'npm_proxy' }
+  end
+end

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

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/configure_svn_proxy'
+
+describe VagrantPlugins::ProxyConf::Action::ConfigureSvnProxy do
+
+  describe '#config_name' do
+    subject { described_class.new(double, double).config_name }
+    it      { should eq 'svn_proxy' }
+  end
+
+end

data/spec/unit/vagrant-proxyconf/cap/linux/git_proxy_conf_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/linux/git_proxy_conf'
+
+describe VagrantPlugins::ProxyConf::Cap::Linux::GitProxyConf do
+
+  describe '.git_proxy_conf' do
+    let(:subject) { described_class.git_proxy_conf(double) }
+    let(:machine) { double }
+    let(:communicator) { double }
+
+    before do
+      machine.stub(:communicate => communicator)
+    end
+
+    it "returns true when git is installed" do
+      expect(communicator).to receive(:test).with('which git').and_return(true)
+      expect(described_class.git_proxy_conf(machine)).to be_true
+    end
+
+    it "returns false when pear is not installed" do
+      expect(communicator).to receive(:test).with('which git').and_return(false)
+      expect(described_class.git_proxy_conf(machine)).to be_false
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/cap/linux/npm_proxy_conf_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/linux/npm_proxy_conf'
+
+describe VagrantPlugins::ProxyConf::Cap::Linux::NpmProxyConf do
+
+  describe '.npm_proxy_conf' do
+    let(:machine) { double }
+    let(:communicator) { double }
+
+    before do
+      machine.stub(:communicate => communicator)
+    end
+
+    it "returns true when npm is installed" do
+      expect(communicator).to receive(:test).with('which npm').and_return(true)
+      expect(described_class.npm_proxy_conf(machine)).to be_true
+    end
+
+    it "returns false when npm is not installed" do
+      expect(communicator).to receive(:test).with('which npm').and_return(false)
+      expect(described_class.npm_proxy_conf(machine)).to be_false
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/cap/linux/svn_proxy_conf_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/linux/svn_proxy_conf'
+
+describe VagrantPlugins::ProxyConf::Cap::Linux::SvnProxyConf do
+
+  describe '.svn_proxy_conf' do
+    let(:subject) { described_class.svn_proxy_conf(double) }
+    let(:machine) { double }
+    let(:communicator) { double }
+
+    before do
+      machine.stub(:communicate => communicator)
+    end
+
+    it "returns true when svn is installed" do
+      expect(communicator).to receive(:test).with('which svn').and_return(true)
+      expect(described_class.svn_proxy_conf(machine)).to be_true
+    end
+
+    it "returns false when pear is not installed" do
+      expect(communicator).to receive(:test).with('which svn').and_return(false)
+      expect(described_class.svn_proxy_conf(machine)).to be_false
+    end
+  end
+
+end

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

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/config/git_proxy'
+
+describe VagrantPlugins::ProxyConf::Config::GitProxy do
+  let(:instance) { described_class.new }
+  before(:each) { ENV.delete('VAGRANT_GIT_HTTP_PROXY') }
+end

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

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/config/svn_proxy'
+
+describe VagrantPlugins::ProxyConf::Config::SvnProxy do
+  let(:instance) { described_class.new }
+  before(:each) { ENV.delete('VAGRANT_SVN_HTTP_PROXY') }
+end

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

@@ -9,6 +9,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
     let(:uri)  { nil }
     its(:to_s) { should be_nil }
     its(:uri)  { should be_nil }
+    its(:host) { should be_nil }
+    its(:port) { should be_nil }
     its(:user) { should be_nil }
     its(:pass) { should be_nil }
   end
@@ -17,6 +19,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
     let(:uri)  { false }
     its(:to_s) { should be_nil }
     its(:uri)  { should be_nil }
+    its(:host) { should be_nil }
+    its(:port) { should be_nil }
     its(:user) { should be_nil }
     its(:pass) { should be_nil }
   end
@@ -25,6 +29,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
     let(:uri)  { '' }
     its(:to_s) { should eq '' }
     its(:uri)  { should eq '' }
+    its(:host) { should be_nil }
+    its(:port) { should be_nil }
     its(:user) { should be_nil }
     its(:pass) { should be_nil }
   end
@@ -33,6 +39,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI 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(:host) { should eq 'proxy.example.com' }
+    its(:port) { should eq 8123 }
     its(:user) { should be_nil }
     its(:pass) { should be_nil }
   end
@@ -41,6 +49,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI 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(:host) { should eq 'proxy.example.com' }
+    its(:port) { should eq 8123 }
     its(:user) { should eq 'foo' }
     its(:pass) { should be_nil }
   end
@@ -49,6 +59,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI 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(:host) { should eq 'proxy.example.com' }
+    its(:port) { should eq 8123 }
     its(:user) { should eq '' }
     its(:pass) { should eq 'bar' }
   end
@@ -57,6 +69,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI 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(:host) { should eq 'proxy.example.com' }
+    its(:port) { should eq 8123 }
     its(:user) { should eq 'foo' }
     its(:pass) { should eq 'bar' }
   end
@@ -65,6 +79,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
     let(:uri)  { 'http://foo:bar@proxy.example.com' }
     its(:to_s) { should eq 'http://proxy.example.com:80' }
     its(:uri)  { should eq 'http://proxy.example.com:80' }
+    its(:host) { should eq 'proxy.example.com' }
+    its(:port) { should eq 80 }
     its(:user) { should eq 'foo' }
     its(:pass) { should eq 'bar' }
   end
@@ -73,6 +89,8 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
     let(:uri)  { 'http://proxy.example.com:80/' }
     its(:to_s) { should eq 'http://proxy.example.com:80' }
     its(:uri)  { should eq 'http://proxy.example.com:80' }
+    its(:host) { should eq 'proxy.example.com' }
+    its(:port) { should eq 80 }
     its(:user) { should be_nil }
     its(:pass) { should be_nil }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -17,9 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -35,21 +35,29 @@ 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_git_proxy.rb
+- lib/vagrant-proxyconf/action/configure_npm_proxy.rb
 - lib/vagrant-proxyconf/action/configure_pear_proxy.rb
+- lib/vagrant-proxyconf/action/configure_svn_proxy.rb
 - lib/vagrant-proxyconf/action/configure_yum_proxy.rb
 - lib/vagrant-proxyconf/action/is_enabled.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/linux/git_proxy_conf.rb
+- lib/vagrant-proxyconf/cap/linux/npm_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/linux/pear_proxy_conf.rb
+- lib/vagrant-proxyconf/cap/linux/svn_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/redhat/yum_proxy_conf.rb
 - lib/vagrant-proxyconf/capability.rb
 - lib/vagrant-proxyconf/config.rb
 - lib/vagrant-proxyconf/config/apt_proxy.rb
 - lib/vagrant-proxyconf/config/env_proxy.rb
+- lib/vagrant-proxyconf/config/git_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/svn_proxy.rb
 - lib/vagrant-proxyconf/config/yum_proxy.rb
 - lib/vagrant-proxyconf/hook.rb
 - lib/vagrant-proxyconf/logger.rb
@@ -77,20 +85,28 @@ files:
 - 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_git_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_npm_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_pear_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_svn_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/is_enabled_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/linux/git_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/linux/npm_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/linux/svn_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/git_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/svn_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
@@ -108,17 +124,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: A Vagrant plugin that configures the virtual machine to use proxy servers
@@ -141,20 +157,28 @@ test_files:
 - 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_git_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_npm_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_pear_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_svn_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/is_enabled_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/linux/git_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/linux/npm_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/linux/svn_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/git_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/svn_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