diff options
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | Gemfile | 6 | ||||
-rw-r--r-- | Gemfile.lock | 14 | ||||
-rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index c8d205f..f349b8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ branches: notifications: email: false language: ruby -script: 'rake spec' +script: 'bundle exec rake spec' after_success: - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng - .forge-releng/publish @@ -1,5 +1,5 @@ -source :rubygems +source 'https://rubygems.org' gem 'rake', '~> 0.8.7' -gem 'rspec', '~> 1.2.9' -gem 'mocha', '~> 0.12.7', :require => false +gem 'rspec', '~> 1.3' +gem 'mocha', '~> 0.12.9', :require => false gem 'puppet', '~> 2.7' diff --git a/Gemfile.lock b/Gemfile.lock index 210a2dd..ce22804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: - facter (1.6.13) + facter (1.7.2) metaclass (0.0.1) - mocha (0.12.7) + mocha (0.12.10) metaclass (~> 0.0.1) - puppet (2.7.19) + puppet (2.7.22) facter (~> 1.5) rake (0.8.7) - rspec (1.2.9) + rspec (1.3.2) PLATFORMS ruby DEPENDENCIES - mocha (~> 0.12.7) + mocha (~> 0.12.9) puppet (~> 2.7) rake (~> 0.8.7) - rspec (~> 1.2.9) + rspec (~> 1.3) diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 6f979cb..76fa315 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -293,7 +293,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) if @resource.value(:identity) Tempfile.open('git-helper') do |f| f.puts '#!/bin/sh' - f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -i #{@resource.value(:identity)} $*" + f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*" f.close FileUtils.chmod(0755, f.path) |