mcollective-client 1.3.3 → 2.0.0

data/bin/mc-call-agent

@@ -6,49 +6,49 @@ require 'pp'
 oparser = MCollective::Optionparser.new({:verbose => true}, "filter")
 
 options = oparser.parse{|parser, options|
-    parser.define_head "Call an agent parsing an argument to it"
-    parser.banner = "Usage: mc-call-agent [options] --agent agent --argument arg"
+  parser.define_head "Call an agent parsing an argument to it"
+  parser.banner = "Usage: mc-call-agent [options] --agent agent --argument arg"
 
-    parser.on('-a', '--agent AGENT', 'Agent to call') do |v|
-        options[:agent] = v
-    end
+  parser.on('-a', '--agent AGENT', 'Agent to call') do |v|
+    options[:agent] = v
+  end
 
-    parser.on('--arg', '--argument ARGUMENT', 'Argument to pass to agent') do |v|
-        options[:argument] = v
-    end
+  parser.on('--arg', '--argument ARGUMENT', 'Argument to pass to agent') do |v|
+    options[:argument] = v
+  end
 }
 
 if options[:agent] == nil || options[:argument] == nil
-    puts("Please use either --agent or --argument")
-    exit 1
+  puts("Please use either --agent or --argument")
+  exit 1
 end
 
 begin
-    options[:filter]["agent"] << options[:agent]
+  options[:filter]["agent"] << options[:agent]
 
-    client = MCollective::Client.new(options[:config])
-    client.options = options
+  client = MCollective::Client.new(options[:config])
+  client.options = options
 
-    c = 0
+  c = 0
 
-    stats = client.discovered_req(options[:argument], options[:agent]) do |resp|
-        next if resp == nil
+  stats = client.discovered_req(options[:argument], options[:agent]) do |resp|
+    next if resp == nil
 
-        c += 1
+    c += 1
 
-        if options[:verbose]
-            puts("#{resp[:senderid]}>")
-            pp resp[:body]
-        else
-            puts if c % 4 == 1
-            printf("%-30s", resp[:senderid])
-        end
+    if options[:verbose]
+      puts("#{resp[:senderid]}>")
+      pp resp[:body]
+    else
+      puts if c % 4 == 1
+      printf("%-30s", resp[:senderid])
     end
+  end
 
-    client.disconnect
+  client.disconnect
 rescue Exception => e
-    STDERR.puts "Could not call remote agent: #{e}"
-    exit 1
+  STDERR.puts "Could not call remote agent: #{e}"
+  exit 1
 end
 
 client.display_stats(stats)

data/bin/mco

@@ -7,21 +7,31 @@ known_applications = MCollective::Applications.list
 
 # links from mc-ping to mc will result in ping being run
 if $0 =~ /mc\-([a-zA-Z\-_\.]+)$/
-    app_name = $1
+  app_name = $1
 else
-    app_name = ARGV.first
-    ARGV.delete_at(0)
+  app_name = ARGV.first
+  ARGV.delete_at(0)
 end
 
 if known_applications.include?(app_name)
-    # make sure the various options classes shows the right help etc
-    $0 = app_name
+  # make sure the various options classes shows the right help etc
+  $0 = app_name
 
-    MCollective::Applications.run(app_name)
+  MCollective::Applications.run(app_name)
 else
-    puts "The Marionette Collective version #{MCollective.version}"
-    puts
-    puts "#{$0}: command (options)"
-    puts
-    puts "Known commands: #{known_applications.join " "}"
+  puts "The Marionette Collective version #{MCollective.version}"
+  puts
+  puts "usage: #{$0} command <options>"
+  puts
+  puts "Known commands:"
+  puts
+
+  known_applications.sort.uniq.in_groups_of(3) do |apps|
+    puts "   %-20s %-20s %-20s" % [apps[0], apps[1], apps[2]]
+  end
+
+  puts
+  puts "Type '#{$0} help' for a detailed list of commands and '#{$0} help command'"
+  puts "to get detailed help for a command"
+  puts
 end

data/lib/mcollective.rb

@@ -7,10 +7,10 @@ require 'singleton'
 require 'socket'
 require 'erb'
 require 'shellwords'
-require 'mcollective/monkey_patches'
-require 'tempfile'
 require 'rbconfig'
+require 'tempfile'
 require 'tmpdir'
+require 'mcollective/monkey_patches'
 
 # == The Marionette Collective
 #

data/lib/mcollective/pluginpackager.rb

@@ -13,14 +13,49 @@ module MCollective
       const_get("#{klass}")
     end
 
+    # Fetch and return metadata from plugin DDL
     def self.get_metadata(path, type)
       ddl = MCollective::RPC::DDL.new("package", false)
       ddl.instance_eval File.read(Dir.glob(File.join(path, type, "*.ddl")).first)
       ddl.meta
     end
 
+    # Checks if a directory is present and not empty
     def self.check_dir_present(path)
       (File.directory?(path) && !Dir.glob(File.join(path, "*")).empty?)
     end
+
+    # Quietly calls a block if verbose parameter is false
+    def self.do_quietly?(verbose, &block)
+      unless verbose
+        old_stdout = $stdout.clone
+        $stdout.reopen(File.new("/dev/null", "w"))
+        begin
+          block.call
+        rescue Exception => e
+          $stdout.reopen old_stdout
+          raise e
+        ensure
+          $stdout.reopen old_stdout
+        end
+      else
+        block.call
+      end
+    end
+
+    # Checks if a build tool is present on the system
+    def self.build_tool?(build_tool)
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+        builder = File.join(path, build_tool)
+        if File.exists?(builder)
+          return true
+        end
+      end
+      false
+    end
+
+    def self.safe_system(*args)
+      raise RuntimeError, "Failed: #{args.join(' ')}" unless system *args
+    end
   end
 end

data/lib/mcollective/pluginpackager/agent_definition.rb

@@ -2,33 +2,41 @@ module MCollective
   module PluginPackager
     # MCollective Agent Plugin package
     class AgentDefinition
-      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :iteration, :postinstall
-      attr_accessor :plugintype
+      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :iteration, :preinstall
+      attr_accessor :plugintype, :dependencies, :postinstall, :mcserver, :mcclient, :mccommon
 
-      def initialize(path, name, vendor, postinstall, iteration, plugintype)
+      def initialize(path, name, vendor, preinstall, postinstall, iteration, dependencies, mcodependency, plugintype)
         @plugintype = plugintype
         @path = path
         @packagedata = {}
         @iteration = iteration || 1
+        @preinstall = preinstall
         @postinstall = postinstall
         @vendor = vendor || "Puppet Labs"
+        @mcserver = mcodependency[:server] || "mcollective"
+        @mcclient = mcodependency[:client] || "mcollective-client"
+        @mccommon = mcodependency[:common] || "mcollective-common"
+        @dependencies = dependencies || []
         @target_path = File.expand_path(@path)
         @metadata = PluginPackager.get_metadata(@path, "agent")
-        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(" ", "_")
+        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(" ", "-")
         identify_packages
       end
 
       # Identify present packages and populate packagedata hash.
       def identify_packages
-        @packagedata[:common] = common
-        @packagedata[:agent] = agent
-        @packagedata[:client] = client
+        common_package = common
+        @packagedata[:common] = common_package if common_package
+        agent_package = agent
+        @packagedata[:agent] = agent_package if agent_package
+        client_package = client
+        @packagedata[:client] = client_package if client_package
       end
 
       # Obtain Agent package files and dependencies.
       def agent
         agent = {:files => [],
-                 :dependencies => ["mcollective"],
+                 :dependencies => @dependencies.clone << @mcserver,
                  :description => "Agent plugin for #{@metadata[:name]}"}
 
         agentdir = File.join(@path, "agent")
@@ -41,7 +49,6 @@ module MCollective
         else
           return nil
         end
-
         agent[:dependencies] << "mcollective-#{@metadata[:name]}-common" if @packagedata[:common]
         agent
       end
@@ -49,7 +56,7 @@ module MCollective
       # Obtain client package files and dependencies.
       def client
         client = {:files => [],
-                  :dependencies => ["mcollective-client"],
+                  :dependencies => @dependencies.clone << @mcclient,
                   :description => "Client plugin for #{@metadata[:name]}"}
 
         clientdir = File.join(@path, "application")
@@ -66,7 +73,7 @@ module MCollective
       # Obtain common package files and dependencies.
       def common
         common = {:files =>[],
-                  :dependencies => ["mcollective-common"],
+                  :dependencies => @dependencies.clone << @mccommon,
                   :description => "Common libraries for #{@metadata[:name]}"}
 
         commondir = File.join(@path, "util")

data/lib/mcollective/pluginpackager/standard_definition.rb

@@ -1,32 +1,39 @@
 module MCollective
   module PluginPackager
     class StandardDefinition
-      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :iteration, :postinstall
-      attr_accessor :plugintype
+      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :iteration
+      attr_accessor :plugintype, :preinstall, :postinstall, :dependencies, :mcserver
+      attr_accessor :mccommon
 
-      def initialize(path, name, vendor, postinstall, iteration, plugintype)
+      def initialize(path, name, vendor, preinstall, postinstall, iteration, dependencies, mcodependency, plugintype)
         @plugintype = plugintype
         @path = path
         @packagedata = {}
         @iteration = iteration || 1
+        @preinstall = preinstall
         @postinstall = postinstall
         @vendor = vendor || "Puppet Labs"
+        @dependencies = dependencies || []
+        @mcserver = mcodependency[:server] || "mcollective"
+        @mccommon = mcodependency[:common] || "mcollective-common"
         @target_path = File.expand_path(@path)
         @metadata = PluginPackager.get_metadata(@path, @plugintype)
-        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(" ", "_")
+        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(" ", "-")
         identify_packages
       end
 
       # Identify present packages and populate the packagedata hash
       def identify_packages
-        @packagedata[:common] = common
-        @packagedata[@plugintype] = plugin
+        common_package = common
+        @packagedata[:common] = common_package if common_package
+        plugin_package = plugin
+        @packagedata[@plugintype] = plugin_package if plugin_package
       end
 
       # Obtain standard plugin files and dependencies
       def plugin
         plugindata = {:files => [],
-                      :dependencies => ["mcollective"],
+                      :dependencies => @dependencies.clone << @mcserver,
                       :description => "#{@name} #{@plugintype} plugin for the Marionette Collective."}
 
         plugindir = File.join(@path, @plugintype.to_s)
@@ -43,7 +50,7 @@ module MCollective
       # Obtain list of common files
       def common
         common = {:files => [],
-                  :dependencies => ["mcolelctive-common"],
+                  :dependencies => @dependencies.clone << @mccommon,
                   :description => "Common libraries for #{@name} connector plugin"}
 
         commondir = File.join(@path, "util")

data/lib/mcollective/rpc/client.rb

@@ -359,7 +359,7 @@ module MCollective
 
       # Set a compound filter
       def compound_filter(filter)
-        @filter["compound"] = Matcher::Parser.new(filter).execution_stack
+        @filter["compound"] << Matcher::Parser.new(filter).execution_stack
         reset
       end
 

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'mocha'
 require 'ostruct'
 require 'tmpdir'
 require 'tempfile'
+require 'fileutils'
 
 require 'monkey_patches/instance_variable_defined'
 

data/spec/unit/application_spec.rb

@@ -613,22 +613,15 @@ module MCollective
       end
 
       it "should catch handle exit() correctly" do
-        Application.send(:define_method, :main) do
-          exit 1
-        end
-
+        @app.expects(:main).raises(SystemExit)
         @app.expects(:disconnect).once
 
         expect { @app.run }.to raise_error(SystemExit)
       end
 
       it "should catch all exceptions and process them correctly" do
+        @app.expects(:main).raises("rspec")
         @app.expects(:application_failure).once
-
-        Application.send(:define_method, :main) do
-          raise "rspec"
-        end
-
         @app.run
       end
     end

data/spec/unit/pluginpackager/agent_definition_spec.rb

@@ -9,9 +9,23 @@ module MCollective
         PluginPackager.expects(:get_metadata).once.returns({:name => "foo"})
       end
 
-      it "should replace spaces in the package name with underscores" do
-        agent = AgentDefinition.new(".", "test package", nil, nil, nil, "agent")
-        agent.metadata[:name].should == "test_package"
+      describe "#initialize" do
+        it "should replace spaces in the package name with dashes" do
+          agent = AgentDefinition.new(".", "test package", nil, nil, nil, nil, [], {}, "agent")
+          agent.metadata[:name].should == "test-package"
+        end
+
+        it "should set dependencies if present" do
+          agent = AgentDefinition.new(".", "test-package", nil, nil, nil, nil, ["foo"], {}, "agent")
+          agent.dependencies.should == ["foo"]
+        end
+
+        it "should set mc server, client and common dependencies" do
+          agent = AgentDefinition.new(".", "test-package", nil, nil, nil, nil, [], {:server => "pe-mcollective"}, "agent")
+          agent.mcserver.should == "pe-mcollective"
+          agent.mcclient.should == "mcollective-client"
+          agent.mccommon.should == "mcollective-common"
+        end
       end
 
       describe "#identify_packages" do
@@ -20,7 +34,7 @@ module MCollective
           AgentDefinition.any_instance.expects(:agent).once.returns(:check)
           AgentDefinition.any_instance.expects(:client).once.returns(:check)
 
-          agent = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          agent = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           agent.packagedata[:common].should == :check
           agent.packagedata[:agent].should == :check
           agent.packagedata[:client].should == :check
@@ -35,7 +49,7 @@ module MCollective
         it "should not populate the agent files if the agent directory is empty" do
           AgentDefinition.any_instance.expects(:common).returns(nil)
           PluginPackager.expects(:check_dir_present).returns(false)
-          agent = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          agent = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           agent.packagedata[:agent].should == nil
         end
 
@@ -45,17 +59,17 @@ module MCollective
           File.stubs(:join).returns("tmpdir")
           Dir.stubs(:glob).returns(["file.rb", "implementation.rb"])
 
-          agent = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          agent = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           agent.packagedata[:agent][:files].should == ["file.rb", "implementation.rb"]
         end
 
         it "should add common package as dependency if present" do
-          AgentDefinition.any_instance.expects(:common).returns(true)
+          AgentDefinition.any_instance.expects(:common).returns({:files=> ["test.rb"]})
           PluginPackager.expects(:check_dir_present).returns(true)
           File.stubs(:join).returns("tmpdir")
           Dir.stubs(:glob).returns([])
 
-          agent = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          agent = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           agent.packagedata[:agent][:dependencies].should == ["mcollective", "mcollective-foo-common"]
         end
       end
@@ -68,7 +82,7 @@ module MCollective
 
         it "should not populate the commong files if the util directory is empty" do
           PluginPackager.expects(:check_dir_present).returns(false)
-          common = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          common = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           common.packagedata[:common].should == nil
         end
 
@@ -76,7 +90,7 @@ module MCollective
           PluginPackager.expects(:check_dir_present).returns(true)
           File.stubs(:join).returns("tmpdir")
           Dir.stubs(:glob).returns(["file.rb"])
-          common = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          common = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           common.packagedata[:common][:files].should == ["file.rb"]
         end
       end
@@ -99,7 +113,7 @@ module MCollective
           Dir.expects(:glob).with("bindir/*").returns(["bin.rb"])
           Dir.expects(:glob).with("agentdir/*.ddl").returns(["agent.ddl"])
 
-          client = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          client = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           client.packagedata[:client][:files].should == ["client.rb", "bin.rb", "agent.ddl"]
         end
 
@@ -107,7 +121,7 @@ module MCollective
           AgentDefinition.any_instance.expects(:common).returns(nil)
           PluginPackager.expects(:check_dir_present).times(3).returns(false)
 
-          client = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          client = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           client.packagedata[:client].should == nil
         end
 
@@ -121,7 +135,7 @@ module MCollective
           Dir.expects(:glob).with("bindir/*").returns(["bin.rb"])
           Dir.expects(:glob).with("agentdir/*.ddl").returns(["agent.ddl"])
 
-          client = AgentDefinition.new(".", nil, nil, nil, nil, "agent")
+          client = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
           client.packagedata[:client][:dependencies].should == ["mcollective-client", "mcollective-foo-common"]
         end
       end