]> gitweb.fluxo.info Git - puppet-mysql.git/commitdiff
Coding style at grant type
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Jan 2013 14:55:09 +0000 (12:55 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Jan 2013 14:55:09 +0000 (12:55 -0200)
lib/puppet/type/mysql_grant.rb

index 415f5aa39b6e19a5a193d527e676b4ce4276ac4d..29ae22231fc9634dac605a832e70e621eed5a3e7 100644 (file)
@@ -1,77 +1,77 @@
 # This has to be a separate type to enable collecting
 Puppet::Type.newtype(:mysql_grant) do
-       @doc = "Manage a database user's rights."
-       #ensurable
+  @doc = "Manage a database user's rights."
+  #ensurable
 
-       autorequire :mysql_db do
-               # puts "Starting db autoreq for %s" % self[:name]
-               reqs = []
-               matches = self[:name].match(/^([^@]+)@([^\/]+)\/(.+)$/)
-               unless matches.nil?
-                       reqs << matches[3]
-               end
-               # puts "Autoreq: '%s'" % reqs.join(" ")
-               reqs
-       end
+  autorequire :mysql_db do
+    # puts "Starting db autoreq for %s" % self[:name]
+    reqs = []
+    matches = self[:name].match(/^([^@]+)@([^\/]+)\/(.+)$/)
+    unless matches.nil?
+      reqs << matches[3]
+    end
+    # puts "Autoreq: '%s'" % reqs.join(" ")
+    reqs
+  end
 
-       autorequire :mysql_user do
-               # puts "Starting user autoreq for %s" % self[:name]
-               reqs = []
-               matches = self[:name].match(/^([^@]+)@([^\/]+).*$/)
-               unless matches.nil?
-                       reqs << "%s@%s" % [ matches[1], matches[2] ]
-               end
-               # puts "Autoreq: '%s'" % reqs.join(" ")
-               reqs
-       end
+  autorequire :mysql_user do
+    # puts "Starting user autoreq for %s" % self[:name]
+    reqs = []
+    matches = self[:name].match(/^([^@]+)@([^\/]+).*$/)
+    unless matches.nil?
+      reqs << "%s@%s" % [ matches[1], matches[2] ]
+    end
+    # puts "Autoreq: '%s'" % reqs.join(" ")
+    reqs
+  end
 
-       newparam(:name) do
-               desc "The primary key: either user@host for global privilges or user@host/database for database specific privileges"
-       end
-       newproperty(:privileges, :array_matching => :all) do
-               desc "The privileges the user should have. The possible values are implementation dependent."
-               munge do |v|
-                       symbolize(v)
-               end
+  newparam(:name) do
+    desc "The primary key: either user@host for global privilges or user@host/database for database specific privileges"
+  end
+  newproperty(:privileges, :array_matching => :all) do
+    desc "The privileges the user should have. The possible values are implementation dependent."
+    munge do |v|
+      symbolize(v)
+    end
 
-               def should_to_s(newvalue = @should)
-                       if newvalue
-                               unless newvalue.is_a?(Array)
-                                       newvalue = [ newvalue ]
-                               end
-                               newvalue.collect do |v| v.to_s end.sort.join ", "
-                       else
-                               nil
-                       end
-               end
+    def should_to_s(newvalue = @should)
+      if newvalue
+        unless newvalue.is_a?(Array)
+          newvalue = [ newvalue ]
+        end
+        newvalue.collect do |v| v.to_s end.sort.join ", "
+      else
+        nil
+      end
+    end
 
-               def is_to_s(currentvalue = @is)
-                       if currentvalue
-                               unless currentvalue.is_a?(Array)
-                                       currentvalue = [ currentvalue ]
-                               end
-                               currentvalue.collect do |v| v.to_s end.sort.join ", "
-                       else
-                               nil
-                       end
-               end
+    def is_to_s(currentvalue = @is)
+      if currentvalue
+        unless currentvalue.is_a?(Array)
+          currentvalue = [ currentvalue ]
+        end
+        currentvalue.collect do |v| v.to_s end.sort.join ", "
+      else
+        nil
+      end
+    end
 
-               # use the sorted outputs for comparison
-               def insync?(is)
-                       if defined? @should and @should
-                               case self.should_to_s 
-                               when "all"
-                                       self.provider.all_privs_set?
-                               when self.is_to_s(is)
-                                       true
-                               else
-                                       false
-                               end
-                       else
-                               true
-                       end
-               end
+    # use the sorted outputs for comparison
+    def insync?(is)
+      if defined? @should and @should
+        case self.should_to_s 
+        when "all"
+          self.provider.all_privs_set?
+        when self.is_to_s(is)
+          true
+        else
+          false
+        end
+      else
+        true
+      end
+    end
 
-       end
+  end
 end