vagrant-proxyconf 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b3ddc5133ada4016216defd4f705bdd86d6c21
-  data.tar.gz: ccaac1be3e9bf09356c8329217c3b06cdc444dc4
+  metadata.gz: 01b50f214b87a8c1d79057bce5f6d1b23b0ae19f
+  data.tar.gz: 4e0448369bd0b1d0661523502f262e401680db90
 SHA512:
-  metadata.gz: 41b8fed86e10fd26473d69e2bbbb282922f5b5dae2ca5de57c4189afd56167cd49a3559aadb3c7d79cd5bea3f4c8e7b2a89d58cb2ed3fa79598a1d38ffa6ce45
-  data.tar.gz: e403b143e6462b46a7b34243a013aa7fd0b774624de8cfcdf79a61c67f039a2e12ed7167922cfdbd8c8a26ef29c9ce253ffc6532c2ab117b20fbbcb8189d1d30
+  metadata.gz: 4b411ae888f87e672a32e08a3d7e6e0cbfb631dc3ae798daae9f738bbe6e096b4e6ad70c0c7164902b64e23daa8d40c38521ffc4f8d42392bad79564d307fc9f
+  data.tar.gz: af7095bc3dd5765871d17c5066a13bfb49406e0012121569abf2c04f63e80923831b45b12c57dd4643aa472576c98ad9904c79cdb960bf3be6583d98e79ff684

data/.travis.yml

@@ -7,7 +7,7 @@ before_install:
 bundler_args: --without=development
 
 rvm: 2.0.0
-env: VAGRANT_VERSION=v1.6.3
+env: VAGRANT_VERSION=v1.6.5
 matrix:
   include:
     - env: VAGRANT_VERSION=v1.5.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.4.0 / 2014-09-28
+
+Features:
+
+  - Support for configuring Docker ([GH-69][])
+
 # 1.3.2 / 2014-05-30
 
 Improvements:
@@ -174,3 +180,4 @@ Bug fixes:
 [GH-62]: https://github.com/tmatilai/vagrant-proxyconf/issues/62 "Issue 62"
 [GH-63]: https://github.com/tmatilai/vagrant-proxyconf/issues/63 "Issue 63"
 [GH-67]: https://github.com/tmatilai/vagrant-proxyconf/issues/67 "Issue 67"
+[GH-69]: https://github.com/tmatilai/vagrant-proxyconf/issues/69 "Issue 69"

data/Gemfile

@@ -2,12 +2,13 @@ source 'https://rubygems.org'
 
 gem 'vagrant',
   git: 'https://github.com/mitchellh/vagrant.git',
-  ref: ENV.fetch('VAGRANT_VERSION', 'v1.6.3')
+  ref: ENV.fetch('VAGRANT_VERSION', 'v1.6.5')
 
 gem 'cane', '~> 2.6'
 gem 'coveralls', require: false
 gem 'rake'
-gem 'rspec', '~> 2.11'
+gem 'rspec', '~> 3.1'
+gem 'rspec-its', '~> 1.0'
 gem 'tailor', '~> 1.4'
 
 group :development do

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 docker
 * proxy configuration for npm
 * proxy configuration for Yum
 * proxy configuration for PEAR

data/lib/vagrant-proxyconf/action.rb

@@ -1,6 +1,7 @@
 require 'vagrant/action/builtin/call'
 require_relative 'action/configure_apt_proxy'
 require_relative 'action/configure_chef_proxy'
+require_relative 'action/configure_docker_proxy'
 require_relative 'action/configure_env_proxy'
 require_relative 'action/configure_git_proxy'
 require_relative 'action/configure_npm_proxy'
@@ -51,6 +52,7 @@ module VagrantPlugins
 
             b2.use ConfigureAptProxy
             b2.use ConfigureChefProxy
+            b2.use ConfigureDockerProxy
             b2.use ConfigureEnvProxy
             b2.use ConfigureGitProxy
             b2.use ConfigureNpmProxy

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

@@ -0,0 +1,88 @@
+require_relative 'base'
+require_relative '../resource'
+require_relative '../userinfo_uri'
+
+module VagrantPlugins
+  module ProxyConf
+    class Action
+      # Action for configuring Docker on the guest
+      class ConfigureDockerProxy < Base
+        def config_name
+          'docker_proxy'
+        end
+
+        private
+
+        def config
+          # Use global proxy config
+          @config ||= finalize_config(@machine.config.proxy)
+        end
+
+        def configure_machine
+          logger.info('Writing the proxy configuration to docker config')
+          detect_export
+          write_docker_config
+        end
+
+        def docker
+          if config_path && config_path.include?('docker.io')
+            'docker.io'
+          else
+            'docker'
+          end
+        end
+
+        def write_docker_config
+          tmp = "/tmp/vagrant-proxyconf"
+          path = config_path
+
+          @machine.communicate.tap do |comm|
+            sed_script = docker_sed_script
+            local_tmp = tempfile(docker_config)
+
+            comm.sudo("rm #{tmp}", error_check: false)
+            comm.upload(local_tmp.path, tmp)
+            comm.sudo("touch #{path}")
+            comm.sudo("sed -e '#{sed_script}' #{path} > #{path}.new")
+            comm.sudo("cat #{tmp} >> #{path}.new")
+            comm.sudo("chmod 0644 #{path}.new")
+            comm.sudo("chown root:root #{path}.new")
+            comm.sudo("mv #{path}.new #{path}")
+            comm.sudo("rm #{tmp}")
+            comm.sudo(service_restart_command)
+          end
+        end
+
+        def detect_export
+          @machine.communicate.tap do |comm|
+            comm.test('which systemctl') ? @export = '' : @export = 'export '
+          end
+        end
+
+        def service_restart_command
+          ["systemctl restart #{docker}",
+            "service #{docker} restart",
+            "/etc/init.d/#{docker} restart"].join(' || ')
+        end
+
+        def docker_sed_script
+          <<-SED.gsub(/^\s+/, '')
+            /^#{@export}HTTP_PROXY=/ d
+            /^#{@export}NO_PROXY=/ d
+            /^#{@export}http_proxy=/ d
+            /^#{@export}no_proxy=/ d
+          SED
+        end
+
+        def docker_config
+          <<-CONFIG.gsub(/^\s+/, '')
+            #{@export}HTTP_PROXY=#{config.http || ''}
+            #{@export}NO_PROXY=#{config.no_proxy || ''}
+            #{@export}http_proxy=#{config.http || ''}
+            #{@export}no_proxy=#{config.no_proxy || ''}
+          CONFIG
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require_relative '../util'
+
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module CoreOS
+        # Capability for docker proxy configuration
+        module DockerProxyConf
+          # @return [String, false] the path to docker or `false` if not found
+          def self.docker_proxy_conf(machine)
+            return false unless Util.which(machine, 'docker')
+
+            machine.communicate.tap do |comm|
+              src_file='/usr/lib/systemd/system/docker.service'
+              tmp_file='/tmp/docker.service'
+              env_file='EnvironmentFile=-\/etc\/default\/docker'
+              comm.sudo("sed -e 's/\\[Service\\]/[Service]\\n#{env_file}/g' #{src_file} > #{tmp_file}")
+
+              comm.sudo('mv /tmp/docker.service /etc/systemd/system/')
+              comm.sudo('systemctl daemon-reload')
+            end
+            '/etc/default/docker'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require_relative '../util'
+
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Linux
+        # Capability for docker proxy configuration
+        module DockerProxyConf
+          # @return [String, false] the path to docker or `false` if not found
+          def self.docker_proxy_conf(machine)
+            docker_command = 'docker'    if Util.which(machine, 'docker')
+            docker_command = 'docker.io' if Util.which(machine, 'docker.io')
+
+            return false if docker_command.nil?
+
+            if machine.communicate.test('cat /etc/redhat-release')
+              "/etc/sysconfig/#{docker_command}"
+            elsif machine.communicate.test('ls /var/lib/boot2docker/')
+              "/var/lib/boot2docker/profile"
+            else
+              "/etc/default/#{docker_command}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/capability.rb

@@ -8,6 +8,16 @@ module VagrantPlugins
         Cap::Debian::AptProxyConf
       end
 
+      guest_capability 'linux', 'docker_proxy_conf' do
+        require_relative 'cap/linux/docker_proxy_conf'
+        Cap::Linux::DockerProxyConf
+      end
+
+      guest_capability 'coreos', 'docker_proxy_conf' do
+        require_relative 'cap/coreos/docker_proxy_conf'
+        Cap::CoreOS::DockerProxyConf
+      end
+
       guest_capability 'linux', 'env_proxy_conf' do
         require_relative 'cap/linux/env_proxy_conf'
         Cap::Linux::EnvProxyConf

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.3.2'
+    VERSION = '1.4.0'
   end
 end

data/locales/en.yml

@@ -8,6 +8,14 @@ en:
       configuring: |-
         Configuring proxy for Apt...
 
+    docker_proxy:
+      not_enabled: |-
+        docker_proxy not enabled or configured
+      not_supported: |-
+        Skipping Docker proxy config as the machine does not support it
+      configuring: |-
+        Configuring proxy for Docker...
+
     chef_proxy:
       no_provisioners: |-
         No Chef provisioners configured

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rspec/its'
+
 require 'simplecov'
 require 'coveralls'
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[

data/spec/unit/support/shared/apt_proxy_config.rb

@@ -23,44 +23,44 @@ shared_examples "apt proxy config" do |proto|
 
     context "with ip" do
       subject        { config_with(proto => "10.1.2.3") }
-      its(:enabled?) { should be_true }
+      its(:enabled?) { should be_truthy }
       its(:to_s)     { should eq conf_line(proto, "10.1.2.3") }
     end
 
     context "with name" do
       subject        { config_with(proto => "proxy.example.com") }
-      its(:enabled?) { should be_true }
+      its(:enabled?) { should be_truthy }
       its(:to_s)     { should eq conf_line(proto, "proxy.example.com") }
     end
 
     context "with name and port" do
       subject        { config_with(proto => "acng:8080") }
-      its(:enabled?) { should be_true }
+      its(:enabled?) { should be_truthy }
       its(:to_s)     { should eq conf_line(proto, "acng", 8080) }
     end
 
     context "with protocol and name" do
       subject        { config_with(proto => "#{proto}://proxy.foo.tld") }
-      its(:enabled?) { should be_true }
+      its(:enabled?) { should be_truthy }
       its(:to_s)     { should eq conf_line(proto, "proxy.foo.tld", nil) }
     end
 
     context "with trailing slash" do
       subject        { config_with(proto => "#{proto}://proxy.foo.tld/") }
-      its(:enabled?) { should be_true }
+      its(:enabled?) { should be_truthy }
       its(:to_s)     { should eq conf_line(proto, "proxy.foo.tld/", nil) }
     end
 
     context "with protocol and name and port" do
       subject        { config_with(proto => "#{proto}://prism.nsa.gov:666") }
-      its(:enabled?) { should be_true }
+      its(:enabled?) { should be_truthy }
       its(:to_s)     { should eq conf_line(proto, "prism.nsa.gov", 666) }
     end
 
     ["DIRECT", "direct"].each do |direct|
       context "with #{direct.inspect}" do
         subject        { config_with(proto => direct) }
-        its(:enabled?) { should be_true }
+        its(:enabled?) { should be_truthy }
         its(:to_s)     { should eq conf_line(proto, :direct) }
       end
     end
@@ -68,14 +68,14 @@ shared_examples "apt proxy config" do |proto|
     [false, ""].each do |unset|
       context "with #{unset.inspect}" do
         subject        { config_with(proto => unset) }
-        its(:enabled?) { should be_true }
+        its(:enabled?) { should be_truthy }
         its(:to_s)     { should eq "" }
       end
     end
 
     context "with nil" do
       subject        { config_with(proto => nil) }
-      its(:enabled?) { should be_false }
+      its(:enabled?) { should be_falsey }
       its(:to_s)     { should eq "" }
     end
 

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

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureAptProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'apt_proxy' }
+    it      { is_expected.to eq 'apt_proxy' }
   end
 
 end

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

@@ -10,7 +10,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
 
     def configure_chef
       action = described_class.new(nil, nil)
-      action.stub(:config => config)
+      allow(action).to receive(:config) { config }
       action.send(:configure_chef, chef)
     end
 

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

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/configure_docker_proxy'
+
+describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
+
+  describe '#config_name' do
+    subject { described_class.new(double, double).config_name }
+    it      { is_expected.to eq 'docker_proxy' }
+  end
+end

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

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureEnvProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'env_proxy' }
+    it      { is_expected.to eq 'env_proxy' }
   end
 
 end

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

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureGitProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'git_proxy' }
+    it      { is_expected.to eq 'git_proxy' }
   end
 
 end

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

@@ -5,6 +5,6 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureNpmProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'npm_proxy' }
+    it      { is_expected.to eq 'npm_proxy' }
   end
 end

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

@@ -5,6 +5,6 @@ describe VagrantPlugins::ProxyConf::Action::ConfigurePearProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'pear_proxy' }
+    it      { is_expected.to eq 'pear_proxy' }
   end
 end

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

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureSvnProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'svn_proxy' }
+    it      { is_expected.to eq 'svn_proxy' }
   end
 
 end

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

@@ -5,35 +5,35 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureYumProxy do
 
   describe '#config_name' do
     subject { described_class.new(double, double).config_name }
-    it      { should eq 'yum_proxy' }
+    it      { is_expected.to eq 'yum_proxy' }
   end
 
   describe '#proxy_params' do
     subject do
       action = described_class.new(nil, nil)
-      action.stub(:config => config)
+      allow(action).to receive(:config) { config }
       action.send(:proxy_params)
     end
     let(:config) { OpenStruct.new(http: http) }
 
     context "with `false`" do
       let(:http) { false }
-      it { should eq %q{-v proxy='' -v user='' -v pass=''} }
+      it { is_expected.to eq %q{-v proxy='' -v user='' -v pass=''} }
     end
 
     context "without userinfo" do
       let(:http) { 'http://proxy:1234/' }
-      it { should eq %q{-v proxy=http://proxy:1234 -v user='' -v pass=''} }
+      it { is_expected.to eq %q{-v proxy=http://proxy:1234 -v user='' -v pass=''} }
     end
 
     context "with userinfo" do
       let(:http) { 'http://foo:bar@myproxy:9876' }
-      it { should eq %q{-v proxy=http://myproxy:9876 -v user=foo -v pass=bar} }
+      it { is_expected.to eq %q{-v proxy=http://myproxy:9876 -v user=foo -v pass=bar} }
     end
 
     context "with special characters" do
       let(:http) { %q{http://x*y:a(b@proxy.com:8080} }
-      it { should eq %q{-v proxy=http://proxy.com:8080 -v user=x\\*y -v pass=a\\(b} }
+      it { is_expected.to eq %q{-v proxy=http://proxy.com:8080 -v user=x\\*y -v pass=a\\(b} }
     end
   end
 end

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

@@ -5,13 +5,19 @@ describe VagrantPlugins::ProxyConf::Action::IsEnabled do
   let(:app) { lambda { |env| } }
   let(:env) { { :machine => machine } }
   let(:machine) do
-    double('machine').tap { |machine| machine.stub(:config).and_return(config) }
+    double('machine').tap do |machine|
+      allow(machine).to receive(:config) { config }
+    end
   end
   let(:config) do
-    double('config').tap { |config| config.stub(:proxy => proxy_config) }
+    double('config').tap do |config|
+      allow(config).to receive(:proxy) { proxy_config }
+    end
   end
   let(:proxy_config) do
-    double('proxy_config').tap { |config| config.stub(:enabled => enabled) }
+    double('proxy_config').tap do |config|
+      allow(config).to receive(:enabled) { enabled }
+    end
   end
 
   [false, ''].each do |value|
@@ -20,7 +26,7 @@ describe VagrantPlugins::ProxyConf::Action::IsEnabled do
 
       it "results to falsy" do
         described_class.new(app, {}).call(env)
-        expect(env[:result]).to be_false
+        expect(env[:result]).to be_falsey
       end
     end
   end
@@ -31,7 +37,7 @@ describe VagrantPlugins::ProxyConf::Action::IsEnabled do
 
       it "results to truthy" do
         described_class.new(app, {}).call(env)
-        expect(env[:result]).to be_true
+        expect(env[:result]).to be_truthy
       end
     end
   end

data/spec/unit/vagrant-proxyconf/cap/debian/apt_proxy_conf_spec.rb

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Cap::Debian::AptProxyConf do
 
   describe '.apt_proxy_conf' do
     let(:subject) { described_class.apt_proxy_conf(double) }
-    it { should eq '/etc/apt/apt.conf.d/01proxy' }
+    it { is_expected.to eq '/etc/apt/apt.conf.d/01proxy' }
   end
 
 end

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

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/linux/docker_proxy_conf'
+require 'vagrant-proxyconf/cap/util'
+
+describe VagrantPlugins::ProxyConf::Cap::Linux::DockerProxyConf do
+
+  describe '.docker_proxy_conf' do
+    let(:machine) { double }
+    let(:communicator) { double }
+
+    before do
+      allow(machine).to receive(:communicate) { communicator }
+    end
+
+    it "returns the path when docker is installed on Redhat" do
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) do |_m, c|
+        (c == 'docker') ? '/path/to/docker' : false
+      end
+      allow(communicator).to receive(:test) do |c|
+        c == 'cat /etc/redhat-release'
+      end
+
+      expect(described_class.docker_proxy_conf(machine)).to eq '/etc/sysconfig/docker'
+    end
+
+    it "returns the path when docker is installed on Debian or Ubuntu" do
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) do |_m, c|
+        (c == 'docker') ? '/path/to/docker' : false
+      end
+      allow(communicator).to receive(:test) { false }
+
+      expect(described_class.docker_proxy_conf(machine)).to eq '/etc/default/docker'
+    end
+
+    it "returns the path when docker.io is installed on Ubuntu 14.04 or higher" do
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) do |_m, c|
+        (c == 'docker.io') ? '/path/to/docker.io': false
+      end
+      allow(communicator).to receive(:test) { false }
+
+      expect(described_class.docker_proxy_conf(machine)).to eq '/etc/default/docker.io'
+    end
+
+    it "returns the path when docker is installed on boot2docker" do
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) do |_m, c|
+        (c == 'docker') ? '/path/to/docker' : false
+      end
+      allow(communicator).to receive(:test) do |c|
+        c == 'ls /var/lib/boot2docker'
+      end
+
+      expect(described_class.docker_proxy_conf(machine)).to eq '/etc/default/docker'
+    end
+
+    it "returns false when docker is not installed" do
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { false }
+      expect(described_class.docker_proxy_conf(machine)).to be_falsey
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Cap::Linux::EnvProxyConf do
 
   describe '.env_proxy_conf' do
     let(:subject) { described_class.env_proxy_conf(double) }
-    it { should eq '/etc/profile.d/proxy.sh' }
+    it { is_expected.to eq '/etc/profile.d/proxy.sh' }
   end
 
 end

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

@@ -8,13 +8,13 @@ describe VagrantPlugins::ProxyConf::Cap::Linux::GitProxyConf do
     let(:machine) { double }
 
     it "returns the path when git is installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/git')
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { '/path/to/git' }
       expect(described_class.git_proxy_conf(machine)).to eq '/path/to/git'
     end
 
     it "returns false when git is not installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
-      expect(described_class.git_proxy_conf(machine)).to be_false
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { false }
+      expect(described_class.git_proxy_conf(machine)).to be_falsey
     end
   end
 

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

@@ -8,13 +8,13 @@ describe VagrantPlugins::ProxyConf::Cap::Linux::NpmProxyConf do
     let(:machine) { double }
 
     it "returns the path when npm is installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/npm')
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { '/path/to/npm' }
       expect(described_class.npm_proxy_conf(machine)).to eq '/path/to/npm'
     end
 
     it "returns false when npm is not installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
-      expect(described_class.npm_proxy_conf(machine)).to be_false
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { false }
+      expect(described_class.npm_proxy_conf(machine)).to be_falsey
     end
   end
 

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

@@ -8,13 +8,13 @@ describe VagrantPlugins::ProxyConf::Cap::Linux::PearProxyConf do
     let(:machine) { double }
 
     it "returns the path when pear is installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/pear')
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { '/path/to/pear' }
       expect(described_class.pear_proxy_conf(machine)).to eq '/path/to/pear'
     end
 
     it "returns false when pear is not installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
-      expect(described_class.pear_proxy_conf(machine)).to be_false
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { false }
+      expect(described_class.pear_proxy_conf(machine)).to be_falsey
     end
   end
 

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

@@ -8,13 +8,13 @@ describe VagrantPlugins::ProxyConf::Cap::Linux::SvnProxyConf do
     let(:machine) { double }
 
     it "returns true when svn is installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/svn')
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { '/path/to/svn' }
       expect(described_class.svn_proxy_conf(machine)).to eq '/path/to/svn'
     end
 
     it "returns false when pear is not installed" do
-      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
-      expect(described_class.svn_proxy_conf(machine)).to be_false
+      allow(VagrantPlugins::ProxyConf::Cap::Util).to receive(:which) { false }
+      expect(described_class.svn_proxy_conf(machine)).to be_falsey
     end
   end
 

data/spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Cap::Redhat::YumProxyConf do
 
   describe '.yum_proxy_conf' do
     let(:subject) { described_class.yum_proxy_conf(double) }
-    it { should eq '/etc/yum.conf' }
+    it { is_expected.to eq '/etc/yum.conf' }
   end
 
 end

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

@@ -8,7 +8,7 @@ describe VagrantPlugins::ProxyConf::Cap::Util do
     let(:communicator) { double }
 
     before do
-      machine.stub(:communicate => communicator)
+      allow(machine).to receive(:communicate) { communicator }
     end
 
     it "returns the path when the command is installed" do
@@ -25,7 +25,7 @@ describe VagrantPlugins::ProxyConf::Cap::Util do
       expect(communicator).to receive(:execute).
         with('which bar', error_check: false).
         and_return(1)
-      expect(described_class.which(machine, 'bar')).to be_false
+      expect(described_class.which(machine, 'bar')).to be_falsey
     end
   end
 

data/spec/unit/vagrant-proxyconf/cap/windows/env_proxy_conf_spec.rb

@@ -5,7 +5,7 @@ describe VagrantPlugins::ProxyConf::Cap::Windows::EnvProxyConf do
 
   describe '.env_proxy_conf' do
     let(:subject) { described_class.env_proxy_conf(double) }
-    it { should eq '/proxy.conf' }
+    it { is_expected.to eq '/proxy.conf' }
   end
 
 end

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

@@ -12,7 +12,7 @@ describe VagrantPlugins::ProxyConf::Config::AptProxy do
 
   context "defaults" do
     subject        { config_with({}) }
-    its(:enabled?) { should be_false }
+    its(:enabled?) { should be_falsey }
     its(:to_s)     { should eq "" }
   end
 
@@ -22,7 +22,7 @@ describe VagrantPlugins::ProxyConf::Config::AptProxy do
 
   context "with both http and https proxies" do
     subject        { config_with(http: "10.2.3.4", https: "ssl-proxy:8443") }
-    its(:enabled?) { should be_true }
+    its(:enabled?) { should be_truthy }
     its(:to_s)     { should match conf_line_pattern("http", "10.2.3.4") }
     its(:to_s)     { should match conf_line_pattern("https", "ssl-proxy", 8443) }
   end

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

@@ -26,14 +26,14 @@ describe VagrantPlugins::ProxyConf::Config::EnvProxy do
 
   context "defaults" do
     subject        { config_with({}) }
-    its(:enabled?) { should be_false }
+    its(:enabled?) { should be_falsey }
     its(:to_s)     { should eq "" }
   end
 
   context "with http config" do
     let(:proxy)    { 'http://proxy.example.com:8888' }
     subject        { config_with({ http: proxy }) }
-    its(:enabled?) { should be_true }
+    its(:enabled?) { should be_truthy }
     its(:to_s)     { should match_lines [
       %Q{export HTTP_PROXY=#{proxy}\n},
       %Q{export http_proxy=#{proxy}\n},
@@ -44,7 +44,7 @@ describe VagrantPlugins::ProxyConf::Config::EnvProxy do
     let(:proxy)    { 'http://proxy.example.com:8888' }
     let(:no_proxy) { 'localhost, 127.0.0.1' }
     subject        { config_with({ http: proxy, no_proxy: no_proxy }) }
-    its(:enabled?) { should be_true }
+    its(:enabled?) { should be_truthy }
     its(:to_s)     { should match_lines [
       %Q{export HTTP_PROXY=#{proxy}\n},
       %Q{export http_proxy=#{proxy}\n},
@@ -57,7 +57,7 @@ describe VagrantPlugins::ProxyConf::Config::EnvProxy do
     let(:proxy)    { 'http://proxy.example.com:8888' }
     before(:each)  { ENV['VAGRANT_ENV_HTTP_PROXY'] = proxy }
     subject        { config_with({ http: 'http://default:3128' }) }
-    its(:enabled?) { should be_true }
+    its(:enabled?) { should be_truthy }
     its(:to_s)     { should match_lines [
       %Q{export HTTP_PROXY=#{proxy}\n},
       %Q{export http_proxy=#{proxy}\n},

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

@@ -7,6 +7,12 @@ describe VagrantPlugins::ProxyConf::Config::KeyMixin do
     include VagrantPlugins::ProxyConf::Config::KeyMixin
     key :foo
     key :bar
+
+    # Hack to keep rspec 3 description generation happy
+    def respond_to?(method)
+      return false if method == :to_ary
+      super
+    end
   end
 
   class TestDefaultConfig < Vagrant.plugin('2', :config)
@@ -38,8 +44,8 @@ describe VagrantPlugins::ProxyConf::Config::KeyMixin do
     subject { config.merge_defaults(default) }
 
     context 'with no configuration' do
-      it { should be_kind_of config.class }
-      it { should_not be config }
+      it { is_expected.to be_kind_of config.class }
+      it { is_expected.not_to be config }
 
       its(:foo) { should be_nil }
       its(:bar) { should be_nil }

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

@@ -6,7 +6,7 @@ describe VagrantPlugins::ProxyConf do
   describe '.logger' do
     subject { described_class.logger }
 
-    it { should be_a Log4r::Logger }
+    it { is_expected.to be_a Log4r::Logger }
 
     it "always returns the same instance" do
       expect(subject).to be described_class.logger

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

@@ -9,18 +9,18 @@ describe VagrantPlugins::ProxyConf::Plugin do
     end
 
     it "accepts single String argument" do
-      expect(described_class.check_vagrant_version('~> 1.1')).to be_true
-      expect(described_class.check_vagrant_version('1.2')).to be_false
+      expect(described_class.check_vagrant_version('~> 1.1')).to be_truthy
+      expect(described_class.check_vagrant_version('1.2')).to be_falsey
     end
 
     it "accepts an Array argument" do
-      expect(described_class.check_vagrant_version(['>= 1.1', '< 1.3.0.beta'])).to be_true
-      expect(described_class.check_vagrant_version(['>= 1.3'])).to be_false
+      expect(described_class.check_vagrant_version(['>= 1.1', '< 1.3.0.beta'])).to be_truthy
+      expect(described_class.check_vagrant_version(['>= 1.3'])).to be_falsey
     end
 
     it "accepts multiple arguments" do
-      expect(described_class.check_vagrant_version('>= 1.0', '<= 1.3')).to be_true
-      expect(described_class.check_vagrant_version('~> 1.2', '>= 1.2.5')).to be_false
+      expect(described_class.check_vagrant_version('>= 1.0', '<= 1.3')).to be_truthy
+      expect(described_class.check_vagrant_version('~> 1.2', '>= 1.2.5')).to be_falsey
     end
   end
 
@@ -34,7 +34,7 @@ describe VagrantPlugins::ProxyConf::Plugin do
         'VagrantPlugins::ProxyConf::Plugin::VAGRANT_VERSION_REQUIREMENT',
         requirement)
       stub_const('Vagrant::VERSION', vagrant_version)
-      $stderr.stub(:puts)
+      allow($stderr).to receive(:puts)
     end
 
     context "on too old Vagrant version" do
@@ -43,7 +43,7 @@ describe VagrantPlugins::ProxyConf::Plugin do
         expect { subject }.to raise_error(err_msg)
       end
       it "warns" do
-        $stderr.should_receive(:puts).with(err_msg)
+        expect($stderr).to receive(:puts).with(err_msg)
         subject rescue nil
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -34,6 +34,7 @@ files:
 - lib/vagrant-proxyconf/action/base.rb
 - lib/vagrant-proxyconf/action/configure_apt_proxy.rb
 - lib/vagrant-proxyconf/action/configure_chef_proxy.rb
+- lib/vagrant-proxyconf/action/configure_docker_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
@@ -42,7 +43,9 @@ files:
 - 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/coreos/docker_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/debian/apt_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
@@ -86,6 +89,7 @@ files:
 - spec/unit/support/shared/apt_proxy_config.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
 - 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
@@ -96,6 +100,7 @@ files:
 - 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/docker_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
@@ -160,6 +165,7 @@ test_files:
 - spec/unit/support/shared/apt_proxy_config.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
 - 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
@@ -170,6 +176,7 @@ test_files:
 - 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/docker_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