Feature 20

.travis.yml

@@ -38,4 +38,5 @@ notifications:
 branches:
   only:
     - master
+    - feature-20
     - /^release.*$/

CHANGELOG.md

@@ -1,3 +1,8 @@
+v2.0.0
+======
+Supports clear-cache, install, update, run-scripts and dump-autoload.
+Require and global require are now supported.
+
 v1.2.1
 ======
 f44b7e5 Now also supports Amazon Linux (RedHat)

README.md

@@ -136,7 +136,7 @@ composer::exec { 'silex-update':
     lock                     => false, # Only updates the lock file hash to suppress warning about the lock file being out of date.
     global                   => false, # The global command allows you to run other commands like install, require or update as if you were running them from the COMPOSER_HOME directory.
     working_dir              => undef, # If specified, use the given directory as working directory.
-    format                   => undef, # Format of the output: text or json (default: "text"). Only applies to `cache-clear`.
+    format                   => undef, # Format of the output: text or json (default: "text"). Only applies to `clear-cache`.
     onlyif                   => undef, # If true.
     unless                   => undef, # If true.
 }

manifests/exec.pp

@@ -59,23 +59,23 @@
     'update',
     'require',
     'run-scripts',
-    'cache-clear'
+    'clear-cache'
   ]
 
   if member($exec_cmds, $cmd) == false {
     fail(
-      "Only types 'install', 'update', 'cache-clear', 'run-scripts' and 'require' are allowed, ${cmd} given"
+      "Only types 'install', 'update', 'clear-cache', 'run-scripts' and 'require' are allowed, ${cmd} given"
     )
   }
 
   if $prefer_source and $prefer_dist {
     fail('Only one of \$prefer_source or \$prefer_dist can be true.')
   }
 
-  # Validate format for cache-clear command
+  # Validate format for clear-cache command
   if $format {
-    if $cmd != 'cache-clear' {
-      fail('Format only applies when \$cmd is set to `cache-clear`.')
+    if $cmd != 'clear-cache' {
+      fail('Format only applies when \$cmd is set to `clear-cache`.')
     }
     elsif $format != 'text' and $format != 'json' {
       fail('Invalid format specified. Use \'text\' or \'json\'.')

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "tPl0ch-composer",
-  "version": "1.3.5",
+  "version": "2.0.0",
   "author": "tPl0ch - Thomas Ploch <profiploch@gmail.com>",
   "summary": "This module provides the 'Composer' PHP dependency manager.",
   "license": "MIT",

spec/defines/composer_exec_spec.rb

@@ -78,6 +78,29 @@
           })
         }
       end
+
+      context 'using clear-cache command' do
+        it { should contain_class('git') }
+        it { should contain_class('stdlib') }
+        it { should contain_class('composer') }
+
+        let(:title) { 'yourpr0ject' }
+        let(:params) { {
+          :cmd       => 'clear-cache',
+          :cwd       => '/just/in/time',
+          :logoutput => true,
+          :unless  => '/just/in/time/bin/entry --version | grep 2\.0\.6',
+        } }
+
+        it {
+          should contain_exec('composer_clear_cache').without_user.without_timeout.with({
+            :command   => %r{php /usr/local/bin/composer clear-cache --no-plugins --no-scripts --no-interaction},
+            :cwd       => '/just/in/time',
+            :logoutput => true,
+            :unless    => '/just/in/time/bin/entry --version | grep 2\.0\.6',
+          })
+        }
+      end
     end
   end
 

templates/clear-cache.erb

@@ -1,4 +1,3 @@
 <%= @command -%>
 <% unless @dev %> --no-dev<% end -%>
-<% if @format %> --format=<%= @format%><%end -%>
-<%- end -%>
+<% if @format %> --format=<%= @format%><%end -%>