From 9fbf0108406b5d8b30c17fc7befba60d82113e54 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 31 Jan 2014 01:17:09 -0800 Subject: [PATCH 01/16] Using rbenv instead of managing system ruby Conflicts: Modulefile manifests/install.pp --- Modulefile | 2 ++ manifests/install.pp | 3 ++- manifests/params.pp | 2 +- manifests/setup.pp | 29 ++++++++++++++++++++--------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Modulefile b/Modulefile index a37da41..d06e023 100644 --- a/Modulefile +++ b/Modulefile @@ -6,6 +6,8 @@ license 'GPLv3' summary 'Puppet GitLab Module' description 'Module to install GitLab using puppet' project_page 'https://github.com/sbadia/puppet-gitlab/' + +dependency 'alup/rbenv', '>= 1.2.0' dependency 'puppetlabs/stdlib', '>= 3.1.0' dependency 'puppetlabs/vcsrepo', '>= 0.2.0' #dependency 'sbadia/gitlab_requirements', '>= 0.2.0' diff --git a/manifests/install.pp b/manifests/install.pp index 8592286..04dd04c 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -3,6 +3,7 @@ # class gitlab::install inherits gitlab { + # note that this is *without* $gitlab_without_gems = $gitlab_dbtype ? { 'mysql' => 'postgres', 'pgsql' => 'mysql', @@ -58,7 +59,7 @@ file { "${git_home}/gitlab/config/initializers/rack_attack.rb": ensure => file, - source => "${git_home}/gitlab/config/initializers/rack_attack.rb.example" + source => "${git_home}/gitlab/config/initializers/rack_attack.rb.example", } exec { 'install gitlab': diff --git a/manifests/params.pp b/manifests/params.pp index 0902b5d..8776726 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -33,7 +33,7 @@ $gitlab_username_change = true $gitlab_unicorn_port = '8080' $gitlab_unicorn_worker = '2' - $exec_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' + $exec_path = "${git_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" $ldap_enabled = false $ldap_host = 'ldap.domain.com' $ldap_base = 'dc=domain,dc=com' diff --git a/manifests/setup.pp b/manifests/setup.pp index 9c5bb23..833bda5 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -74,18 +74,29 @@ } } # Case $::osfamily - # system packages - package { 'bundler': - ensure => installed, - provider => gem, - } - # dev. dependencies ensure_packages($system_packages) - package { 'charlock_holmes': - ensure => '0.6.9.4', - provider => gem, + rbenv::install { $git_user: + group => $git_user, + home => $git_home, + rc => '.bashrc', # read by non-interactive shells (e.g. ssh) + } + + rbenv::compile { 'gitlab/1.9.3-p484': + user => $git_user, + home => $git_home, + ruby => '1.9.3-p484', + global => true, + before => [ Exec['install gitlab-shell'], + Exec['install gitlab'] ], + } + + rbenv::gem { 'charlock_holmes': + user => $git_user, + home => $git_home, + ruby => '1.9.3-p484', + ensure => '0.6.9.4', } # other packages From 68cb233bcdc6f1e18b3af7d00a61b59e966d559f Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 3 Feb 2014 09:30:47 -0800 Subject: [PATCH 02/16] Updating to Ruby 2.0.0-p247 --- manifests/setup.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index 833bda5..f6b8daf 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -83,10 +83,10 @@ rc => '.bashrc', # read by non-interactive shells (e.g. ssh) } - rbenv::compile { 'gitlab/1.9.3-p484': + rbenv::compile { 'gitlab/2.0.0-p247': user => $git_user, home => $git_home, - ruby => '1.9.3-p484', + ruby => '2.0.0-p247', global => true, before => [ Exec['install gitlab-shell'], Exec['install gitlab'] ], @@ -95,7 +95,7 @@ rbenv::gem { 'charlock_holmes': user => $git_user, home => $git_home, - ruby => '1.9.3-p484', + ruby => '2.0.0-p247', ensure => '0.6.9.4', } From 1833dd4f4f70c28000ade558db6313a72298d7c0 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 3 Feb 2014 09:35:23 -0800 Subject: [PATCH 03/16] Notifying exec resources --- manifests/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index f6b8daf..dacacf8 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -88,7 +88,7 @@ home => $git_home, ruby => '2.0.0-p247', global => true, - before => [ Exec['install gitlab-shell'], + notify => [ Exec['install gitlab-shell'], Exec['install gitlab'] ], } From 0129a5d427195155dbf9e5bd9c3a2c3930290ca3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 3 Feb 2014 14:55:30 -0800 Subject: [PATCH 04/16] Totally glazed over ruby p353 --- manifests/setup.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index dacacf8..1b219bb 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -83,10 +83,10 @@ rc => '.bashrc', # read by non-interactive shells (e.g. ssh) } - rbenv::compile { 'gitlab/2.0.0-p247': + rbenv::compile { 'gitlab/2.0.0-p353': user => $git_user, home => $git_home, - ruby => '2.0.0-p247', + ruby => '2.0.0-p353', global => true, notify => [ Exec['install gitlab-shell'], Exec['install gitlab'] ], @@ -95,7 +95,7 @@ rbenv::gem { 'charlock_holmes': user => $git_user, home => $git_home, - ruby => '2.0.0-p247', + ruby => '2.0.0-p353', ensure => '0.6.9.4', } From ddacc3e79ad161ee8a69477440ffb050ab6a619b Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 24 Apr 2014 14:14:39 -0700 Subject: [PATCH 05/16] Parameterizing ruby version --- manifests/init.pp | 1 + manifests/params.pp | 1 + manifests/setup.pp | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index f71dcd3..a508575 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -266,6 +266,7 @@ $gitlab_unicorn_port = $gitlab::params::gitlab_unicorn_port, $gitlab_unicorn_worker = $gitlab::params::gitlab_unicorn_worker, $gitlab_bundler_flags = $gitlab::params::gitlab_bundler_flags, + $gitlab_ruby_version = $gitlab::params::gitlab_ruby_version, $exec_path = $gitlab::params::exec_path, $ldap_enabled = $gitlab::params::ldap_enabled, $ldap_host = $gitlab::params::ldap_host, diff --git a/manifests/params.pp b/manifests/params.pp index 02b1178..7467e7c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -39,6 +39,7 @@ $gitlab_unicorn_port = '8080' $gitlab_unicorn_worker = '2' $gitlab_bundler_flags = '--deployment' + $gitlab_ruby_version = '2.1.1' $exec_path = "${git_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" $ldap_enabled = false $ldap_host = 'ldap.domain.com' diff --git a/manifests/setup.pp b/manifests/setup.pp index 1b219bb..51f1480 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -83,10 +83,10 @@ rc => '.bashrc', # read by non-interactive shells (e.g. ssh) } - rbenv::compile { 'gitlab/2.0.0-p353': + rbenv::compile { 'gitlab/ruby': user => $git_user, home => $git_home, - ruby => '2.0.0-p353', + ruby => $gitlab_ruby_version, global => true, notify => [ Exec['install gitlab-shell'], Exec['install gitlab'] ], @@ -95,10 +95,10 @@ rbenv::gem { 'charlock_holmes': user => $git_user, home => $git_home, - ruby => '2.0.0-p353', + ruby => $gitlab_ruby_version, ensure => '0.6.9.4', } # other packages - ensure_packages([$git_package_name,'postfix','curl']) + ensure_packages([$git_package_name, 'postfix', 'curl']) } From 2a766403e6388e23a07a946949273ecf78bdf10b Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 24 Apr 2014 15:47:49 -0700 Subject: [PATCH 06/16] Documenting gitlab_ruby_version in init.pp --- manifests/init.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a508575..9e0f5dd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -146,11 +146,15 @@ # # [*gitlab_unicorn_port*] # Port that unicorn listens on 172.0.0.1 for HTTP traffic -# (default: 8080) +# default: 8080 # # [*gitlab_bundler_flags*] # Flags that should be passed to bundler when installing gems -# (default: --deployment) +# default: --deployment +# +# [*gitlab_ruby_version*] +# Ruby version to install with rbenv for Gitlab user +# default: 2.1.1 # # [*ldap_enabled*] # Enable LDAP backend for gitlab web (see bellow) From 9363f880862b2d5620057c3003920f4aa7148c32 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 31 May 2014 13:57:48 -0700 Subject: [PATCH 07/16] Syntax fix WARNING: ensure found on line but it's not the first attribute --- manifests/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index d36d2f6..1143b5f 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -93,10 +93,10 @@ } rbenv::gem { 'charlock_holmes': + ensure => '0.6.9.4', user => $git_user, home => $git_home, ruby => $gitlab_ruby_version, - ensure => '0.6.9.4', } # other packages From ab7b77430e97c5f5b9f2367432c95dc5006e993b Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 31 May 2014 15:23:42 -0700 Subject: [PATCH 08/16] Adding rbenv to fixtures --- .fixtures.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.fixtures.yml b/.fixtures.yml index 1d7763e..ba4607f 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,5 +2,6 @@ fixtures: symlinks: "gitlab": "#{source_dir}" repositories: + "rbenv": "git://github.com/alup/puppet-rbenv.git" "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" "vcsrepo": "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" From eff4aea70a370865e5e7402a61e7728dd850f958 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 31 May 2014 15:40:08 -0700 Subject: [PATCH 09/16] Setting latest fixture git refs --- .fixtures.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index ba4607f..24e87fc 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,7 +1,13 @@ fixtures: symlinks: - "gitlab": "#{source_dir}" + gitlab: "#{source_dir}" repositories: - "rbenv": "git://github.com/alup/puppet-rbenv.git" - "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" - "vcsrepo": "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" + rbenv: + repo: "git://github.com/alup/puppet-rbenv.git" + ref: "6628a24" + stdlib: + repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git" + ref: "4.2.1" + vcsrepo: + repo: "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" + ref: "0.2.0" From 9d9a91f53b4c67b7a474cf2170cfc7db62236423 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Sat, 5 Jul 2014 01:47:46 +0200 Subject: [PATCH 10/16] spec: Fix unit tests according andschwa rbenv feature --- spec/classes/gitlab_install_spec.rb | 8 ++++---- spec/classes/gitlab_setup_spec.rb | 9 ++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/spec/classes/gitlab_install_spec.rb b/spec/classes/gitlab_install_spec.rb index 830075a..072c692 100644 --- a/spec/classes/gitlab_install_spec.rb +++ b/spec/classes/gitlab_install_spec.rb @@ -81,7 +81,7 @@ it { should contain_file('/home/git/gitlab-shell/config.yml').with_content(/^\s*port: 6379$/)} it { should contain_exec('install gitlab-shell').with( :user => 'git', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', + :path => '/home/git/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :command => 'ruby /home/git/gitlab-shell/bin/install', :cwd => '/home/git', :creates => '/home/git/repositories', @@ -159,7 +159,7 @@ describe 'install gitlab' do it { should contain_exec('install gitlab').with( :user => 'git', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', + :path => '/home/git/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :command => "bundle install --without development aws test postgres --deployment", :unless => 'bundle check', :cwd => '/home/git/gitlab', @@ -180,7 +180,7 @@ let(:params) {{ :gitlab_dbtype => 'pgsql' }} it { should contain_exec('install gitlab').with( :user => 'git', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', + :path => '/home/git/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :command => "bundle install --without development aws test mysql --deployment", :unless => 'bundle check', :cwd => '/home/git/gitlab', @@ -195,7 +195,7 @@ describe 'setup gitlab database' do it { should contain_exec('setup gitlab database').with( :user => 'git', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', + :path => '/home/git/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :command => '/usr/bin/yes yes | bundle exec rake gitlab:setup RAILS_ENV=production', :cwd => '/home/git/gitlab', :creates => '/home/git/.gitlab_setup_done', diff --git a/spec/classes/gitlab_setup_spec.rb b/spec/classes/gitlab_setup_spec.rb index 76377b4..038cc8a 100644 --- a/spec/classes/gitlab_setup_spec.rb +++ b/spec/classes/gitlab_setup_spec.rb @@ -118,13 +118,8 @@ end #### Gems (all dist.) describe 'commons gems' do - it { should contain_package('bundler').with( - :ensure => 'installed', - :provider => 'gem' - )} - it { should contain_package('charlock_holmes').with( - :ensure => '0.6.9.4', - :provider => 'gem' + it { should contain_rbenv__gem('charlock_holmes').with( + :ensure => '0.6.9.4' )} end #### Commons packages (all dist.) From bb5f36c2449f1bdf946d818e7f7ab4ebb1f3cfd5 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 5 Jul 2014 15:18:39 -0700 Subject: [PATCH 11/16] Bumping Ruby version to 2.1.2 --- manifests/init.pp | 2 +- manifests/params.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bb639b1..2af460c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -168,7 +168,7 @@ # # [*gitlab_ruby_version*] # Ruby version to install with rbenv for Gitlab user -# default: 2.1.1 +# default: 2.1.2 # # [*gitlab_ensure_postfix*] # Whether or not this module should ensure the postfix package is diff --git a/manifests/params.pp b/manifests/params.pp index 9df2dcb..97dcb10 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -42,7 +42,7 @@ $gitlab_unicorn_worker = '2' $gitlab_bundler_flags = '--deployment' $gitlab_bundler_jobs = 1 - $gitlab_ruby_version = '2.1.1' + $gitlab_ruby_version = '2.1.2' $gitlab_ensure_postfix = true $exec_path = "${git_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" $ldap_enabled = false From ffd333d72624638f6137ebae80dbc10a36063077 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 5 Jul 2014 18:17:52 -0700 Subject: [PATCH 12/16] Fix for rbenv loading in .profile and .bashrc --- manifests/setup.pp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index 57efd0a..6752be8 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -83,7 +83,18 @@ rbenv::install { $git_user: group => $git_user, home => $git_home, - rc => '.bashrc', # read by non-interactive shells (e.g. ssh) + + } + + # By default, puppet-rbenv sets ~/.profile to load rbenv, which is + # read when bash is invoked as an interactive login shell, but we + # also need ~/.bashrc to load rbenv (which is read by interactive + # but non-login shells). This works, but may not be the best + # solution, please see issue #114 if you have a better solution. + file { "${git_home}/.bashrc": + ensure => link, + target => "${git_home}/.profile", + require => Rbenv::Install[$git_user], } rbenv::compile { 'gitlab/ruby': From e72c937ca25c27f2bc6354468016e8a9b2c45f4c Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 5 Jul 2014 19:00:08 -0700 Subject: [PATCH 13/16] Adding some rbenv unit test coverage --- spec/classes/gitlab_setup_spec.rb | 57 +++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/spec/classes/gitlab_setup_spec.rb b/spec/classes/gitlab_setup_spec.rb index 038cc8a..69e4949 100644 --- a/spec/classes/gitlab_setup_spec.rb +++ b/spec/classes/gitlab_setup_spec.rb @@ -13,11 +13,12 @@ # a non-default common parameter set let :params_set do { - :git_user => 'gitlab', - :git_home => '/srv/gitlab', - :git_comment => 'Labfooboozoo', - :git_email => 'gitlab@fooboozoo.fr', - :git_proxy => 'http://proxy.fooboozoo.fr:3128' + :git_user => 'gitlab', + :git_home => '/srv/gitlab', + :git_comment => 'Labfooboozoo', + :git_email => 'gitlab@fooboozoo.fr', + :git_proxy => 'http://proxy.fooboozoo.fr:3128', + :gitlab_ruby_version => '2.0.0' } end @@ -41,7 +42,7 @@ it { should contain_file('/home/git').with(:ensure => 'directory', :mode => '0755')} it { should contain_file('/home/git/gitlab-satellites').with(:ensure => 'directory', :mode => '0750')} end - context 'with specifics params' do + context 'with specific params' do let(:params) { params_set } it { should contain_user(params_set[:git_user]).with( :ensure => 'present', @@ -59,8 +60,50 @@ end end + ### Ruby + describe 'rbenv' do + context 'with default params' do + it { should contain_rbenv__install('git').with( + :group => 'git', + :home => '/home/git' + )} + it { should contain_file('/home/git/.bashrc').with( + :ensure => 'link', + :target => '/home/git/.profile', + :require => 'Rbenv::Install[git]' + )} + it { should contain_rbenv__compile('gitlab/ruby').with( + :user => 'git', + :home => '/home/git', + :ruby => '2.1.2', + :global => true, + :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'], + )} + + end + context 'with specific params' do + let(:params) { params_set } + it { should contain_rbenv__install(params_set[:git_user]).with( + :group => params_set[:git_user], + :home => params_set[:git_home], + )} + it { should contain_file('/srv/gitlab/.bashrc').with( + :ensure => 'link', + :target => '/srv/gitlab/.profile', + :require => 'Rbenv::Install[gitlab]', + )} + it { should contain_rbenv__compile('gitlab/ruby').with( + :user => params_set[:git_user], + :home => params_set[:git_home], + :ruby => '2.0.0', + :global => true, + :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'], + )} + end + end + ### Sshkey - describe 'sshkey (hostfile)' do + describe 'sshkey (hostfile)' do it { should contain_sshkey('localhost').with( :ensure => 'present', :host_aliases => 'gitlab.fooboozoo.fr', From daad63a18a2392d739f79bb19c11cccb8b61b9b9 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 5 Jul 2014 19:07:14 -0700 Subject: [PATCH 14/16] Adding Ruby 2.1.2 to TravisCI We could also add 2.1.1, 2.1.0, etc. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3ea2c5d..fd535b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rvm: - 1.8.7 - 1.9.3 - 2.0.0 + - 2.1.2 env: matrix: - PUPPET_GEM_VERSION="~> 2.7.0" From 7a5806799c63e854bbe1947410d3b7be04fc4de3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 5 Jul 2014 19:07:36 -0700 Subject: [PATCH 15/16] Heh, removing trailing comma in tests for old Rubies --- spec/classes/gitlab_setup_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/classes/gitlab_setup_spec.rb b/spec/classes/gitlab_setup_spec.rb index 69e4949..b68ac75 100644 --- a/spec/classes/gitlab_setup_spec.rb +++ b/spec/classes/gitlab_setup_spec.rb @@ -77,7 +77,7 @@ :home => '/home/git', :ruby => '2.1.2', :global => true, - :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'], + :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'] )} end @@ -85,19 +85,19 @@ let(:params) { params_set } it { should contain_rbenv__install(params_set[:git_user]).with( :group => params_set[:git_user], - :home => params_set[:git_home], + :home => params_set[:git_home] )} it { should contain_file('/srv/gitlab/.bashrc').with( :ensure => 'link', :target => '/srv/gitlab/.profile', - :require => 'Rbenv::Install[gitlab]', + :require => 'Rbenv::Install[gitlab]' )} it { should contain_rbenv__compile('gitlab/ruby').with( :user => params_set[:git_user], :home => params_set[:git_home], :ruby => '2.0.0', :global => true, - :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'], + :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'] )} end end From e3c7b21b585b9fcf747482134a9226b7dac75516 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 5 Jul 2014 19:16:33 -0700 Subject: [PATCH 16/16] Excluding Puppet 2.7, 3.0 from Ruby 2.1.2 in the matrix These fail for reasons beyond our control (as far as I can tell) --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index fd535b6..2803a50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,10 @@ matrix: env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.1.2 + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.1.2 + env: PUPPET_GEM_VERSION="~> 3.3.0" + notifications: email: false