god 0.7.14 → 0.7.15

data/History.txt

@@ -1,6 +1,7 @@
-==
+== 0.7.15 / 2009-08-19
   * Minor Enhancements
     * Support SSL Campfire connections [github.com/eric]
+    * Allow wildcards in -c configuration file option
 
 == 0.7.14 / 2009-08-10
   * Minor Enhancements

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 7
-:patch: 14
 :major: 0
+:minor: 7
+:patch: 15

data/god.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.14"
+  s.version = "0.7.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-08-19}
   s.default_executable = %q{god}
   s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{tom@mojombo.com}

data/lib/god/cli/run.rb

@@ -58,7 +58,7 @@ module God
         end
         
         if @options[:config]
-          unless File.exist?(@options[:config])
+          if !@options[:config].include?('*') && !File.exist?(@options[:config])
             abort "File not found: #{@options[:config]}"
           end
           
@@ -151,8 +151,12 @@ module God
             abort "No files could be loaded"
           end
         else
-          unless load_god_file(File.expand_path(config))
-            abort "File could not be loaded"
+          files = Dir.glob(config)
+          abort "No files could be loaded" if files.empty?
+          files.each do |f|
+            unless load_god_file(File.expand_path(config))
+              abort "File '#{config}' could not be loaded"
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: god
 dependencies: []