Update version according to OSCI-856

[packages/precise/mcollective.git] / lib / mcollective / pluginpackager / standard_definition.rb

diff --git a/lib/mcollective/pluginpackager/standard_definition.rb b/lib/mcollective/pluginpackager/standard_definition.rb
index 6c389a1642a782a0d2e121162bfe434222f3d191..09a6464c19b9c979da5e0930301577e8b6cabb49 100644 (file)
--- a/lib/mcollective/pluginpackager/standard_definition.rb
+++ b/lib/mcollective/pluginpackager/standard_definition.rb
@@ -1,25 +1,25 @@
 module MCollective
   module PluginPackager
     class StandardDefinition
-      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :iteration
+      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :revision
       attr_accessor :plugintype, :preinstall, :postinstall, :dependencies, :mcname, :mcversion
 
-      def initialize(path, name, vendor, preinstall, postinstall, iteration, dependencies, mcdependency, plugintype)
+      def initialize(configuration, mcdependency, plugintype)
         @plugintype = plugintype
-        @path = path
+        @path = configuration[:target]
         @packagedata = {}
-        @iteration = iteration || 1
-        @preinstall = preinstall
-        @postinstall = postinstall
-        @vendor = vendor || "Puppet Labs"
-        @dependencies = dependencies || []
+        @revision = configuration[:revision] || 1
+        @preinstall = configuration[:preinstall]
+        @postinstall = configuration[:postinstall]
+        @vendor = configuration[:vendor] || "Puppet Labs"
+        @dependencies = configuration[:dependency] || []
         @target_path = File.expand_path(@path)
         @metadata, mcversion = PluginPackager.get_metadata(@path, @plugintype)
-
         @mcname = mcdependency[:mcname] || "mcollective"
         @mcversion = mcdependency[:mcversion] || mcversion
         @dependencies << {:name => "#{mcname}-common", :version => @mcversion}
-        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(/\s+|_/, "-")
+        @metadata[:name] = (configuration[:pluginname] || @metadata[:name]).downcase.gsub(/\s+|_/, "-")
+        @metadata[:version] = (configuration[:version] || @metadata[:version])
         identify_packages
       end
 
@@ -28,7 +28,7 @@ module MCollective
         common_package = common
         @packagedata[:common] = common_package if common_package
         plugin_package = plugin
-        @packagedata[@plugintype] = plugin_package if plugin_package
+        @packagedata[@plugintype.to_sym] = plugin_package if plugin_package
       end
 
       # Obtain standard plugin files and dependencies
@@ -46,7 +46,7 @@ module MCollective
 
         plugindata[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common",
                                       :version => @metadata[:version],
-                                      :iteration => @iteration} if @packagedata[:common]
+                                      :revision => @revision} if @packagedata[:common]
         plugindata
       end