Merge pull request #624 from seffenberg-naspers/fix_apt_key_with_userinfo

apt_key now really works with userinfo for http(s)

diff --cc spec/acceptance/apt_key_provider_spec.rb
Simple merge

diff --cc spec/unit/puppet/type/apt_key_spec.rb
index 7cd80c689f5e7b63b9ede57bca22f890f7393f80,b17c8aed0ddb8056e704eacd557780f7eb671a95..9c2dd91a4f5faf72fc84f31e108ff0c73dbf8542
--- 1/spec/unit/puppet/type/apt_key_spec.rb
--- 2/spec/unit/puppet/type/apt_key_spec.rb
+++ b/spec/unit/puppet/type/apt_key_spec.rb
@@@ -136,9 -136,16 +136,16 @@@ describe Puppet::Type::type(:apt_key) d
        )}.to_not raise_error
      end
  
+     it 'allows the http URI with username and password' do
+       expect { Puppet::Type.type(:apt_key).new(
+           :id      => '4BD6EC30',
+           :source  => 'http://testme:Password2@pgp.mit.edu'
+       )}.to_not raise_error
+     end
+ 
      it 'allows the https URI scheme in source' do
        expect { Puppet::Type.type(:apt_key).new(
 -        :id      => '4BD6EC30',
 +        :id      => 'EF8D349F',
          :source  => 'https://pgp.mit.edu'
        )}.to_not raise_error
      end