choria-mcorpc-support 2.24.1 → 2.25.0

data/lib/mcollective.rb

@@ -43,7 +43,6 @@ module MCollective
   require "mcollective/log"
   require "mcollective/message"
   require "mcollective/optionparser"
-  require "mcollective/generators"
   require "mcollective/pluginmanager"
   require "mcollective/pluginpackager"
   require "mcollective/rpc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.24.1
+  version: 2.25.0
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Libraries enabling Ruby support for the Choria Orchestration Server
 email: rip@devco.net
 executables:
@@ -57,6 +63,8 @@ files:
 - lib/mcollective/agent/bolt_tasks.ddl
 - lib/mcollective/agent/bolt_tasks.json
 - lib/mcollective/agent/bolt_tasks.rb
+- lib/mcollective/agent/choria_provision.ddl
+- lib/mcollective/agent/choria_provision.json
 - lib/mcollective/agent/choria_util.ddl
 - lib/mcollective/agent/choria_util.json
 - lib/mcollective/agent/rpcutil.ddl
@@ -118,12 +126,6 @@ files:
 - lib/mcollective/facts.rb
 - lib/mcollective/facts/base.rb
 - lib/mcollective/facts/yaml_facts.rb
-- lib/mcollective/generators.rb
-- lib/mcollective/generators/agent_generator.rb
-- lib/mcollective/generators/base.rb
-- lib/mcollective/generators/templates/action_snippet.erb
-- lib/mcollective/generators/templates/ddl.erb
-- lib/mcollective/generators/templates/plugin.erb
 - lib/mcollective/log.rb
 - lib/mcollective/logger.rb
 - lib/mcollective/logger/base.rb

data/lib/mcollective/generators/agent_generator.rb

@@ -1,50 +0,0 @@
-module MCollective
-  module Generators
-    class AgentGenerator < Base
-      attr_accessor :ddl, :content
-
-      def initialize(plugin_name, actions=[], name=nil, description=nil, author=nil,
-                     license=nil, version=nil, url=nil, timeout=nil)
-
-        super(name, description, author, license, version, url, timeout)
-        @plugin_name = plugin_name
-        @actions = actions || []
-        @ddl = create_ddl
-        @mod_name = "Agent"
-        @pclass = "RPC::Agent"
-        @content = create_plugin_content
-        @plugin = create_plugin_string
-        write_plugins
-      end
-
-      def create_ddl
-        action_text = ""
-        @actions.each_with_index do |action, i|
-          action_text += "action \"#{action}\", :description => \"%ACTIONDESCRIPTION%\" do\n"
-          action_text += action_help if i == 0
-          action_text += "end\n"
-          action_text += "\n" unless @actions.size == (i + 1)
-        end
-        # Use inherited method to create metadata part of the ddl
-        create_metadata_string + action_text
-      end
-
-      def create_plugin_content
-        content_text = ""
-
-        # Add actions to agent file
-        @actions.each_with_index do |action, i|
-          content_text +=  "%6s%s" % [" ", "action \"#{action}\" do\n"]
-          content_text +=  "%6s%s" % [" ", "end\n"]
-          content_text += "\n" unless @actions.size == (i + 1)
-        end
-        content_text
-      end
-
-      def action_help
-        action_snippet = File.read(File.join(File.dirname(__FILE__), "templates", "action_snippet.erb"))
-        ERB.new(action_snippet).result
-      end
-    end
-  end
-end

data/lib/mcollective/generators/base.rb

@@ -1,45 +0,0 @@
-module MCollective
-  module Generators
-    class Base
-      attr_accessor :meta, :plugin_name, :mod_name
-
-      def initialize(name, description, author, license, version, url, timeout)
-        @meta = {:name => name,
-                 :description => description,
-                 :author => author,
-                 :license => license,
-                 :version => version,
-                 :url => url,
-                 :timeout => timeout}
-      end
-
-      def create_metadata_string
-        ddl_template = File.read(File.join(File.dirname(__FILE__), "templates", "ddl.erb"))
-        ERB.new(ddl_template, nil, "-").result(binding)
-      end
-
-      def create_plugin_string
-        plugin_template = File.read(File.join(File.dirname(__FILE__), "templates", "plugin.erb"))
-        ERB.new(plugin_template, nil, "-").result(binding)
-      end
-
-      def write_plugins
-        Dir.mkdir @plugin_name
-        dirname = File.join(@plugin_name, @mod_name.downcase)
-        Dir.mkdir dirname
-        puts "Created plugin directory : #{@plugin_name}"
-
-        File.open(File.join(dirname, "#{@plugin_name}.ddl"), "w") {|f| f.puts @ddl}
-        puts "Created DDL file : #{File.join(dirname, "#{@plugin_name}.ddl")}"
-
-        File.open(File.join(dirname, "#{@plugin_name}.rb"), "w") {|f| f.puts @plugin}
-        puts "Created #{@mod_name} file : #{File.join(dirname, "#{@plugin_name}.rb")}"
-      rescue Errno::EEXIST
-        raise "cannot generate '#{@plugin_name}' : plugin directory already exists."
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        FileUtils.rm_rf(@plugin_name) if File.directory?(@plugin_name)
-        raise "cannot generate plugin - #{e}"
-      end
-    end
-  end
-end

data/lib/mcollective/generators/templates/action_snippet.erb

@@ -1,13 +0,0 @@
-     # Example Input
-     input :name,
-           :prompt => "%PROMPT%",
-           :description => "%DESCRIPTION%",
-           :type => %TYPE%,
-           :validation => '%VALIDATION%',
-           :optional => %OPTIONAL%,
-           :maxlength => %MAXLENGTH%
-
-     # Example output
-     output :name,
-            :description => "%DESCRIPTION%",
-            :display_as => "%DISPLAYAS%"

data/lib/mcollective/generators/templates/ddl.erb

@@ -1,8 +0,0 @@
-metadata :name => "<%= meta[:name] || "%FULLNANE%" -%>",
-         :description => "<%= meta[:description] || "%DESCRIPTION%" -%>",
-         :author => "<%= meta[:author] || "%AUTHOR%" -%>",
-         :license => "<%= meta[:license] || "%LICENSE%" -%>",
-         :version => "<%= meta[:version] || "%VERSION%" -%>",
-         :url => "<%= meta[:url] || "%URL%" -%>",
-         :timeout => <%= meta[:timeout] || "%TIMEOUT%" %>
-

data/lib/mcollective/generators/templates/plugin.erb

@@ -1,7 +0,0 @@
-module MCollective
-  module <%= @mod_name%>
-    class <%= @plugin_name.capitalize -%><<%= @pclass%>
-<%= @content%>
-    end
-  end
-end

data/lib/mcollective/generators.rb

@@ -1,6 +0,0 @@
-module MCollective
-  module Generators
-    require "mcollective/generators/base"
-    require "mcollective/generators/agent_generator"
-  end
-end