god 0.7.16 → 0.7.17

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.17 / 2009-08-25
+  * Bug Fixes
+    * Fix the glob and directory config loading for -c option
+
 == 0.7.16 / 2009-08-24
   * Minor Enhancements
     * Better logging for disk_usage condition [github.com/lettherebecode]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 16
+:patch: 17

data/god.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.16"
+  s.version = "0.7.17"
 
   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-24}
+  s.date = %q{2009-08-25}
   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

@@ -142,27 +142,19 @@ module God
       end
       
       def load_config(config)
-        if File.directory? config
-          files_loaded = false
-          Dir[File.expand_path('**/*.god', config)].each do |god_file|
-            files_loaded ||= load_god_file(File.expand_path(god_file))
-          end
-          unless files_loaded
-            abort "No files could be loaded"
-          end
-        else
-          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
+        files = File.directory?(config) ? Dir['**/*.god'] : Dir[config]
+        abort "No files could be found" if files.empty?
+        files.each do |god_file|
+          unless load_god_file(god_file)
+            abort "File '#{god_file}' could not be loaded"
           end
         end
       end
       
       def load_god_file(god_file)
+        applog(nil, :info, "Loading #{god_file}")
         load File.expand_path(god_file)
+        true
       rescue Exception => e
         if e.instance_of?(SystemExit)
           raise
@@ -170,7 +162,7 @@ module God
           puts "There was an error in #{god_file}"
           puts "\t" + e.message
           puts "\t" + e.backtrace.join("\n\t")
-          return false
+          false
         end
       end
       

metadata

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