vagrant-proxyconf 1.5.2 → 2.0.0

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

@@ -1,6 +1,15 @@
 require 'spec_helper'
 require 'vagrant-proxyconf/action/configure_svn_proxy'
 
+def mock_write_config(machine)
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf", error_check: false)
+  allow(machine).to receive_message_chain(:communicate, :upload)
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /tmp/vagrant-proxyconf")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /tmp/vagrant-proxyconf")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/subversion")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("mv -f /tmp/vagrant-proxyconf /etc/subversion/servers")
+end
+
 describe VagrantPlugins::ProxyConf::Action::ConfigureSvnProxy do
 
   describe '#config_name' do
@@ -8,6 +17,82 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureSvnProxy do
     it      { is_expected.to eq 'svn_proxy' }
   end
 
+  describe "#configure_machine" do
+    let(:config) { OpenStruct.new }
+    let(:machine) { double('machine') }
+
+    subject do
+      svn_proxy = described_class.new(nil, nil)
+      svn_proxy.instance_variable_set(:@machine, machine)
+
+      allow(svn_proxy).to receive(:config) { config }
+      allow(machine).to receive_message_chain(:guest, :capability?).with(:svn_proxy_conf).and_return(@supported)
+      allow(machine).to receive_message_chain(:guest, :capability).with(:svn_proxy_conf).and_return(@supported)
+
+      mock_write_config(machine)
+
+      svn_proxy.send(:configure_machine)
+    end
+
+    it 'returns nil, when not supported' do
+      @supported = false
+
+      config.http = 'http://some-svn-proxy:8080'
+      config.no_proxy = 'localhost'
+
+      is_expected.to eq nil
+    end
+
+    it 'returns true, when supported' do
+      @supported = true
+
+      config.http = 'http://some-svn-proxy:8080'
+      config.no_proxy = 'localhost'
+
+      is_expected.to eq true
+    end
+
+  end
+
+  describe "#unconfigure_machine" do
+    let(:config) { OpenStruct.new }
+    let(:machine) { double('machine') }
+
+    subject do
+      svn_proxy = described_class.new(nil, nil)
+      svn_proxy.instance_variable_set(:@machine, machine)
+
+      allow(svn_proxy).to receive(:config) { config }
+      allow(machine).to receive_message_chain(:guest, :capability?).with(:svn_proxy_conf).and_return(@supported)
+      allow(machine).to receive_message_chain(:guest, :capability).with(:svn_proxy_conf).and_return(@supported)
+
+      allow(machine).to receive_message_chain(:communicate, :sudo).with("touch /etc/subversion/servers")
+      allow(machine).to receive_message_chain(:communicate, :sudo).with("sed -i.bak -e '/^http-proxy-/d' /etc/subversion/servers")
+      allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/subversion/servers")
+      allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/subversion/servers")
+
+      svn_proxy.send(:unconfigure_machine)
+    end
+
+    it 'returns nil, when not supported' do
+      @supported = false
+
+      config.http = 'http://some-svn-proxy:8080'
+      config.no_proxy = 'localhost'
+
+      is_expected.to eq nil
+    end
+
+    it 'returns true, when supported' do
+      @supported = true
+
+      config.http = 'http://some-svn-proxy:8080'
+      config.no_proxy = 'localhost'
+
+      is_expected.to eq true
+    end
+  end
+
   describe '#svn_config' do
     subject do
       action = described_class.new(nil, nil)

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

@@ -41,4 +41,104 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureYumProxy do
       it { is_expected.to eq %q{-v proxy=http://proxy.com:8080 -v user=foo\% -v pass=abc\#123} }
     end
   end
+
+  describe "#configure_machine" do
+    let(:machine) { double('machine') }
+    let(:config) { OpenStruct.new }
+
+    context "when not supported" do
+      subject do
+        yum_proxy = described_class.new(nil, nil)
+        yum_proxy.instance_variable_set(:@machine, machine)
+
+        allow(yum_proxy).to receive(:config) { config }
+        allow(machine).to receive_message_chain(:guest, :capability?).with(:yum_proxy_conf).and_return(false)
+        allow(machine).to receive_message_chain(:guest, :capability).with(:yum_proxy_conf).and_return(nil)
+
+        yum_proxy.send(:configure_machine)
+      end
+
+      it 'returns nil' do
+        is_expected.to eq nil
+      end
+    end
+
+    context "when supported" do
+      subject do
+        yum_proxy = described_class.new(nil, nil)
+        yum_proxy.instance_variable_set(:@machine, machine)
+
+        config.http = "http://username:pass@some-yum-proxy-server:8080"
+
+        allow(yum_proxy).to receive(:config) { config }
+        allow(machine).to receive_message_chain(:guest, :capability?).with(:yum_proxy_conf).and_return(true)
+        allow(machine).to receive_message_chain(:guest, :capability).with(:yum_proxy_conf).and_return("/etc/yum.conf")
+
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf", error_check: false)
+        allow(machine).to receive_message_chain(:communicate, :upload)
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("touch /etc/yum.conf")
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("gawk -f /tmp/vagrant-proxyconf -v proxy=http://some-yum-proxy-server:8080 -v user=username -v pass=pass /etc/yum.conf > /etc/yum.conf.new")
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/yum.conf.new")
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/yum.conf.new")
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("mv -f /etc/yum.conf.new /etc/yum.conf")
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf")
+
+        yum_proxy.send(:configure_machine)
+      end
+
+      it 'returns true' do
+        is_expected.to eq true
+      end
+
+    end
+  end
+
+  describe "#unconfigure_machine" do
+    let(:machine) { double('machine') }
+    let(:config) { OpenStruct.new }
+
+    context "when not supported" do
+      subject do
+        yum_proxy = described_class.new(nil, nil)
+        yum_proxy.instance_variable_set(:@machine, machine)
+
+        allow(yum_proxy).to receive(:config) { config }
+        allow(machine).to receive_message_chain(:guest, :capability?).with(:yum_proxy_conf).and_return(false)
+        allow(machine).to receive_message_chain(:guest, :capability).with(:yum_proxy_conf).and_return(nil)
+
+        yum_proxy.send(:unconfigure_machine)
+      end
+
+      it 'returns nil' do
+        is_expected.to eq nil
+      end
+    end
+
+    context "when supported" do
+      subject do
+        yum_proxy = described_class.new(nil, nil)
+        yum_proxy.instance_variable_set(:@machine, machine)
+
+        config.proxy = OpenStruct.new
+        config.proxy.enabled = false
+        config.http = "http://username:pass@some-yum-proxy-server:8080"
+
+        allow(yum_proxy).to receive(:config) { config }
+        allow(machine).to receive(:config) { config }
+
+        allow(machine).to receive_message_chain(:guest, :capability?).with(:yum_proxy_conf).and_return(true)
+        allow(machine).to receive_message_chain(:guest, :capability).with(:yum_proxy_conf).and_return("/etc/yum.conf")
+
+        allow(machine).to receive_message_chain(:communicate, :test).with("grep '^proxy' /etc/yum.conf").and_return(true)
+        allow(machine).to receive_message_chain(:communicate, :sudo).with("sed -i.bak -e '/^proxy/d' /etc/yum.conf")
+
+        yum_proxy.send(:unconfigure_machine)
+      end
+
+      it 'returns true' do
+        is_expected.to eq true
+      end
+    end
+  end
+
 end

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

@@ -17,7 +17,7 @@ describe VagrantPlugins::ProxyConf::Cap::Linux::DockerProxyConf do
         (c == 'docker') ? '/path/to/docker' : false
       end
       allow(communicator).to receive(:test) do |c|
-        c == 'cat /etc/redhat-release'
+        c == '[ -f /etc/redhat-release ]'
       end
 
       expect(described_class.docker_proxy_conf(machine)).to eq '/etc/sysconfig/docker'

data/spec/unit/vagrant-proxyconf/cap/util_spec.rb

@@ -13,7 +13,7 @@ describe VagrantPlugins::ProxyConf::Cap::Util do
 
     it "returns the path when the command is installed" do
       expect(communicator).to receive(:execute).
-        with('which foo', error_check: false).
+        with('command -v foo', error_check: false).
         and_yield(:stdout, "/path/to/foo\n").
         and_yield(:stdout, "PROMPT\n").
         and_yield(:stderr, "not foo\n").
@@ -23,7 +23,7 @@ describe VagrantPlugins::ProxyConf::Cap::Util do
 
     it "returns false when the command is not installed" do
       expect(communicator).to receive(:execute).
-        with('which bar', error_check: false).
+        with('command -v bar', error_check: false).
         and_return(1)
       expect(described_class.which(machine, 'bar')).to be_falsey
     end

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

@@ -9,7 +9,7 @@ describe VagrantPlugins::ProxyConf::Config::KeyMixin do
     key :bar
 
     # Hack to keep rspec 3 description generation happy
-    def respond_to?(method)
+    def respond_to?(method, include_all = false)
       return false if method == :to_ary
       super
     end

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

@@ -69,6 +69,20 @@ describe 'resources/yum_config.awk' do
       end
     end
 
+    context "with old proxy conf containing special characters" do
+      let(:old_conf) { 'yum_with_repository_and_proxy_containing_special_chars.conf' }
+
+      it "replaces existing proxy and 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
+
+      it "disables existing proxy" do
+        conf = { proxy: '', user: 'baz', pass: 'bar' }
+        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' }
 

data/travis/before_install

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+remove_default_specs() {
+    echo "Removing default gemspec"
+    find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete
+}
+
+install_bundler() {
+    echo "Uninstalling current Bundler versions"
+    rvm @global do gem uninstall bundler --all --executables
+    gem uninstall bundler --all --executables
+    echo "Installing Bundler '$BUNDLER_VERSION'"
+    gem install bundler --version "$BUNDLER_VERSION"
+}
+
+print_bundler_version() {
+    bundler --version
+}
+
+if [ -n "${BUNDLER_VERSION:-}" ]; then
+    remove_default_specs
+    install_bundler
+    print_bundler_version
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -27,8 +27,12 @@ files:
 - README.md
 - Rakefile
 - development/.gitignore
+- development/Dockerfile
 - development/README.md
 - development/Vagrantfile.example
+- development/install-c7.sh
+- development/install-debian.sh
+- development/tinyproxy.conf
 - lib/vagrant-proxyconf.rb
 - lib/vagrant-proxyconf/action.rb
 - lib/vagrant-proxyconf/action/base.rb
@@ -46,22 +50,28 @@ files:
 - lib/vagrant-proxyconf/cap/coreos/docker_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/debian/apt_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/debian/docker_proxy_conf.rb
+- lib/vagrant-proxyconf/cap/linux/chef_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/linux/docker_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/linux/yum_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/redhat/yum_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/util.rb
 - lib/vagrant-proxyconf/cap/windows/env_proxy_conf.rb
 - lib/vagrant-proxyconf/capability.rb
 - lib/vagrant-proxyconf/config.rb
 - lib/vagrant-proxyconf/config/apt_proxy.rb
+- lib/vagrant-proxyconf/config/chef_proxy.rb
+- lib/vagrant-proxyconf/config/docker_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/npm_proxy.rb
+- lib/vagrant-proxyconf/config/pear_proxy.rb
 - lib/vagrant-proxyconf/config/proxy.rb
 - lib/vagrant-proxyconf/config/svn_proxy.rb
 - lib/vagrant-proxyconf/config/yum_proxy.rb
@@ -74,7 +84,10 @@ files:
 - locales/en.yml
 - resources/yum_config.awk
 - spec/spec_helper.rb
+- spec/unit/fixtures/docker_client_config_json_enabled_proxy
+- spec/unit/fixtures/docker_client_config_json_no_proxy
 - spec/unit/fixtures/empty
+- spec/unit/fixtures/etc_environment_only_http_proxy.conf
 - 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
@@ -85,9 +98,11 @@ files:
 - 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_containing_special_chars.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/base_spec.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_docker_proxy_spec.rb
@@ -123,6 +138,7 @@ files:
 - spec/unit/vagrant-proxyconf/resource_spec.rb
 - spec/unit/vagrant-proxyconf/resources/yum_config_spec.rb
 - spec/unit/vagrant-proxyconf/userinfo_uri_spec.rb
+- travis/before_install
 - vagrant-proxyconf.gemspec
 homepage: http://tmatilai.github.io/vagrant-proxyconf/
 licenses:
@@ -144,13 +160,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 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/docker_client_config_json_enabled_proxy
+- spec/unit/fixtures/docker_client_config_json_no_proxy
 - spec/unit/fixtures/empty
+- spec/unit/fixtures/etc_environment_only_http_proxy.conf
 - 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
@@ -161,9 +180,11 @@ test_files:
 - 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_containing_special_chars.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/base_spec.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_docker_proxy_spec.rb
@@ -199,4 +220,3 @@ test_files:
 - 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: