choria-mcorpc-support 2.20.5 → 2.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b40e519fe1594ef21f3842e4786bdfbe9359f1
-  data.tar.gz: ae87678ad14ba3d22805143c59c5558f271286c4
+  metadata.gz: 29d095eecde9726e77979a330ff4ed2a27ac7912
+  data.tar.gz: a6aa7aa304f84aa576e711e40184d492c245295e
 SHA512:
-  metadata.gz: 92c39adc948b47af880815b13597c4205a4e0dcb3058c82d5e2c8e762cc11a15b7ae15028093bf3a04e9f01458bde03e3a91b678b783fbb49875ea93bbc85786
-  data.tar.gz: e49b19a7e16acec11b619e1492ef6e7f3cadb819bf93ac0759889fa1032e53529e7432404b8a10cbde6e8152204e069372d493bf0c6ff908ce87684bfd3add8b
+  metadata.gz: da30c83fef47986f8acb747d284ace2ecc736cfd9f7045b938c51684c801837080b346dbcdde7ca27a692e00181bb4b616af1d172457312217d26bd0d113bc92
+  data.tar.gz: ad9ca3e3fc6e99bad8eafd7a97764519d0e490644d9b80c39933b020d26c1f307ba4891e34d63bf8d79ac207533981dfa6a2a1bc201a99bb9ce9c4798747758c

data/lib/mcollective.rb

@@ -54,7 +54,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
 
-  VERSION = "2.20.5".freeze
+  VERSION = "2.20.6".freeze
 
   def self.version
     VERSION

data/lib/mcollective/application/plugin.rb

@@ -213,7 +213,7 @@ mco plugin package [options] <directory>
     def load_plugin_ddl(plugin, type)
       [plugin, "#{plugin}_#{type}"].each do |p|
         ddl = DDL.new(p, type, false)
-        if ddl.findddlfile(p, type)
+        if ddl.client_activated? && ddl.findddlfile(p, type)
           ddl.loadddlfile
           return ddl
         end
@@ -224,9 +224,14 @@ mco plugin package [options] <directory>
 
     # Show application list and plugin help
     def doc_command
-      known_plugin_types = [["Agents", :agent], ["Aggregate", :aggregate],
-                            ["Connectors", :connector], ["Data Queries", :data],
-                            ["Discovery Methods", :discovery], ["Validator Plugins", :validator]]
+      known_plugin_types = [
+        ["Agents", :agent],
+        ["Aggregate", :aggregate],
+        ["Connectors", :connector],
+        ["Data Queries", :data],
+        ["Discovery Methods", :discovery],
+        ["Validator Plugins", :validator]
+      ]
 
       if configuration.include?(:target) && configuration[:target] != "."
         if configuration[:target] =~ /^(.+?)\/(.+)$/
@@ -265,7 +270,11 @@ mco plugin package [options] <directory>
 
           PluginManager.find(plugin_type[1], "ddl").each do |ddl|
             begin
-              help = DDL.new(ddl, plugin_type[1])
+              help = DDL.new(ddl, plugin_type[1], false)
+
+              next unless help.client_activated?
+
+              help.loadddlfile
               pluginname = ddl.gsub(/_#{plugin_type[1]}$/, "")
               puts "  %-25s %s" % [pluginname, help.meta[:description]]
             rescue => e
@@ -289,7 +298,7 @@ mco plugin package [options] <directory>
     # Creates the correct package plugin object.
     def prepare_plugin
       plugintype = set_plugin_type unless configuration[:plugintype]
-      configuration[:format] = "puppet_module" unless configuration[:format]
+      configuration[:format] = "forge" unless configuration[:format]
       PluginPackager.load_packagers
       plugin_class = PluginPackager[configuration[:plugintype]]
 
@@ -299,7 +308,10 @@ mco plugin package [options] <directory>
         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]

data/lib/mcollective/ddl/agentddl.rb

@@ -44,6 +44,10 @@ module MCollective
         super
       end
 
+      def client_activated?
+        Util.str_to_bool(@config.pluginconf.fetch("%s.activate_client" % @pluginname, ACTIVATION_DEFAULT.to_s))
+      end
+
       def input(argument, properties)
         raise "Input needs a :optional property" unless properties.include?(:optional)
 

data/lib/mcollective/ddl/base.rb

@@ -19,6 +19,8 @@ module MCollective
     class Base
       attr_reader :meta, :entities, :pluginname, :plugintype, :usage, :requirements
 
+      ACTIVATION_DEFAULT = true
+
       def initialize(plugin, plugintype=:agent, loadddl=true)
         @entities = {}
         @meta = {}
@@ -77,6 +79,10 @@ module MCollective
       end
 
       def loadddlfile
+        if @config.mode == :client && !client_activated?
+          raise("%s/%s is disabled, cannot load DDL file" % [@plugintype, @pluginname])
+        end
+
         if ddlfile = findddlfile
           instance_eval(File.read(ddlfile), ddlfile, 1)
         else
@@ -95,7 +101,12 @@ module MCollective
             return ddlfile
           end
         end
-        return false
+
+        false
+      end
+
+      def client_activated?
+        ACTIVATION_DEFAULT
       end
 
       def validate_requirements
@@ -186,6 +197,8 @@ module MCollective
         @entities[action][:output][argument] = {:description => properties[:description],
                                                 :display_as  => properties[:display_as],
                                                 :default     => properties[:default]}
+
+        @entities[action][:output][argument][:type] = properties[:type] if properties[:type]
       end
 
       def requires(requirement)

data/lib/mcollective/pluginpackager/agent_definition.rb

@@ -12,7 +12,7 @@ module MCollective
         @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 @@ module MCollective
 
       # 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 @@ module MCollective
 
       # 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", "**", "**")

data/lib/mcollective/pluginpackager/{puppet_module_packager.rb → forge_packager.rb}

@@ -2,12 +2,12 @@ require "yaml"
 
 module MCollective
   module PluginPackager
-    class PuppetmodulePackager
+    class ForgePackager
       def initialize(plugin, pluginpath = nil, signature = nil, verbose = false, keep_artifacts = nil, module_template = nil)
         @plugin = plugin
         @verbose = verbose
         @keep_artifacts = keep_artifacts
-        @module_template = module_template || File.join(File.dirname(__FILE__), 'templates', 'puppet_module')
+        @module_template = module_template || File.join(File.dirname(__FILE__), 'templates', 'forge')
       end
 
       def which(cmd)
@@ -214,7 +214,7 @@ module MCollective
         begin
           PluginPackager.execute_verbosely(@verbose) do
             Dir.chdir(@tmpdir) do
-              PluginPackager.safe_system('puppet module build')
+              PluginPackager.safe_system('pdk build --force')
             end
           end
         rescue

data/lib/mcollective/pluginpackager/standard_definition.rb

@@ -11,7 +11,7 @@ module MCollective
         @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, @plugintype)
@@ -20,6 +20,7 @@ module MCollective
         @dependencies << {:name => "#{mcname}-common", :version => @mcversion}
         @metadata[:name] = (configuration[:pluginname] || @metadata[:name]).downcase.gsub(/\s+|_/, "-")
         @metadata[:version] = (configuration[:version] || @metadata[:version])
+
         identify_packages
       end
 
@@ -33,9 +34,11 @@ module MCollective
 
       # Obtain standard plugin files and dependencies
       def plugin
-        plugindata = {:files => [],
-                      :dependencies => @dependencies.clone,
-                      :description => "#{@name} #{@plugintype} plugin for the Marionette Collective."}
+        plugindata = {
+          :files => [],
+          :dependencies => @dependencies.clone,
+          :description => "#{@name} #{@plugintype} plugin for the Choria Orchestrator."
+        }
 
         plugindir = File.join(@path, @plugintype.to_s)
         if PluginPackager.check_dir_present plugindir
@@ -44,25 +47,33 @@ module MCollective
           return nil
         end
 
-        plugindata[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common",
-                                      :version => @metadata[:version],
-                                      :revision => @revision} if @packagedata[:common]
+        if @packagedata[:common]
+          plugindata[:plugindependency] = {
+            :name => "#{@mcname}-#{@metadata[:name]}-common",
+            :version => @metadata[:version],
+            :revision => @revision
+          }
+        end
+
         plugindata
       end
 
       # Obtain list of common files
       def common
-        common = {:files => [],
-                  :dependencies => @dependencies.clone,
-                  :description => "Common libraries for #{@name} connector plugin"}
+        common = {
+          :files => [],
+          :dependencies => @dependencies.clone,
+          :description => "Common libraries for #{@name} connector plugin"
+        }
 
         commondir = File.join(@path, "util")
         if PluginPackager.check_dir_present commondir
           common[:files] = Dir.glob(File.join(commondir, "*"))
+
           return common
-        else
-          return nil
         end
+
+        nil
       end
     end
   end

data/lib/mcollective/pluginpackager/templates/{puppet_module → forge}/README.md.erb

@@ -67,6 +67,6 @@ For a full list of possible configuration settings see the module [source reposi
 
 ## Development:
 
-To contribute to this MCollective plugin please visit <%= @plugin.metadata[:url] %>.
+To contribute to this [Choria.IO](https://choria.io) plugin please visit <%= @plugin.metadata[:url] %>.
 
 This module was generated using the Choria Plugin Packager based on templates found at the [GitHub Project](https://github.com/choria-io/).

data/lib/mcollective/pluginpackager/templates/{puppet_module → forge}/metadata.json.erb

@@ -7,12 +7,12 @@
   "source": "<%= @plugin.metadata[:url] %>",
   "project_page": "<%= @plugin.metadata[:url] %>",
   "dependencies": [
-  {"name": "choria/mcollective", "version_requirement": ">= 0.4.0 < 2.0.0"}
+  {"name": "choria/mcollective", "version_requirement": ">= 0.9.3 < 2.0.0"}
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.9.0"
+      "version_requirement": ">= 6.0.0"
     }
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.20.5
+  version: 2.20.6
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -135,28 +135,14 @@ files:
 - lib/mcollective/pluginmanager.rb
 - lib/mcollective/pluginpackager.rb
 - lib/mcollective/pluginpackager/agent_definition.rb
-- lib/mcollective/pluginpackager/debpackage_packager.rb
-- lib/mcollective/pluginpackager/modulepackage_packager.rb
-- lib/mcollective/pluginpackager/ospackage_packager.rb
-- lib/mcollective/pluginpackager/puppet_module_packager.rb
-- lib/mcollective/pluginpackager/rpmpackage_packager.rb
+- lib/mcollective/pluginpackager/forge_packager.rb
 - lib/mcollective/pluginpackager/standard_definition.rb
-- lib/mcollective/pluginpackager/templates/debian/Makefile.erb
-- lib/mcollective/pluginpackager/templates/debian/changelog.erb
-- lib/mcollective/pluginpackager/templates/debian/compat.erb
-- lib/mcollective/pluginpackager/templates/debian/control.erb
-- lib/mcollective/pluginpackager/templates/debian/copyright.erb
-- lib/mcollective/pluginpackager/templates/debian/rules.erb
-- lib/mcollective/pluginpackager/templates/module/Modulefile.erb
-- lib/mcollective/pluginpackager/templates/module/README.md.erb
-- lib/mcollective/pluginpackager/templates/module/_manifest.pp.erb
-- lib/mcollective/pluginpackager/templates/puppet_module/README.md.erb
-- lib/mcollective/pluginpackager/templates/puppet_module/data/defaults.yaml.erb
-- lib/mcollective/pluginpackager/templates/puppet_module/data/plugin.yaml.erb
-- lib/mcollective/pluginpackager/templates/puppet_module/hiera.yaml.erb
-- lib/mcollective/pluginpackager/templates/puppet_module/manifests/init.pp.erb
-- lib/mcollective/pluginpackager/templates/puppet_module/metadata.json.erb
-- lib/mcollective/pluginpackager/templates/redhat/rpm_spec.erb
+- lib/mcollective/pluginpackager/templates/forge/README.md.erb
+- lib/mcollective/pluginpackager/templates/forge/data/defaults.yaml.erb
+- lib/mcollective/pluginpackager/templates/forge/data/plugin.yaml.erb
+- lib/mcollective/pluginpackager/templates/forge/hiera.yaml.erb
+- lib/mcollective/pluginpackager/templates/forge/manifests/init.pp.erb
+- lib/mcollective/pluginpackager/templates/forge/metadata.json.erb
 - lib/mcollective/registration/base.rb
 - lib/mcollective/rpc.rb
 - lib/mcollective/rpc/actionrunner.rb

data/lib/mcollective/pluginpackager/debpackage_packager.rb

@@ -1,237 +0,0 @@
-module MCollective
-  module PluginPackager
-    class DebpackagePackager
-      require 'erb'
-
-      def initialize(plugin, pluginpath = nil, signature = nil, verbose = false, keep_artifacts = nil, module_template = nil)
-        if PluginPackager.command_available?('debuild')
-          @plugin = plugin
-          @verbose = verbose
-          @libdir = pluginpath || '/usr/share/mcollective/plugins/mcollective/'
-          @signature = signature
-          @package_name = "#{@plugin.mcname}-#{@plugin.metadata[:name]}"
-          @keep_artifacts = keep_artifacts
-        else
-          raise("Cannot build package. 'debuild' is not present on the system.")
-        end
-      end
-
-      # Build process :
-      # - create buildroot
-      # - craete buildroot/debian
-      # - create the relative directories with package contents
-      # - create install files for each of the plugins that are going to be built
-      # - create debian build files
-      # - create tarball
-      # - create pre and post install files
-      # - run the build script
-      # - move packages to cwd
-      # - clean up
-      def create_packages
-        begin
-          puts "Building packages for #{@package_name} plugin."
-
-          @tmpdir = Dir.mktmpdir('mcollective_packager')
-          @build_dir = File.join(@tmpdir, "#{@package_name}_#{@plugin.metadata[:version]}")
-          Dir.mkdir(@build_dir)
-
-          create_debian_dir
-          @plugin.packagedata.each do |type, data|
-            prepare_tmpdirs(data)
-            create_install_file(type, data)
-            create_pre_and_post_install(type)
-          end
-          create_debian_files
-          create_tar
-          run_build
-          move_packages
-
-          puts "Completed building all packages for #{@package_name} plugin."
-        ensure
-          if @keep_artifacts
-            puts 'Keeping build artifacts.'
-            puts "Build artifacts saved - #{@tmpdir}"
-          else
-            puts 'Removing build artifacts.'
-            cleanup_tmpdirs
-          end
-        end
-      end
-
-      private
-
-      def create_debian_files
-        ['control', 'Makefile', 'compat', 'rules', 'copyright', 'changelog'].each do |f|
-          create_file(f)
-        end
-      end
-
-      def run_build
-        FileUtils.cd(@build_dir) do
-          PluginPackager.execute_verbosely(@verbose) do
-            if @signature
-              if @signature.is_a?(String)
-                PluginPackager.safe_system("debuild --no-lintian -i -k#{@signature}")
-              else
-                PluginPackager.safe_system("debuild --no-lintian -i")
-              end
-            else
-              PluginPackager.safe_system("debuild --no-lintian -i -us -uc")
-            end
-          end
-        end
-      end
-
-      # Creates a string used by the control file to specify dependencies
-      # Dependencies can be formatted as :
-      # foo (>= x.x-x)
-      # foo (>= x.x)
-      # foo
-      def build_dependency_string(data)
-        dependencies = []
-        PluginPackager.filter_dependencies('debian', data[:dependencies]).each do |dep|
-          if dep[:version] && dep[:revision]
-            dependencies << "#{dep[:name]} (>=#{dep[:version]}-#{dep[:revision]}) | puppet-agent"
-          elsif dep[:version]
-            dependencies << "#{dep[:name]} (>=#{dep[:version]}) | puppet-agent"
-          else
-            dependencies << "#{dep[:name]} | puppet-agent"
-          end
-        end
-
-        if data[:plugindependency]
-          dependencies << "#{data[:plugindependency][:name]} (= ${binary:Version})"
-        end
-
-        dependencies.join(', ')
-      end
-
-      # Creates an install file for each of the packages that are going to be created
-      # for the plugin
-      def create_install_file(type, data)
-        install_file = "#{@package_name}-#{type}"
-        begin
-          install_file = File.join(@build_dir, 'debian', "#{install_file}.install")
-          File.open(install_file, 'w') do |file|
-            data[:files].each do |f|
-              extended_filename = File.join(@libdir, File.expand_path(f).gsub(/^#{@plugin.target_path}/, ''))
-              file.puts "#{extended_filename} #{File.dirname(extended_filename)}"
-            end
-          end
-        rescue Errno::EACCES => e
-          puts "Could not create install file '#{install_file}'. Permission denied"
-          raise e
-        rescue => e
-          puts "Could not create install file '#{install_file}'."
-          raise e
-        end
-      end
-
-      # Move source package and debs to cwd
-      def move_packages
-        begin
-          files_to_copy = Dir.glob(File.join(@tmpdir, '*.{deb,dsc,diff.gz,orig.tar.gz,changes}'))
-          FileUtils.cp(files_to_copy, '.')
-        rescue => e
-          puts 'Could not copy packages to working directory.'
-          raise e
-        end
-      end
-
-      # Create pre and post install files in $buildroot/debian
-      # from supplied scripts.
-      # Note that all packages built for the plugin will invoke
-      # the same pre and post install scripts.
-      def create_pre_and_post_install(type)
-        if @plugin.preinstall
-          if !File.exists?(@plugin.preinstall)
-            puts "pre-install script '#{@plugin.preinstall}' not found."
-            raise(Errno::ENOENT, @plugin.preinstall)
-          else
-            FileUtils.cp(@plugin.preinstall, File.join(@build_dir, 'debian', "#{@package_name}-#{type}.preinst"))
-          end
-        end
-
-        if @plugin.postinstall
-          if !File.exists?(@plugin.postinstall)
-            puts "post-install script '#{@plugin.postinstall}' not found."
-            raise(Errno::ENOENT, @plugin.postinstall)
-          else
-            FileUtils.cp(@plugin.postinstall, File.join(@build_dir, 'debian', "#{@package_name}-#{type}.postinst"))
-          end
-        end
-      end
-
-      # Tar up source
-      # Expects directory : $mcollective-$agent_$version
-      # Creates file : $buildroot/$mcollective-$agent_$version.orig.tar.gz
-      def create_tar
-        name_and_version = "#{@package_name}_#{@plugin.metadata[:version]}"
-        tarfile = "#{name_and_version}.orig.tar.gz"
-        begin
-          PluginPackager.execute_verbosely(@verbose) do
-            Dir.chdir(@tmpdir) do
-              PluginPackager.safe_system("tar -Pcvzf #{File.join(@tmpdir, tarfile)} #{name_and_version}")
-            end
-          end
-        rescue Exception => e
-          puts "Could not create tarball - #{tarfile}"
-          raise e
-        end
-      end
-
-      def create_file(filename)
-        begin
-          file = ERB.new(File.read(File.join(File.dirname(__FILE__), 'templates', 'debian', "#{filename}.erb")), nil, '-')
-          File.open(File.join(@build_dir, 'debian', filename), 'w') do |f|
-            f.puts file.result(binding)
-          end
-        rescue => e
-          puts "Could not create file - '#{filename}'"
-          raise e
-        end
-      end
-
-      # Move files contained in the plugin to the correct directory
-      # relative to the build root.
-      def prepare_tmpdirs(data)
-        data[:files].each do |file|
-          begin
-            targetdir = File.join(@build_dir, @libdir, File.dirname(File.expand_path(file)).gsub(/^#{@plugin.target_path}/, ""))
-            FileUtils.mkdir_p(targetdir) unless File.directory?(targetdir)
-            FileUtils.cp_r(file, targetdir)
-          rescue Errno::EACCES => e
-            puts "Could not create directory '#{targetdir}'. Permission denied"
-            raise e
-          rescue Errno::ENOENT => e
-            puts "Could not copy file '#{file}' to '#{targetdir}'. File does not exist"
-            raise e
-          rescue => e
-            puts 'Could not prepare build directory'
-            raise e
-          end
-        end
-      end
-
-      # Create the $buildroot/debian directory
-      def create_debian_dir
-        deb_dir = File.join(@build_dir, 'debian')
-        begin
-          FileUtils.mkdir_p(deb_dir)
-        rescue => e
-          puts "Could not create directory '#{deb_dir}'"
-          raise e
-        end
-      end
-
-      def cleanup_tmpdirs
-        begin
-          FileUtils.rm_r(@tmpdir) if File.directory?(@tmpdir)
-        rescue => e
-          puts "Could not remove temporary build directory - '#{@tmpdir}'"
-          raise e
-        end
-      end
-    end
-  end
-end

data/lib/mcollective/pluginpackager/modulepackage_packager.rb

@@ -1,127 +0,0 @@
-module MCollective
-  module PluginPackager
-    class ModulepackagePackager
-      require 'erb'
-
-      def initialize(plugin, pluginpath = nil, signature = nil, verbose = false, keep_artifacts = nil, module_template = nil)
-        assert_new_enough_puppet
-        @plugin = plugin
-        @package_name = "#{@plugin.mcname}_#{@plugin.metadata[:name]}".gsub(/-/, '_')
-        @verbose = verbose
-        @keep_artifacts = keep_artifacts
-        @module_template = module_template || File.join(File.dirname(__FILE__), 'templates', 'module')
-      end
-
-      # Build Process :
-      # - create module directory
-      # - run 'puppet module build'
-      # - move generated package back to cwd
-      def create_packages
-        begin
-          puts "Building module for #{@package_name} plugin."
-
-          @tmpdir = Dir.mktmpdir('mcollective_packager')
-          make_module
-          run_build
-          move_package
-
-          puts "Completed building module for #{@package_name} plugin."
-        ensure
-          if @keep_artifacts
-            puts 'Keeping build artifacts'
-            puts "Build artifacts saved - #{@tmpdir}"
-          else
-            cleanup_tmpdirs
-          end
-        end
-      end
-
-      private
-
-      def assert_new_enough_puppet
-        unless PluginPackager.command_available?('puppet')
-          raise("Cannot build package. 'puppet' is not present on the system.")
-        end
-
-        s = Shell.new('puppet --version')
-        s.runcommand
-        actual_version = s.stdout.chomp
-
-        required_version = '3.3.0'
-        if Util.versioncmp(actual_version, required_version) < 0
-          raise("Cannot build package. puppet #{required_version} or greater required.  We have #{actual_version}.")
-        end
-      end
-
-      def make_module
-        targetdir = File.join(@tmpdir, 'manifests')
-        FileUtils.mkdir_p(targetdir) unless File.directory?(targetdir)
-
-        # for each subpackage make a subclass
-        @plugin.packagedata.each do |klass,data|
-          data[:files].each do |file|
-            relative_path = File.expand_path(file).gsub(/#{@plugin.target_path}|^\.\//, '')
-            targetdir = File.join(@tmpdir, 'files', klass.to_s, 'mcollective', File.dirname(relative_path))
-            FileUtils.mkdir_p(targetdir) unless File.directory?(targetdir)
-            FileUtils.cp_r(file, targetdir)
-          end
-
-          @klass = klass.to_s
-          render_template('_manifest.pp.erb', File.join(@tmpdir, 'manifests', "#{klass}.pp"))
-        end
-
-        # render all the templates we have
-        Dir.glob(File.join(@module_template, '*.erb')).each do |template|
-          filename = File.basename(template, '.erb')
-          next if filename =~ /^_/ # starting with underscore makes it private
-          render_template("#{filename}.erb", File.join(@tmpdir, filename))
-        end
-      end
-
-      def render_template(template, path)
-        begin
-          erb = ERB.new(File.read(File.join(@module_template, template)), nil, '-')
-          File.open(path, 'w') do |f|
-            f.puts erb.result(binding)
-          end
-        rescue => e
-          puts "Could not render template to path - '#{path}'"
-          raise e
-        end
-      end
-
-      def run_build
-        begin
-          PluginPackager.execute_verbosely(@verbose) do
-            Dir.chdir(@tmpdir) do
-              PluginPackager.safe_system('puppet module build')
-            end
-          end
-        rescue => e
-          puts 'Build process has failed'
-          raise e
-        end
-      end
-
-      # Move built package to cwd
-      def move_package
-        begin
-          package_file = File.join(@tmpdir, 'pkg', "#{@plugin.vendor}-#{@package_name}-#{@plugin.metadata[:version]}.tar.gz")
-          FileUtils.cp(package_file, '.')
-        rescue => e
-          puts 'Could not copy package to working directory'
-          raise e
-        end
-      end
-
-      def cleanup_tmpdirs
-        begin
-          FileUtils.rm_r(@tmpdir) if File.directory?(@tmpdir)
-        rescue => e
-          puts "Could not remove temporary build directory - '#{@tmpdir}'"
-          raise e
-        end
-      end
-    end
-  end
-end

data/lib/mcollective/pluginpackager/ospackage_packager.rb

@@ -1,59 +0,0 @@
-module MCollective
-  module PluginPackager
-    # MCollective plugin packager general OS implementation.
-    class OspackagePackager
-
-      attr_accessor :package, :verbose, :packager, :package_type
-
-      # Create packager object with package parameter containing list of files,
-      # dependencies and package metadata.
-      def initialize(package, pluginpath = nil, signature = nil, verbose = false, keep_artifacts = false, module_template = nil)
-
-        if File.exists?("/etc/redhat-release")
-          @packager = PluginPackager["RpmpackagePackager"].new(package, pluginpath, signature, verbose, keep_artifacts, module_template)
-          @package_type = "RPM"
-        elsif File.exists?("/etc/debian_version")
-          @packager = PluginPackager["DebpackagePackager"].new(package, pluginpath, signature, verbose, keep_artifacts, module_template)
-          @package_type = "Deb"
-        else
-          raise "cannot identify operating system."
-        end
-
-        @package = package
-        @verbose = verbose
-      end
-
-      # Hands over package creation to the detected packager implementation
-      # based on operating system.
-      def create_packages
-        @packager.create_packages
-      end
-
-      # Displays the package metadata and detected files
-      def package_information
-        puts
-        puts "%30s%s" % ["Plugin information : ", @package.metadata[:name]]
-        puts "%30s%s" % ["-" * 22, "-" * 22]
-        puts "%30s%s" % ["Plugin Type : ", @package.plugintype.capitalize]
-        puts "%30s%s" % ["Package Output Format : ", @package_type]
-        puts "%30s%s" % ["Version : ", @package.metadata[:version]]
-        puts "%30s%s" % ["Revision : ", @package.revision]
-        puts "%30s%s" % ["Vendor : ", @package.vendor]
-        puts "%30s%s" % ["Post Install Script : ", @package.postinstall] if @package.postinstall
-        puts "%30s%s" % ["Author : ", @package.metadata[:author]]
-        puts "%30s%s" % ["License : ", @package.metadata[:license]]
-        puts "%30s%s" % ["URL : ", @package.metadata[:url]]
-
-        if @package.packagedata.size > 0
-          @package.packagedata.each_with_index do |values, i|
-            if i == 0
-              puts "%30s%s" % ["Identified Packages : ", values[0]]
-            else
-              puts "%30s%s" % [" ", values[0]]
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/mcollective/pluginpackager/rpmpackage_packager.rb

@@ -1,180 +0,0 @@
-module MCollective
-  module PluginPackager
-    class RpmpackagePackager
-      require 'erb'
-
-      def initialize(plugin, pluginpath = nil, signature = nil, verbose = false, keep_artifacts = nil, module_template = nil)
-        if @buildtool = select_command
-          @plugin = plugin
-          @package_name = "#{@plugin.mcname}-#{@plugin.metadata[:name]}"
-          @package_name_and_version = "#{@package_name}-#{@plugin.metadata[:version]}"
-          @verbose = verbose
-          @libdir = pluginpath || '/usr/libexec/mcollective/mcollective/'
-          @signature = signature
-          @rpmdir = rpmdir
-          @srpmdir = srpmdir
-          @keep_artifacts = keep_artifacts
-        else
-          raise("Cannot build package. 'rpmbuild' or 'rpmbuild-md5' is not present on the system")
-        end
-      end
-
-      # Determine the build tool present on the system
-      def select_command
-        if PluginPackager.command_available?('rpmbuild-md5')
-          return 'rpmbuild-md5'
-        elsif PluginPackager.command_available?('rpmbuild')
-          return 'rpmbuild'
-        else
-          return nil
-        end
-      end
-
-      def rpmdir
-        `rpm --eval '%_rpmdir'`.chomp
-      end
-
-      def srpmdir
-        `rpm --eval '%_srcrpmdir'`.chomp
-      end
-
-      # Build Process :
-      # - create temporary buildroot
-      # - create the spec file
-      # - create the tarball
-      # - run the build script
-      # - move pacakges to cwd
-      # - clean up
-      def create_packages
-        begin
-          puts "Building packages for #{@package_name} plugin."
-
-          @tmpdir = Dir.mktmpdir('mcollective_packager')
-          prepare_tmpdirs
-
-          make_spec_file
-          run_build
-          move_packages
-
-          puts "Completed building all packages for #{@package_name} plugin."
-        ensure
-          if @keep_artifacts
-            puts 'Keeping build artifacts'
-            puts "Build artifacts saved - #{@tmpdir}"
-          else
-            cleanup_tmpdirs
-          end
-        end
-      end
-
-      private
-
-      def run_build
-        begin
-          tarfile = create_tar
-          PluginPackager.execute_verbosely(@verbose) do
-            PluginPackager.safe_system("#{@buildtool} -ta#{" --quiet" unless @verbose}#{" --sign" if @signature} #{tarfile}")
-          end
-        rescue => e
-          puts 'Build process has failed'
-          raise e
-        end
-      end
-
-      # Tar up source
-      # Expects directory $mcollective-$agent-$version
-      # Creates file : $tmpbuildroot/$mcollective-$agent-$version
-      def create_tar
-        tarfile = File.join(@tmpdir, "#{@package_name_and_version}.tgz")
-        begin
-         PluginPackager.execute_verbosely(@verbose) do
-            Dir.chdir(@tmpdir) do
-              PluginPackager.safe_system("tar -cvzf #{tarfile} #{@package_name_and_version}")
-            end
-          end
-        rescue => e
-          puts "Could not create tarball - '#{tarfile}'"
-          raise e
-        end
-        tarfile
-      end
-
-      # Move rpm's and srpm's to cwd
-      def move_packages
-        begin
-          files_to_copy = []
-          files_to_copy += Dir.glob(File.join(@rpmdir, 'noarch', "#{@package_name}-*-#{@plugin.metadata[:version]}-#{@plugin.revision}*.noarch.rpm"))
-          files_to_copy += Dir.glob(File.join(@srpmdir, "#{@package_name}-#{@plugin.metadata[:version]}-#{@plugin.revision}*.src.rpm"))
-          FileUtils.cp(files_to_copy, '.')
-        rescue => e
-          puts 'Could not copy packages to working directory'
-          raise e
-        end
-      end
-
-      # Create the specfile and place as $tmpbuildroot/$mcollective-$agent-$version/$mcollective-$agent-$version.spec
-      def make_spec_file
-        spec_file = File.join(@tmpdir, @package_name_and_version, "#{@package_name_and_version}.spec")
-        begin
-          spec_template = ERB.new(File.read(File.join(File.dirname(__FILE__), 'templates', 'redhat', 'rpm_spec.erb')), nil, '-')
-          File.open(spec_file, 'w') do |f|
-            f.puts spec_template.result(binding)
-          end
-        rescue => e
-          puts "Could not create specfile - '#{spec_file}'"
-          raise e
-        end
-      end
-
-      # Move files contained in the plugin to the correct directory
-      # relative to the build root.
-      def prepare_tmpdirs
-        plugin_files.each do |file|
-          begin
-            targetdir = File.join(@tmpdir, @package_name_and_version, @libdir, File.dirname(File.expand_path(file)).gsub(@plugin.target_path, ""))
-            FileUtils.mkdir_p(targetdir) unless File.directory?(targetdir)
-            FileUtils.cp_r(file, targetdir)
-          rescue Errno::EACCES => e
-            puts "Could not create directory '#{targetdir}'. Permission denied"
-            raise e
-          rescue Errno::ENOENT => e
-            puts "Could not copy file '#{file}' to '#{targetdir}'. File does not exist"
-            raise e
-          rescue => e
-            puts 'Could not prepare temporary build directory'
-            raise e
-          end
-        end
-      end
-
-      # Extract all the package files from the plugin's package data hash
-      def plugin_files
-        files = []
-        @plugin.packagedata.each do |name, data|
-          files += data[:files].reject{ |f| File.directory?(f) }
-        end
-        files
-      end
-
-      # Extract the package specific files from the file list and omits directories
-      def package_files(files)
-        package_files = []
-        files.each do |f|
-          if !File.directory?(f)
-            package_files << File.join(@libdir, File.expand_path(f).gsub(/#{@plugin.target_path}|\.\//, ''))
-          end
-        end
-        package_files
-      end
-
-      def cleanup_tmpdirs
-        begin
-          FileUtils.rm_r(@tmpdir) if File.directory?(@tmpdir)
-        rescue => e
-          puts "Could not remove temporary build directory - '#{@tmpdir}'"
-          raise e
-        end
-      end
-    end
-  end
-end

data/lib/mcollective/pluginpackager/templates/debian/Makefile.erb

@@ -1,7 +0,0 @@
-DESTDIR=
-
-build:
-
-clean:
-
-install:

data/lib/mcollective/pluginpackager/templates/debian/changelog.erb

@@ -1,5 +0,0 @@
-<%= @package_name -%> (<%= @plugin.metadata[:version]-%>-<%= @plugin.revision-%>) unstable; urgency=low
-
-  * Automated release for <%= @package_name -%> by mco plugin packager.
-
- -- The Marionette Collective <mcollective-dev@googlegroups.com>  <%= Time.new.strftime('%a, %d %b %Y %H:%M:%S %z') %>

data/lib/mcollective/pluginpackager/templates/debian/compat.erb

@@ -1 +0,0 @@
-7

data/lib/mcollective/pluginpackager/templates/debian/control.erb

@@ -1,15 +0,0 @@
-Source: <%= @package_name %>
-Homepage: <%= @plugin.metadata[:url] %>
-Section: utils
-Priority: extra
-Build-Depends: debhelper (>= 7), cdbs, dpatch
-Maintainer: <%= @plugin.metadata[:author] %>
-Standards-Version: 3.9.1
-<% @plugin.packagedata.each do |type, data| %>
-Package: <%= "#{@package_name}-#{type}" %>
-Architecture: all
-Depends: <%= build_dependency_string(data) %>
-Description: <%= @plugin.metadata[:description]%>
- <%= data[:description]%>
- .
-<% end -%>

data/lib/mcollective/pluginpackager/templates/debian/copyright.erb

@@ -1,8 +0,0 @@
-This package was generated by the MCollective plugin packager on
-<%= Time.now%>
-
-Upstream Author:
-  <%= @plugin.metadata[:author] %> <%= @plugin.metadata[:url] %>
-
-License:
-  <%= @plugin.metadata[:license] -%>

data/lib/mcollective/pluginpackager/templates/debian/rules.erb

@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/makefile.mk
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -f debian/Makefile -C $(DEB_BUILDDIR)

data/lib/mcollective/pluginpackager/templates/module/Modulefile.erb

@@ -1,5 +0,0 @@
-name '<%= @plugin.vendor %>-<%= @package_name %>'
-version '<%= @plugin.metadata[:version] %>'
-description '<%= @plugin.metadata[:description] %>'
-project_page '<%= @plugin.metadata[:url]%>'
-dependency 'puppetlabs/mcollective', '1.x'

data/lib/mcollective/pluginpackager/templates/module/README.md.erb

@@ -1,37 +0,0 @@
-# <%= @package_name %>
-
-#### Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with <%= @package_name %>](#setup)
-    * [What the <%= @package_name %> module affects](#what-the-<%= @package_name %>-module-affects)
-    * [Setup requirements](#setup-requirements)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-
-
-## Overview
-
-The <%= @package_name %> module is a module that wraps a source release of the
-<%= @plugin.metadata[:name] %> mcollective plugin for use with the
-[puppetlabs mcollective](http://forge.puppetlabs.com/puppetlabs/mcollective)
-module.
-
-## Module description
-
-## Usage
-
-<% @plugin.packagedata.keys.map { |x| x.to_s }.sort.each do |klass| -%>
-<%# Don't document common class -%>
-<% if klass != "common" -%>
-### class <%= @package_name %>::<%= klass %>
-
-Installs the <%= klass %> component of the <%= @plugin.metadata[:name] %> plugin.
-
-```puppet
-include <%= @package_name%>::<%= klass %>
-```
-<% end %>
-<% end %>
-

data/lib/mcollective/pluginpackager/templates/module/_manifest.pp.erb

@@ -1,9 +0,0 @@
-#
-class <%= @package_name %>::<%= @klass %> {
-  <% if @plugin.packagedata[:common] && @klass != 'common' %>
-  include ::<%= @package_name %>::common
-  <% end %>
-  mcollective::plugin { '<%= @package_name %>/<%= @klass %>':
-    source => 'puppet:///modules/<%= @package_name %>/<%= @klass %>',
-  }
-}

data/lib/mcollective/pluginpackager/templates/redhat/rpm_spec.erb

@@ -1,63 +0,0 @@
-Name: <%= @package_name %>
-Summary: <%= @plugin.metadata[:description] %>
-Version: <%= @plugin.metadata[:version] %>
-Release: <%= @plugin.revision %>%{?dist}
-License: <%= @plugin.metadata[:license]%>
-URL: <%= @plugin.metadata[:url]%>
-Vendor: <%= @plugin.vendor%>
-Packager: <%= @plugin.metadata[:author]%>
-BuildArch: noarch
-Group: System Tools
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: <%= @package_name_and_version%>.tgz
-
-%description
-<%= @plugin.metadata[:description] %>
-
-%prep
-%setup
-
-%build
-<% package_files = plugin_files.map{ |f| File.join(@libdir, File.expand_path(f).gsub(/#{File.expand_path(@plugin.path)}|\.\//, '')) } -%>
-<% dirs = package_files.map{ |f| File.dirname(f) }.uniq -%>
-
-%install
-rm -rf %{buildroot}
-<% dirs.each do |dir| -%>
-%{__install} -d -m0755 %{buildroot}<%= dir%>
-<% end -%>
-<% package_files.each do |file| -%>
-%{__install} -m0644 -v <%= (file[0].chr == '/') ? file[1..file.size-1]: file%> %{buildroot}<%=file %>
-<% end -%>
-
-<% @plugin.packagedata.each do |type, data| %>
-%package <%= type %>
-Summary: <%= @plugin.metadata[:description] %>
-<% if data[:plugindependency] %>
-Requires: <%= data[:plugindependency][:name] -%> = <%= data[:plugindependency][:version]%>-<%= data[:plugindependency][:revision]%>%{?dist}
-<% end -%>
-<% PluginPackager.filter_dependencies('redhat', data[:dependencies]).each do |dep|-%>
-Requires: <%= dep[:name] -%> <%= ">= #{dep[:version]}" if dep[:version]%><%="-#{dep[:revision]}" if dep[:revision]%>
-<% end -%>
-%description <%= type %>
-<%= data[:description] %>
-
-%files <%= type %>
-%defattr(-, root, root, -)
-<% package_files(data[:files]).each do |file| -%>
-<%= file %>
-<% end -%>
-<% end -%>
-
-<% if @plugin.preinstall -%>
-%pre
-<%= @plugin.preinstall %>
-<% end -%>
-<% if @plugin.postinstall -%>
-%post
-<%= @plugin.postinstall%>
-<% end -%>
-
-%changelog
-* <%= Time.now.strftime("%a %b %d %Y") -%> <%= @plugin.metadata[:author]%> - <%= @plugin.metadata[:version]%>-<%= @plugin.revision %>
-- Built Package <%= @plugin.metadata[:name] -%>