Merge remote-tracking branch 'github/pull/695'

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

diff --git a/cookbooks/wordpress/libraries/wordpress.rb b/cookbooks/wordpress/libraries/wordpress.rb
index a381ecfff4446fa0331646268ee6d1f82f4104ab..92db4b19924c068079c5f7bc8b76a1e3428cf7bd 100644 (file)
--- a/cookbooks/wordpress/libraries/wordpress.rb
+++ b/cookbooks/wordpress/libraries/wordpress.rb
@@ -1,11 +1,14 @@
-require "chef/mixin/command"
+require "chef/mixin/shell_out"
+
+require "addressable"
+require "httpclient"
+require "json"
 
 class Chef
   module Wordpress
-    extend Chef::Mixin::Command
+    extend Chef::Mixin::ShellOut
 
     @api_responses = {}
-    @svn_responses = {}
 
     class << self
       def current_version
@@ -13,32 +16,21 @@ 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]*/
-          Regexp.last_match[1]
-        else
-          "trunk"
-        end
+        plugin_information(name)["version"]
       end
 
       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))
+      def plugin_information(name)
+        api_get("https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&request[slug]=#{name}")
       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)
-
-          @svn_responses[url] = stdout.force_encoding("UTF-8")
-        end
-
-        @svn_responses[url]
+      def api_get(url)
+        @api_responses[url] ||= ::JSON.parse(::HTTPClient.new.get_content(url))
       end
     end
   end