Permalink
Browse files

Add travis testing support.

Conflicts:
	.fixtures.yml
	.gitignore
	Gemfile
	spec/spec_helper.rb
  • Loading branch information...
1 parent 77373ed commit 1699a9ecaaacea0c043b7700a0b66a986466dfda @nanliu nanliu committed Oct 18, 2013
Showing with 15 additions and 42 deletions.
  1. +1 −3 .fixtures.yml
  2. +2 −20 .gitignore
  3. +12 −0 .travis.yml
  4. +0 −2 Gemfile
  5. +0 −17 spec/spec_helper.rb
View
@@ -1,7 +1,5 @@
fixtures:
repositories:
- vmware_lib:
- repo: 'git@github.com:nanliu/vmware-vmware_lib.git'
- branch: 'upgrade'
+ vmware_lib: 'git://github.com/vmware/vmware-vmware_lib.git'
symlinks:
'vcsa': "#{source_dir}"
View
@@ -1,23 +1,5 @@
-lib/puppet/type/esx_debug.rb
-lib/puppet/provider/esx_debug/default.rb
tests/data.pp
-*.gem
-*.rbc
.bundle
-.config
-.bak
+.pkg
+.vagrant
Gemfile.lock
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
View
@@ -0,0 +1,12 @@
+language: ruby
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+rvm:
+ - 1.9.3
+env:
+ - PUPPET_GEM_VERSION="~> 3.2.0"
+matrix:
+ include:
+ - rvm: 1.8.7
+ env: PUPPET_GEM_VERSION="~> 2.7.0"
+notifications:
+ email: false
View
@@ -1,8 +1,6 @@
source 'https://rubygems.org'
-gem 'hashdiff'
gem 'net-ssh'
-gem 'rbvmomi'
group :development, :test do
gem 'rake'
View
@@ -1,20 +1,3 @@
require 'puppetlabs_spec_helper/module_spec_helper'
Puppet[:modulepath] = './spec/fixtures/modules'
-
-begin
- require 'puppet_x/puppetlabs/transport'
-rescue LoadError => detail
- require 'pathname' # WORK_AROUND #14073 and #7788
- vmware_module = Puppet::Module.find('vmware_lib', Puppet[:environment].to_s)
- require File.join vmware_module.path, 'lib/puppet_x/puppetlabs/transport'
-end
-
-begin
- require 'puppet_x/puppetlabs/transport/ssh'
-rescue LoadError => detail
- require 'pathname' # WORK_AROUND #14073 and #7788
- module_lib = Pathname.new(__FILE__).parent.parent.parent
- require File.join module_lib, 'puppet_x/puppetlabs/transport/ssh'
-end
-

0 comments on commit 1699a9e

Please sign in to comment.