(choria-io#30) move the aiomodule package into this module, retire ot…

…hers

Retires all the other packaging methods in favour of the aio module
one which is being renamed to forge and used as default

lib/mcollective/application/plugin.rb

@@ -298,7 +298,7 @@ def doc_command
     # Creates the correct package plugin object.
     def prepare_plugin
       plugintype = set_plugin_type unless configuration[:plugintype]
-      configuration[:format] = "ospackage" unless configuration[:format]
+      configuration[:format] = "forge" unless configuration[:format]
       PluginPackager.load_packagers
       plugin_class = PluginPackager[configuration[:plugintype]]
 
@@ -308,7 +308,10 @@ def prepare_plugin
         configuration[:dependency].map!{|dep| {:name => dep, :version => nil}}
       end
 
-      mcdependency = {:mcname => configuration[:mcname], :mcversion => configuration[:mcversion]}
+      mcdependency = {
+        :mcname => configuration[:mcname],
+        :mcversion => configuration[:mcversion]
+      }
 
       # Deprecation warning for --iteration
       if configuration[:iteration]

lib/mcollective/pluginpackager/agent_definition.rb

@@ -12,7 +12,7 @@ def initialize(configuration, mcdependency, plugintype)
         @revision = configuration[:revision] || 1
         @preinstall = configuration[:preinstall]
         @postinstall = configuration[:postinstall]
-        @vendor = configuration[:vendor] || "Puppet Labs"
+        @vendor = configuration[:vendor] || "Choria.IO User"
         @dependencies = configuration[:dependency] || []
         @target_path = File.expand_path(@path)
         @metadata, mcversion = PluginPackager.get_metadata(@path, "agent")
@@ -36,9 +36,11 @@ def identify_packages
 
       # Obtain Agent package files and dependencies.
       def agent
-        agent = {:files => [],
-                 :dependencies => @dependencies.clone,
-                 :description => "Agent plugin for #{@metadata[:name]}"}
+        agent = {
+          :files => [],
+          :dependencies => @dependencies.clone,
+          :description => "Agent plugin for #{@metadata[:name]}"
+        }
 
         agentdir = File.join(@path, "agent")
 
@@ -69,9 +71,11 @@ def client
 
       # Obtain common package files and dependencies.
       def common
-        common = {:files =>[],
-                  :dependencies => @dependencies.clone,
-                  :description => "Common libraries for #{@metadata[:name]}"}
+        common = {
+          :files =>[],
+          :dependencies => @dependencies.clone,
+          :description => "Common libraries for #{@metadata[:name]}"
+        }
 
         datadir = File.join(@path, "data", "**")
         utildir = File.join(@path, "util", "**", "**")