Merge pull request #58 from awegmann/master

Changed ini template to sort the key

spec/classes/grafana_spec.rb

@@ -275,10 +275,10 @@
       expected = "# This file is managed by Puppet, any changes will be overwritten\n\n"\
                  "app_mode = production\n\n"\
                  "[section]\n"\
-                 "string = production\n"\
-                 "number = 8080\n"\
                  "boolean = false\n"\
-                 "empty = \n"
+                 "empty = \n"\
+                 "number = 8080\n"\
+                 "string = production\n"
 
       it { should contain_file('/etc/grafana/grafana.ini').with_content(expected) }
 
@@ -306,3 +306,4 @@
     end
   end
 end
+

templates/config.ini.erb

@@ -1,13 +1,13 @@
 # This file is managed by Puppet, any changes will be overwritten
 
-<%- @cfg.each_pair do |key, value|
-  if value.is_a?(Hash) -%>
+<%- @cfg.keys.sort.each do |key|
+  if @cfg[key].is_a?(Hash) -%>
 
 [<%= key %>]
-    <%- value.each_pair do |key, value| -%>
-<%= key %> = <%= value %>
+    <%- @cfg[key].keys.sort.each do |valkey| -%>
+<%= valkey %> = <%= @cfg[key][valkey] %>
     <%- end -%>
   <%- else -%>
-<%= key %> = <%= value %>
+<%= key %> = <%= @cfg[key] %>
   <%- end
 end -%>