Merge pull request #4 from tPl0ch/exec_user

Allow setting exec user for project and exec

.gitignore

@@ -2,3 +2,4 @@ spec/fixtures/modules/*
 .bundle/
 vendor/
 Gemfile.lock
+pkg/

manifests/exec.pp

@@ -25,13 +25,15 @@
   $logoutput         = false,
   $verbose           = false,
   $refreshonly       = false,
+  $user              = undef,
 ) {
   require composer
   require git
 
   Exec {
     path        => "/bin:/usr/bin/:/sbin:/usr/sbin:${composer::target_dir}",
     environment => "COMPOSER_HOME=${composer::composer_home}",
+    user        => $user,
   }
 
   if $cmd != 'install' and $cmd != 'update' {

manifests/project.pp

@@ -25,6 +25,9 @@
 # [*php_package*]
 #   The Package name of the PHP CLI package.
 #
+# [*user*]
+#   The user name to exec the composer commands as. Default is undefined.
+#
 # === Authors
 #
 # Thomas Ploch <[email protected]>
@@ -43,14 +46,16 @@
   $repository_url = undef,
   $keep_vcs       = false,
   $tries          = 3,
-  $timeout        = 1200
+  $timeout        = 1200,
+  $user           = undef,
 ) {
   require git
   require composer
 
   Exec {
     path        => "/bin:/usr/bin/:/sbin:/usr/sbin:${composer::target_dir}",
     environment => "COMPOSER_HOME=${composer::composer_home}",
+    user        => $user,
   }
 
   $exec_name    = "composer_create_project_${title}"

spec/defines/composer_exec_spec.rb

@@ -13,14 +13,16 @@
 
         let(:title) { 'myproject' }
         let(:params) { {
-          :cmd => 'install',
-          :cwd => '/my/awesome/project',
+          :cmd  => 'install',
+          :cwd  => '/my/awesome/project',
+          :user => 'linus',
         } }
 
         it {
           should contain_exec('composer_update_myproject').with({
             :command       => %r{php /usr/local/bin/composer install --no-plugins --no-scripts --no-interaction},
             :cwd       => '/my/awesome/project',
+            :user      => 'linus',
             :logoutput => false,
           })
         }
@@ -39,7 +41,7 @@
         } }
 
         it {
-          should contain_exec('composer_update_yourpr0ject').with({
+          should contain_exec('composer_update_yourpr0ject').without_user.with({
             :command   => %r{php /usr/local/bin/composer update --no-plugins --no-scripts --no-interaction             package1             packageinf},
             :cwd       => '/just/in/time',
             :logoutput => true,

spec/defines/composer_project_spec.rb

@@ -18,7 +18,7 @@
         it { should include_class('composer') }
 
         it {
-          should contain_exec('composer_create_project_myproject').with({
+          should contain_exec('composer_create_project_myproject').without_user.with({
             :command => "php /usr/local/bin/composer --stability=dev create-project projectzzz /my/subpar/project",
             :tries   => 3,
             :timeout => 1200,
@@ -39,7 +39,8 @@
           :repository_url => '[email protected]:trollface/whoadawg.git',
           :keep_vcs       => true,
           :tries          => 2,
-          :timeout        => 600
+          :timeout        => 600,
+          :user           => 'mrploch',
         } }
 
         it { should include_class('git') }
@@ -51,6 +52,7 @@
             :tries   => 2,
             :timeout => 600,
             :creates => '/my/mediocre/project',
+            :user    => 'mrploch',
           })
         }
       end