From e215dab712d0a4fb946b173c2b089688a8c7d617 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Fri, 14 Sep 2012 17:43:53 -0400 Subject: [PATCH 1/6] [Fixes myplanetdigital/ariadne#12] Removed wonky logic in upgrading PEAR. --- recipes/default.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index a9c5d99..4562637 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -27,11 +27,9 @@ end end -php_pear "PEAR" do - cur_version = `pear -V| head -1| awk -F': ' '{print $2}'` +php_pear "PEAR-phpunit" do + version "1.9.0" action :upgrade - # This feels super ghetto. Open to improvements. - not_if { Gem::Version.new(cur_version) > Gem::Version.new('1.9.0') } end php_pear "PHPUnit" do From 9e7e545ad85bcd60fbeaeeb13e8e817d87534174 Mon Sep 17 00:00:00 2001 From: M Parker Date: Sat, 10 Nov 2012 16:24:16 -0500 Subject: [PATCH 2/6] fix duplicate package channel error when installing phpunit fixes myplanetdigital/vagrant-ariadne#77 --- recipes/default.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipes/default.rb b/recipes/default.rb index 4562637..74f7d90 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -32,6 +32,17 @@ action :upgrade end +php_pear "File_Iterator" do + channel "phpunit" + action :install +end + +php_pear "Text_Template" do + channel "phpunit" + version "1.1.3" + action :install +end + php_pear "PHPUnit" do channel "phpunit" version node['phpunit']['version'] From 8423f7017798853098660e626a06585e37ef5cf6 Mon Sep 17 00:00:00 2001 From: M Parker Date: Sun, 11 Nov 2012 12:26:22 -0500 Subject: [PATCH 3/6] bug: whitespace errors --- recipes/default.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 74f7d90..3888a83 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -34,13 +34,13 @@ php_pear "File_Iterator" do channel "phpunit" - action :install + action :install end php_pear "Text_Template" do channel "phpunit" - version "1.1.3" - action :install + version "1.1.3" + action :install end php_pear "PHPUnit" do From 8e5fc558fe753cef021c4ed9686fbe97240cff6f Mon Sep 17 00:00:00 2001 From: M Parker Date: Sun, 11 Nov 2012 12:27:34 -0500 Subject: [PATCH 4/6] bug: more whitespace errors --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index 3888a83..fd842dd 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -34,7 +34,7 @@ php_pear "File_Iterator" do channel "phpunit" - action :install + action :install end php_pear "Text_Template" do From 49089beb270b88805bff102d552f0bd0a6396876 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Tue, 15 Jan 2013 15:50:11 -0500 Subject: [PATCH 5/6] Locked down PHPUnit dep versions. See http://stackoverflow.com/a/14161054 --- recipes/default.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index fd842dd..935af38 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -34,12 +34,13 @@ php_pear "File_Iterator" do channel "phpunit" + version "1.3.2" action :install end php_pear "Text_Template" do channel "phpunit" - version "1.1.3" + version "1.1.2" action :install end From 5e2106c8fa1b547f0c9f6f29f6c1eae252b219a4 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Tue, 15 Jan 2013 16:05:40 -0500 Subject: [PATCH 6/6] Add package_name back into PEAR upgrade (so resource namespace is duplicated elsewhere). --- recipes/default.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/default.rb b/recipes/default.rb index 935af38..5155fa8 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -28,6 +28,7 @@ end php_pear "PEAR-phpunit" do + package_name "PEAR" version "1.9.0" action :upgrade end