vagrant-proxyconf 1.5.2 → 2.0.1

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.5.2'
+    VERSION = '2.0.1'
   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: |-

data/resources/yum_config.awk

@@ -39,6 +39,7 @@ BEGIN {
 $1 ~ /^proxy(_username|_password)?$/ {
   if (main == 1) {
     $2 = conf[$1]
+    NF = 2
     seen[$1] = 1
   }
 }

data/spec/spec_helper.rb

@@ -1,14 +1,31 @@
 require 'rspec/its'
+require 'vagrant-proxyconf/config/proxy'
 
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  coverage_dir('tmp/coverage')
-  add_filter '/spec/'
+PROJECT_DIR = File.absolute_path(__dir__)
+
+def fixture_file(filename)
+  File.join([PROJECT_DIR, "unit", "fixtures", filename])
+end
+
+def load_fixture(filename)
+  File.read(filename)
+end
+
+def create_config_proxy(config={})
+  config[:enabled] = true unless config.has_key?(:enabled)
+  config[:ftp] ||= nil
+  config[:http] ||= nil
+  config[:https] ||= nil
+  config[:no_proxy] ||= nil
+
+  proxy = VagrantPlugins::ProxyConf::Config::Proxy.new
+
+  # configure proxy
+  config.each do |key, value|
+    proxy.instance_variable_set("@#{key}", value)
+  end
+
+  proxy
 end
 
 RSpec.configure do |config|
@@ -17,4 +34,5 @@ RSpec.configure do |config|
   end
   config.color = true
   config.tty = true
+  config.formatter = :documentation
 end

data/spec/unit/fixtures/docker_client_config_json_enabled_proxy

@@ -0,0 +1,9 @@
+{
+  "proxies": {
+    "default": {
+      "httpProxy": "http://proxy-server-01.example.com:8080",
+      "httpsProxy": "https://proxy-server-01.example.com:8080",
+      "noProxy": "localhost,*.example.com,.example.com"
+    }
+  }
+}

data/spec/unit/fixtures/docker_client_config_json_no_proxy

@@ -0,0 +1,5 @@
+{
+  "proxies": {
+    "default": {}
+  }
+}

data/spec/unit/fixtures/etc_environment_only_http_proxy.conf

@@ -0,0 +1,9 @@
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+HTTP_PROXY=http://192.168.33.200:8080
+HTTPS_PROXY=
+FTP_PROXY=
+NO_PROXY=
+http_proxy=http://192.168.33.200:8080
+https_proxy=
+ftp_proxy=
+no_proxy=

data/spec/unit/fixtures/yum_with_repository_and_proxy_containing_special_chars.conf

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

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

@@ -0,0 +1,191 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/base'
+require 'vagrant-proxyconf/action/configure_apt_proxy'
+
+class MyBase < VagrantPlugins::ProxyConf::Action::Base
+
+  def config_name
+    'my_base'
+  end
+
+  private
+
+  def configure_machine
+  end
+
+  def unconfigure_machine
+  end
+
+end
+
+def create_base(machine, env)
+  base = MyBase.new(nil, env)
+  base.instance_variable_set(:@machine, machine)
+
+  expect(base.config_name).to eq 'my_base'
+
+  base
+end
+
+describe MyBase do
+  let(:machine) { double('machine') }
+
+  describe "#skip?" do
+    let(:config) { OpenStruct.new }
+    let(:env) { OpenStruct.new }
+
+    subject do
+      base = create_base(machine, env)
+      allow(machine).to receive_message_chain(:config, :proxy) { config }
+
+      base.send(:skip?)
+    end
+
+    context "when attempting to configure a app proxy that is not defined" do
+      before(:each) do
+        config.enabled = {:foobar => false}
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:my_base] = false" do
+      before(:each) do
+        config.enabled = {:my_base => false}
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled[:my_base] = true" do
+      before(:each) do
+        config.enabled = {:my_base => true}
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:my_base] = {}" do
+      before(:each) do
+        config.enabled = {}
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+
+    context "when config.proxy.enabled[:my_base] = {:enabled => false, :skip => false}" do
+      before(:each) do
+        config.enabled = {
+          :my_base => {
+            :enabled => false,
+            :skip    => false,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:my_base] = {:enabled => true, :skip => false}" do
+      before(:each) do
+        config.enabled = {
+          :my_base => {
+            :enabled => true,
+            :skip    => false,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:my_base] = {:enabled => true, :skip => true}" do
+      before(:each) do
+        config.enabled = {
+          :my_base => {
+            :enabled => true,
+            :skip    => true,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled[:my_base] = {:enabled => false, :skip => true}" do
+      before(:each) do
+        config.enabled = {
+          :my_base => {
+            :enabled => false,
+            :skip    => true,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled = false" do
+      before(:each) do
+        config.enabled = false
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled = true " do
+      before(:each) do
+        config.enabled = true
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enable[:my_base] = {:enabled => true} and :skip key is missing" do
+      before(:each) do
+        config.enabled = {
+          :my_base => {
+            :enabled => false,
+          },
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+  end
+
+end

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

@@ -8,4 +8,166 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureAptProxy do
     it      { is_expected.to eq 'apt_proxy' }
   end
 
+  describe "#unconfigure_machine" do
+    let(:app) { lambda { |env| } }
+    let(:env) { Hash.new }
+    let(:machine) { double('machine') }
+
+    context 'when proxy is disabled' do
+      it 'should remove file: "/etc/apt/apt.conf.d/01proxy" and return true' do
+        apt_proxy = described_class.new(app, env)
+        apt_proxy.instance_variable_set(:@machine, machine)
+
+        expect(apt_proxy.config_name).to eq 'apt_proxy'
+
+        # configure test doubles
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /etc/apt/apt.conf.d/01proxy")
+        allow(machine).to receive_message_chain(:guest, :capability?).with(:apt_proxy_conf).and_return(true)
+        allow(machine).to receive_message_chain(:guest, :capability).with(:apt_proxy_conf).and_return("/etc/apt/apt.conf.d/01proxy")
+        allow(machine).to receive_message_chain(:guest, :name).and_return('non-supported-os')
+
+        expect(apt_proxy.send(:unconfigure_machine)).to eq true
+      end
+    end
+
+    context 'when not on a supported OS' do
+      it '#unconfigure_machine should return false' do
+        apt_proxy = described_class.new(app, env)
+        apt_proxy.instance_variable_set(:@machine, machine)
+
+        expect(apt_proxy.config_name).to eq 'apt_proxy'
+
+        # configure test doubles
+        allow(machine).to receive_message_chain(:guest, :name).and_return('non-supported-os')
+        allow(machine).to receive_message_chain(:guest, :capability?).with(:apt_proxy_conf).and_return(false)
+
+        expect(apt_proxy.send(:unconfigure_machine)).to eq false
+      end
+
+    end
+  end
+
+  describe "#skip?" do
+    let(:machine) { double('machine') }
+
+    let(:config) { OpenStruct.new }
+
+    subject do
+      apt_proxy = described_class.new(nil, nil)
+      apt_proxy.instance_variable_set(:@machine, machine)
+
+      allow(machine).to receive_message_chain(:config, :proxy) { config }
+
+      apt_proxy.send(:skip?)
+    end
+
+    context "when config.proxy.enabled[:apt] = false" do
+      before(:each) do
+        config.enabled = {:apt => false}
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled[:apt] = true" do
+      before(:each) do
+        config.enabled = {:apt => true}
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:apt] = {:enabled => false, :skip => false}" do
+      before(:each) do
+        config.enabled = {
+          :apt => {
+            :enabled => false,
+            :skip    => false,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:apt] = {:enabled => true, :skip => false}" do
+      before(:each) do
+        config.enabled = {
+          :apt => {
+            :enabled => true,
+            :skip    => false,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context "when config.proxy.enabled[:apt] = {:enabled => true, :skip => true}" do
+      before(:each) do
+        config.enabled = {
+          :apt => {
+            :enabled => true,
+            :skip    => true,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled[:apt] = {:enabled => false, :skip => true}" do
+      before(:each) do
+        config.enabled = {
+          :apt => {
+            :enabled => false,
+            :skip    => true,
+          }
+        }
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled = false" do
+      before(:each) do
+        config.enabled = false
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context "when config.proxy.enabled = true " do
+      before(:each) do
+        config.enabled = true
+        config.http    = 'http://foo-proxy-server:8080'
+        config.https   = 'http://foo-prxoy-server:8080'
+        config.ftp     = 'ftp://foo-proxy-server:8080'
+      end
+
+      it { is_expected.to eq false }
+    end
+  end
+
 end