vagrant-proxyconf 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.1 / 2013-12-01
+
+- Ensure that Yum configuration includes the (default) port ([GH-36][])
+
 # 1.0.0 / 2013-11-05
 
 - Add support for configuring Yum directly (not only via global env vars) ([GH-4][])
@@ -91,3 +95,4 @@
 [GH-30]: https://github.com/tmatilai/vagrant-proxyconf/issues/30 "Issue 30"
 [GH-32]: https://github.com/tmatilai/vagrant-proxyconf/issues/32 "Issue 32"
 [GH-35]: https://github.com/tmatilai/vagrant-proxyconf/issues/35 "Issue 35"
+[GH-36]: https://github.com/tmatilai/vagrant-proxyconf/issues/36 "Issue 36"

data/lib/vagrant-proxyconf/userinfo_uri.rb

@@ -30,9 +30,9 @@ module VagrantPlugins
       # @param uri [URI::Generic] the URI with optional userinfo
       # @return [String] the URI without userinfo
       def strip_userinfo(uri)
-        u = uri.dup
-        u.userinfo = ''
-        u.to_s
+        return '' if uri.to_s.empty?
+
+        "#{uri.scheme}://#{uri.host}:#{uri.port}"
       end
     end
   end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

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

@@ -62,7 +62,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
       end
 
       it "configures unset proxies" do
-        expect(chef.https_proxy).to eq 'http://sslproxy:3128/'
+        expect(chef.https_proxy).to eq 'http://sslproxy:3128'
       end
     end
   end

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

@@ -19,7 +19,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureYumProxy do
 
     context "without userinfo" do
       let(:http) { 'http://proxy:1234/' }
-      it { should eq %q{-v proxy=http://proxy:1234/ -v user='' -v pass=''} }
+      it { should eq %q{-v proxy=http://proxy:1234 -v user='' -v pass=''} }
     end
 
     context "with userinfo" do

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

@@ -30,35 +30,51 @@ describe VagrantPlugins::ProxyConf::UserinfoURI do
   end
 
   context "without userinfo" do
-    let(:uri)  { 'http://proxy.example.com:8123/' }
-    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
-    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    let(:uri)  { 'http://proxy.example.com:8123' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123' }
     its(:user) { should be_nil }
     its(:pass) { should be_nil }
   end
 
   context "with username" do
     let(:uri)  { 'http://foo@proxy.example.com:8123/' }
-    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
-    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123' }
     its(:user) { should eq 'foo' }
     its(:pass) { should be_nil }
   end
 
   context "with password" do
-    let(:uri)  { 'http://:bar@proxy.example.com:8123/' }
-    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
-    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    let(:uri)  { 'http://:bar@proxy.example.com:8123' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123' }
     its(:user) { should eq '' }
     its(:pass) { should eq 'bar' }
   end
 
   context "with userinfo" do
     let(:uri)  { 'http://foo:bar@proxy.example.com:8123/' }
-    its(:to_s) { should eq 'http://proxy.example.com:8123/' }
-    its(:uri)  { should eq 'http://proxy.example.com:8123/' }
+    its(:to_s) { should eq 'http://proxy.example.com:8123' }
+    its(:uri)  { should eq 'http://proxy.example.com:8123' }
     its(:user) { should eq 'foo' }
     its(:pass) { should eq 'bar' }
   end
 
+  context "without port" do
+    let(:uri)  { 'http://foo:bar@proxy.example.com' }
+    its(:to_s) { should eq 'http://proxy.example.com:80' }
+    its(:uri)  { should eq 'http://proxy.example.com:80' }
+    its(:user) { should eq 'foo' }
+    its(:pass) { should eq 'bar' }
+  end
+
+  context "with default port" do
+    let(:uri)  { 'http://proxy.example.com:80/' }
+    its(:to_s) { should eq 'http://proxy.example.com:80' }
+    its(:uri)  { should eq 'http://proxy.example.com:80' }
+    its(:user) { should be_nil }
+    its(:pass) { should be_nil }
+  end
+
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -92,26 +93,33 @@ files:
 homepage: http://tmatilai.github.io/vagrant-proxyconf/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1237288161997812265
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1237288161997812265
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers
 test_files:
 - spec/spec_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjMwNWI4YzNjYmJjMTkyMGU4M2VmMjdmM2M4MjA2NTEzZjY2NDk4Zg==
-  data.tar.gz: !binary |-
-    NDFkOTMxOWU2ZTE4NWI0NGE5YjhmMDZhNTE4ZjRmYTVjY2RmNzRhMQ==
-SHA512:
-  metadata.gz: !binary |-
-    NTE4MjQ2NWU1ZjgyMmM5ZDg0ODlhMGI0MDU4ZmEzZWJmOTBlZjA0NTk5ZWM4
-    Mjk1NDZhYmJmMzljMzViNjNkMDFkNWI1ODAxMzE5ZTgzZmYxNzg0ZGY4MDdh
-    ZmQ3MzYzZDQ1MWYyYmUzZTg5ODNiZDY2MDBjY2QyNTZkNGZmNjQ=
-  data.tar.gz: !binary |-
-    Y2RmN2Q2NjQ3YzQ3YjFkNWM1OWZjN2ExOGUyMjg1OGRkMDdkYTgyYmFkZTI5
-    ZTAxYWQ5Zjk0ZDVjMmI2OWUyNDUyZjk2YWUwOWFmY2ExMTE0MTg1MzVkMDA2
-    NTY2NGY3MDBlZTJhNjY1MjQ0YTE1ZWJjMjkyZTI2NDMwMGIxYjM=