From f6fff32d527c0b61a97b1192b18ba8dcc223668f Mon Sep 17 00:00:00 2001 From: Justin Downing Date: Wed, 26 Aug 2015 17:46:44 -0400 Subject: [PATCH] fix lint errors --- README.md | 4 ++-- manifests/build.pp | 22 +++++++++++----------- manifests/plugin.pp | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index eb2839d..10f5199 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ You can test this module with rspec: ## Vagrant You can also test this module in a Vagrant box. There are two box definitons included in the -Vagrant file for CentOS, Debian, and Ubuntu testing. You will need to use `librarian-puppet` to setup +Vagrant file for CentOS and Ubuntu testing. You will need to use `librarian-puppet` to setup dependencies: bundle install @@ -95,4 +95,4 @@ To test both boxes: To test one distribution: - vagrant up [centos|debian|ubuntu] + vagrant up [centos|ubuntu] diff --git a/manifests/build.pp b/manifests/build.pp index 78e2531..accb6b6 100644 --- a/manifests/build.pp +++ b/manifests/build.pp @@ -112,22 +112,22 @@ $patch ? { undef => '', false => '', default => ' --patch' } ], '') exec { "own-plugins-${title}": - command => "chown -R ${owner}:${group} ${install_dir}/plugins", - user => 'root', - unless => "test -d ${install_dir}/versions/${title}", - require => Class['rbenv'], + command => "chown -R ${owner}:${group} ${install_dir}/plugins", + user => 'root', + unless => "test -d ${install_dir}/versions/${title}", + require => Class['rbenv'], }-> exec { "git-pull-rubybuild-${title}": - command => 'git reset --hard HEAD && git pull', - cwd => "${install_dir}/plugins/ruby-build", - user => 'root', - unless => "test -d ${install_dir}/versions/${title}", - require => Rbenv::Plugin['sstephenson/ruby-build'], + command => 'git reset --hard HEAD && git pull', + cwd => "${install_dir}/plugins/ruby-build", + user => 'root', + unless => "test -d ${install_dir}/versions/${title}", + require => Rbenv::Plugin['sstephenson/ruby-build'], }-> exec { "rbenv-install-${title}": # patch file must be read from stdin only if supplied - command => sprintf("rbenv install ${title}${install_options}%s", $patch ? { undef => '', false => '', default => " < ${patch_file}" }), - creates => "${install_dir}/versions/${title}", + command => sprintf("rbenv install ${title}${install_options}%s", $patch ? { undef => '', false => '', default => " < ${patch_file}" }), + creates => "${install_dir}/versions/${title}", }~> exec { "rbenv-ownit-${title}": command => "chown -R ${owner}:${group} \ diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 403213c..1c6c7bd 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -42,10 +42,10 @@ Exec { environment => $env } exec { "install-${name}": - command => "/usr/bin/git clone https://github.com/${name}.git", - cwd => "${install_dir}/plugins", - onlyif => "/usr/bin/test -d ${install_dir}/plugins", - unless => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}", + command => "/usr/bin/git clone https://github.com/${name}.git", + cwd => "${install_dir}/plugins", + onlyif => "/usr/bin/test -d ${install_dir}/plugins", + unless => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}", }~> exec { "rbenv-permissions-${name}": command => "/bin/chown -R ${rbenv::owner}:${rbenv::group} \ @@ -57,10 +57,10 @@ # run `git pull` on each run if we want to keep the plugin updated if $latest == true { exec { "update-${name}": - command => '/usr/bin/git pull', - cwd => "${install_dir}/plugins/${plugin[1]}", - user => $rbenv::owner, - onlyif => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}", + command => '/usr/bin/git pull', + cwd => "${install_dir}/plugins/${plugin[1]}", + user => $rbenv::owner, + onlyif => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}", } } }