choria-mcorpc-support 2.20.5 → 2.21.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.20.5
+  version: 2.21.1
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.6'
 description: Libraries enabling Ruby support for the Choria Orchestration Server
 email: rip@devco.net
 executables:
@@ -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