vagrant-proxyconf 1.5.2 → 2.0.0

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

@@ -11,16 +11,9 @@ module VagrantPlugins
 
         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
+          return if !supported?
+
           if config.http
             @machine.communicate.sudo(
               "#{git_path} config --system http.proxy #{config.http}")
@@ -29,6 +22,29 @@ module VagrantPlugins
               "#{git_path} config --system --unset-all http.proxy",
               error_check: false)
           end
+
+          if config.https
+            @machine.communicate.sudo(
+              "#{git_path} config --system https.proxy #{config.https}")
+          else
+            @machine.communicate.sudo(
+              "#{git_path} config --system --unset-all https.proxy",
+              error_check: false)
+          end
+
+          true
+        end
+
+        def unconfigure_machine
+          return if !supported?
+
+          # zero out the configuration
+          config.http = nil
+          config.https = nil
+
+          configure_machine
+
+          true
         end
 
         def git_path

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

@@ -11,18 +11,24 @@ module VagrantPlugins
 
         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)
+          set_or_delete_proxy('noproxy', config.no_proxy)
+        end
+
+        def unconfigure_machine
+          config.http = nil
+          config.https = nil
+          config.no_proxy = nil
+          configure_machine
+
+          true
         end
 
         def set_or_delete_proxy(key, value)
+          return if !supported?
+
           command = "#{npm_path} config --global "
           if value
             command << "set #{key} #{escape(value)}"
@@ -34,6 +40,8 @@ module VagrantPlugins
             @machine.communicate.sudo("#{npm_path} config --global set #{key} foo")
           end
           @machine.communicate.sudo(command)
+
+          true
         end
 
         def npm_path

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

@@ -11,17 +11,24 @@ module VagrantPlugins
 
         private
 
-        # @return [Vagrant::Plugin::V2::Config] the configuration
-        def config
-          # Use global proxy config
-          @config ||= finalize_config(@machine.config.proxy)
-        end
-
         def configure_machine
+          return if !supported?
+
+          config.http = nil if disabled?
           proxy = config.http || ''
 
-          @machine.communicate.sudo(
-            "#{pear_path} config-set http_proxy #{escape(proxy)} system")
+          @machine.communicate.sudo("#{pear_path} config-set http_proxy #{escape(proxy)} system")
+
+          true
+        end
+
+        def unconfigure_machine
+          return if !supported?
+
+          config.http = nil
+          configure_machine
+
+          true
         end
 
         def pear_path

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

@@ -12,17 +12,24 @@ module VagrantPlugins
 
         private
 
-        # @return [Vagrant::Plugin::V2::Config] the configuration
-        def config
-          return @config if @config
+        def configure_machine
+          return if !supported?
+
+          write_config(svn_config, path: '/etc/subversion/servers')
 
-          # Use only `config.svn_proxy`, don't merge with the default config
-          @config = @machine.config.svn_proxy
-          finalize_config(@config)
+          true
         end
 
-        def configure_machine
-          write_config(svn_config, path: '/etc/subversion/servers')
+        def unconfigure_machine
+          return if !supported?
+
+          @machine.communicate.tap do |comm|
+            comm.sudo("touch /etc/subversion/servers")
+            comm.sudo("sed -i.bak -e '/^http-proxy-/d' /etc/subversion/servers")
+            comm.sudo("chown root:root /etc/subversion/servers")
+            comm.sudo("chmod 0644 /etc/subversion/servers")
+          end
+          true
         end
 
         def svn_config

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

@@ -14,6 +14,8 @@ module VagrantPlugins
         private
 
         def configure_machine
+          return if !supported?
+
           tmp = "/tmp/vagrant-proxyconf"
           path = config_path
 
@@ -27,6 +29,20 @@ module VagrantPlugins
             comm.sudo("mv -f #{path}.new #{path}")
             comm.sudo("rm -f #{tmp}")
           end
+
+          true
+        end
+
+        def unconfigure_machine
+          return if !supported?
+
+          @machine.communicate.tap do |comm|
+            if comm.test("grep '^proxy' #{config_path}")
+              comm.sudo("sed -i.bak -e '/^proxy/d' #{config_path}")
+            end
+          end
+
+          true
         end
 
         def proxy_params

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

@@ -0,0 +1,17 @@
+require_relative '../util'
+
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Linux
+        # Capability for chef  proxy configuration
+        module ChefProxyConf
+          # @return [String, false] the path to chef or `false` if not found
+          def self.chef_proxy_conf(machine)
+            Util.which(machine, 'chef-client')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module VagrantPlugins
 
             return false if docker_command.nil?
 
-            if machine.communicate.test('cat /etc/redhat-release')
+            if machine.communicate.test('[ -f /etc/redhat-release ]')
               "/etc/sysconfig/#{docker_command}"
             elsif machine.communicate.test('ls /var/lib/boot2docker/')
               "/var/lib/boot2docker/profile"
@@ -21,6 +21,7 @@ module VagrantPlugins
               "/etc/default/#{docker_command}"
             end
           end
+
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Linux
+        # Capability for Yum proxy configuration
+        module YumProxyConf
+          # @return [String] the path to the configuration file
+          def self.yum_proxy_conf(machine)
+            machine.communicate.tap do |comm|
+              return '/etc/yum.conf' if comm.test('[ -f /etc/yum.conf ]')
+              return '/etc/yum/yum.conf' if comm.test('[ -f /etc/yum/yum.conf ]')
+            end
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/cap/util.rb

@@ -6,11 +6,10 @@ module VagrantPlugins
         # Returns path to the command on the machine, or false if it's not found
         def self.which(machine, cmd)
           path = false
-          status = machine.communicate.execute(
-            "which #{cmd}", error_check: false) do |type, data|
-              # search for the command to work around `ssh.pty = true`
-              path = data.chomp if type == :stdout && data =~ /#{cmd}$/
-            end
+          status = machine.communicate.execute("command -v #{cmd}", error_check: false) do |type, data|
+            # search for the command to work around `ssh.pty = true`
+            path = data.chomp if type == :stdout && data =~ /#{cmd}$/
+          end
           status == 0 && path
         end
       end

data/lib/vagrant-proxyconf/capability.rb

@@ -13,6 +13,11 @@ module VagrantPlugins
         Cap::Linux::DockerProxyConf
       end
 
+      guest_capability 'linux', 'chef_proxy_conf' do
+        require_relative 'cap/linux/chef_proxy_conf'
+        Cap::Linux::ChefProxyConf
+      end
+
       guest_capability 'coreos', 'docker_proxy_conf' do
         require_relative 'cap/coreos/docker_proxy_conf'
         Cap::CoreOS::DockerProxyConf
@@ -57,6 +62,11 @@ module VagrantPlugins
         require_relative 'cap/redhat/yum_proxy_conf'
         Cap::Redhat::YumProxyConf
       end
+
+      guest_capability 'linux', 'yum_proxy_conf' do
+        require_relative 'cap/linux/yum_proxy_conf'
+        Cap::Linux::YumProxyConf
+      end
     end
   end
 end

data/lib/vagrant-proxyconf/config.rb

@@ -8,6 +8,16 @@ module VagrantPlugins
         Config::AptProxy
       end
 
+      config 'chef_proxy' do
+        require_relative 'config/chef_proxy'
+        Config::ChefProxy
+      end
+
+      config 'docker_proxy' do
+        require_relative 'config/docker_proxy'
+        Config::DockerProxy
+      end
+
       config 'env_proxy' do
         require_relative 'config/env_proxy'
         Config::EnvProxy
@@ -18,6 +28,16 @@ module VagrantPlugins
         Config::GitProxy
       end
 
+      config 'npm_proxy' do
+        require_relative 'config/npm_proxy'
+        Config::NpmProxy
+      end
+
+      config 'pear_proxy' do
+        require_relative 'config/pear_proxy'
+        Config::PearProxy
+      end
+
       config 'proxy' do
         require_relative 'config/proxy'
         Config::Proxy

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

@@ -0,0 +1,25 @@
+require 'vagrant'
+require_relative 'key_mixin'
+
+module VagrantPlugins
+  module ProxyConf
+    module Config
+      # Configuration for generic `<protocol>_proxy` environment variables
+      #
+      # @!parse class ChefProxy < Vagrant::Plugin::V2::Config; end
+      class ChefProxy < Vagrant.plugin('2', :config)
+        include KeyMixin
+        # @!parse extend KeyMixin::ClassMethods
+
+        # @return [String] the HTTP proxy
+        key :http, env_var: 'VAGRANT_CHEF_HTTP_PROXY'
+
+        # @return [String] the HTTPS proxy
+        key :https, env_var: 'VAGRANT_CHEF_HTTPS_PROXY'
+
+        # @return [String] a comma separated list of hosts or domains which do not use proxies
+        key :no_proxy, env_var: 'VAGRANT_CHEF_NO_PROXY'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'vagrant'
+require_relative 'key_mixin'
+
+module VagrantPlugins
+  module ProxyConf
+    module Config
+      # Configuration for generic `<protocol>_proxy` environment variables
+      #
+      # @!parse class DockerProxy < Vagrant::Plugin::V2::Config; end
+      class DockerProxy < Vagrant.plugin('2', :config)
+        include KeyMixin
+        # @!parse extend KeyMixin::ClassMethods
+
+        # @return [String] the HTTP proxy
+        key :http, env_var: 'VAGRANT_DOCKER_HTTP_PROXY'
+
+        # @return [String] the HTTPS proxy
+        key :https, env_var: 'VAGRANT_DOCKER_HTTPS_PROXY'
+
+        # @return [String] a comma separated list of hosts or domains which do not use proxies
+        key :no_proxy, env_var: 'VAGRANT_DOCKER_NO_PROXY'
+      end
+    end
+  end
+end

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

@@ -13,6 +13,9 @@ module VagrantPlugins
 
         # @return [String] the HTTP proxy
         key :http, env_var: 'VAGRANT_GIT_HTTP_PROXY'
+
+        # @return [String] the HTTPS proxy
+        key :https, env_var: 'VAGRANT_GIT_HTTPS_PROXY'
       end
     end
   end

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

@@ -0,0 +1,25 @@
+require 'vagrant'
+require_relative 'key_mixin'
+
+module VagrantPlugins
+  module ProxyConf
+    module Config
+      # Proxy configuration for npm
+      #
+      # @!parse class NpmProxy < Vagrant::Plugin::V2::Config; end
+      class NpmProxy < Vagrant.plugin('2', :config)
+        include KeyMixin
+        # @!parse extend KeyMixin::ClassMethods
+
+        # @return [String] the HTTP proxy
+        key :http, env_var: 'VAGRANT_NPM_HTTP_PROXY'
+
+        # @return [String] the HTTPS proxy
+        key :https, env_var: 'VAGRANT_NPM_HTTPS_PROXY'
+
+        # @return [String] the HTTPS proxy
+        key :no_proxy, env_var: 'VAGRANT_NPM_NO_PROXY'
+      end
+    end
+  end
+end

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

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

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.5.2'
+    VERSION = '2.0.0'
   end
 end

data/locales/en.yml

@@ -7,6 +7,10 @@ en:
         Skipping Apt proxy config as the machine does not support it
       configuring: |-
         Configuring proxy for Apt...
+      skip: |-
+        Skipping configuration of apt_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for Apt...
 
     docker_proxy:
       not_enabled: |-
@@ -15,6 +19,10 @@ en:
         Skipping Docker proxy config as the machine does not support it
       configuring: |-
         Configuring proxy for Docker...
+      skip: |-
+        Skipping configuration of docker_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for Docker...
 
     chef_proxy:
       no_provisioners: |-
@@ -23,6 +31,10 @@ en:
         Default proxy not enabled or configured. Skipping Chef provisioner configuration.
       configuring: |-
         Configuring proxy for Chef provisioners...
+      skip: |-
+        Skipping configuration of chef_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for Chef provisioners...
 
     env_proxy:
       not_enabled: |-
@@ -31,6 +43,10 @@ en:
         Skipping environment variable based proxy config as the machine does not support it
       configuring: |-
         Configuring proxy environment variables...
+      skip: |-
+        Skipping configuration of env_proxy
+      unconfiguring: |-
+        Unconfiguring proxy environment variables...
 
     git_proxy:
       not_enabled: |-
@@ -39,6 +55,10 @@ en:
         Skipping Git proxy config as `git` is not found
       configuring: |-
         Configuring proxy for Git...
+      skip: |-
+        Skipping configuration of git_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for Git...
 
     npm_proxy:
       not_enabled: |-
@@ -47,6 +67,10 @@ en:
         Skipping npm proxy config as `npm` is not found
       configuring: |-
         Configuring proxy for npm...
+      skip: |-
+        Skipping configuration of npm_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for npm...
 
     pear_proxy:
       not_enabled: |-
@@ -55,6 +79,10 @@ en:
         Skipping PEAR proxy config as `pear` is not found
       configuring: |-
         Configuring proxy for PEAR...
+      skip: |-
+        Skipping configuration of pear_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for PEAR...
 
     svn_proxy:
       not_enabled: |-
@@ -63,6 +91,10 @@ en:
         Skipping Subversion proxy config as the machine does not support it
       configuring: |-
         Configuring proxy for Subversion...
+      skip: |-
+        Skipping configuration of svn_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for Subversion...
 
     yum_proxy:
       not_enabled: |-
@@ -71,6 +103,12 @@ en:
         Skipping Yum proxy config as the machine does not support it
       configuring: |-
         Configuring proxy for Yum...
+      skip: |-
+        Skipping configuration of yum_proxy
+      unconfiguring: |-
+        Unconfiguring proxy for Yum...
+
+    errors:
 
     errors:
       vagrant_version: |-