Changes for compatibility with Chef 12.14.

+ changes from @reidab PR connecting with mysql migration from recipes to resources

attributes/default.rb

@@ -14,7 +14,7 @@
 default[:sphinx][:source][:base_url]              = "http://sphinxsearch.com/files"
 default[:sphinx][:source][:stemmer_url]           = "http://snowball.tartarus.org/dist/libstemmer_c.tgz"
 default[:sphinx][:source][:install_path]          = "/usr/local"
-default[:sphinx][:source][:binary_path]           = "#{sphinx[:source][:install_path]}/bin"
+default[:sphinx][:source][:binary_path]           = "#{node[:sphinx][:source][:install_path]}/bin"
 default[:sphinx][:source][:configure_flags]       = []
 default[:sphinx][:source][:extra_configure_flags] = []
 default[:sphinx][:source][:branch]                = 'trunk'

metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email "[email protected]"
 license          "Apache 2.0"
 description      "Installs/Configures sphinx search engine."
-version          "1.1.0"
+version          "1.1.1"
 
 recipe           "sphinx", "Installs sphinx"
 recipe           "sphinx::package", "Installs sphinx from a package"
@@ -16,7 +16,7 @@
 provides         "sphinx::rpm"
 
 depends          "build-essential", ">= 1.1.2"
-depends          "mysql"
+depends          "mysql", ">= 6.0.0"
 depends          "percona"
 depends          "postgresql", ">= 1.0.0"
 depends          "yum"

recipes/default.rb

@@ -1,4 +1,4 @@
+mysql_client "default" if node[:sphinx][:use_mysql]
 include_recipe "percona::client" if node[:sphinx][:use_percona]
-include_recipe "mysql::client" if node[:sphinx][:use_mysql]
 include_recipe "postgresql::client" if node[:sphinx][:use_postgres]
 include_recipe "sphinx::#{node[:sphinx][:install_method]}"

resources/index.rb

@@ -4,6 +4,6 @@
 attribute :name, :kind_of => String, :name_attribute => true, :required => true
 
 attribute :source, :kind_of => String
-attribute :params, :kind_of => Hash, :required => true, :default => {}
+attribute :attrs, :kind_of => Hash, :required => true, :default => {}
 
 attribute :rotate, :kind_of => [TrueClass, FalseClass], :default => false

resources/source.rb

@@ -4,4 +4,4 @@
 attribute :name, :kind_of => String, :name_attribute => true, :required => true
 
 attribute :type, :kind_of => String, :required => true
-attribute :params, :kind_of => Hash, :required => true, :default => {}
+attribute :attrs, :kind_of => Hash, :required => true, :default => {}

templates/default/index.erb

@@ -1,7 +1,7 @@
 index <%= @new_resource.name %> {
     source = <%= @new_resource.source %>
     path  = <%= @data_path %>
-<% @new_resource.params.each do |k, v| %>
+<% @new_resource.attrs.each do |k, v| %>
     <%= k %> = <%= v %>
 <% end %>
 }

templates/default/source.erb

@@ -1,6 +1,6 @@
 source <%= @new_resource.name %> {
     type = <%= @new_resource.type %>
-<% @new_resource.params.each do |k, v| %>
+<% @new_resource.attrs.each do |k, v| %>
     <% if v.respond_to?("each") %>
         <% v.each do |sub_v| %>
             <%= k %> = <%= sub_v %>