Permalink
Browse files

Merge branch 'release/0.3.0'

  • Loading branch information...
2 parents f884489 + 67c2f46 commit cd058da76209551c0aa512082c40ae1937d34471 @alistairstead alistairstead committed Mar 5, 2013
Showing with 10 additions and 6 deletions.
  1. +3 −3 metadata.rb
  2. +7 −3 providers/composer.rb
View
@@ -6,9 +6,9 @@
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "0.2.0"
-depends "git", "= 1.0.0"
-depends "yum", "= 0.8.0"
-depends "apt", "= 1.8.4"
+depends "git", ">= 1.0.0"
+depends "yum", ">= 0.8.0"
+depends "apt", ">= 1.8.4"
depends "php", "= 1.1.8"
depends "chef-php-extra"
View
@@ -1,7 +1,7 @@
# Cookbook Name:: chef-php-extra
# Provider:: composer
#
-# Copyright 2012, Marcello Duarte
+# Copyright 2012, Marcello Duarte, Alistair Stead
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@
remote_file "#{new_resource.project_path}/composer.phar" do
source "http://getcomposer.org/composer.phar"
mode "0774"
- not_if !::File.exists?("#{new_resource.project_path}/composer.phar")
+ not_if do
+ ::File.exists?("#{new_resource.project_path}/composer.phar")
+ end
end
new_resource.updated_by_last_action(true)
end
@@ -34,7 +36,9 @@
cwd new_resource.project_path
user "root"
command "php composer.phar install"
- only_if ::File.exists?("#{new_resource.project_path}/composer.json")
+ only_if do
+ ::File.exists?("#{new_resource.project_path}/composer.json")
+ end
end
new_resource.updated_by_last_action(true)
end

0 comments on commit cd058da

Please sign in to comment.