Build fixes

.travis.yml

@@ -14,7 +14,5 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false

Gemfile

@@ -19,11 +19,11 @@ group :development, :test do
   gem 'puppet-lint-trailing_comma-check',                 :require => false
   gem 'puppet-lint-file_ensure-check',                    :require => false
   gem 'puppet-lint-version_comparison-check',             :require => false
-  gem 'puppet-lint-fileserver-check',                     :require => false
+  gem 'puppet-lint-fileserver-check',                     :require => false, :git => 'https://github.com/bodgit/puppet-lint-fileserver-check.git', :branch => 'puppet-lint-2.x'
   gem 'puppet-lint-file_source_rights-check',             :require => false
   gem 'puppet-lint-alias-check',                          :require => false
   gem 'librarian-puppet',                                 :require => false
-  gem 'beaker', '>= 2.18.2',                              :require => false
+  gem 'beaker', '>= 2.18.2', '< 3.0.0',                   :require => false
   gem 'beaker-rspec',                                     :require => false
   gem 'rspec-puppet-facts', '>= 1.1.1',                   :require => false
   gem 'coveralls',                                        :require => false

manifests/helper.pp

@@ -5,7 +5,7 @@
 ) {
 
   if ! defined(Class['::oddjob']) {
-    fail('You must include the oddjob base class before using any oddjob defined resources') # lint:ignore:80chars
+    fail('You must include the oddjob base class before using any oddjob defined resources')
   }
 
   validate_string($content)

manifests/mkhomedir.pp

@@ -4,7 +4,7 @@
 ) inherits ::oddjob::params {
 
   if ! defined(Class['::oddjob']) {
-    fail('You must include the oddjob base class before using the oddjob::mkhomedir class') # lint:ignore:80chars
+    fail('You must include the oddjob base class before using the oddjob::mkhomedir class')
   }
 
   validate_string($package_name)

manifests/params.pp

@@ -9,7 +9,7 @@
       $service_name           = 'oddjobd'
     }
     default: {
-      fail("The ${module_name} module is not supported on an ${::osfamily} based system.") # lint:ignore:80chars
+      fail("The ${module_name} module is not supported on an ${::osfamily} based system.")
     }
   }
 }