vagrant-proxyconf 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d859efb30525863489514b79c22bb78026039cc
-  data.tar.gz: de787f2cb8e3a1fb9500667e45df19f6b9e6a208
+  metadata.gz: 57a68635cfc9a1ce7ad88b14d65ff04950f43b7b
+  data.tar.gz: 182af0796244d4b82b6eb6cc9338b2cc3212361b
 SHA512:
-  metadata.gz: 3d2923af76570dc3a474e437b177a12e0e3ec6ca2f523820879e1acdd1d22d694526ac3adcadd008db3dbd331c3245c8ac24346a3b7936c52675578c3d12d513
-  data.tar.gz: a64851d585e6cd4a83a116d66d29b8b008770e39ca1cedb22874a15db46441bc421ac901a5d6eec7a6fcb558c71c7621896fee912433221891cca7872b00c54d
+  metadata.gz: 31c746c218e6f4f65e9b3cbe88c09b7ca4d0e2efe472193d4571c60b531ad0241d76d55579a00673b08d9d543bf5eacfe6a9800e0baa6326408a344eda6b0e0b
+  data.tar.gz: 12fc3b6db9dc5511dcba1f21b0e77d1f796c734613420cd3c4b5672a0b10a6cec7131138c203d839c05a21235b092077ca842465f4bdca1142f8a22b28445209

data/CHANGELOG.md

@@ -1,10 +1,16 @@
+# 1.5.2 / 2015-10-01
+
+Improvements:
+
+  - Support URI-encorded UserInfo for Chef, SVN, Yum ([GH-130][])
+  - Support docker on Debian/Ubuntu with systemd ([GH-133][])
+
 # 1.5.1 / 2015-07-25
 
 Bug fixes:
 
   - Fix docker configuration ([GH-106][])
 
-
 # 1.5.0 / 2015-01-15
 
 Features:
@@ -214,3 +220,5 @@ Bug fixes:
 [GH-103]: https://github.com/tmatilai/vagrant-proxyconf/issues/103 "Issue 103"
 [GH-105]: https://github.com/tmatilai/vagrant-proxyconf/issues/105 "Issue 105"
 [GH-106]: https://github.com/tmatilai/vagrant-proxyconf/issues/106 "Issue 106"
+[GH-130]: https://github.com/tmatilai/vagrant-proxyconf/issues/106 "Issue 130"
+[GH-133]: https://github.com/tmatilai/vagrant-proxyconf/issues/106 "Issue 133"

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

@@ -0,0 +1,50 @@
+require_relative '../util'
+
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Debian
+        # Capability for docker proxy configuration
+        module DockerProxyConf
+          CONFIG_DIR = '/etc/default/'
+
+          # @return [String, false] the path to docker or `false` if not found
+          def self.docker_proxy_conf(machine)
+            docker_command = find_docker_command(machine)
+            return false if docker_command.nil?
+
+            config_path = CONFIG_DIR + docker_command
+            return config_path unless Util.which(machine, 'systemctl')
+
+            machine.communicate.tap do |comm|
+              src_file = "/lib/systemd/system/#{docker_command}.service"
+              dst_file = "/etc/systemd/system/#{docker_command}.service"
+              tmp_file = "/tmp/#{docker_command}.service"
+              env_file = "EnvironmentFile=-\\/etc\\/default\\/#{docker_command}"
+              if comm.test("grep -q -e '#{env_file}' #{src_file}")
+                comm.sudo("cp -p #{src_file} #{tmp_file}")
+              else
+                comm.sudo("sed -e 's/\\[Service\\]/[Service]\\n#{env_file}/g' #{src_file} > #{tmp_file}")
+              end
+              unless comm.test("diff #{tmp_file} #{dst_file}")
+                # update config and restart docker when config changed
+                comm.sudo("mv -f #{tmp_file} #{dst_file}")
+                comm.sudo('systemctl daemon-reload')
+              end
+              comm.sudo("rm -f #{tmp_file}")
+            end
+            config_path
+          end
+
+          private
+
+          def self.find_docker_command(machine)
+            return 'docker'    if Util.which(machine, 'docker')
+            return 'docker.io' if Util.which(machine, 'docker.io')
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/capability.rb

@@ -18,6 +18,11 @@ module VagrantPlugins
         Cap::CoreOS::DockerProxyConf
       end
 
+      guest_capability 'debian', 'docker_proxy_conf' do
+        require_relative 'cap/debian/docker_proxy_conf'
+        Cap::Debian::DockerProxyConf
+      end
+
       guest_capability 'linux', 'env_proxy_conf' do
         require_relative 'cap/linux/env_proxy_conf'
         Cap::Linux::EnvProxyConf

data/lib/vagrant-proxyconf/userinfo_uri.rb

@@ -11,13 +11,7 @@ module VagrantPlugins
       #   @return [String] the host
       # @!attribute [r] port
       #   @return [String] the port
-      # @!attribute [r] user
-      #   @return [String] the username
-      def_delegators :@uri, :host, :port, :user
-
-      # @!attribute [r] pass
-      #   @return [String] the password
-      def_delegator :@uri, :password, :pass
+      def_delegators :@uri, :host, :port
 
       # @param uri [String] the URI including optional userinfo
       def initialize(uri)
@@ -36,6 +30,18 @@ module VagrantPlugins
         end
       end
 
+      # @return [String] the username
+      def user
+        return URI.decode(@uri.user) if @uri.user
+        @uri.user
+      end
+
+      # @return [String] the password
+      def pass
+        return URI.decode(@uri.password) if @uri.password
+        @uri.password
+      end
+
       alias_method :to_s, :uri
     end
   end

data/lib/vagrant-proxyconf/version.rb

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

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

@@ -45,6 +45,24 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
       end
     end
 
+    context "with specified default configurations in URI encoded" do
+      before :each do
+        config.http  = 'http://bar%23:baz%25@foo:1234'
+        config.https = false
+
+        configure_chef
+      end
+
+      it "configures chef" do
+        expect(chef.http_proxy).to  eq 'http://foo:1234'
+        expect(chef.http_proxy_user).to eq 'bar#'
+        expect(chef.http_proxy_pass).to eq 'baz%'
+        expect(chef.https_proxy).to be_nil
+        expect(chef.https_proxy_user).to be_nil
+        expect(chef.https_proxy_pass).to be_nil
+      end
+    end
+
     context "with specified chef configurations" do
       before :each do
         chef.http_proxy = 'http://proxy:8080/'

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

@@ -8,4 +8,83 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureSvnProxy do
     it      { is_expected.to eq 'svn_proxy' }
   end
 
+  describe '#svn_config' do
+    subject do
+      action = described_class.new(nil, nil)
+      allow(action).to receive(:config) { config }
+      action.send(:svn_config)
+    end
+    let(:config) { OpenStruct.new(http: http) }
+    let(:uri_encoded) { false }
+
+    context "with `false`" do
+      let(:http) { false }
+      it do
+        is_expected.to eq <<-CONFIG
+[global]
+http-proxy-host=
+http-proxy-port=
+http-proxy-username=
+http-proxy-password=
+http-proxy-exceptions=
+        CONFIG
+      end
+    end
+
+    context "without userinfo" do
+      let(:http) { 'http://proxy:1234/' }
+      it do
+        is_expected.to eq <<-CONFIG
+[global]
+http-proxy-host=proxy
+http-proxy-port=1234
+http-proxy-username=
+http-proxy-password=
+http-proxy-exceptions=
+        CONFIG
+      end
+    end
+
+    context "with userinfo" do
+      let(:http) { 'http://foo:bar@myproxy:9876' }
+      it do
+        is_expected.to eq <<-CONFIG
+[global]
+http-proxy-host=myproxy
+http-proxy-port=9876
+http-proxy-username=foo
+http-proxy-password=bar
+http-proxy-exceptions=
+        CONFIG
+      end
+    end
+
+    context "with special characters" do
+      let(:http) { %q{http://x*y:a(b@proxy.com:8080} }
+      it do
+        is_expected.to eq <<-CONFIG
+[global]
+http-proxy-host=proxy.com
+http-proxy-port=8080
+http-proxy-username=x*y
+http-proxy-password=a(b
+http-proxy-exceptions=
+        CONFIG
+      end
+    end
+
+    context "with URI encoded special characters" do
+      let(:http) { %q{http://foo%25:abc%23123@proxy.com:8080} }
+      it do
+        is_expected.to eq <<-CONFIG
+[global]
+http-proxy-host=proxy.com
+http-proxy-port=8080
+http-proxy-username=foo%
+http-proxy-password=abc#123
+http-proxy-exceptions=
+        CONFIG
+      end
+    end
+  end
 end

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

@@ -35,5 +35,10 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureYumProxy do
       let(:http) { %q{http://x*y:a(b@proxy.com:8080} }
       it { is_expected.to eq %q{-v proxy=http://proxy.com:8080 -v user=x\\*y -v pass=a\\(b} }
     end
+
+    context "with URI encoded special characters" do
+      let(:http) { %q{http://foo%25:abc%23123@proxy.com:8080} }
+      it { is_expected.to eq %q{-v proxy=http://proxy.com:8080 -v user=foo\% -v pass=abc\#123} }
+    end
   end
 end

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

@@ -95,4 +95,13 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
     its(:pass) { should be_nil }
   end
 
+  context "with uri_encoded" do
+    let(:uri)          { 'http://foo%25:bar%23123@proxy.example.com:8123/' }
+    its(:to_s)         { should eq 'http://proxy.example.com:8123' }
+    its(:uri)          { should eq 'http://proxy.example.com:8123' }
+    its(:host)         { should eq 'proxy.example.com' }
+    its(:port)         { should eq 8123 }
+    its(:user)         { should eq 'foo%' }
+    its(:pass)         { should eq 'bar#123' }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -45,6 +45,7 @@ files:
 - 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/debian/docker_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
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers