Switch wordpress version check to use the JSON API

[chef.git] / cookbooks / wordpress / libraries / wordpress.rb

diff --git a/cookbooks/wordpress/libraries/wordpress.rb b/cookbooks/wordpress/libraries/wordpress.rb
index e83ba0417089f4876e251601d1d6a4bea567096a..1ea8585879a103de96da35f62d6641826488acbe 100644 (file)
--- a/cookbooks/wordpress/libraries/wordpress.rb
+++ b/cookbooks/wordpress/libraries/wordpress.rb
@@ -1,11 +1,12 @@
-require "chef/mixin/command"
+require "chef/mixin/shell_out"
 
+require "addressable"
 require "httpclient"
-require "php_serialize"
+require "json"
 
 class Chef
   module Wordpress
-    extend Chef::Mixin::Command
+    extend Chef::Mixin::ShellOut
 
     @api_responses = {}
     @svn_responses = {}
@@ -16,7 +17,7 @@ class Chef
       end
 
       def current_plugin_version(name)
-        if svn_cat("http://plugins.svn.wordpress.org/#{name}/trunk/readme.txt") =~ /Stable tag:\s*([^\s\r]*)[\s\r]*/
+        if svn_cat("https://plugins.svn.wordpress.org/#{name}/trunk/readme.txt") =~ /Stable tag:\s*([^\s\r]*)[\s\r]*/
           Regexp.last_match[1]
         else
           "trunk"
@@ -26,19 +27,18 @@ class Chef
       private
 
       def core_version_check
-        api_get("http://api.wordpress.org/core/version-check/1.6")
+        api_get("https://api.wordpress.org/core/version-check/1.7")
       end
 
       def api_get(url)
-        @api_responses[url] ||= ::PHP.unserialize(::HTTPClient.new.get_content(url))
+        @api_responses[url] ||= ::JSON.parse(::HTTPClient.new.get_content(url))
       end
 
       def svn_cat(url)
         unless @svn_responses[url]
-          status, stdout, stderr = output_of_command("svn cat #{url}", {})
-          handle_command_failures(status, "STDOUT: #{stdout}\nSTDERR: #{stderr}", :output_on_failure => true)
+          result = shell_out!("svn", "cat", url)
 
-          @svn_responses[url] = stdout.force_encoding("UTF-8")
+          @svn_responses[url] = result.stdout.force_encoding("UTF-8")
         end
 
         @svn_responses[url]