.travis.yml

@@ -6,9 +6,9 @@ branches:
 language: ruby
 bundler_args: --without development
 script:
-  - "rake lint"
-  - "rake syntax"
-  - "rake spec SPEC_OPTS='--format documentation'"
+  - "bundle exec rake lint"
+  - "bundle exec rake syntax"
+  - "bundle exec rake spec SPEC_OPTS='--format documentation'"
 after_success:
   - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
   - .forge-releng/publish

CHANGELOG

@@ -1,3 +1,5 @@
+2.7.2 - Federico Voges & Ben ford
+ * Fix #155 gem install issues with arguments
 2.7.1 - Alex Scoble & esalberg & annaken
  * Fix webhook directory permissions #144
  * Fix gem dep regression #154

Gemfile

@@ -23,7 +23,7 @@ end
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
-  gem 'puppet', :require => false
+  gem 'puppet', '3.7.0', :require => false
 end
 
 # vim:ft=ruby

manifests/install.pp

@@ -49,13 +49,26 @@
       elsif $provider == 'pe_gem' {
         include r10k::install::pe_gem
       }
+
+
+      # Currently we share a package resource to keep things simple
+      # Puppet seems to have a bug (see #87 ) related to passing an
+      # empty to value to the gem,pe_gem providers. This code
+      # converts an empty array to semi-standard gem options
+      # This was previously undef but that caused strict var issues
+      if $provider in ['pe_gem','gem' ] and $install_options == [] {
+        $provider_install_options = ['--no-ri', '--no-rdoc']
+      } else {
+        $provider_install_options = $install_options
+      }
+
       # Puppet Enterprise 3.8 and ships an embedded r10k so thats all thats supported
       # This conditional should not effect FOSS customers based on the fact
       unless versioncmp($::pe_version, '3.8.0') >= 0 {
         package { $real_package_name:
           ensure          => $version,
           provider        => $provider,
-          install_options => $install_options,
+          install_options => $provider_install_options
         }
       }
     }

metadata.json

@@ -8,7 +8,7 @@
   "source": "https://github.com/acidprime/r10k",
   "summary": "Module for setting up dynamic environments using r10k",
   "tags": ["git", "pe", "environment", "mcollective"],
-  "version": "2.7.1",
+  "version": "2.7.2",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

spec/classes/install_spec.rb

@@ -257,4 +257,107 @@
       )
     }
   end
+  context "Puppet Enterprise 3.7.x on a RedHat 5 installing via pe_gem with empty install_options" do
+    let :params do
+      {
+        :manage_ruby_dependency => 'BOGON',
+        :package_name           => 'r10k',
+        :provider               => 'pe_gem',
+        :version                => '1.5.0',
+        :keywords               => '',
+        :install_options        => [],
+      }
+    end
+    let :facts do
+      {
+        :manage_ruby_dependency => 'BOGON',
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '5',
+        :operatingsystem        => 'Centos',
+        :is_pe                  => '',
+        :pe_version             => '3.7.0'
+      }
+    end
+    it { should contain_package("r10k").with(
+        :ensure     => '1.5.0',
+        :provider   => 'pe_gem',
+        :install_options => ['--no-ri', '--no-rdoc']
+      )
+    }
+  end
+  context "On a RedHat 5 installing via gem with empty install_options" do
+    let :params do
+      {
+        :manage_ruby_dependency => 'include',
+        :package_name           => 'r10k',
+        :provider               => 'gem',
+        :version                => '1.5.0',
+        :keywords               => '',
+        :install_options        => [],
+      }
+    end
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '5',
+        :operatingsystem        => 'Centos',
+      }
+    end
+    it { should contain_package("r10k").with(
+        :ensure     => '1.5.0',
+        :provider   => 'gem',
+        :install_options => ['--no-ri', '--no-rdoc']
+      )
+    }
+  end
+  context "On a RedHat 5 installing via gem with populated install_options" do
+    let :params do
+      {
+        :manage_ruby_dependency => 'include',
+        :package_name           => 'r10k',
+        :provider               => 'gem',
+        :version                => '1.5.0',
+        :keywords               => '',
+        :install_options        => ['BOGON'],
+      }
+    end
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '5',
+        :operatingsystem        => 'Centos',
+      }
+    end
+    it { should contain_package("r10k").with(
+        :ensure     => '1.5.0',
+        :provider   => 'gem',
+        :install_options => ['BOGON']
+      )
+    }
+  end
+  context "On a RedHat 5 installing via yum with populated install_options" do
+    let :params do
+      {
+        :manage_ruby_dependency => 'include',
+        :package_name           => 'r10k',
+        :provider               => 'yum',
+        :version                => '1.5.0',
+        :keywords               => '',
+        :install_options        => ['BOGON'],
+      }
+    end
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '5',
+        :operatingsystem        => 'Centos',
+      }
+    end
+    it { should contain_package("r10k").with(
+        :ensure     => '1.5.0',
+        :provider   => 'yum',
+        :install_options => ['BOGON']
+      )
+    }
+  end
 end