Merge ffebad0 into 5e304d2

lib/vagrant-proxyconf/action.rb

@@ -3,6 +3,7 @@
 require_relative 'action/configure_chef_proxy'
 require_relative 'action/configure_env_proxy'
 require_relative 'action/configure_yum_proxy'
+require_relative 'action/configure_git_proxy'
 require_relative 'action/is_enabled'
 require_relative 'action/only_once'
 
@@ -31,6 +32,7 @@ def self.config_actions
             b2.use ConfigureChefProxy
             b2.use ConfigureEnvProxy
             b2.use ConfigureYumProxy
+            b2.use ConfigureGitProxy
           end
         end
       end

lib/vagrant-proxyconf/action/configure_git_proxy.rb

@@ -0,0 +1,30 @@
+require_relative 'base'
+require_relative '../resource'
+require_relative '../userinfo_uri'
+
+module VagrantPlugins
+  module ProxyConf
+    class Action
+      # Action for configuring Git on the guest
+      class ConfigureGitProxy < Base
+        def config_name
+          'git_proxy'
+        end
+
+        private
+
+        def configure_machine(machine, config)
+          uri = escape(config.http)
+          machine.communicate.tap do |comm|
+            comm.sudo("git config --system --add http.proxy #{uri}")
+          end
+        end
+
+        # @param value [String, nil] the string to escape for shell usage
+        def escape(value)
+          value.to_s.shellescape
+        end
+      end
+    end
+  end
+end

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

lib/vagrant-proxyconf/plugin.rb

@@ -62,6 +62,11 @@ def self.load_optional_dependencies
         Config::EnvProxy
       end
 
+      config 'git_proxy' do
+        require_relative 'config/git_proxy'
+        Config::GitProxy
+      end
+
       config 'proxy' do
         require_relative 'config/proxy'
         Config::Proxy
@@ -82,6 +87,10 @@ def self.load_optional_dependencies
         Cap::Linux::EnvProxyConf
       end
 
+      guest_capability 'linux', 'git_proxy_conf' do
+
+      end
+
       guest_capability 'coreos', 'env_proxy_conf' do
         # disabled on CoreOS
       end

locales/en.yml

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

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

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

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