diff options
| -rw-r--r-- | .sync.yml | 5 | ||||
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | Gemfile | 11 | ||||
| -rw-r--r-- | examples/p4/create_client.pp | 4 | ||||
| -rw-r--r-- | examples/p4/delete_client.pp | 4 | ||||
| -rw-r--r-- | examples/p4/latest_client.pp | 6 | ||||
| -rw-r--r-- | examples/p4/sync_client.pp | 8 | ||||
| -rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 2 |
8 files changed, 30 insertions, 23 deletions
@@ -1,6 +1,11 @@ --- .travis.yml: script: "\"bundle exec rake spec SPEC_OPTS='--format documentation'\"" + extras: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" Rakefile: unmanaged: true spec/spec_helper.rb: diff --git a/.travis.yml b/.travis.yml index 8cfaf23..291ceb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ --- +sudo: false language: ruby bundler_args: --without system_tests script: "bundle exec rake spec SPEC_OPTS='--format documentation'" @@ -6,12 +7,16 @@ matrix: fast_finish: true include: - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 + - rvm: 2.1.5 env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 2.1.5 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" notifications: email: false @@ -11,23 +11,18 @@ def location_for(place, fake_version = nil) end group :development, :unit_tests do - gem 'rake', :require => false gem 'rspec-core', '3.1.7', :require => false - gem 'rspec-puppet', '~> 1.0', :require => false gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', :require => false gem 'simplecov', :require => false gem 'puppet_facts', :require => false gem 'json', :require => false end -beaker_version = ENV['BEAKER_VERSION'] -beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] group :system_tests do - if beaker_version + if beaker_version = ENV['BEAKER_VERSION'] gem 'beaker', *location_for(beaker_version) end - if beaker_rspec_version + if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] gem 'beaker-rspec', *location_for(beaker_rspec_version) else gem 'beaker-rspec', :require => false @@ -35,6 +30,8 @@ group :system_tests do gem 'serverspec', :require => false end + + if facterversion = ENV['FACTER_GEM_VERSION'] gem 'facter', facterversion, :require => false else diff --git a/examples/p4/create_client.pp b/examples/p4/create_client.pp index 0f8233a..3cf9160 100644 --- a/examples/p4/create_client.pp +++ b/examples/p4/create_client.pp @@ -1,4 +1,4 @@ vcsrepo { '/tmp/vcstest/p4_client_root': - ensure => present, - provider => 'p4', + ensure => present, + provider => 'p4', } diff --git a/examples/p4/delete_client.pp b/examples/p4/delete_client.pp index 1e305f1..82c9c95 100644 --- a/examples/p4/delete_client.pp +++ b/examples/p4/delete_client.pp @@ -1,4 +1,4 @@ vcsrepo { '/tmp/vcstest/p4_client_root': - ensure => absent, - provider => 'p4', + ensure => absent, + provider => 'p4', } diff --git a/examples/p4/latest_client.pp b/examples/p4/latest_client.pp index a7caeb6..106ef9e 100644 --- a/examples/p4/latest_client.pp +++ b/examples/p4/latest_client.pp @@ -1,5 +1,5 @@ vcsrepo { '/tmp/vcstest/p4_client_root': - ensure => latest, - provider => 'p4', - source => '//depot/...', + ensure => latest, + provider => 'p4', + source => '//depot/...', } diff --git a/examples/p4/sync_client.pp b/examples/p4/sync_client.pp index fc0e29c..33e4731 100644 --- a/examples/p4/sync_client.pp +++ b/examples/p4/sync_client.pp @@ -1,6 +1,6 @@ vcsrepo { '/tmp/vcstest/p4_client_root': - ensure => present, - provider => 'p4', - source => '//depot/...', - revision => '30', + ensure => present, + provider => 'p4', + source => '//depot/...', + revision => '30', } diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 8101253..44e4d04 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -418,7 +418,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) # @!visibility private def git_with_identity(*args) if @resource.value(:identity) - Tempfile.open('git-helper') do |f| + Tempfile.open('git-helper', Puppet[:statedir]) do |f| f.puts '#!/bin/sh' f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*" f.close |