mcollective-client 2.8.1 → 2.8.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 52ad5cb27607bdabe126ccaec0b7557f5e1afba2
4
- data.tar.gz: 369104211b6a92719f05b936ba821fd2241747d4
3
+ metadata.gz: 904c505ab77f21d5d77d3eb209fea1d13ac0da5b
4
+ data.tar.gz: 64f5cacf2b09eb58e47f5d1024a291b6d45bd5cf
5
5
  SHA512:
6
- metadata.gz: 4efe3ae45ef64f73f65c2fa6cc923a6c9788dcad2249eab223a0a188974129a1897a7f4b06ecf531ef4108e315c58f1621860a5ef8ebbffc9e85bac829d2f327
7
- data.tar.gz: 897e104caa014f6f00dc0abc2bcf72edff1278db7452d7a58144d6445b6d7558309208b1cbe2d621022abcaf5ef6c3b54450cbfbae3de55de30c545dbac40c06
6
+ metadata.gz: 7bbb22468aa2d8c296f4251d1802c8b1c67172a864aa2f2fd26f8418f7e1f6a4c53e32afccd539a765bb426040ddda12f54f61159a3f5ea5dbcbfb42a272a1f4
7
+ data.tar.gz: 2a0f8ac39135386fa1bc16702eead7e442e4de491ca545950baf12f33d7a40817e16f4a92e5bc1dbd39246d261fad5828e7cbb9dcb041efb01a910f4b522ad40
data/bin/mco CHANGED
@@ -6,6 +6,9 @@ $LOAD_PATH.delete '.'
6
6
 
7
7
  require 'mcollective'
8
8
 
9
+ # assume everything will all be fine
10
+ exitcode = 0
11
+
9
12
  Version = MCollective.version
10
13
  known_applications = MCollective::Applications.list
11
14
 
@@ -15,6 +18,12 @@ if $0 =~ /mc\-([a-zA-Z\-_\.]+)$/
15
18
  else
16
19
  app_name = ARGV.first
17
20
  ARGV.delete_at(0)
21
+
22
+ # it may be a config option rather than an application name. In this
23
+ # case pretend we had no application name
24
+ if app_name =~ /^--/
25
+ app_name = nil
26
+ end
18
27
  end
19
28
 
20
29
  if known_applications.include?(app_name)
@@ -25,8 +34,20 @@ if known_applications.include?(app_name)
25
34
  else
26
35
  puts "The Marionette Collective version #{MCollective.version}"
27
36
  puts
28
- puts "usage: #{$0} command <options>"
29
- puts
37
+
38
+ if app_name
39
+ puts "Unknown command '#{app_name}', searched for applications in:"
40
+ puts
41
+ puts MCollective::Config.instance.libdir.map { |path| " #{path}\n" }
42
+ puts
43
+
44
+ # exit with an error as we didn't find a command
45
+ exitcode = 1
46
+ else
47
+ puts "usage: #{$0} command <options>"
48
+ puts
49
+ end
50
+
30
51
  puts "Known commands:"
31
52
  puts
32
53
 
@@ -39,3 +60,5 @@ else
39
60
  puts "to get detailed help for a command"
40
61
  puts
41
62
  end
63
+
64
+ exit exitcode
@@ -8,7 +8,7 @@ metadata :name => "average",
8
8
 
9
9
  usage <<-USAGE
10
10
 
11
- This aggregate plugin will determine te average of a set of numeric values.
11
+ This aggregate plugin will determine the average of a set of numeric values.
12
12
 
13
13
  DDL Example:
14
14
 
@@ -145,7 +145,7 @@ module MCollective
145
145
 
146
146
  libdirs.each do |dir|
147
147
  unless File.directory?(dir)
148
- Log.warn("Cannot find libdir: #{dir}")
148
+ Log.debug("Cannot find libdir: #{dir}")
149
149
  end
150
150
 
151
151
  # remove the old one if it exists, we're moving it to the front
data/lib/mcollective.rb CHANGED
@@ -59,7 +59,7 @@ module MCollective
59
59
 
60
60
  MCollective::Vendor.load_vendored
61
61
 
62
- VERSION="2.8.1"
62
+ VERSION="2.8.2"
63
63
 
64
64
  def self.version
65
65
  VERSION
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mcollective-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.8.1
4
+ version: 2.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-09 00:00:00.000000000 Z
11
+ date: 2015-05-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: systemu