gitorious-munin-plugins 0.9.22 → 0.10.0

data/bin/gitorious-munin-plugin

@@ -10,10 +10,6 @@ require "gitorious-munin-plugins/memory_gauge"
 require "term/ansicolor"
 require "trollop"
 
-
-
-
-
 all_plugins = GitoriousMuninPlugins::Plugin.all
 called_as = Pathname($0).basename.to_s
 cli = GitoriousMuninPlugins::Cli.new(all_plugins, called_as)

data/lib/gitorious-munin-plugins/cli.rb

@@ -8,17 +8,15 @@ module GitoriousMuninPlugins
     end
 
     def run
-      if plugins.any? {|plugin| plugin.named?(called_as)}
+      if plugins.any? {|plugin| plugin.named?(called_as) }
         load_plugin(called_as)
       else
         UsagePlugin.new(plugins).run
       end
     end
 
-
     def load_plugin(name)
       load Plugin.root.realpath + "#{name}.rb"
     end
   end
-
 end

data/lib/gitorious-munin-plugins/config.rb

@@ -25,11 +25,15 @@ module GitoriousMuninPlugins
 
     # Fetch line matching #{key}= in /etc/gitorious.conf
     def fetch(key, default_value=nil)
+      return ENV[key] if ENV[key]
 
       begin
         config_file = File.read(GITORIOUS_CONF_PATH)
       rescue Errno::ENOENT
-        abort "Gitorious configuration file #{GITORIOUS_CONF_PATH} was not found, exiting"
+        abort <<-MSG
+Gitorious configuration file #{GITORIOUS_CONF_PATH} was not found, and
+environment variable #{key} was not set, exiting.
+        MSG
       end
 
       result = config_file.scan(/^#{key}=(.*)$/).flatten.first

data/lib/gitorious-munin-plugins/usage_plugin.rb

@@ -27,7 +27,7 @@ EOS
       elsif global_options[:uninstall_given]
         uninstall_plugins(ARGV)
       elsif global_options[:try_given]
-        try_running(ARGV)
+        (ARGV[0] || "").split(",").each { |name| try_running(name) }
       end
     end
 
@@ -54,7 +54,9 @@ EOS
     end
 
     def try_running(name)
-      load Plugin.root.realpath + "#{name}.rb"
+      plugin = Plugin.root.realpath + "#{name}.rb"
+      abort("Unknown plugin #{name}, exiting. List valid plugins with -l.") if !plugin.exist?
+      load(plugin)
     end
 
     def extract_plugins_from_spec(spec)

data/lib/gitorious-munin-plugins/version.rb

@@ -1,3 +1,3 @@
 module GitoriousMuninPlugins
-  VERSION = "0.9.22"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitorious-munin-plugins
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
-  - 22
-  version: 0.9.22
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Marius Mathiesen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 +01:00
+date: 2013-06-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency